Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/model/model.h')
-rw-r--r--src/model/model.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/model/model.h b/src/model/model.h
index 8e3d82d..c15213c 100644
--- a/src/model/model.h
+++ b/src/model/model.h
@@ -13,7 +13,7 @@
#include "math/mathlib.h"
-#include "model/collisionmesh.h"
+#include "model/collisionmodel.h"
#include "model/tags.h"
#include "model/fragment.h"
@@ -76,8 +76,8 @@ public:
return model_groups;
}
- inline CollisionMesh *collisionmesh() {
- return model_collisionmesh;
+ inline CollisionModel *collisionmodel() {
+ return model_collisionmodel;
}
/// list of model light tags
@@ -150,8 +150,8 @@ public:
/// set model radius
void set_radius(const float radius);
- /// set model collision mesh
- void set_collisionmesh(CollisionMesh *collisionmesh);
+ /// set collision model
+ void set_collisionmodel(CollisionModel *collisionmodel);
/// set model origin
void set_origin(const math::Vector3f &origin);
@@ -206,7 +206,7 @@ private:
Groups model_groups;
float model_radius;
static Registry model_registry;
- CollisionMesh *model_collisionmesh;
+ CollisionModel *model_collisionmodel;
};
}