X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fobject.h;h=98a259594a11fb5977910eb81208bc1200fa4ea0;hb=HEAD;hp=ecd4fa319c3f30365593c0ebad585f3eb30f7ae0;hpb=64e2adbbab48320b6cd792e515b44cea112a3be4;p=demo

diff --git a/src/object.h b/src/object.h
index ecd4fa3..98a2595 100644
--- 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();