projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
picking up exhibits works again with the slot mechanism
[laserbrain_demo]
/
src
/
object.h
diff --git
a/src/object.h
b/src/object.h
index
cc82d1b
..
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 {
enum ObjType { OBJ_NULL, OBJ_MESH };
class Object {
-private:
+protected:
std::string name;
std::string name;
+ mutable AABox aabb;
public:
Material mtl;
public:
Material mtl;
- //GeomObject *bvol;
SceneNode *node;
Object();
SceneNode *node;
Object();
@@
-32,6
+32,8
@@
public:
virtual void update(float dt = 0.0f);
virtual void draw() const;
virtual void update(float dt = 0.0f);
virtual void draw() const;
+
+ virtual const AABox &get_aabox() const;
};
#endif // OBJECT_H_
};
#endif // OBJECT_H_