From e7a0b54c4717afdfa12a8847d5bc72b7b68290b4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Fri, 6 May 2011 17:08:21 +0000 Subject: Import submodel clip --- src/model/collisionmesh.h | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) (limited to 'src/model/collisionmesh.h') 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 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 -- cgit v1.2.3