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

Changed how fast the marble is dying and spawning.

Browse Source
This commit is contained in:
Fabian Klemp 2015-03-09 16:00:07 +01:00
parent f71f9e0590
commit 7ef0fddd1f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
physics.cc
View File

@ -85,7 +85,7 @@ void Physics::takeUpdateStep(float timeDiff)
if(sinking) if(sinking)
{ {
btVector3 currentPos = playerBall->getCenterOfMassPosition(); btVector3 currentPos = playerBall->getCenterOfMassPosition();
currentPos -= btVector3(0,0.35f*timeDiff,0); currentPos -= btVector3(0,0.8f*timeDiff,0);
float damp = playerBall->getAngularDamping(); float damp = playerBall->getAngularDamping();
playerBall->setDamping(playerBall->getLinearDamping(),0.9); playerBall->setDamping(playerBall->getLinearDamping(),0.9);
world->stepSimulation(timeDiff); world->stepSimulation(timeDiff);
@ -106,7 +106,7 @@ void Physics::takeUpdateStep(float timeDiff)
else else
{ {
btVector3 currentPos = playerBall->getCenterOfMassPosition(); btVector3 currentPos = playerBall->getCenterOfMassPosition();
currentPos += btVector3(0,0.9f*timeDiff,0); currentPos += btVector3(0,3.0f*timeDiff,0);
world->stepSimulation(timeDiff); world->stepSimulation(timeDiff);
playerBall->setCenterOfMassTransform(btTransform(playerBall->getOrientation(),currentPos)); playerBall->setCenterOfMassTransform(btTransform(playerBall->getOrientation(),currentPos));
cameraBody->setCenterOfMassTransform(btTransform(btQuaternion(0,0,0,1),camPos)); cameraBody->setCenterOfMassTransform(btTransform(btQuaternion(0,0,0,1),camPos));