X-Git-Url: http://git.mutantstargoat.com?p=demo;a=blobdiff_plain;f=src%2Fobject.h;h=220e1d77fde5a6162e8dcd64e54447a4b3d78635;hp=ecd4fa319c3f30365593c0ebad585f3eb30f7ae0;hb=46cc932f7ddb0c81f352bc847973dae6b327ebeb;hpb=9da6afeaca91bbb18899f3144c5d0a1bf1f31bb7 diff --git a/src/object.h b/src/object.h index ecd4fa3..220e1d7 100644 --- a/src/object.h +++ b/src/object.h @@ -16,8 +16,6 @@ enum OType { }; struct Material { -// std::string name; <-TODO or id - Vec3 diffuse; Vec3 specular; float shininess; @@ -28,7 +26,7 @@ struct Material { class Object { public: Mat4 transform; - Material material; + Material *material; Mesh *mesh; Object();