Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-02-08 16:55:23 +0000
committerStijn Buys <ingar@osirion.org>2011-02-08 16:55:23 +0000
commit38eb51c26ab0d9dbebc974c7a21f96a429ce3098 (patch)
tree8563fdcf4de0d19ad20e660ae30b4b333825e4d4 /src/model
parent84dd93a63305bd3b1ff3c5c897a6f3e729bfefed (diff)
Corrected triangle loading of collision model, added 'complex' flag to ships.ini
to enable collision models on player ships.
Diffstat (limited to 'src/model')
-rw-r--r--src/model/collisionmesh.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/model/collisionmesh.cc b/src/model/collisionmesh.cc
index 90aafc3..5d4505a 100644
--- a/src/model/collisionmesh.cc
+++ b/src/model/collisionmesh.cc
@@ -69,7 +69,8 @@ void CollisionMesh::add_triangle(const math::Vector3f & v0, const math::Vector3f
collisionmesh_triangles->addTriangle(
to_btVector3(v0),
to_btVector3(v1),
- to_btVector3(v1)
+ to_btVector3(v2),
+ true
);
collisionmesh_size += 1;
}