|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
|
|
|
|
|
#include <cassert> |
|
|
|
|
|
|
|
|
|
#include <glm/gtc/matrix_transform.hpp> |
|
|
|
|
#include <glm/ext/matrix_transform.hpp> |
|
|
|
|
|
|
|
|
|
#include "dumbLog.h" |
|
|
|
|
#include "entity.h" |
|
|
|
|
@ -14,24 +14,6 @@ void initDefaults(entity& e);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// interface
|
|
|
|
|
#if 0 |
|
|
|
|
bool |
|
|
|
|
entInitModel(entity& e, const char* model_path) |
|
|
|
|
{ |
|
|
|
|
initDefaults(e); |
|
|
|
|
|
|
|
|
|
if (meLoadFromFile(e.meshes, model_path)) |
|
|
|
|
{ |
|
|
|
|
e.render_objs = roInitModel(e.meshes); |
|
|
|
|
|
|
|
|
|
if (e.render_objs != nullptr) |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
entFree(e); |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
bool |
|
|
|
|
entInitModel(entity* e, model* mdl) |
|
|
|
|
@ -76,7 +58,7 @@ entScale(entity& e, glm::vec3 v)
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void |
|
|
|
|
entRotate(entity*& e, float angle, glm::vec3 axis) |
|
|
|
|
entRotate(entity* e, float angle, glm::vec3 axis) |
|
|
|
|
{ |
|
|
|
|
e->world_transform = glm::rotate(e->world_transform, angle, axis); |
|
|
|
|
} |
|
|
|
|
|