no clue :) just to push it

[demo] / src / object.h

diff --git a/src/object.h b/src/object.h
index ecd4fa3..98a2595 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -9,26 +9,19 @@ class Mesh;
 class ShaderProgram;
 class Texture;
 
-enum OType {
-       OBJ_MESH,
-       OBJ_PT_LIGHT,
-       OBJ_CAMERA
-};
-
 struct Material {
-//     std::string name; <-TODO or id
-
        Vec3 diffuse;
        Vec3 specular;
        float shininess;
 
        Texture *dtex; // diffuse
+       std::string name;
 };
 
 class Object {
 public:
        Mat4 transform;
-       Material material;
+       Material *material;
        Mesh *mesh;
 
        Object();