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-05-05 18:08:45 +0000
committerStijn Buys <ingar@osirion.org>2011-05-05 18:08:45 +0000
commit1687737ca713cd0baeca3cf79950ef4877640c99 (patch)
treef6cfd31c850cec95da491036f1dd772397128549 /src/model/model.cc
parent09d68d3d1d77d45343e3562c0b5e0cd6816d47d3 (diff)
Initial support for btCompoundShape and the infrastructure required to accomodate multiple meshes per collision model,
added prototype files for signals
Diffstat (limited to 'src/model/model.cc')
-rw-r--r--src/model/model.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/model/model.cc b/src/model/model.cc
index d1805df..ab89dae 100644
--- a/src/model/model.cc
+++ b/src/model/model.cc
@@ -30,7 +30,7 @@ Model::Model(const std::string & name) :
model_quad_detail_count = 0;
model_quad_count = 0;
- model_collisionmesh = 0;
+ model_collisionmodel = 0;
}
Model::~Model()
@@ -72,8 +72,8 @@ Model::~Model()
model_sounds.clear();
}
-void Model::set_collisionmesh(CollisionMesh *collisionmesh)
-{ model_collisionmesh = collisionmesh;
+void Model::set_collisionmodel(CollisionModel *collisionmodel)
+{ model_collisionmodel = collisionmodel;
}