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

Made more physics parameters for objects adjustable in the xml file

Browse Source 
(for now to support a puck).
This commit is contained in:
hiker 2016-05-25 17:21:31 +10:00
parent 5f6f1ec448
commit 566df3dee6
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/physics/physical_object.cpp
View File

@ -60,7 +60,14 @@ PhysicalObject::Settings::Settings(const XMLNode &xml_node)
xml_node.get("id", &m_id );
xml_node.get("mass", &m_mass );
xml_node.get("radius", &m_radius );
xml_node.get("height", &m_height );
xml_node.get("friction", &m_friction );
xml_node.get("restitution", &m_restitution );
xml_node.get("linear-factor", &m_linear_factor );
xml_node.get("angular-factor", &m_angular_factor );
xml_node.get("linear-damping", &m_linear_damping );
xml_node.get("angular-damping", &m_angular_damping );
xml_node.get("shape", &shape );
xml_node.get("reset", &m_crash_reset );
xml_node.get("explode", &m_knock_kart );
@ -98,7 +105,13 @@ void PhysicalObject::Settings::init()
m_knock_kart = false;
m_mass = 0.0f;
m_radius = -1.0f;
m_height = -1.0f;
m_friction = 0.5f; // default bullet value
m_restitution = 0.0f;
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;
m_angular_damping = 0.0f;
m_reset_when_too_low = false;
m_flatten_kart = false;
} // Settings
@ -130,11 +143,10 @@ PhysicalObject::PhysicalObject(bool is_dynamic,
m_flatten_kart = false;
m_triangle_mesh = NULL;
m_object = object;
m_init_xyz = object->getAbsoluteCenterPosition();
m_init_hpr = object->getRotation();
m_init_scale = object->getScale();
m_object = object;
m_init_xyz = object->getAbsoluteCenterPosition();
m_init_hpr = object->getRotation();
m_init_scale = object->getScale();
m_id = settings.m_id;
m_mass = settings.m_mass;
@ -160,8 +172,7 @@ PhysicalObject::PhysicalObject(bool is_dynamic,
m_is_dynamic = is_dynamic;
init();
m_body->setRestitution(settings.m_restitution);
init(settings);
} // PhysicalObject
// ----------------------------------------------------------------------------
@ -205,7 +216,7 @@ void PhysicalObject::move(const Vec3& xyz, const core::vector3df& hpr)
// ----------------------------------------------------------------------------
/** Additional initialisation after loading of the model is finished.
*/
void PhysicalObject::init()
void PhysicalObject::init(const PhysicalObject::Settings& settings)
{
// 1. Determine size of the object
// -------------------------------
@ -296,6 +307,8 @@ void PhysicalObject::init()
}
case MP_CYLINDER_Y:
{
if(settings.m_height > 0)
extend.setY(settings.m_height);
if (m_radius < 0) m_radius = 0.5f*extend.length_2d();
m_shape = new btCylinderShape(0.5f*extend);
break;
@ -514,6 +527,12 @@ void PhysicalObject::init()
m_user_pointer.set(this);
m_body->setUserPointer(&m_user_pointer);
m_body->setFriction(settings.m_friction);
m_body->setRestitution(settings.m_restitution);
m_body->setLinearFactor(settings.m_linear_factor);
m_body->setAngularFactor(settings.m_angular_factor);
m_body->setDamping(settings.m_linear_damping,settings.m_angular_damping);
if (!m_is_dynamic)
{
m_body->setCollisionFlags( m_body->getCollisionFlags()

17
src/physics/physical_object.hpp
View File

@ -51,12 +51,25 @@ public:
std::string m_id;
/** Mass of the object. */
float m_mass;
/** Radius of the object. */
/** Radius of the object, to overwrite the graphical dimension. */
float m_radius;
/** Height of an object, to overwrite the graphical dimension. */
float m_height;
/** Shape of the object. */
PhysicalObject::BodyTypes m_body_type;
/** Restitution of the physical object. */
float m_restitution;
/** Friction for this object. */
float m_friction;
/** Bullet's linear factor. */
Vec3 m_linear_factor;
/** Bullet angular factor. */
Vec3 m_angular_factor;
/** Bullet's linear damping factor. */
float m_linear_damping;
/** Bullet's angular damping factor. */
float m_angular_damping;
/** Trigger a reset in karts touching it? */
bool m_crash_reset;
/** Knock the kart around. */
@ -179,7 +192,7 @@ public:
virtual void reset ();
virtual void handleExplosion(const Vec3& pos, bool directHit);
void update (float dt);
void init ();
void init (const Settings &settings);
void move (const Vec3& xyz, const core::vector3df& hpr);
void hit (const Material *m, const Vec3 &normal);
bool isSoccerBall () const;