projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quick backup of the finished scene loader before I submit other parts
[demo]
/
src
/
object.h
diff --git
a/src/object.h
b/src/object.h
index
ecd4fa3
..
57aef84
100644
(file)
--- a/
src/object.h
+++ b/
src/object.h
@@
-16,19
+16,18
@@
enum OType {
};
struct Material {
};
struct Material {
-// std::string name; <-TODO or id
-
Vec3 diffuse;
Vec3 specular;
float shininess;
Texture *dtex; // diffuse
Vec3 diffuse;
Vec3 specular;
float shininess;
Texture *dtex; // diffuse
+ std::string name;
};
class Object {
public:
Mat4 transform;
};
class Object {
public:
Mat4 transform;
- Material material;
+ Material *material;
Mesh *mesh;
Object();
Mesh *mesh;
Object();