mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-05 02:51:49 +00:00
add more debug messages and checks
This commit is contained in:
parent
f1d85000e4
commit
a7ffbc9dec
3 changed files with 47 additions and 14 deletions
|
|
@ -1,10 +1,13 @@
|
|||
#include "Transform.hpp"
|
||||
|
||||
#include "data/dv_util.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "maths/util.hpp"
|
||||
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
|
||||
static debug::Logger logger("entity-transform");
|
||||
|
||||
void Transform::refresh() {
|
||||
combined = glm::mat4(1.0f);
|
||||
combined = glm::translate(combined, pos);
|
||||
|
|
@ -33,25 +36,31 @@ void Transform::deserialize(const dv::value& root) {
|
|||
dv::get_mat(root, "rot", rot);
|
||||
}
|
||||
|
||||
bool Transform::checkValue(const glm::vec3& vector) {
|
||||
bool Transform::checkValue(const glm::vec3& vector, std::string_view name) {
|
||||
if (util::is_nan_or_inf(vector)) {
|
||||
auto message = "invalid vector attempted set to " + std::string(name) +
|
||||
" : " + std::to_string(vector.x) + ", " +
|
||||
std::to_string(vector.y) + ", " +
|
||||
std::to_string(vector.z);
|
||||
#ifndef NDEBUG
|
||||
throw std::invalid_argument(
|
||||
"invalid vector: " + std::to_string(vector.x) + ", " +
|
||||
std::to_string(vector.y) + ", " + std::to_string(vector.z)
|
||||
);
|
||||
throw std::invalid_argument(message);
|
||||
#else
|
||||
logger.warning() << message;
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Transform::checkValue(const glm::mat3& matrix) {
|
||||
bool Transform::checkValue(const glm::mat3& matrix, std::string_view name) {
|
||||
if (util::is_nan_or_inf(matrix)) {
|
||||
auto message =
|
||||
"invalid matrix (contains nan or inf) attempted set to " +
|
||||
std::string(name);
|
||||
#ifndef NDEBUG
|
||||
throw std::invalid_argument("invalid matrix (contains nan or inf)");
|
||||
throw std::invalid_argument(message);
|
||||
#else
|
||||
logger.warning() << message;
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ struct Transform {
|
|||
void refresh();
|
||||
|
||||
inline void setRot(const glm::mat3& m) {
|
||||
if (!checkValue(m)) {
|
||||
if (!checkValue(m, "rotation")) {
|
||||
return;
|
||||
}
|
||||
rot = m;
|
||||
|
|
@ -33,7 +33,7 @@ struct Transform {
|
|||
}
|
||||
|
||||
inline void setSize(const glm::vec3& v) {
|
||||
if (!checkValue(v)) {
|
||||
if (!checkValue(v, "size")) {
|
||||
return;
|
||||
}
|
||||
if (glm::distance2(displaySize, v) >= EPSILON) {
|
||||
|
|
@ -43,7 +43,7 @@ struct Transform {
|
|||
}
|
||||
|
||||
inline void setPos(const glm::vec3& v) {
|
||||
if (!checkValue(v)) {
|
||||
if (!checkValue(v, "position")) {
|
||||
return;
|
||||
}
|
||||
if (glm::distance2(displayPos, v) >= EPSILON) {
|
||||
|
|
@ -52,6 +52,6 @@ struct Transform {
|
|||
pos = v;
|
||||
}
|
||||
|
||||
static bool checkValue(const glm::vec3& v);
|
||||
static bool checkValue(const glm::mat3& v);
|
||||
static bool checkValue(const glm::vec3& v, std::string_view name);
|
||||
static bool checkValue(const glm::mat3& v, std::string_view name);
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue