ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further tweaked restitution for track and bowling ball to avoid

Browse Source 
bowling balls jumping up and down, while still maintaining a push
back for soccer balls.
This commit is contained in:
hiker 2016-08-01 08:00:14 +10:00
parent efe9fa6329
commit cdde62dadb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/items/bowling.cpp
View File

@ -57,7 +57,7 @@ Bowling::Bowling(AbstractKart *kart)
createPhysics(y_offset, btVector3(0.0f, 0.0f, m_speed*2), createPhysics(y_offset, btVector3(0.0f, 0.0f, m_speed*2),
new btSphereShape(0.5f*m_extend.getY()), new btSphereShape(0.5f*m_extend.getY()),
1.0f /*restitution*/, 0.8f /*restitution*/,
-70.0f /*gravity*/, -70.0f /*gravity*/,
true /*rotates*/); true /*rotates*/);
// Even if the ball is fired backwards, m_speed must be positive, // Even if the ball is fired backwards, m_speed must be positive,

2
src/physics/triangle_mesh.cpp
View File

@ -188,7 +188,7 @@ void TriangleMesh::createPhysicalBody(btCollisionObject::CollisionFlags flags,
m_motion_state = new btDefaultMotionState(startTransform); m_motion_state = new btDefaultMotionState(startTransform);
btRigidBody::btRigidBodyConstructionInfo info(0.0f, m_motion_state, btRigidBody::btRigidBodyConstructionInfo info(0.0f, m_motion_state,
m_collision_shape); m_collision_shape);
info.m_restitution = 1.0f; info.m_restitution = 0.8f;
m_body=new btRigidBody(info); m_body=new btRigidBody(info);
World::getWorld()->getPhysics()->addBody(m_body); World::getWorld()->getPhysics()->addBody(m_body);