aboutsummaryrefslogtreecommitdiff
path: root/src/o3d/obj3d.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/o3d/obj3d.h')
-rw-r--r--src/o3d/obj3d.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/o3d/obj3d.h b/src/o3d/obj3d.h
index 250b6bc..9f407f9 100644
--- a/src/o3d/obj3d.h
+++ b/src/o3d/obj3d.h
@@ -1,22 +1,15 @@
#ifndef O3D_OBJ3D_H
#define O3D_OBJ3D_H
-#include "math/vector.h"
+#include <type_traits>
+#include "math/tform.h"
#include "o3d/mesh.h"
namespace engine::o3d {
-class Scene;
-
-class Object3D {
- public:
- Scene* scene = nullptr;
- Mesh mesh;
- engine::math::Vector3 loc;
- float scale;
- float rot_x, rot_y, rot_z;
-
- Object3D(Mesh mesh, engine::math::Vector3 loc, float scale, float rot_x, float rot_y, float rot_z);
+struct Object3D {
+ Mesh mesh;
+ math::Transform transform;
};
}