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

Improved handling of scaled physical objects

Browse Source
This commit is contained in:
Marianne Gagnon 2015-03-05 20:14:33 -05:00
parent fb4f4aeb2e
commit 8bd33dba23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/physics/physical_object.cpp
View File

@ -246,6 +246,10 @@ void PhysicalObject::init()
{
Log::fatal("PhysicalObject", "Unknown node type");
}
max = max * Vec3(m_init_scale);
min = min * Vec3(m_init_scale);
Vec3 extend = max-min;
// Adjust the mesth of the graphical object so that its center is where it
// is in bullet (usually at (0,0,0)). It can be changed in the case clause
@ -503,10 +507,8 @@ void PhysicalObject::update(float dt)
hpr.setHPR(t.getRotation());
//m_node->setRotation(hpr.toIrrHPR());
core::vector3df scale(1,1,1);
m_object->move(xyz.toIrrVector(), hpr.toIrrVector()*RAD_TO_DEGREE,
scale, false);
return;
m_init_scale, false);
} // update
// ----------------------------------------------------------------------------