faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

added trimesh back to collision

Browse Source
This commit is contained in:
Jasper 2015-01-19 15:24:44 +01:00
parent 12ee9a4ac5
commit 8c8655c096
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
physics.cc
View File

@ -148,7 +148,7 @@ void Physics::addPlayer(float friction, float rad, Entity entity, float mass, fl
btRigidBody::btRigidBodyConstructionInfo info(mass,motion,sphere,inertia); btRigidBody::btRigidBodyConstructionInfo info(mass,motion,sphere,inertia);
info.m_friction = friction; info.m_friction = friction*2;
info.m_restitution = 0.0f; info.m_restitution = 0.0f;
playerBall = new btRigidBody(info); playerBall = new btRigidBody(info);
@ -229,7 +229,7 @@ void Physics::addTriangleMeshBody(Entity entity, std::string path, float mass, f
bodies.push_back(body); bodies.push_back(body);
world->addRigidBody(body); world->addRigidBody(body,COL_OBJECTS, objectsPhysicsCollision);
if(bodies.size() != indice) if(bodies.size() != indice)
@ -366,7 +366,7 @@ void Physics::addCamera(float rad, float distance)
cameraBody->setDamping(0.9f,1.0f); cameraBody->setDamping(0.9f,1.0f);
world->addRigidBody(cameraBody); world->addRigidBody(cameraBody,COL_OBJECTS, objectsPhysicsCollision);
cameraBody->setSleepingThresholds(0,0); cameraBody->setSleepingThresholds(0,0);