projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of goat:git/laserbrain_demo
[laserbrain_demo]
/
src
/
object.h
diff --git
a/src/object.h
b/src/object.h
index
65c39e1
..
3ffec1f
100644
(file)
--- a/
src/object.h
+++ b/
src/object.h
@@
-12,12
+12,12
@@
class SceneNode;
enum ObjType { OBJ_NULL, OBJ_MESH };
class Object {
-private:
+protected:
std::string name;
+ mutable AABox aabb;
public:
Material mtl;
- //GeomObject *bvol;
SceneNode *node;
Object();