dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EPhysics: fix mass getter 

SVN revision: 74494
This commit is contained in:
Bruno Dilly 2012-07-27 14:47:23 +00:00
parent 4716f7f7ca
commit 7dc1e7b4b7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/ephysics/src/lib/ephysics_body.cpp
View File

@ -27,6 +27,7 @@ struct _EPhysics_Body {
Evas_Object *evas_obj; Evas_Object *evas_obj;
EPhysics_World *world; EPhysics_World *world;
Eina_Inlist *callbacks; Eina_Inlist *callbacks;
double mass;
Eina_Bool active:1; Eina_Bool active:1;
}; };
@ -82,6 +83,7 @@ _ephysics_body_add(EPhysics_World *world, btCollisionShape *collision_shape)
body->collision_shape = collision_shape; body->collision_shape = collision_shape;
body->rigid_body = rigid_body; body->rigid_body = rigid_body;
body->mass = mass;
body->world = world; body->world = world;
body->rigid_body->setUserPointer(body); body->rigid_body->setUserPointer(body);
body->rigid_body->setLinearFactor(btVector3(1, 1, 0)); body->rigid_body->setLinearFactor(btVector3(1, 1, 0));
@ -558,6 +560,7 @@ ephysics_body_mass_set(EPhysics_Body *body, double mass)
body->collision_shape->calculateLocalInertia(mass, inertia); body->collision_shape->calculateLocalInertia(mass, inertia);
body->rigid_body->setMassProps(mass, inertia); body->rigid_body->setMassProps(mass, inertia);
body->rigid_body->updateInertiaTensor(); body->rigid_body->updateInertiaTensor();
body->mass = mass;
DBG("Body %p mass changed to %lf.", body, mass); DBG("Body %p mass changed to %lf.", body, mass);
} }
@ -571,7 +574,7 @@ ephysics_body_mass_get(const EPhysics_Body *body)
return 0; return 0;
} }
return 1 / body->rigid_body->getInvMass(); return body->mass;
} }
EAPI void EAPI void