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.cc
parent4af61dca099d2b7010d4fa83833ceeeef01b0b0f (diff)
Support structures for complex entity collision,
renamed sv_arrysize cvar to mem_vertex.
Diffstat (limited to 'src/model/model.cc')
-rw-r--r--src/model/model.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/model/model.cc b/src/model/model.cc
index fb33bd0..d1805df 100644
--- a/src/model/model.cc
+++ b/src/model/model.cc
@@ -1,5 +1,5 @@
/*
- render/model.h
+ render/model.cc
This file is part of the Osirion project and is distributed under
the terms of the GNU General Public License version 2
*/
@@ -29,6 +29,8 @@ Model::Model(const std::string & name) :
model_tris_count = 0;
model_quad_detail_count = 0;
model_quad_count = 0;
+
+ model_collisionmesh = 0;
}
Model::~Model()
@@ -70,6 +72,11 @@ Model::~Model()
model_sounds.clear();
}
+void Model::set_collisionmesh(CollisionMesh *collisionmesh)
+{ model_collisionmesh = collisionmesh;
+
+}
+
void Model::set_origin(const math::Vector3f &origin)
{
model_origin.assign(origin);