Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-01-21 14:41:35 +0000
committerStijn Buys <ingar@osirion.org>2011-01-21 14:41:35 +0000
commit035653e94a3d74b8f18c993034199d7cd08a895a (patch)
tree6acc56c14a86b499657b6e7faaf50f9e6f7ff57d /src/model/model.h
parent4af61dca099d2b7010d4fa83833ceeeef01b0b0f (diff)
Support structures for complex entity collision,
renamed sv_arrysize cvar to mem_vertex.
Diffstat (limited to 'src/model/model.h')
-rw-r--r--src/model/model.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/model/model.h b/src/model/model.h
index d3973c9..8e3d82d 100644
--- a/src/model/model.h
+++ b/src/model/model.h
@@ -13,6 +13,7 @@
#include "math/mathlib.h"
+#include "model/collisionmesh.h"
#include "model/tags.h"
#include "model/fragment.h"
@@ -75,6 +76,10 @@ public:
return model_groups;
}
+ inline CollisionMesh *collisionmesh() {
+ return model_collisionmesh;
+ }
+
/// list of model light tags
inline Lights & lights() {
return model_lights;
@@ -145,6 +150,9 @@ public:
/// set model radius
void set_radius(const float radius);
+ /// set model collision mesh
+ void set_collisionmesh(CollisionMesh *collisionmesh);
+
/// set model origin
void set_origin(const math::Vector3f &origin);
@@ -198,6 +206,7 @@ private:
Groups model_groups;
float model_radius;
static Registry model_registry;
+ CollisionMesh *model_collisionmesh;
};
}