projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fixed mesh bugs
[demo]
/
src
/
object.h
diff --git
a/src/object.h
b/src/object.h
index
220e1d7
..
98a2595
100644
(file)
--- a/
src/object.h
+++ b/
src/object.h
@@
-9,18
+9,13
@@
class Mesh;
class ShaderProgram;
class Texture;
-enum OType {
- OBJ_MESH,
- OBJ_PT_LIGHT,
- OBJ_CAMERA
-};
-
struct Material {
Vec3 diffuse;
Vec3 specular;
float shininess;
Texture *dtex; // diffuse
+ std::string name;
};
class Object {