projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added linear interpolation in image to use it at the terrain generation
[demo]
/
src
/
object.h
diff --git
a/src/object.h
b/src/object.h
index
ecd4fa3
..
98a2595
100644
(file)
--- a/
src/object.h
+++ b/
src/object.h
@@
-9,26
+9,19
@@
class Mesh;
class ShaderProgram;
class Texture;
class ShaderProgram;
class Texture;
-enum OType {
- OBJ_MESH,
- OBJ_PT_LIGHT,
- OBJ_CAMERA
-};
-
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();