enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

EPhysics: fix API regarding geometry and acceleration 

units
Avoid messing Evas coordinates (pixels) with meters.
Change gravity setter / getter too.



SVN revision: 73184
This commit is contained in:
Bruno Dilly 2012-07-03 02:17:55 +00:00
parent 7f4fbaf689
commit 22d76ad177
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
legacy/ephysics/src/lib/EPhysics.h
View File

@ -298,7 +298,8 @@ typedef void (*EPhysics_World_Event_Cb)(void *data, EPhysics_World *world, void
* It can be paused / unpaused with @ref ephysics_world_running_set() and its
* gravity can be changed with @ref ephysics_world_gravity_set().
*
* By default it starts with gravity y = -9.81 and playing.
* By default it starts with gravity y = 294 Evas coordinates per second ^ 2
* and playing.
*
* If default updates between physics bodies and evas objects will be used
* it's mandatory to set the size of the area to be rendered with
@ -330,6 +331,8 @@ EAPI EPhysics_World *ephysics_world_new(void);
* @param w rendered area width, in pixels.
* @param h rendered area height, in pixels.
*
* @note The unit used for geometry is Evas coordinates.
*
* @see ephysics_body_event_callback_add() for more info.
* @see ephysics_world_rate_get().
* @see ephysics_world_render_geometry_get().
@ -420,13 +423,20 @@ EAPI Eina_Bool ephysics_world_running_get(const EPhysics_World *world);
*
* Gravity will act over bodies with mass over all the time.
*
* By default values are 0, -9.81.
* By default values are 0, 294 Evas Coordinates per second ^ 2
* (9.8 m/s^2, since we've a default rate of 30 pixels).
*
* If you change the rate but wants to keep 9.8 m/s^2, you well need
* to set world gravity with: 9.8 * new_rate.
*
* @param world The world object.
* @param gx Gravity on x axis.
* @param gy Gravity on y axis.
*
* @note The unit used for acceleration is Evas coordinates per second ^ 2.
*
* @see ephysics_world_gravity_get().
* @see ephysics_world_rate_set().
*
* @ingroup EPhysics_World
*/
@ -453,7 +463,11 @@ EAPI void ephysics_world_gravity_get(const EPhysics_World *world, double *gx, do
* It will be used by automatic updates of evas objects associated to
* physics bodies.
*
* By default its value is 20 pixel per meter.
* By default its value is 20 Evas coordinates (pixels) per meter.
*
* If you change the rate but wants to keep gravity as (0, 9.8 m/s^2),
* you well need to set world gravity with: 9.8 * new_rate.
* For this, use @ref ephysics_world_gravity_set();
*
* @param world The world object.
* @param rate Rate between pixels and meters. Value must be > 0.
@ -844,8 +858,6 @@ EAPI EPhysics_World *ephysics_body_world_get(const EPhysics_Body *body);
* updates of associated evas objects, or complement updates, like changing
* evas objects properties under certain conditions of position or rotation.
*
* @note The unit used for positions or sizes on EPhysics is meter.
*
* @param body The body to associate to an evas object.
* @param evas_obj The evas object that will be associated to this @p body.
* @param use_obj_pos If @c EINA_TRUE it will set the physics body position

9
legacy/ephysics/src/lib/ephysics_world.cpp
View File

@ -287,7 +287,7 @@ ephysics_world_new(void)
goto no_list;
}
world->dynamics_world->setGravity(btVector3(0, -9.81, 0));
world->dynamics_world->setGravity(btVector3(0, -9.8, 0));
world->rate = 30;
world->dynamics_world->setInternalTickCallback(_ephysics_world_tick_cb,
(void *) world);
@ -463,7 +463,8 @@ ephysics_world_gravity_set(EPhysics_World *world, double gx, double gy)
return;
}
world->dynamics_world->setGravity(btVector3(gx, gy, 0));
world->dynamics_world->setGravity(btVector3(gx / world->rate,
-gy / world->rate, 0));
DBG("World gravity set to X:%lf, Y:%lf.", gx, gy);
}
@ -480,8 +481,8 @@ ephysics_world_gravity_get(const EPhysics_World *world, double *gx, double *gy)
vector = world->dynamics_world->getGravity();
if (gx) *gx = vector.x();
if (gy) *gy = vector.y();
if (gx) *gx = vector.x() * world->rate;
if (gy) *gy = -vector.y() * world->rate;
}
EAPI void