From 2a87246be478e5ddd2bef4080f36382a889e02dd Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Thu, 27 Jan 2011 12:36:26 +0000 Subject: Moved material loading from render to core, make sure the dedicated server reads materials.ini, removed unnecessary CollisionMesh::translate() method. --- src/model/collisionmesh.cc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/model/collisionmesh.cc') diff --git a/src/model/collisionmesh.cc b/src/model/collisionmesh.cc index b20074f..90aafc3 100644 --- a/src/model/collisionmesh.cc +++ b/src/model/collisionmesh.cc @@ -34,7 +34,8 @@ void CollisionMesh::clear() con_debug << " clearing collision meshes" << std::endl; for (Registry::iterator i = collisionmesh_registry.begin(); i != collisionmesh_registry.end(); ++i) { - delete(*i).second; + delete (*i).second; + (*i).second = 0; } collisionmesh_registry.clear(); @@ -73,16 +74,4 @@ void CollisionMesh::add_triangle(const math::Vector3f & v0, const math::Vector3f collisionmesh_size += 1; } -void CollisionMesh::translate(const math::Vector3f translation) -{ - /* - IndexedMeshArray & indexes = collisionmesh_triangles->getIndexedMeshArray(); - for (size_t i =0; i < indexes.size(); i++) { - btIndexedMesh & mesh = indexes[i]; - - - } - */ -} - } // namespace model -- cgit v1.2.3