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

Remove a unneeded setting

Browse Source
This commit is contained in:
Benau 2016-06-13 09:09:18 +08:00 committed by GitHub
parent 1e1093dccc
commit 143bc2618e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/physics/physical_object.cpp
View File

@ -111,6 +111,7 @@ void PhysicalObject::Settings::init()
m_linear_factor = Vec3(1.0f, 1.0f, 1.0f);
m_angular_factor = Vec3(1.0f, 1.0f, 1.0f);
m_linear_damping = 0.0f;
// Make sure that the cones stop rolling by defining angular friction != 0.
m_angular_damping = 0.5f;
m_reset_when_too_low = false;
m_flatten_kart = false;
@ -521,8 +522,6 @@ void PhysicalObject::init(const PhysicalObject::Settings& settings)
btRigidBody::btRigidBodyConstructionInfo info(m_mass, m_motion_state,
m_shape, inertia);
// Make sure that the cones stop rolling by defining angular friction != 0.
info.m_angularDamping = 0.5f;
m_body = new btRigidBody(info);
m_user_pointer.set(this);
m_body->setUserPointer(&m_user_pointer);