projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
assign mesh, material to objects
[demo]
/
src
/
object.h
diff --git
a/src/object.h
b/src/object.h
index
ecd4fa3
..
220e1d7
100644
(file)
--- 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();