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-06 17:08:21 +0000
committerStijn Buys <ingar@osirion.org>2011-05-06 17:08:21 +0000
commite7a0b54c4717afdfa12a8847d5bc72b7b68290b4 (patch)
tree015dc7cc0f75c4405f5d07e137533d5dbc761598 /src/model/collisionmesh.h
parentebe064bf159a5c6e90f2bbe902efa16c6e654ff8 (diff)
Import submodel clip
Diffstat (limited to 'src/model/collisionmesh.h')
-rw-r--r--src/model/collisionmesh.h36
1 files changed, 4 insertions, 32 deletions
diff --git a/src/model/collisionmesh.h b/src/model/collisionmesh.h
index 4ab1c19..e80774d 100644
--- a/src/model/collisionmesh.h
+++ b/src/model/collisionmesh.h
@@ -30,6 +30,9 @@ public:
typedef std::list<CollisionMesh *> Registry;
CollisionMesh();
+
+ /// copy constructor
+ CollisionMesh(const CollisionMesh &other);
~CollisionMesh();
@@ -131,38 +134,6 @@ public:
*/
void add_triangle(const math::Vector3f & v0, const math::Vector3f & v1, const math::Vector3f & v2);
- /* ---- static ----------------------------------------------------- */
-
- /**
- * @brief initialize collisionmesh registry
- */
- static void init();
-
- /**
- * @brief shutdown collisionmesh registry
- */
- static void shutdown();
-
- /**
- * @brief clear collisionmesh registry
- */
- static void clear();
-
- /**
- * @brief find a collisionmesh in the registry
- */
- static CollisionMesh *find(const std::string &name);
-
- /**
- * @brief add a collisionmesh to the registry
- */
- static void add(CollisionMesh *collisionmesh);
-
-
- inline static bool initialized() {
- return collisionmesh_initialized;
- }
-
private:
/// the materials registry
@@ -180,6 +151,7 @@ private:
float collisionmesh_scale;
float collisionmesh_distance;
+ bool collisionmesh_owns_triangles;
};
} // namespace model