From: Enlightenment S. <no-...@en...> - 2012-06-28 14:02:13
|
Log: EPhysics: fix function references on docs discomfitor spotted some issues, so now all the functions are marked with @ref, so it will warn if they couldn't be found on project. Except functions on @see section, since we are already warned about them. Author: bdilly Date: 2012-06-28 07:02:02 -0700 (Thu, 28 Jun 2012) New Revision: 73013 Trac: http://trac.enlightenment.org/e/changeset/73013 Modified: trunk/ephysics/src/lib/EPhysics.h Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-06-28 14:01:19 UTC (rev 73012) +++ trunk/ephysics/src/lib/EPhysics.h 2012-06-28 14:02:02 UTC (rev 73013) @@ -103,7 +103,7 @@ { /* * The following events are only for use with EPhysics world objects, with - * ephysics_world_event_callback_add(): + * @ref ephysics_world_event_callback_add(): */ EPHYSICS_CALLBACK_WORLD_FIRST, /**< kept as sentinel, not really an event */ EPHYSICS_CALLBACK_WORLD_DEL, /**< World being deleted (called before free) */ @@ -112,7 +112,7 @@ /* * The following events are only for use with EPhysics body objects, with - * ephysics_body_event_callback_add(): + * @ref ephysics_body_event_callback_add(): */ EPHYSICS_CALLBACK_BODY_FIRST, /**< kept as sentinel, not really an event */ EPHYSICS_CALLBACK_BODY_UPDATE, /**< Body being updated */ @@ -164,14 +164,15 @@ * A camera defines the region of the physics world that will be rendered * on the canvas. It sets the point of view. * - * Every world has a camera, that can be get with ephysics_world_camera_get(). - * Its position can be set with ephysics_camera_position_set() and zoom - * in / zoom out can be done with ephysics_camera_zoom_set(). + * Every world has a camera, that can be get with + * @ref ephysics_world_camera_get(). + * Its position can be set with @ref ephysics_camera_position_set() and zoom + * in / zoom out can be done with @ref ephysics_camera_zoom_set(). * * @note WIP: IT'S NOT WORKING YET!! */ -typedef struct _EPhysics_Camera EPhysics_Camera; /**< Camera handle, used to zoom in / out a scene, or change the frame position to be rendered. Every world have a camera that can be get with ephysics_world_camera_get(). */ +typedef struct _EPhysics_Camera EPhysics_Camera; /**< Camera handle, used to zoom in / out a scene, or change the frame position to be rendered. Every world have a camera that can be get with @ref ephysics_world_camera_get(). */ /** * @brief @@ -277,14 +278,14 @@ * broadphase interface and a dispatcher to dispatch calculations * for overlapping pairs. * - * A new world can be created with ephysics_world_new() and deleted with - * ephysics_world_del(). It can have its gravity changed with - * ephysics_world_gravity_set() and play / paused with - * ephysics_world_running_set(). When running, the simulation will be gradually - * stepped. + * A new world can be created with @ref ephysics_world_new() and deleted with + * @ref ephysics_world_del(). It can have its gravity changed with + * @ref ephysics_world_gravity_set() and play / paused with + * @ref ephysics_world_running_set(). When running, the simulation will be + * gradually stepped. */ -typedef struct _EPhysics_World EPhysics_World; /**< World handle, most basic type of EPhysics. Created with ephysics_world_new() and deleted with ephysics_world_del(). */ +typedef struct _EPhysics_World EPhysics_World; /**< World handle, most basic type of EPhysics. Created with @ref ephysics_world_new() and deleted with @ref ephysics_world_del(). */ /** * @typedef EPhysics_World_Event_Cb @@ -311,14 +312,14 @@ * A new world will be created with set collision configuration, * constraint solver, broadphase interface and dispatcher. * - * It can be paused / unpaused with ephysics_world_running_set() and its - * gravity can be changed with ephysics_world_gravity_set(). + * 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. * * 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 - * ephysics_world_geometry_size_set(). + * @ref ephysics_world_render_geometry_set(). * * @return A new world or @c NULL, on errors. * @@ -335,10 +336,10 @@ * By default it starts with null x, y, width and height. * * The physics world won't be limited, but boundaries can be added with: - * @li ephysics_world_top_boundary_add(), - * @li ephysics_world_bottom_boundary_add(), - * @li ephysics_world_left_boundary_add(), - * @li ephysics_world_right_boundary_add(). + * @li @ref ephysics_body_top_boundary_add(), + * @li @ref ephysics_body_bottom_boundary_add(), + * @li @ref ephysics_body_left_boundary_add(), + * @li @ref ephysics_body_right_boundary_add(). * * @param world the world to be configured. * @param x Coordinate x of the top left point of rendered area, in pixels. @@ -577,35 +578,36 @@ * A body is a representation of an object inside a physics world. * * Bodies can have different shapes that can be created with: - * @li ephysics_body_circle_add(); - * @li or ephysics_body_box_add(). + * @li @ref ephysics_body_circle_add(); + * @li or @ref ephysics_body_box_add(). * * They can collide and have customizable properties, like: - * @li mass, set with ephysics_body_mass_set(); - * @li coefficient of restitution, set with ephysics_body_restitution_set(); - * @li and friction, set with ephysics_body_friction_set(). + * @li mass, set with @ref ephysics_body_mass_set(); + * @li coefficient of restitution, set with + * @ref ephysics_body_restitution_set(); + * @li and friction, set with @ref ephysics_body_friction_set(). * * Bodies can have its position and size directly set by - * ephysics_body_geometry_set(). + * @ref ephysics_body_geometry_set(). * * Also, they can have an associated evas object, done with - * ephysics_body_evas_object_set() function, being responsible for updating + * @ref ephysics_body_evas_object_set() function, being responsible for updating * its position and rotation, or letting a user callback be set - * for this task with ephysics_body_event_callback_add(). + * for this task with @ref ephysics_body_event_callback_add(). * * Also, bodies can have impulses applied over them, and will be affected * by gravity. Impulses can be applied with: - * @li ephysics_body_central_impulse_apply(); - * @li ephysics_body_torque_impulse_apply(). + * @li @ref ephysics_body_central_impulse_apply(); + * @li @ref ephysics_body_torque_impulse_apply(). * * Bodies can be removed from the world being directly deleted with - * ephysics_body_del() or when the world is deleted, case when all the + * @ref ephysics_body_del() or when the world is deleted, case when all the * bodies belonging to it will be deleted as well. Evas objects associated * to these bodies won't be affected in any way, but they will stop being * moved or rotated. */ -typedef struct _EPhysics_Body EPhysics_Body; /**< Body handle, represents an object on EPhysics world. Created with ephysics_body_circle_add() or ephysics_body_box_add() and deleted with ephysics_body_del(). */ +typedef struct _EPhysics_Body EPhysics_Body; /**< Body handle, represents an object on EPhysics world. Created with @ref ephysics_body_circle_add() or @ref ephysics_body_box_add() and deleted with @ref ephysics_body_del(). */ /** * @typedef EPhysics_Body_Event_Cb @@ -630,9 +632,10 @@ * Create a new circle physics body. * * Its collision shape will be a circle of diameter 1. To change it's size - * ephysics_body_geometry_set() should be used, so it can be deformed + * @ref ephysics_body_geometry_set() should be used, so it can be deformed * on x and y axises. - * Any evas object can be associated to it with ephysics_body_evas_object_set(), + * Any evas object can be associated to it with + * @ref ephysics_body_evas_object_set(), * and it will collide as a circle (even if you have an evas rectangle). * * Actually, since we're using a 3D backend, it will be a cylinder on @@ -652,7 +655,7 @@ * Create a new box physics body. * * Its collision shape will be a box of dimensions 1 on all the axises. - * To change it's size ephysics_body_geometry_set() should be used, + * To change it's size @ref ephysics_body_geometry_set() should be used, * so it can be deformed on x and y axises. * * @param world The world this body will belongs to. @@ -670,7 +673,8 @@ * Create a physic top boundary. * * A physic top boundary will limit the bodies area and placed on top edge of - * worlds render geometry - defined with ephysics_world_render_geometry_set(). + * worlds render geometry - defined with + * @ref ephysics_world_render_geometry_set(). * * @param world The world this body will belong to. * @return a new body or @c NULL, on erros. @@ -686,7 +690,7 @@ * * A physic bottom boundary will limit the bodies area and placed on bottom * edge of worlds render geometry - defined with - * ephysics_world_render_geometry_set(). + * @ref ephysics_world_render_geometry_set(). * * @param world The world this body will belong to. * @return a new body or @c NULL, on erros. @@ -702,7 +706,7 @@ * * A physic left boundary will limit the bodies area and placed right o the * left edge of worlds render geometry - defined with - * ephysics_world_render_geometry_set(). + * @ref ephysics_world_render_geometry_set(). * * @param world The world this body will belong to. * @return a new body or @c NULL, on erros. @@ -718,7 +722,7 @@ * * A physic right boundary will limit the bodies area and placed right o the * right edge of worlds render geometry - defined with - * ephysics_world_render_geometry_set(). + * @ref ephysics_world_render_geometry_set(). * * @param world The world this body will belong to. * @return a new body or @c NULL, on erros. @@ -734,7 +738,7 @@ * * This function will remove this body from its world and will * free all the memory used. It won't delete or modify an associated evas - * object, what can be done with ephysics_body_evas_object_set(). So after + * object, what can be done with @ref ephysics_body_evas_object_set(). So after * it is removed the evas object will stop being updated, but will continue * to be rendered on canvas. * @@ -771,7 +775,7 @@ * This association should be 1:1. You can have physics bodies without evas * objects, but you can't have more than an evas object directly associated * to this body. If you want more, you can use - * ephysics_body_event_callback_add() to register a callback that + * @ref ephysics_body_event_callback_add() to register a callback that * will update the other evas objects. This function can be used to disable * updates of associated evas objects, or complement updates, like changing * evas objects properties under certain conditions of position or rotation. @@ -829,8 +833,9 @@ * on all the axises. * * There are two direct ways of modifying this geometry: - * @li With ephysics_body_geometry_set(); - * @li When associating an evas object with ephysics_body_evas_object_set(). + * @li With @ref ephysics_body_geometry_set(); + * @li When associating an evas object with + * @ref ephysics_body_evas_object_set(). * * When the world is simulated forces will be applied on objects * with mass and position will be modified too. @@ -904,12 +909,13 @@ * Update the evas object associated to the body. * * This function should be called to update position and rotation of - * the evas object associated to the body with ephysics_body_evas_object_set(). + * the evas object associated to the body with + * @ref ephysics_body_evas_object_set(). * It will take rate between pixels and meters set with - * ephysics_world_rate_set() in account. + * @ref ephysics_world_rate_set() in account. * * If an update callback wasn't set with - * ephysics_body_event_callback_add(), this function will be executed + * @ref ephysics_body_event_callback_add(), this function will be executed * after each physics simulation tick. If a callback was set, it won't be * called automatically. So inside this callback it could be called, or * a customized update could be implemented. @@ -926,9 +932,9 @@ * * The registered callback will receives the body and extra user data that * can be passed. From body it's possible to get the world it belongs to - * with ephysics_body_world_get(), the rate between pixels and meters - * with ephysics_world_rate_get() and the associated evas object with - * ephysics_body_evas_object_get(). + * with @ref ephysics_body_world_get(), the rate between pixels and meters + * with @ref ephysics_world_rate_get() and the associated evas object with + * @ref ephysics_body_evas_object_get(). * * So it's enough to do customized updates or fix pointers in your program. * @@ -944,11 +950,11 @@ * * If no callback is registered, the evas object associated to physics body * will be automatically moved and rotated, taking rate between meters and - * pixels on account. This rate is set by ephysics_world_rate_set(). + * pixels on account. This rate is set by @ref ephysics_world_rate_set(). * * If callbacks are registered, these function will be called and will * be responsible for updating the evas object. If the default update - * is wanted, function ephysics_body_evas_object_update() can be called + * is wanted, function @ref ephysics_body_evas_object_update() can be called * inside the callback. So you could make changes before and after * the evas object is updated. * @@ -1089,7 +1095,7 @@ * When a impulse is applied over a body it will has its velocity changed. * This impulse will be applied on body's center, so it won't implies in * rotating the body. For that is possible to apply a torque impulse with - * ephysics_body_torque_impulse_apply(). + * @ref ephysics_body_torque_impulse_apply(). * * @note Impulse is measured in Ns (Newton seconds). * @@ -1178,12 +1184,12 @@ * between bodies and the world. Constraints can limit movement angle, * translation, or work like a motor. * - * Constraints can be created with ephysics_constraint_add() and removed with - * ephysics_constraint_del(). Can be applied between two bodies or between - * a body and the world. + * Constraints can be created with @ref ephysics_constraint_add() and removed + * with @ref ephysics_constraint_del(). + * Can be applied between two bodies or between a body and the world. */ -typedef struct _EPhysics_Constraint EPhysics_Constraint; /**< Constraint handle, used to limit bodies movements. Created with ephysics_constraint_add() and deleted with ephysics_constraint_del(). */ +typedef struct _EPhysics_Constraint EPhysics_Constraint; /**< Constraint handle, used to limit bodies movements. Created with @ref ephysics_constraint_add() and deleted with @ref ephysics_constraint_del(). */ /** * @brief |
From: Enlightenment S. <no-...@en...> - 2012-06-29 22:22:49
|
Log: EPhysics: remove annoying tick dbg msg Author: bdilly Date: 2012-06-29 15:22:43 -0700 (Fri, 29 Jun 2012) New Revision: 73065 Trac: http://trac.enlightenment.org/e/changeset/73065 Modified: trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-06-29 22:22:35 UTC (rev 73064) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-06-29 22:22:43 UTC (rev 73065) @@ -52,8 +52,6 @@ world = (EPhysics_World *) dynamics_world->getWorldUserInfo(); - DBG("Tick"); - for (int i = 0; i < objects.size(); i++) { EPhysics_Body *body; |
From: Enlightenment S. <no-...@en...> - 2012-06-29 22:24:40
|
Log: EPhysics: add linear slop setter / getter for world Constraint solver can be configured using some advanced settings, like the solver slop factor. Linear slop on sequencial impulse constraint solver is used as a factor for penetration. The penetration will the manifold distance + linear slop. Author: bdilly Date: 2012-06-29 15:24:33 -0700 (Fri, 29 Jun 2012) New Revision: 73066 Trac: http://trac.enlightenment.org/e/changeset/73066 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-06-29 22:22:43 UTC (rev 73065) +++ trunk/ephysics/src/lib/EPhysics.h 2012-06-29 22:24:33 UTC (rev 73066) @@ -566,6 +566,41 @@ EAPI void *ephysics_world_event_callback_del(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func); /** + * @brief + * Set linear slop to be used by world. + * + * Constraint solver can be configured using some advanced settings, like + * the solver slop factor. + * + * The default value is set to 0 with a small value results in a smoother + * stabilization for stacking bodies. + * + * Linear slop on sequencial impulse constraint solver is used as a factor + * for penetration. The penetration will the manifold distance + linear slop. + * + * @param world The physics world. + * @param linear_slop New linear slop value to be used by constraint solver + * of physics engine. + * + * @ingroup EPhysics_World + */ +EAPI void ephysics_world_linear_slop_set(EPhysics_World *world, double linear_slop); + +/** + * @brief + * Get linear slop used by world. + * + * @param world The physics world. + * @return Linear slop value used by constraint solver of physics engine or 0 + * on failure. + * + * @see ephysics_world_linear_slop_set() for details. + * + * @ingroup EPhysics_World + */ +EAPI double ephysics_world_linear_slop_get(EPhysics_World *world); + +/** * @} */ Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-06-29 22:22:43 UTC (rev 73065) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-06-29 22:24:33 UTC (rev 73066) @@ -642,6 +642,30 @@ if (h) *h = world->h; } +EAPI void +ephysics_world_linear_slop_set(EPhysics_World *world, double linear_slop) +{ + if (!world) + { + ERR("Can't set linear slop, world is null."); + return; + } + + world->dynamics_world->getSolverInfo().m_linearSlop = btScalar(linear_slop); +} + +EAPI double +ephysics_world_linear_slop_get(EPhysics_World *world) +{ + if (!world) + { + ERR("Can't get linear slop, world is null."); + return 0; + } + + return world->dynamics_world->getSolverInfo().m_linearSlop; +} + #ifdef __cplusplus } #endif |
From: Enlightenment S. <no-...@en...> - 2012-07-03 02:09:18
|
Log: EPhysics: implement event callback del full for world match data pointer Author: bdilly Date: 2012-07-02 19:09:12 -0700 (Mon, 02 Jul 2012) New Revision: 73177 Trac: http://trac.enlightenment.org/e/changeset/73177 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-03 01:58:13 UTC (rev 73176) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-03 02:09:12 UTC (rev 73177) @@ -560,6 +560,8 @@ * on error. * * @see ephysics_world_event_callback_add() for details. + * @see ephysics_world_event_callback_del_full() if you need to match data + * pointer. * * @ingroup EPhysics_World */ @@ -567,6 +569,28 @@ /** * @brief + * Unregister an ephysics world event callback matching data pointer. + * + * A previously added callback that match @p world, @p type, @p func + * and @p data will be deleted. + * + * @param world The physics world. + * @param type The type of callback to be unregistered. + * @param func The callback function to be unregistered. + * @param data The data pointer that was passed to the callback. + * @return The user data passed when the callback was registered, or @c NULL + * on error. + * + * @see ephysics_world_event_callback_add() for details. + * @see ephysics_world_event_callback_del() if you don't need to match data + * pointer. + * + * @ingroup EPhysics_World + */ +EAPI void *ephysics_world_event_callback_del_full(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func, void *data); + +/** + * @brief * Set linear slop to be used by world. * * Constraint solver can be configured using some advanced settings, like Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 01:58:13 UTC (rev 73176) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 02:09:12 UTC (rev 73177) @@ -592,6 +592,32 @@ return NULL; } +EAPI void * +ephysics_world_event_callback_del_full(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func, void *data) +{ + EPhysics_World_Callback *cb; + void *cb_data; + + if (!world) + { + ERR("Can't delete world event callback, world is null."); + return NULL; + } + + EINA_INLIST_FOREACH(world->callbacks, cb) + { + if ((cb->type == type) && (cb->func == func) && (cb->data == data)) { + cb_data = cb->data; + world->callbacks = eina_inlist_remove(world->callbacks, + EINA_INLIST_GET(cb)); + free(cb); + return cb_data; + } + } + + return NULL; +} + EAPI const Eina_List * ephysics_world_bodies_get(const EPhysics_World *world) { |
From: Enlightenment S. <no-...@en...> - 2012-07-03 02:09:27
|
Log: EPhysics: implement event callback del full for body Author: bdilly Date: 2012-07-02 19:09:21 -0700 (Mon, 02 Jul 2012) New Revision: 73178 Trac: http://trac.enlightenment.org/e/changeset/73178 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-03 02:09:12 UTC (rev 73177) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-03 02:09:21 UTC (rev 73178) @@ -1065,6 +1065,8 @@ * on error. * * @see ephysics_body_event_callback_add() for details. + * @see ephysics_body_event_callback_del_full() if you need to match data + * pointer. * * @ingroup EPhysics_Body */ @@ -1072,6 +1074,28 @@ /** * @brief + * Unregister an ephysics body event callback matching data pointer. + * + * A previously added callback that match @p body, @p type, @p func + * and @p data will be deleted. + * + * @param body The physics body. + * @param type The type of callback to be unregistered. + * @param func The callback function to be unregistered. + * @param data The data pointer that was passed to the callback. + * @return The user data passed when the callback was registered, or @c NULL + * on error. + * + * @see ephysics_body_event_callback_add() for details. + * @see ephysics_body_event_callback_del() if you don't need to match data + * pointer. + * + * @ingroup EPhysics_Body + */ +EAPI void *ephysics_body_event_callback_del_full(EPhysics_Body *body, EPhysics_Callback_Type type, EPhysics_Body_Event_Cb func, void *data); + +/** + * @brief * Set body's coefficient of restitution. * * The coefficient of restitution is proporcion between speed after and Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 02:09:12 UTC (rev 73177) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 02:09:21 UTC (rev 73178) @@ -623,6 +623,32 @@ return NULL; } +EAPI void * +ephysics_body_event_callback_del_full(EPhysics_Body *body, EPhysics_Callback_Type type, EPhysics_Body_Event_Cb func, void *data) +{ + EPhysics_Body_Callback *cb; + void *cb_data; + + if (!body) + { + ERR("Can't delete body event callback, body is null."); + return NULL; + } + + EINA_INLIST_FOREACH(body->callbacks, cb) + { + if ((cb->type == type) && (cb->func == func) && (cb->data == data)) { + cb_data = cb->data; + body->callbacks = eina_inlist_remove(body->callbacks, + EINA_INLIST_GET(cb)); + free(cb); + return cb_data; + } + } + + return NULL; +} + EAPI void ephysics_body_restitution_set(EPhysics_Body *body, double restitution) { |
From: Enlightenment S. <no-...@en...> - 2012-07-03 02:09:41
|
Log: EPhysics: split the callback enum for body and world Should avoid a mess in the future. Author: bdilly Date: 2012-07-02 19:09:34 -0700 (Mon, 02 Jul 2012) New Revision: 73179 Trac: http://trac.enlightenment.org/e/changeset/73179 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-03 02:09:21 UTC (rev 73178) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-03 02:09:34 UTC (rev 73179) @@ -89,42 +89,6 @@ */ /** - * @enum _EPhysics_Callback_Type - * @typedef EPhysics_Callback_Type - * - * Identifier of callbacks to be set for EPhysics bodies and worlds. - * - * @see ephysics_body_event_callback_add() - * @see ephysics_world_event_callback_add() - * - * @ingroup EPhysics - */ -typedef enum _EPhysics_Callback_Type -{ - /* - * The following events are only for use with EPhysics world objects, with - * @ref ephysics_world_event_callback_add(): - */ - EPHYSICS_CALLBACK_WORLD_FIRST, /**< kept as sentinel, not really an event */ - EPHYSICS_CALLBACK_WORLD_DEL, /**< World being deleted (called before free) */ - EPHYSICS_CALLBACK_WORLD_STOPPED, /**< no objects are moving any more */ - EPHYSICS_CALLBACK_WORLD_LAST, /**< kept as sentinel, not really an event */ - - /* - * The following events are only for use with EPhysics body objects, with - * @ref ephysics_body_event_callback_add(): - */ - EPHYSICS_CALLBACK_BODY_FIRST, /**< kept as sentinel, not really an event */ - EPHYSICS_CALLBACK_BODY_UPDATE, /**< Body being updated */ - EPHYSICS_CALLBACK_BODY_COLLISION, /**< Body collided with other body */ - EPHYSICS_CALLBACK_BODY_DEL, /**< Body being deleted (called before free) */ - EPHYSICS_CALLBACK_BODY_STOPPED, /**< Body is not moving any more */ - EPHYSICS_CALLBACK_BODY_LAST, /**< kept as sentinel, not really an event */ - - EPHYSICS_CALLBACK_LAST /**< kept as sentinel, not really an event */ -} EPhysics_Callback_Type; /**< The types of events triggering a callback */ - -/** * Initialize EPhysics * * Initializes Bullet physics engine. @@ -288,6 +252,25 @@ typedef struct _EPhysics_World EPhysics_World; /**< World handle, most basic type of EPhysics. Created with @ref ephysics_world_new() and deleted with @ref ephysics_world_del(). */ /** + * @enum _EPhysics_Callback_World_Type + * @typedef EPhysics_Callback_World_Type + * + * Identifier of callbacks to be set for EPhysics worlds. + * + * @see ephysics_world_event_callback_add() + * @see ephysics_world_event_callback_del() + * @see ephysics_world_event_callback_del_full() + * + * @ingroup EPhysics_World + */ +typedef enum _EPhysics_Callback_World_Type +{ + EPHYSICS_CALLBACK_WORLD_DEL, /**< World being deleted (called before free) */ + EPHYSICS_CALLBACK_WORLD_STOPPED, /**< no objects are moving any more */ + EPHYSICS_CALLBACK_WORLD_LAST, /**< kept as sentinel, not really an event */ +} EPhysics_Callback_World_Type; + +/** * @typedef EPhysics_World_Event_Cb * * EPhysics world event callback function signature. @@ -544,7 +527,7 @@ * * @ingroup EPhysics_World */ -EAPI void ephysics_world_event_callback_add(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func, const void *data); +EAPI void ephysics_world_event_callback_add(EPhysics_World *world, EPhysics_Callback_World_Type type, EPhysics_World_Event_Cb func, const void *data); /** * @brief @@ -565,7 +548,7 @@ * * @ingroup EPhysics_World */ -EAPI void *ephysics_world_event_callback_del(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func); +EAPI void *ephysics_world_event_callback_del(EPhysics_World *world, EPhysics_Callback_World_Type type, EPhysics_World_Event_Cb func); /** * @brief @@ -587,7 +570,7 @@ * * @ingroup EPhysics_World */ -EAPI void *ephysics_world_event_callback_del_full(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func, void *data); +EAPI void *ephysics_world_event_callback_del_full(EPhysics_World *world, EPhysics_Callback_World_Type type, EPhysics_World_Event_Cb func, void *data); /** * @brief @@ -669,6 +652,28 @@ typedef struct _EPhysics_Body EPhysics_Body; /**< Body handle, represents an object on EPhysics world. Created with @ref ephysics_body_circle_add() or @ref ephysics_body_box_add() and deleted with @ref ephysics_body_del(). */ /** + * @enum _EPhysics_Callback_Body_Type + * @typedef EPhysics_Callback_Body_Type + * + * Identifier of callbacks to be set for EPhysics bodies. + * + * @see ephysics_body_event_callback_add() + * @see ephysics_body_event_callback_del() + * @see ephysics_body_event_callback_del_full() + * + * @ingroup EPhysics_Body + */ +typedef enum _EPhysics_Callback_Body_Type +{ + EPHYSICS_CALLBACK_BODY_UPDATE, /**< Body being updated */ + EPHYSICS_CALLBACK_BODY_COLLISION, /**< Body collided with other body */ + EPHYSICS_CALLBACK_BODY_DEL, /**< Body being deleted (called before free) */ + EPHYSICS_CALLBACK_BODY_STOPPED, /**< Body is not moving any more */ + EPHYSICS_CALLBACK_BODY_LAST, /**< kept as sentinel, not really an event */ +} EPhysics_Callback_Body_Type; /**< The types of events triggering a callback */ + + +/** * @typedef EPhysics_Body_Event_Cb * * EPhysics bode event callback function signature. @@ -1049,7 +1054,7 @@ * * @ingroup EPhysics_Body */ -EAPI void ephysics_body_event_callback_add(EPhysics_Body *body, EPhysics_Callback_Type type, EPhysics_Body_Event_Cb func, const void *data); +EAPI void ephysics_body_event_callback_add(EPhysics_Body *body, EPhysics_Callback_Body_Type type, EPhysics_Body_Event_Cb func, const void *data); /** * @brief @@ -1070,7 +1075,7 @@ * * @ingroup EPhysics_Body */ -EAPI void *ephysics_body_event_callback_del(EPhysics_Body *body, EPhysics_Callback_Type type, EPhysics_Body_Event_Cb func); +EAPI void *ephysics_body_event_callback_del(EPhysics_Body *body, EPhysics_Callback_Body_Type type, EPhysics_Body_Event_Cb func); /** * @brief @@ -1092,7 +1097,7 @@ * * @ingroup EPhysics_Body */ -EAPI void *ephysics_body_event_callback_del_full(EPhysics_Body *body, EPhysics_Callback_Type type, EPhysics_Body_Event_Cb func, void *data); +EAPI void *ephysics_body_event_callback_del_full(EPhysics_Body *body, EPhysics_Callback_Body_Type type, EPhysics_Body_Event_Cb func, void *data); /** * @brief Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 02:09:21 UTC (rev 73178) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 02:09:34 UTC (rev 73179) @@ -18,7 +18,7 @@ EINA_INLIST; void (*func) (void *data, EPhysics_Body *body, void *event_info); void *data; - EPhysics_Callback_Type type; + EPhysics_Callback_Body_Type type; }; struct _EPhysics_Body { @@ -560,7 +560,7 @@ } EAPI void -ephysics_body_event_callback_add(EPhysics_Body *body, EPhysics_Callback_Type type, EPhysics_Body_Event_Cb func, const void *data) +ephysics_body_event_callback_add(EPhysics_Body *body, EPhysics_Callback_Body_Type type, EPhysics_Body_Event_Cb func, const void *data) { EPhysics_Body_Callback *cb; @@ -576,8 +576,7 @@ return; } - if ((type <= EPHYSICS_CALLBACK_BODY_FIRST) || - (type >= EPHYSICS_CALLBACK_BODY_LAST)) + if ((type < 0) || (type >= EPHYSICS_CALLBACK_BODY_LAST)) { ERR("Can't set body event callback, callback type is wrong."); return; @@ -598,7 +597,7 @@ } EAPI void * -ephysics_body_event_callback_del(EPhysics_Body *body, EPhysics_Callback_Type type, EPhysics_Body_Event_Cb func) +ephysics_body_event_callback_del(EPhysics_Body *body, EPhysics_Callback_Body_Type type, EPhysics_Body_Event_Cb func) { EPhysics_Body_Callback *cb; void *cb_data; @@ -624,7 +623,7 @@ } EAPI void * -ephysics_body_event_callback_del_full(EPhysics_Body *body, EPhysics_Callback_Type type, EPhysics_Body_Event_Cb func, void *data) +ephysics_body_event_callback_del_full(EPhysics_Body *body, EPhysics_Callback_Body_Type type, EPhysics_Body_Event_Cb func, void *data) { EPhysics_Body_Callback *cb; void *cb_data; Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 02:09:21 UTC (rev 73178) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 02:09:34 UTC (rev 73179) @@ -16,7 +16,7 @@ EINA_INLIST; void (*func) (void *data, EPhysics_World *world, void *event_info); void *data; - EPhysics_Callback_Type type; + EPhysics_Callback_World_Type type; }; struct _EPhysics_World { @@ -529,7 +529,7 @@ } EAPI void -ephysics_world_event_callback_add(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func, const void *data) +ephysics_world_event_callback_add(EPhysics_World *world, EPhysics_Callback_World_Type type, EPhysics_World_Event_Cb func, const void *data) { EPhysics_World_Callback *cb; @@ -545,8 +545,7 @@ return; } - if ((type <= EPHYSICS_CALLBACK_WORLD_FIRST) || - (type >= EPHYSICS_CALLBACK_WORLD_LAST)) + if ((type < 0) || (type >= EPHYSICS_CALLBACK_WORLD_LAST)) { ERR("Can't set world event callback, callback type is wrong."); return; @@ -567,7 +566,7 @@ } EAPI void * -ephysics_world_event_callback_del(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func) +ephysics_world_event_callback_del(EPhysics_World *world, EPhysics_Callback_World_Type type, EPhysics_World_Event_Cb func) { EPhysics_World_Callback *cb; void *cb_data; @@ -593,7 +592,7 @@ } EAPI void * -ephysics_world_event_callback_del_full(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func, void *data) +ephysics_world_event_callback_del_full(EPhysics_World *world, EPhysics_Callback_World_Type type, EPhysics_World_Event_Cb func, void *data) { EPhysics_World_Callback *cb; void *cb_data; |
From: Enlightenment S. <no-...@en...> - 2012-07-03 02:15:35
|
Log: EPhysics: implement body velocity get Implementation of functions for retrieving both the linear and angular velocity on x, y and z axis. Patch by Leandro Dorileo <do...@pr...> Author: bdilly Date: 2012-07-02 19:15:28 -0700 (Mon, 02 Jul 2012) New Revision: 73182 Trac: http://trac.enlightenment.org/e/changeset/73182 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-03 02:14:24 UTC (rev 73181) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-03 02:15:28 UTC (rev 73182) @@ -970,6 +970,33 @@ /** * @brief + * Get body's linear velocity on x and y axis. + * + * @param body The physics body. + * @param x The linear velocity on axis x. + * @param y The linear velocity on axis y. + * + * @see ephysics_body_angular_velocity_get(). + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_linear_velocity_get(const EPhysics_Body *body, double *x, double *y); + +/** + * @brief + * Get body's angular velocity on z axis. + * + * @param body The physics body. + * @param z The angular velocity on axis z. + * + * @see ephysics_body_linear_velocity_get(). + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_angular_velocity_get(const EPhysics_Body *body, double *z); + +/** + * @brief * Update the evas object associated to the body. * * This function should be called to update position and rotation of Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 02:14:24 UTC (rev 73181) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 02:15:28 UTC (rev 73182) @@ -548,6 +548,31 @@ } EAPI void +ephysics_body_linear_velocity_get(const EPhysics_Body *body, double *x, double *y) +{ + if (!body) + { + ERR("Can't get body linear velocity, body is null."); + return; + } + + if (x) *x = body->rigid_body->getLinearVelocity().getX(); + if (y) *y = body->rigid_body->getLinearVelocity().getY(); +} + +EAPI void +ephysics_body_angular_velocity_get(const EPhysics_Body *body, double *z) +{ + if (!body) + { + ERR("Can't get body linear velocity, body is null."); + return; + } + + if (z) *z = body->rigid_body->getAngularVelocity().getZ(); +} + +EAPI void ephysics_body_evas_object_update(EPhysics_Body *body) { if (!body) |
From: Enlightenment S. <no-...@en...> - 2012-07-03 02:18:02
|
Log: EPhysics: fix API regarding geometry and acceleration units Avoid messing Evas coordinates (pixels) with meters. Change gravity setter / getter too. Author: bdilly Date: 2012-07-02 19:17:55 -0700 (Mon, 02 Jul 2012) New Revision: 73184 Trac: http://trac.enlightenment.org/e/changeset/73184 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-03 02:17:17 UTC (rev 73183) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-03 02:17:55 UTC (rev 73184) @@ -298,7 +298,8 @@ * 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 @@ * @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 @@ * * 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,8 +463,12 @@ * 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 @@ * 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 Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 02:17:17 UTC (rev 73183) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 02:17:55 UTC (rev 73184) @@ -287,7 +287,7 @@ 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 @@ 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 @@ 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 |
From: Enlightenment S. <no-...@en...> - 2012-07-03 23:20:57
|
Log: EPhysics: support autodel of bodies outside render area Now it's possible to request a world to delete bodies outside render area, so we can save some resources and avoid issues with world stopped event. Author: bdilly Date: 2012-07-03 16:20:49 -0700 (Tue, 03 Jul 2012) New Revision: 73245 Trac: http://trac.enlightenment.org/e/changeset/73245 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-03 16:28:06 UTC (rev 73244) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-03 23:20:49 UTC (rev 73245) @@ -622,6 +622,150 @@ EAPI double ephysics_world_linear_slop_get(EPhysics_World *world); /** + * @brief + * Set world autodeleting bodies mode when they're outside of render area + * by the top. + * + * It's useful when you don't care about bodies leaving the render + * area set with @ref ephysics_world_render_area_set(), and don't think + * they could / should return. So you can safely delete them and save resources. + * + * Also, it's useful if you have only a bottom border set with + * @ref ephysics_body_top_boundary_add() and gravity set, + * and want to listen for @ref EPHYSICS_CALLBACK_WORLD_STOPPED event. + * If a body goes out of the render area, they will be acting by gravity + * and won't collide to anything, so they could be moving forever and + * world would never stop. For this case, enabling autodel for left and right + * borders seems to be a good idea. + * + * @param world The physics world. + * @param autodel If @c EINA_TRUE delete bodies when they are outside render + * area, otherwise, don't delete. + * + * @see ephysics_world_bodies_outside_top_autodel_get(). + * @see ephysics_world_bodies_outside_bottom_autodel_set(). + * @see ephysics_world_bodies_outside_left_autodel_set(). + * @see ephysics_world_bodies_outside_right_autodel_set(). + * + * @ingroup EPhysics_World + */ +EAPI void ephysics_world_bodies_outside_top_autodel_set(EPhysics_World *world, Eina_Bool autodel); + +/** + * @brief + * Get world autodeleting bodies mode when they're outside of render area by + * the top. + * + * @param world The physics world. + * @return @c EINA_TRUE if bodies will be deleted or @c EINA_FALSE if they + * won't, or on error. + * + * @see ephysics_world_bodies_outside_top_autodel_set() for details. + * + * @ingroup EPhysics_World + */ +EAPI Eina_Bool ephysics_world_bodies_outside_top_autodel_get(EPhysics_World *world); + +/** + * @brief + * Set world autodeleting bodies mode when they're outside of render area + * by the bottom. + * + * @param world The physics world. + * @param autodel If @c EINA_TRUE delete bodies when they are outside render + * area, otherwise, don't delete. + * + * @see ephysics_world_bodies_outside_top_autodel_set() for more details. + * @see ephysics_world_bodies_outside_bottom_autodel_get(). + * @see ephysics_world_bodies_outside_left_autodel_set(). + * @see ephysics_world_bodies_outside_right_autodel_set(). + * + * @ingroup EPhysics_World + */ +EAPI void ephysics_world_bodies_outside_bottom_autodel_set(EPhysics_World *world, Eina_Bool autodel); + +/** + * @brief + * Get world autodeleting bodies mode when they're outside of render area by + * the bottom. + * + * @param world The physics world. + * @return @c EINA_TRUE if bodies will be deleted or @c EINA_FALSE if they + * won't, or on error. + * + * @see ephysics_world_bodies_outside_bottom_autodel_set() for details. + * + * @ingroup EPhysics_World + */ +EAPI Eina_Bool ephysics_world_bodies_outside_bottom_autodel_get(EPhysics_World *world); + +/** + * @brief + * Set world autodeleting bodies mode when they're outside of render area + * by the right. + * + * @param world The physics world. + * @param autodel If @c EINA_TRUE delete bodies when they are outside render + * area, otherwise, don't delete. + * + * @see ephysics_world_bodies_outside_top_autodel_set() for more details. + * @see ephysics_world_bodies_outside_right_autodel_get(). + * @see ephysics_world_bodies_outside_bottom_autodel_set(). + * @see ephysics_world_bodies_outside_left_autodel_set(). + * + * @ingroup EPhysics_World + */ +EAPI void ephysics_world_bodies_outside_right_autodel_set(EPhysics_World *world, Eina_Bool autodel); + +/** + * @brief + * Get world autodeleting bodies mode when they're outside of render area by + * the right. + * + * @param world The physics world. + * @return @c EINA_TRUE if bodies will be deleted or @c EINA_FALSE if they + * won't, or on error. + * + * @see ephysics_world_bodies_outside_right_autodel_set() for details. + * + * @ingroup EPhysics_World + */ +EAPI Eina_Bool ephysics_world_bodies_outside_right_autodel_get(EPhysics_World *world); + +/** + * @brief + * Set world autodeleting bodies mode when they're outside of render area + * by the left. + * + * @param world The physics world. + * @param autodel If @c EINA_TRUE delete bodies when they are outside render + * area, otherwise, don't delete. + * + * @see ephysics_world_bodies_outside_top_autodel_set() for more details. + * @see ephysics_world_bodies_outside_left_autodel_get(). + * @see ephysics_world_bodies_outside_bottom_autodel_set(). + * @see ephysics_world_bodies_outside_right_autodel_set(). + * + * @ingroup EPhysics_World + */ +EAPI void ephysics_world_bodies_outside_left_autodel_set(EPhysics_World *world, Eina_Bool autodel); + +/** + * @brief + * Get world autodeleting bodies mode when they're outside of render area by + * the left. + * + * @param world The physics world. + * @return @c EINA_TRUE if bodies will be deleted or @c EINA_FALSE if they + * won't, or on error. + * + * @see ephysics_world_bodies_outside_left_autodel_set() for details. + * + * @ingroup EPhysics_World + */ +EAPI Eina_Bool ephysics_world_bodies_outside_left_autodel_get(EPhysics_World *world); + +/** * @} */ Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 16:28:06 UTC (rev 73244) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 23:20:49 UTC (rev 73245) @@ -186,6 +186,30 @@ evas_map_free(map); } +static void +_ephysics_body_outside_render_area_check(EPhysics_Body *body) +{ + int wx, wy, ww, wh, bx, by, bw, bh; + + ephysics_world_render_geometry_get(body->world, &wx, &wy, &ww, &wh); + ephysics_body_geometry_get(body, &bx, &by, &bw, &bh); + + // FIXME: check what should be done regarding rotated bodies + if (((ephysics_world_bodies_outside_top_autodel_get(body->world)) && + (by + bh < wy)) || + ((ephysics_world_bodies_outside_bottom_autodel_get(body->world)) && + (by > wy + wh)) || + ((ephysics_world_bodies_outside_left_autodel_get(body->world)) && + (bx + bh < wx)) || + ((ephysics_world_bodies_outside_right_autodel_get(body->world)) && + (bx > wx + ww))) + { + ephysics_world_body_del(body->world, body, body->rigid_body); + ephysics_orphan_body_del(body); + DBG("Body %p deleted. Out of render area", body); + } +} + void ephysics_body_evas_object_update_select(EPhysics_Body *body) { @@ -205,6 +229,9 @@ if (!callback_called) _ephysics_body_evas_object_default_update(body); + + if (ephysics_world_bodies_outside_autodel_get(body->world)) + _ephysics_body_outside_render_area_check(body); } void Modified: trunk/ephysics/src/lib/ephysics_private.h =================================================================== --- trunk/ephysics/src/lib/ephysics_private.h 2012-07-03 16:28:06 UTC (rev 73244) +++ trunk/ephysics/src/lib/ephysics_private.h 2012-07-03 23:20:49 UTC (rev 73245) @@ -62,6 +62,7 @@ void ephysics_body_world_boundaries_resize(EPhysics_World *world); void ephysics_world_boundary_set(EPhysics_World *world, EPhysics_World_Boundary boundary, EPhysics_Body *body); EPhysics_Body *ephysics_world_boundary_get(const EPhysics_World *world, EPhysics_World_Boundary boundary); +Eina_Bool ephysics_world_bodies_outside_autodel_get(EPhysics_World *world); void ephysics_body_evas_object_update_select(EPhysics_Body *body); void ephysics_orphan_body_del(EPhysics_Body *body); Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 16:28:06 UTC (rev 73244) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 23:20:49 UTC (rev 73245) @@ -35,6 +35,11 @@ double rate; Eina_Bool running:1; Eina_Bool active:1; + Eina_Bool outside_autodel:1; + Eina_Bool outside_top:1; + Eina_Bool outside_bottom:1; + Eina_Bool outside_left:1; + Eina_Bool outside_right:1; }; static int _ephysics_world_init_count = 0; @@ -692,6 +697,122 @@ return world->dynamics_world->getSolverInfo().m_linearSlop; } +EAPI void +ephysics_world_bodies_outside_top_autodel_set(EPhysics_World *world, Eina_Bool autodel) +{ + if (!world) + { + ERR("Can't set autodelete mode, world is null."); + return; + } + + world->outside_top = !!autodel; + world->outside_autodel = world->outside_top || world->outside_bottom || + world->outside_left || world->outside_right; +} + +EAPI Eina_Bool +ephysics_world_bodies_outside_top_autodel_get(EPhysics_World *world) +{ + if (!world) + { + ERR("Can't get autodelete mode, world is null."); + return EINA_FALSE; + } + + return world->outside_top; +} + +EAPI void +ephysics_world_bodies_outside_bottom_autodel_set(EPhysics_World *world, Eina_Bool autodel) +{ + if (!world) + { + ERR("Can't set autodelete mode, world is null."); + return; + } + + world->outside_bottom = !!autodel; + world->outside_autodel = world->outside_top || world->outside_bottom || + world->outside_left || world->outside_right; +} + +EAPI Eina_Bool +ephysics_world_bodies_outside_bottom_autodel_get(EPhysics_World *world) +{ + if (!world) + { + ERR("Can't get autodelete mode, world is null."); + return EINA_FALSE; + } + + return world->outside_bottom; +} + +EAPI void +ephysics_world_bodies_outside_left_autodel_set(EPhysics_World *world, Eina_Bool autodel) +{ + if (!world) + { + ERR("Can't set autodelete mode, world is null."); + return; + } + + world->outside_left = !!autodel; + world->outside_autodel = world->outside_top || world->outside_bottom || + world->outside_left || world->outside_right; +} + +EAPI Eina_Bool +ephysics_world_bodies_outside_left_autodel_get(EPhysics_World *world) +{ + if (!world) + { + ERR("Can't get autodelete mode, world is null."); + return EINA_FALSE; + } + + return world->outside_left; +} + +EAPI void +ephysics_world_bodies_outside_right_autodel_set(EPhysics_World *world, Eina_Bool autodel) +{ + if (!world) + { + ERR("Can't set autodelete mode, world is null."); + return; + } + + world->outside_right = !!autodel; + world->outside_autodel = world->outside_top || world->outside_bottom || + world->outside_left || world->outside_right; +} + +EAPI Eina_Bool +ephysics_world_bodies_outside_right_autodel_get(EPhysics_World *world) +{ + if (!world) + { + ERR("Can't get autodelete mode, world is null."); + return EINA_FALSE; + } + + return world->outside_right; +} + +Eina_Bool +ephysics_world_bodies_outside_autodel_get(EPhysics_World *world) +{ + if (!world) + { + ERR("Can't get autodelete mode, world is null."); + return EINA_FALSE; + } + + return world->outside_autodel; +} + #ifdef __cplusplus } #endif |
From: Enlightenment S. <no-...@en...> - 2012-07-03 23:21:17
|
Log: EPhysics: improve log msgs a bit and remove annoying one Print world and bodies pointers so it's possible to track them. And remove annoying "step" debug msg. Author: bdilly Date: 2012-07-03 16:21:11 -0700 (Tue, 03 Jul 2012) New Revision: 73246 Trac: http://trac.enlightenment.org/e/changeset/73246 Modified: trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 23:20:49 UTC (rev 73245) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-03 23:21:11 UTC (rev 73246) @@ -149,8 +149,8 @@ body->rigid_body->getMotionState()->setWorldTransform(trans); - DBG("Body position changed to %lf, %lf.", mx, my); - DBG("Body scale changed to %lf, %lf.", sx, sy); + DBG("Body %p position changed to %lf, %lf.", body, mx, my); + DBG("Body %p scale changed to %lf, %lf.", body, sx, sy); } static void @@ -283,7 +283,7 @@ return NULL; } - INF("Circle body added."); + INF("Circle body added: %p.", body); return body; } @@ -315,7 +315,7 @@ return NULL; } - INF("Box body added."); + INF("Box body added: %p.", body); return body; } @@ -432,7 +432,7 @@ ephysics_world_body_del(body->world, body, body->rigid_body); ephysics_orphan_body_del(body); - INF("Body deleted."); + INF("Body %p deleted.", body); } EAPI void @@ -559,7 +559,7 @@ body->rigid_body->setMassProps(mass, inertia); body->rigid_body->updateInertiaTensor(); - DBG("Body mass changed to %lf.", mass); + DBG("Body %p mass changed to %lf.", body, mass); } EAPI double Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 23:20:49 UTC (rev 73245) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 23:21:11 UTC (rev 73246) @@ -91,8 +91,6 @@ double time_now; void *ldata; - DBG("Step"); - EINA_LIST_FOREACH(lworlds, l, ldata) { double time_now, delta; @@ -303,7 +301,7 @@ if (!_anim_simulate) _anim_simulate = ecore_animator_add(_simulate_worlds, _worlds); - INF("World added."); + INF("World %p added.", world); return world; no_list: @@ -357,7 +355,7 @@ fclose(file); delete serializer; - INF("Serialization written to file: %s.", path); + INF("Serialization of world %p written to file: %s.", world, path); return EINA_TRUE; } @@ -403,7 +401,7 @@ delete world->broadphase; free(world); - INF("World deleted."); + INF("World %p deleted.", world); } EAPI void @@ -470,7 +468,7 @@ world->dynamics_world->setGravity(btVector3(gx / world->rate, -gy / world->rate, 0)); - DBG("World gravity set to X:%lf, Y:%lf.", gx, gy); + DBG("World %p gravity set to X:%lf, Y:%lf.", world, gx, gy); } EAPI void |
From: Enlightenment S. <no-...@en...> - 2012-07-03 23:24:34
|
Log: EPhysics: constraint solver iterations Functions to get and set the constraint solver number of iterations. Patch by Leandro Dorileo <do...@pr...> Author: bdilly Date: 2012-07-03 16:24:27 -0700 (Tue, 03 Jul 2012) New Revision: 73249 Trac: http://trac.enlightenment.org/e/changeset/73249 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-03 23:23:53 UTC (rev 73248) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-03 23:24:27 UTC (rev 73249) @@ -444,6 +444,42 @@ /** * @brief + * Set the number of iterations the constraint solver will have for contact and + * joint constraints. + * + * The default value is set to 10. The greater number of iterations more + * quality and precise the result but with performance penalty. + * + * By default, the Projected Gauss Seidel constraint solver is used for contact + * and joint constraints. The algorithm is an iterative LCP solver, informally + * known as 'sequential impulse'. + * + * A reasonable range of iterations is from 4 (low quality, good performance) + * to 20 (good quality, less but still reasonable performance). + * + * @param world The world to be set. + * @param iterations The number of iterations to be set. + * + * @see ephysics_world_constraint_solver_iterations_get(). + * @ingroup EPhysics_World + */ +EAPI void ephysics_world_constraint_solver_iterations_set(EPhysics_World *world, int iterations); + +/** + * @brief + * Get the number of iterations the constraint solver will have for contact and + * joint constraints. + * + * @param world The world to get number of iterations from. + * @return the number of iterations set to @p world, or 0 on failure. + * + * @see ephysics_world_constraint_solver_iterations_set() for its meaning. + * @ingroup EPhysics_World + */ +EAPI int ephysics_world_constraint_solver_iterations_get(EPhysics_World *world); + +/** + * @brief * Get world gravity values for axis x and y. * * @param world The world object. Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 23:23:53 UTC (rev 73248) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-03 23:24:27 UTC (rev 73249) @@ -472,6 +472,30 @@ } EAPI void +ephysics_world_constraint_solver_iterations_set(EPhysics_World *world, int iterations) +{ + if (!world) + { + ERR("Can't set constraint solver iterations, world is null."); + return; + } + + world->dynamics_world->getSolverInfo().m_numIterations = iterations; +} + +EAPI int +ephysics_world_constraint_solver_iterations_get(EPhysics_World *world) +{ + if (!world) + { + ERR("Can't get constraint solver iterations, world is null."); + return 0; + } + + return world->dynamics_world->getSolverInfo().m_numIterations; +} + +EAPI void ephysics_world_gravity_get(const EPhysics_World *world, double *gx, double *gy) { btVector3 vector; |
From: Enlightenment S. <no-...@en...> - 2012-07-04 22:04:44
|
Log: EPhysics: velocity setters and stop Author: bdilly Date: 2012-07-04 15:04:37 -0700 (Wed, 04 Jul 2012) New Revision: 73312 Trac: http://trac.enlightenment.org/e/changeset/73312 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-04 21:43:29 UTC (rev 73311) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-04 22:04:37 UTC (rev 73312) @@ -663,7 +663,7 @@ * by the top. * * It's useful when you don't care about bodies leaving the render - * area set with @ref ephysics_world_render_area_set(), and don't think + * area set with @ref ephysics_world_render_geometry_set(), and don't think * they could / should return. So you can safely delete them and save resources. * * Also, it's useful if you have only a bottom border set with @@ -1162,6 +1162,23 @@ /** * @brief + * Set body's linear velocity on x and y axis. + * + * @param body The physics body. + * @param x The linear velocity on axis x. + * @param y The linear velocity on axis y. + * + * @note EPhysics unit for linear velocity is Evas coordinates per second. + * + * @see ephysics_body_linear_velocity_get(). + * @see ephysics_body_angular_velocity_set(). + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_linear_velocity_set(EPhysics_Body *body, double x, double y); + +/** + * @brief * Get body's linear velocity on x and y axis. * * @param body The physics body. @@ -1170,6 +1187,7 @@ * * @note EPhysics unit for linear velocity is Evas coordinates per second. * + * @see ephysics_body_linear_velocity_set(). * @see ephysics_body_angular_velocity_get(). * * @ingroup EPhysics_Body @@ -1178,6 +1196,22 @@ /** * @brief + * Set body's angular velocity on z axis. + * + * @param body The physics body. + * @param z The angular velocity on axis z. + * + * @note EPhysics unit for angular velocity is degrees per second. + * + * @see ephysics_body_angular_velocity_set(). + * @see ephysics_body_linear_velocity_get(). + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_angular_velocity_set(EPhysics_Body *body, double z); + +/** + * @brief * Get body's angular velocity on z axis. * * @param body The physics body. @@ -1193,6 +1227,26 @@ /** * @brief + * Stop angular and linear body movement. + * + * It's equivalent to set linear velocity to 0 on both axis and + * angular velocity to 0 as well. + * + * It's a momentary situation. If it receives impulse, directly or + * by collision, if gravity acts over this body, + * it will stop but it will accelerate again. + * + * @param body The physics body. + * + * @see ephysics_body_angular_velocity_set(). + * @see ephysics_body_linear_velocity_set(). + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_stop(EPhysics_Body *body); + +/** + * @brief * Update the evas object associated to the body. * * This function should be called to update position and rotation of Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-04 21:43:29 UTC (rev 73311) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-04 22:04:37 UTC (rev 73312) @@ -575,12 +575,29 @@ } EAPI void +ephysics_body_linear_velocity_set(EPhysics_Body *body, double x, double y) +{ + double rate; + + if (!body) + { + ERR("Can't set body linear velocity, body is null."); + return; + } + + rate = ephysics_world_rate_get(body->world); + body->rigid_body->setLinearVelocity(btVector3(x / rate, y / rate, 0)); + DBG("Linear velocity of body %p set to %lf, %lf", body, x, y); +} + +EAPI void ephysics_body_linear_velocity_get(const EPhysics_Body *body, double *x, double *y) { double rate; + if (!body) { - ERR("Can't get body linear velocity, body is null."); + ERR("Can't get linear velocity, body is null."); return; } @@ -589,12 +606,25 @@ if (y) *y = -body->rigid_body->getLinearVelocity().getY() * rate; } +EAPI void +ephysics_body_angular_velocity_set(EPhysics_Body *body, double z) +{ + if (!body) + { + ERR("Can't set angular velocity, body is null."); + return; + } + + body->rigid_body->setAngularVelocity(btVector3(0, 0, -z/RAD_TO_DEG)); + DBG("Angular velocity of body %p set to %lf", body, z); +} + EAPI double ephysics_body_angular_velocity_get(const EPhysics_Body *body) { if (!body) { - ERR("Can't get body linear velocity, body is null."); + ERR("Can't get angular velocity, body is null."); return 0; } @@ -602,6 +632,21 @@ } EAPI void +ephysics_body_stop(EPhysics_Body *body) +{ + if (!body) + { + ERR("Can't stop a null body."); + return; + } + + body->rigid_body->setLinearVelocity(btVector3(0, 0, 0)); + body->rigid_body->setAngularVelocity(btVector3(0, 0, 0)); + + DBG("Body %p stopped", body); +} + +EAPI void ephysics_body_evas_object_update(EPhysics_Body *body) { if (!body) |
From: Enlightenment S. <no-...@en...> - 2012-07-04 22:06:00
|
Log: EPhysics: expose linear factor Makes it possible to restrict movement on specific axises. Author: bdilly Date: 2012-07-04 15:05:52 -0700 (Wed, 04 Jul 2012) New Revision: 73313 Trac: http://trac.enlightenment.org/e/changeset/73313 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-04 22:04:37 UTC (rev 73312) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-04 22:05:52 UTC (rev 73313) @@ -1522,6 +1522,42 @@ /** * @brief + * Enable or disable body's movement on x and y axises. + * + * Enabled by default on both axises. + * + * @param body The physics body. + * @param enable_x If @c EINA_TRUE allow movement on x axis, if @c EINA_FALSE + * disallow it. + * @param enable_y If @c EINA_TRUE allow movement on y axis, if @c EINA_FALSE + * disallow it. + * + * @see ephysics_body_linear_movement_enable_set(). + * @see ephysics_body_rotation_on_z_axis_enable_set(). + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_linear_movement_enable_set(EPhysics_Body *body, Eina_Bool enable_x, Eina_Bool enable_y); + +/** + * @brief + * Get body's movement on x and y axises behavior. + * + * @param body The physics body. + * @param enable_x @c EINA_TRUE if movement on x axis is allowed, or + * @c EINA_FALSE if it's not. + * @param enable_y @c EINA_TRUE if movement on y axis is allowed, or + * @c EINA_FALSE if it's not. + * + * @see ephysics_body_linear_movement_enable_get(). + * @see ephysics_body_rotation_on_z_axis_enable_get(). + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_linear_movement_enable_get(EPhysics_Body *body, Eina_Bool *enable_x, Eina_Bool *enable_y); + +/** + * @brief * Return body's rotation on z axis. * * By default rotation is 0 degrees. Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-04 22:04:37 UTC (rev 73312) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-04 22:05:52 UTC (rev 73313) @@ -821,6 +821,31 @@ } EAPI void +ephysics_body_linear_movement_enable_set(EPhysics_Body *body, Eina_Bool enable_x, Eina_Bool enable_y) +{ + if (!body) + { + ERR("Can't set linear factor on a null body."); + return; + } + + body->rigid_body->setLinearFactor(btVector3(!!enable_x, !!enable_y, 0)); +} + +EAPI void +ephysics_body_linear_movement_enable_get(EPhysics_Body *body, Eina_Bool *enable_x, Eina_Bool *enable_y) +{ + if (!body) + { + ERR("Can't check if linear factor is enabled, body is null."); + return; + } + + if (enable_x) *enable_x = !!body->rigid_body->getLinearFactor().x(); + if (enable_y) *enable_y = !!body->rigid_body->getLinearFactor().y(); +} + +EAPI void ephysics_body_torque_impulse_apply(EPhysics_Body *body, double roll) { if (!body) |
From: Enlightenment S. <no-...@en...> - 2012-07-05 22:53:00
|
Log: EPhysics: body damping set This patch introduces a function for rigid body damping. Patch by: Leandro Dorileo <do...@pr...> Author: bdilly Date: 2012-07-05 15:52:53 -0700 (Thu, 05 Jul 2012) New Revision: 73382 Trac: http://trac.enlightenment.org/e/changeset/73382 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-05 21:07:15 UTC (rev 73381) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-05 22:52:53 UTC (rev 73382) @@ -1247,6 +1247,37 @@ /** * @brief + * Set the angular and linear damping values. + * + * Damping(linear and angular) values are applied to body's linear and angular + * velocity. + * + * By applying a bodies damping factor the user will face a velocity reduction, + * with a force applied to it - like air resistance. The force is applied to + * slow it down. Different factors can be applied to angular and linear + * velocity to fine tune translation and rotation. + * + * The damping is a force synchronous with the velocity of the object but in + * opposite direction. + * + * Damping is specified as a value between 0 and 1, which is the proportion of + * velocity lost per second. If specified damping value - either for angular or + * linear - is greater or equal to 1, velocities are nulled(that means, will + * become 0 on every axis), resulting on a frozen body. + * + * Default linear damping is set to 0. The same is true for angular damping + * factor. + * + * @param body The physics body. + * @param linear_damping The linear damping force to apply on @p body. + * @param angular_damping The angular damping force to apply on @p body. + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_damping_set(EPhysics_Body *body, double linear_damping, double angular_damping); + +/** + * @brief * Update the evas object associated to the body. * * This function should be called to update position and rotation of Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-05 21:07:15 UTC (rev 73381) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-05 22:52:53 UTC (rev 73382) @@ -647,6 +647,19 @@ } EAPI void +ephysics_body_damping_set(EPhysics_Body *body, double linear_damping, double angular_damping) +{ + if (!body) + { + ERR("Can't set body damping, body is null."); + return; + } + + body->rigid_body->setDamping(btScalar(linear_damping), + btScalar(angular_damping)); +} + +EAPI void ephysics_body_evas_object_update(EPhysics_Body *body) { if (!body) |
From: Enlightenment S. <no-...@en...> - 2012-07-05 22:53:20
|
Log: EPhysics: worlds solver mode Add a function to enable/disable the world constraint solver mode. Also add wrappers for bullets solver modes enumerations, and a function to query the current status. Patch by: Leandro Dorileo <do...@pr...> Author: bdilly Date: 2012-07-05 15:53:14 -0700 (Thu, 05 Jul 2012) New Revision: 73383 Trac: http://trac.enlightenment.org/e/changeset/73383 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-05 22:52:53 UTC (rev 73382) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-05 22:53:14 UTC (rev 73383) @@ -271,6 +271,26 @@ } EPhysics_Callback_World_Type; /** + * @enum _EPhysics_World_Constraint_Solver_Mode + * typedef EPhysics_World_Constraint_Solver_Mode + * + * Identifies the worlds contact and joint constraint solver mode. By default + * EPHYSICS_WORLD_SOLVER_USE_WARMSTARTING is the only enabled solver mode. + * + * @see ephysics_world_constraint_solver_mode_enable_set() + * @see ephysics_world_constraint_solver_mode_enable_get() + * + * @ingroup EPhysics_World + */ +typedef enum _EPhysics_World_Constraint_Solver_Mode +{ + EPHYSICS_WORLD_SOLVER_RANDMIZE_ORDER = 1, /**< Randomize the order of solving the constraint rows*/ + EPHYSICS_WORLD_SOLVER_USE_WARMSTARTING = 4, /**< The PGS is an iterative algorithm where each iteration is based on the solution of previous iteration, if no warmstarting is used, the initial solution for PGS is set to zero each frame (by default this mode is enabled, disabling this mode the user can face a better performance depending on the amount of objects in the simulation)*/ + EPHYSICS_WORLD_SOLVER_USE_2_FRICTION_DIRECTIONS = 16, /**< While calculating a friction impulse consider this should be applied on both bodies (this mode cause a better stacking stabilization)*/ + EPHYSICS_WORLD_SOLVER_SIMD = 256, /**< Use a SSE optimized innerloop, using assembly intrinsics, this is implemented and can be enabled/disabled for Windows and Mac OSX versions, single-precision floating point, 32bit(disabled by default)*/ +} EPhysics_World_Solver_Mode; + +/** * @typedef EPhysics_World_Event_Cb * * EPhysics world event callback function signature. @@ -480,6 +500,33 @@ /** * @brief + * Enable or disable a constraint solver mode to @p world. A world can operate + * on several constraint solver modes. + * + * @param world The world to be set. + * @param solver_mode The solver mode to set. + * + * @see EPhysics_World_Solver_Mode for supported solver modes. + * @see ephysics_world_constraint_solver_mode_enable_get() + * @ingroup EPhysics_World + */ +EAPI void ephysics_world_constraint_solver_mode_enable_set(EPhysics_World *world, EPhysics_World_Solver_Mode solver_mode, Eina_Bool enable); + +/** + * @brief + * Get the @p solver_mode status on @p world. + * + * @param world The world to be queried. + * @param solver_mode The solver mode of interest. + * @return EINA_TRUE if @p solver_mode is enabled, EINA_FALSE otherwise + * + * @see ephysics_world_constraint_solver_mode_enable_set() + * @ingroup EPhysics_World + */ +EAPI Eina_Bool ephysics_world_constraint_solver_mode_enable_get(EPhysics_World *world, EPhysics_World_Solver_Mode solver_mode); + +/** + * @brief * Get world gravity values for axis x and y. * * @param world The world object. Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-05 22:52:53 UTC (rev 73382) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-05 22:53:14 UTC (rev 73383) @@ -290,6 +290,8 @@ goto no_list; } + world->dynamics_world->getSolverInfo().m_solverMode ^= + EPHYSICS_WORLD_SOLVER_SIMD; world->dynamics_world->setGravity(btVector3(0, -9.8, 0)); world->rate = 30; world->dynamics_world->setInternalTickCallback(_ephysics_world_tick_cb, @@ -496,6 +498,34 @@ } EAPI void +ephysics_world_constraint_solver_mode_enable_set(EPhysics_World *world, EPhysics_World_Solver_Mode solver_mode, Eina_Bool enable) +{ + int current_solver_mode; + if (!world) + { + ERR("Can't enable/disable constraint solver mode, world is null."); + return; + } + + current_solver_mode = world->dynamics_world->getSolverInfo().m_solverMode; + if ((enable && !(current_solver_mode & solver_mode)) || + (!enable && (current_solver_mode & solver_mode))) + world->dynamics_world->getSolverInfo().m_solverMode ^= solver_mode; +} + +EAPI Eina_Bool +ephysics_world_constraint_solver_mode_enable_get(EPhysics_World *world, EPhysics_World_Solver_Mode solver_mode) +{ + if (!world) + { + ERR("Can't get constraint solver mode status, world is null."); + return EINA_FALSE; + } + + return world->dynamics_world->getSolverInfo().m_solverMode & solver_mode; +} + +EAPI void ephysics_world_gravity_get(const EPhysics_World *world, double *gx, double *gy) { btVector3 vector; |
From: Enlightenment S. <no-...@en...> - 2012-07-05 22:53:34
|
Log: EPhysics: properly initializes library It wasn't initializing required libs. Author: bdilly Date: 2012-07-05 15:53:28 -0700 (Thu, 05 Jul 2012) New Revision: 73384 Trac: http://trac.enlightenment.org/e/changeset/73384 Modified: trunk/ephysics/src/lib/ephysics_main.cpp Modified: trunk/ephysics/src/lib/ephysics_main.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_main.cpp 2012-07-05 22:53:14 UTC (rev 73383) +++ trunk/ephysics/src/lib/ephysics_main.cpp 2012-07-05 22:53:28 UTC (rev 73384) @@ -2,6 +2,9 @@ # include <config.h> #endif +#include "Ecore.h" +#include "Eina.h" + #include "ephysics_private.h" #ifdef __cplusplus @@ -17,24 +20,43 @@ if (++_ephysics_init_count != 1) return _ephysics_init_count; + if (!eina_init()) + { + EINA_LOG_CRIT("Couldn't init eina"); + return --_ephysics_init_count; + } + + if (!ecore_init()) + { + EINA_LOG_CRIT("Couldn't init ecore"); + goto no_ecore; + } + _ephysics_log_dom = eina_log_domain_register("ephysics", EPHYSICS_LOG_COLOR); if (_ephysics_log_dom < 0) { - EINA_LOG_ERR("Couldn't create a log domain for ephysics"); - return --_ephysics_init_count; + EINA_LOG_CRIT("Couldn't create a log domain for ephysics"); + goto no_log; } if (!ephysics_world_init()) { - ERR("Couldn't initialize worlds"); - eina_log_domain_unregister(_ephysics_log_dom); - _ephysics_log_dom = -1; - return --_ephysics_init_count; + ERR("Couldn't initialize worlds"); + goto no_world; } INF("EPhysics initialized"); return _ephysics_init_count; + +no_world: + eina_log_domain_unregister(_ephysics_log_dom); + _ephysics_log_dom = -1; +no_log: + ecore_shutdown(); +no_ecore: + eina_shutdown(); + return --_ephysics_init_count; } EAPI int @@ -50,6 +72,9 @@ eina_log_domain_unregister(_ephysics_log_dom); _ephysics_log_dom = -1; + ecore_shutdown(); + eina_shutdown(); + return _ephysics_init_count; } |
From: Enlightenment S. <no-...@en...> - 2012-07-05 22:54:02
|
Log: EPhysics: add missing damping getter Author: bdilly Date: 2012-07-05 15:53:56 -0700 (Thu, 05 Jul 2012) New Revision: 73386 Trac: http://trac.enlightenment.org/e/changeset/73386 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-05 22:53:40 UTC (rev 73385) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-05 22:53:56 UTC (rev 73386) @@ -1316,15 +1316,34 @@ * factor. * * @param body The physics body. - * @param linear_damping The linear damping force to apply on @p body. - * @param angular_damping The angular damping force to apply on @p body. + * @param linear_damping The linear damping factor to apply on @p body. + * @param angular_damping The angular damping factor to apply on @p body. * + * @see ephysics_body_damping_get(). + * * @ingroup EPhysics_Body */ EAPI void ephysics_body_damping_set(EPhysics_Body *body, double linear_damping, double angular_damping); /** * @brief + * Get the angular and linear damping values. + * + * Damping(linear and angular) values are applied to body's linear and angular + * velocity. + * + * @param body The physics body. + * @param linear_damping The linear damping factor applied over @p body. + * @param angular_damping The angular damping factor applied over @p body. + * + * @see ephysics_body_damping_set() for details. + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_damping_get(EPhysics_Body *body, double *linear_damping, double *angular_damping); + +/** + * @brief * Update the evas object associated to the body. * * This function should be called to update position and rotation of Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-05 22:53:40 UTC (rev 73385) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-05 22:53:56 UTC (rev 73386) @@ -660,6 +660,20 @@ } EAPI void +ephysics_body_damping_get(EPhysics_Body *body, double *linear_damping, double *angular_damping) +{ + if (!body) + { + ERR("Can't get damping, body is null."); + return; + } + + if (linear_damping) *linear_damping = body->rigid_body->getLinearDamping(); + if (angular_damping) *angular_damping = + body->rigid_body->getAngularDamping(); +} + +EAPI void ephysics_body_evas_object_update(EPhysics_Body *body) { if (!body) |
From: Enlightenment S. <no-...@en...> - 2012-07-06 14:36:51
|
Log: EPhysics: fix missing const on some getters spotted by k-s Author: bdilly Date: 2012-07-06 07:36:40 -0700 (Fri, 06 Jul 2012) New Revision: 73419 Trac: http://trac.enlightenment.org/e/changeset/73419 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-06 14:34:35 UTC (rev 73418) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-06 14:36:40 UTC (rev 73419) @@ -375,7 +375,7 @@ * * @ingroup EPhysics_World */ -EAPI void ephysics_world_render_geometry_get(EPhysics_World *world, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); +EAPI void ephysics_world_render_geometry_get(const EPhysics_World *world, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); /** * @brief @@ -496,7 +496,7 @@ * @see ephysics_world_constraint_solver_iterations_set() for its meaning. * @ingroup EPhysics_World */ -EAPI int ephysics_world_constraint_solver_iterations_get(EPhysics_World *world); +EAPI int ephysics_world_constraint_solver_iterations_get(const EPhysics_World *world); /** * @brief @@ -505,6 +505,7 @@ * * @param world The world to be set. * @param solver_mode The solver mode to set. + * @param enable If @c EINA_TRUE enable the mode, if EINA_FALSE, disable it. * * @see EPhysics_World_Solver_Mode for supported solver modes. * @see ephysics_world_constraint_solver_mode_enable_get() @@ -518,12 +519,12 @@ * * @param world The world to be queried. * @param solver_mode The solver mode of interest. - * @return EINA_TRUE if @p solver_mode is enabled, EINA_FALSE otherwise + * @return EINA_TRUE if @p solver_mode is enabled, EINA_FALSE otherwise. * * @see ephysics_world_constraint_solver_mode_enable_set() * @ingroup EPhysics_World */ -EAPI Eina_Bool ephysics_world_constraint_solver_mode_enable_get(EPhysics_World *world, EPhysics_World_Solver_Mode solver_mode); +EAPI Eina_Bool ephysics_world_constraint_solver_mode_enable_get(const EPhysics_World *world, EPhysics_World_Solver_Mode solver_mode); /** * @brief @@ -702,7 +703,7 @@ * * @ingroup EPhysics_World */ -EAPI double ephysics_world_linear_slop_get(EPhysics_World *world); +EAPI double ephysics_world_linear_slop_get(const EPhysics_World *world); /** * @brief @@ -747,7 +748,7 @@ * * @ingroup EPhysics_World */ -EAPI Eina_Bool ephysics_world_bodies_outside_top_autodel_get(EPhysics_World *world); +EAPI Eina_Bool ephysics_world_bodies_outside_top_autodel_get(const EPhysics_World *world); /** * @brief @@ -780,7 +781,7 @@ * * @ingroup EPhysics_World */ -EAPI Eina_Bool ephysics_world_bodies_outside_bottom_autodel_get(EPhysics_World *world); +EAPI Eina_Bool ephysics_world_bodies_outside_bottom_autodel_get(const EPhysics_World *world); /** * @brief @@ -813,7 +814,7 @@ * * @ingroup EPhysics_World */ -EAPI Eina_Bool ephysics_world_bodies_outside_right_autodel_get(EPhysics_World *world); +EAPI Eina_Bool ephysics_world_bodies_outside_right_autodel_get(const EPhysics_World *world); /** * @brief @@ -846,7 +847,7 @@ * * @ingroup EPhysics_World */ -EAPI Eina_Bool ephysics_world_bodies_outside_left_autodel_get(EPhysics_World *world); +EAPI Eina_Bool ephysics_world_bodies_outside_left_autodel_get(const EPhysics_World *world); /** * @} @@ -1340,7 +1341,7 @@ * * @ingroup EPhysics_Body */ -EAPI void ephysics_body_damping_get(EPhysics_Body *body, double *linear_damping, double *angular_damping); +EAPI void ephysics_body_damping_get(const EPhysics_Body *body, double *linear_damping, double *angular_damping); /** * @brief @@ -1615,7 +1616,7 @@ * * @ingroup EPhysics_Body */ -EAPI Eina_Bool ephysics_body_rotation_on_z_axis_enable_get(EPhysics_Body *body); +EAPI Eina_Bool ephysics_body_rotation_on_z_axis_enable_get(const EPhysics_Body *body); /** * @brief @@ -1651,7 +1652,7 @@ * * @ingroup EPhysics_Body */ -EAPI void ephysics_body_linear_movement_enable_get(EPhysics_Body *body, Eina_Bool *enable_x, Eina_Bool *enable_y); +EAPI void ephysics_body_linear_movement_enable_get(const EPhysics_Body *body, Eina_Bool *enable_x, Eina_Bool *enable_y); /** * @brief @@ -1666,7 +1667,7 @@ * * @ingroup EPhysics_Body */ -EAPI double ephysics_body_rotation_get(EPhysics_Body *body); +EAPI double ephysics_body_rotation_get(const EPhysics_Body *body); /** * @} Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-06 14:34:35 UTC (rev 73418) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-06 14:36:40 UTC (rev 73419) @@ -250,7 +250,7 @@ } btRigidBody * -ephysics_body_rigid_body_get(EPhysics_Body *body) +ephysics_body_rigid_body_get(const EPhysics_Body *body) { return body->rigid_body; } @@ -660,7 +660,7 @@ } EAPI void -ephysics_body_damping_get(EPhysics_Body *body, double *linear_damping, double *angular_damping) +ephysics_body_damping_get(const EPhysics_Body *body, double *linear_damping, double *angular_damping) { if (!body) { @@ -860,7 +860,7 @@ } EAPI void -ephysics_body_linear_movement_enable_get(EPhysics_Body *body, Eina_Bool *enable_x, Eina_Bool *enable_y) +ephysics_body_linear_movement_enable_get(const EPhysics_Body *body, Eina_Bool *enable_x, Eina_Bool *enable_y) { if (!body) { @@ -901,7 +901,7 @@ } EAPI Eina_Bool -ephysics_body_rotation_on_z_axis_enable_get(EPhysics_Body *body) +ephysics_body_rotation_on_z_axis_enable_get(const EPhysics_Body *body) { if (!body) { @@ -913,7 +913,7 @@ } EAPI double -ephysics_body_rotation_get(EPhysics_Body *body) +ephysics_body_rotation_get(const EPhysics_Body *body) { btTransform trans; double rot; Modified: trunk/ephysics/src/lib/ephysics_private.h =================================================================== --- trunk/ephysics/src/lib/ephysics_private.h 2012-07-06 14:34:35 UTC (rev 73418) +++ trunk/ephysics/src/lib/ephysics_private.h 2012-07-06 14:36:40 UTC (rev 73419) @@ -62,12 +62,12 @@ void ephysics_body_world_boundaries_resize(EPhysics_World *world); void ephysics_world_boundary_set(EPhysics_World *world, EPhysics_World_Boundary boundary, EPhysics_Body *body); EPhysics_Body *ephysics_world_boundary_get(const EPhysics_World *world, EPhysics_World_Boundary boundary); -Eina_Bool ephysics_world_bodies_outside_autodel_get(EPhysics_World *world); +Eina_Bool ephysics_world_bodies_outside_autodel_get(const EPhysics_World *world); void ephysics_body_evas_object_update_select(EPhysics_Body *body); void ephysics_orphan_body_del(EPhysics_Body *body); void ephysics_body_contact_processed(EPhysics_Body *body, EPhysics_Body *contact_body); -btRigidBody *ephysics_body_rigid_body_get(EPhysics_Body *body); +btRigidBody *ephysics_body_rigid_body_get(const EPhysics_Body *body); void ephysics_body_active_set(EPhysics_Body *body, Eina_Bool active); EPhysics_Camera *ephysics_camera_add(EPhysics_World *world); Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-06 14:34:35 UTC (rev 73418) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-06 14:36:40 UTC (rev 73419) @@ -486,7 +486,7 @@ } EAPI int -ephysics_world_constraint_solver_iterations_get(EPhysics_World *world) +ephysics_world_constraint_solver_iterations_get(const EPhysics_World *world) { if (!world) { @@ -514,7 +514,7 @@ } EAPI Eina_Bool -ephysics_world_constraint_solver_mode_enable_get(EPhysics_World *world, EPhysics_World_Solver_Mode solver_mode) +ephysics_world_constraint_solver_mode_enable_get(const EPhysics_World *world, EPhysics_World_Solver_Mode solver_mode) { if (!world) { @@ -711,7 +711,7 @@ } EAPI void -ephysics_world_render_geometry_get(EPhysics_World *world, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +ephysics_world_render_geometry_get(const EPhysics_World *world, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { if (!world) { @@ -738,7 +738,7 @@ } EAPI double -ephysics_world_linear_slop_get(EPhysics_World *world) +ephysics_world_linear_slop_get(const EPhysics_World *world) { if (!world) { @@ -764,7 +764,7 @@ } EAPI Eina_Bool -ephysics_world_bodies_outside_top_autodel_get(EPhysics_World *world) +ephysics_world_bodies_outside_top_autodel_get(const EPhysics_World *world) { if (!world) { @@ -790,7 +790,7 @@ } EAPI Eina_Bool -ephysics_world_bodies_outside_bottom_autodel_get(EPhysics_World *world) +ephysics_world_bodies_outside_bottom_autodel_get(const EPhysics_World *world) { if (!world) { @@ -816,7 +816,7 @@ } EAPI Eina_Bool -ephysics_world_bodies_outside_left_autodel_get(EPhysics_World *world) +ephysics_world_bodies_outside_left_autodel_get(const EPhysics_World *world) { if (!world) { @@ -842,7 +842,7 @@ } EAPI Eina_Bool -ephysics_world_bodies_outside_right_autodel_get(EPhysics_World *world) +ephysics_world_bodies_outside_right_autodel_get(const EPhysics_World *world) { if (!world) { @@ -854,7 +854,7 @@ } Eina_Bool -ephysics_world_bodies_outside_autodel_get(EPhysics_World *world) +ephysics_world_bodies_outside_autodel_get(const EPhysics_World *world) { if (!world) { |
From: Enlightenment S. <no-...@en...> - 2012-07-27 14:47:33
|
Log: EPhysics: fix mass getter Author: bdilly Date: 2012-07-27 07:47:23 -0700 (Fri, 27 Jul 2012) New Revision: 74494 Trac: http://trac.enlightenment.org/e/changeset/74494 Modified: trunk/ephysics/src/lib/ephysics_body.cpp Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-27 14:02:34 UTC (rev 74493) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-27 14:47:23 UTC (rev 74494) @@ -27,6 +27,7 @@ Evas_Object *evas_obj; EPhysics_World *world; Eina_Inlist *callbacks; + double mass; Eina_Bool active:1; }; @@ -82,6 +83,7 @@ body->collision_shape = collision_shape; body->rigid_body = rigid_body; + body->mass = mass; body->world = world; body->rigid_body->setUserPointer(body); body->rigid_body->setLinearFactor(btVector3(1, 1, 0)); @@ -558,6 +560,7 @@ body->collision_shape->calculateLocalInertia(mass, inertia); body->rigid_body->setMassProps(mass, inertia); body->rigid_body->updateInertiaTensor(); + body->mass = mass; DBG("Body %p mass changed to %lf.", body, mass); } @@ -571,7 +574,7 @@ return 0; } - return 1 / body->rigid_body->getInvMass(); + return body->mass; } EAPI void |
From: Enlightenment S. <no-...@en...> - 2012-07-27 14:47:52
|
Log: EPhysics: add data setter / getter for bodies Useful when you need structures per bodies to be updated on collision callbacks. Author: bdilly Date: 2012-07-27 07:47:46 -0700 (Fri, 27 Jul 2012) New Revision: 74495 Trac: http://trac.enlightenment.org/e/changeset/74495 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-27 14:47:23 UTC (rev 74494) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-27 14:47:46 UTC (rev 74495) @@ -1670,6 +1670,39 @@ EAPI double ephysics_body_rotation_get(const EPhysics_Body *body); /** + * @brief + * Set data to @p body. + * + * If a previous data was set, it's reference will be lost and body + * will point to the new data. + * + * It can be useful when you need to store a structure per body. For example, + * some values that must to be updated when a collision occurs between two + * bodies. + * + * @param body The physics body. + * @param data The data to be set. + * + * @see ephysics_body_data_get() + * + * @ingroup EPhysics_Body + */ +EAPI void ephysics_body_data_set(EPhysics_Body *body, void *data); + +/** + * @brief + * Return data previously set to body. + * + * @param body The physics body. + * @return The data set or @c NULL on error. + * + * @see ephysics_body_data_get() for more details + * + * @ingroup EPhysics_Body + */ +EAPI void *ephysics_body_data_get(const EPhysics_Body *body); + +/** * @} */ Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-27 14:47:23 UTC (rev 74494) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-27 14:47:46 UTC (rev 74495) @@ -26,6 +26,7 @@ btRigidBody *rigid_body; Evas_Object *evas_obj; EPhysics_World *world; + void *data; Eina_Inlist *callbacks; double mass; Eina_Bool active:1; @@ -934,6 +935,30 @@ return rot; } +EAPI void +ephysics_body_data_set(EPhysics_Body *body, void *data) +{ + if (!body) + { + ERR("Can't set data, body is null."); + return; + } + + body->data = data; +} + +EAPI void * +ephysics_body_data_get(const EPhysics_Body *body) +{ + if (!body) + { + ERR("Can't get data, body is null."); + return NULL; + } + + return body->data; +} + #ifdef __cplusplus } #endif |
From: Enlightenment S. <no-...@en...> - 2012-07-27 14:48:52
|
Log: EPhysics: add note regarding body data Requested by Ricardo. Author: bdilly Date: 2012-07-27 07:48:41 -0700 (Fri, 27 Jul 2012) New Revision: 74497 Trac: http://trac.enlightenment.org/e/changeset/74497 Modified: trunk/ephysics/src/lib/EPhysics.h Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-27 14:48:19 UTC (rev 74496) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-27 14:48:41 UTC (rev 74497) @@ -1680,6 +1680,11 @@ * some values that must to be updated when a collision occurs between two * bodies. * + * @note EPhysics won't handle this data, it won't be used in any way + * by the library. If it need to be freed when the body is deleted, a + * callback for @ref EPHYSICS_CALLBACK_BODY_DEL can be added and + * data should be explicity freed. + * * @param body The physics body. * @param data The data to be set. * |
From: Enlightenment S. <no-...@en...> - 2012-07-27 14:49:26
|
Log: EPhysics: small/trivial function return fix This patch fix a compilation warning by _ephysics_world_contact_processed_cb not returning. Bullet doesn't care about what is returned, so this is just a compilation warning fix. Patch by: Leandro Dorileo <do...@pr...> Author: bdilly Date: 2012-07-27 07:49:20 -0700 (Fri, 27 Jul 2012) New Revision: 74499 Trac: http://trac.enlightenment.org/e/changeset/74499 Modified: trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-27 14:48:59 UTC (rev 74498) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-27 14:49:20 UTC (rev 74499) @@ -125,6 +125,8 @@ ephysics_body_contact_processed(body_0, body_1); ephysics_body_contact_processed(body_1, body_0); + + return EINA_TRUE; } static void |
From: Enlightenment S. <no-...@en...> - 2012-07-27 14:50:02
|
Log: EPhysics: collision filter This patch introduces a collision filter API. Once a rigid body has been added to some group it must just collide against rigid bodies in the same group, if no group has been attribute it's going to collide against any other body. Patch by: Leandro Dorileo <do...@pr...> Author: bdilly Date: 2012-07-27 07:49:53 -0700 (Fri, 27 Jul 2012) New Revision: 74501 Trac: http://trac.enlightenment.org/e/changeset/74501 Modified: trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/EPhysics.h =================================================================== --- trunk/ephysics/src/lib/EPhysics.h 2012-07-27 14:49:37 UTC (rev 74500) +++ trunk/ephysics/src/lib/EPhysics.h 2012-07-27 14:49:53 UTC (rev 74501) @@ -1453,6 +1453,58 @@ /** * @brief + * Add a @p body to a given collision group. + * + * After calling this function the body is said to be added to collision @p + * group. + * + * If not added to any group the body will collide against any other body. + * Otherwise this body will collide only against those in the same groups. + * + * @param body The body to be added to @p group. + * @param group The group the @p body will belong to. + * @return EINA_TRUE on success, EINA_FALSE otherwise. + * + * @see ephysics_body_collision_group_del() + * @see ephysics_body_collision_group_list_get() + * @ingroup EPhysics_Body + */ +EAPI Eina_Bool ephysics_body_collision_group_add(EPhysics_Body *body, const char *group); + +/** + * @brief + * Removes @p body from collision @p group. + * + * This @p body will not belong to @p group any more and the collisions filter + * must take that on account. + * + * @param body The body to be removed from @p group. + * @param group The group @p body must be removed from. + * @return EINA_TRUE on success, EINA_FALSE otherwise. + * + * @see ephysics_body_collision_group_add() + * @ingroup EPhysics_Body + */ +EAPI Eina_Bool ephysics_body_collision_group_del(EPhysics_Body *body, const char *group); + +/** + * @brief + * Get the collision group list of @p body. + * + * @param body The body of interest. + * @return The collision group list of @p body, NULL on failure or case no + * group has been added to @p body. + * + * @warning The collision group list is an EPhysics internal data structure and + * should @b never be modified by its callers. + * + * @see ephysics_body_collision_group_add() + * @ingroup EPhysics_Body + */ +EAPI const Eina_List *ephysics_body_collision_group_list_get(const EPhysics_Body *body); + +/** + * @brief * Update the evas object associated to the body. * * This function should be called to update position and rotation of Modified: trunk/ephysics/src/lib/ephysics_body.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-27 14:49:37 UTC (rev 74500) +++ trunk/ephysics/src/lib/ephysics_body.cpp 2012-07-27 14:49:53 UTC (rev 74501) @@ -30,6 +30,7 @@ Eina_Inlist *callbacks; double mass; Eina_Bool active:1; + Eina_List *collision_groups; }; struct _EPhysics_Body_Collision { @@ -50,8 +51,84 @@ EINA_INLIST_FOREACH(body->callbacks, cb) if (cb->type == EPHYSICS_CALLBACK_BODY_STOPPED) cb->func(cb->data, body, (void *) body->evas_obj); +}; + +Eina_Bool +ephysics_body_filter_collision(EPhysics_Body *body0, EPhysics_Body *body1) +{ + void *grp; + Eina_Iterator *it; + Eina_List *l; + + if ((!body0->collision_groups) || (!body1->collision_groups)) + return EINA_TRUE; + + EINA_LIST_FOREACH(body0->collision_groups, l, grp) + { + if (eina_list_data_find(body1->collision_groups, grp)) + return EINA_TRUE; + } + + return EINA_FALSE; } +EAPI Eina_Bool +ephysics_body_collision_group_add(EPhysics_Body *body, const char *group) +{ + Eina_List *l; + void *grp; + Eina_Stringshare *group_str; + + if (!body) + { + ERR("Can't add body collision group, body is null."); + return EINA_FALSE; + } + + group_str = eina_stringshare_add(group); + EINA_LIST_FOREACH(body->collision_groups, l, grp) + { + if (grp == group_str) + { + eina_stringshare_del(group_str); + return EINA_TRUE; + } + } + + body->collision_groups = eina_list_append(body->collision_groups, group_str); + return EINA_TRUE; +} + +EAPI Eina_Bool +ephysics_body_collision_group_del(EPhysics_Body *body, const char *group) +{ + Eina_Stringshare *group_str; + + if (!body) + { + ERR("Can't remove body collision group, body is null."); + return EINA_FALSE; + } + + group_str = eina_stringshare_add(group); + body->collision_groups = eina_list_remove(body->collision_groups, group_str); + eina_stringshare_del(group_str); + eina_stringshare_del(group_str); + return EINA_TRUE; +} + +EAPI const Eina_List * +ephysics_body_collision_group_list_get(const EPhysics_Body *body) +{ + if (!body) + { + ERR("Can't get the body's collision group, body is null."); + return NULL; + } + + return body->collision_groups; +} + static EPhysics_Body * _ephysics_body_add(EPhysics_World *world, btCollisionShape *collision_shape) { @@ -88,6 +165,7 @@ return NULL; } + body->collision_groups = NULL; body->collision_shape = collision_shape; body->rigid_body = rigid_body; body->mass = mass; @@ -111,6 +189,7 @@ _ephysics_body_del(EPhysics_Body *body) { EPhysics_Body_Callback *cb; + void *group; if (body->evas_obj) evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_DEL, @@ -124,6 +203,9 @@ free(cb); } + EINA_LIST_FREE(body->collision_groups, group) + eina_stringshare_del((Eina_Stringshare *)group); + delete body->rigid_body->getMotionState(); delete body->collision_shape; delete body->rigid_body; Modified: trunk/ephysics/src/lib/ephysics_private.h =================================================================== --- trunk/ephysics/src/lib/ephysics_private.h 2012-07-27 14:49:37 UTC (rev 74500) +++ trunk/ephysics/src/lib/ephysics_private.h 2012-07-27 14:49:53 UTC (rev 74501) @@ -64,6 +64,8 @@ EPhysics_Body *ephysics_world_boundary_get(const EPhysics_World *world, EPhysics_World_Boundary boundary); Eina_Bool ephysics_world_bodies_outside_autodel_get(const EPhysics_World *world); +Eina_Bool ephysics_body_filter_collision(EPhysics_Body *body0, EPhysics_Body *body1); + void ephysics_body_evas_object_update_select(EPhysics_Body *body); void ephysics_orphan_body_del(EPhysics_Body *body); void ephysics_body_contact_processed(EPhysics_Body *body, EPhysics_Body *contact_body, btVector3 position); Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-27 14:49:37 UTC (rev 74500) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-07-27 14:49:53 UTC (rev 74501) @@ -48,6 +48,23 @@ static Eina_List *_worlds = NULL; static Ecore_Animator *_anim_simulate = NULL; +struct _ephysics_world_ovelap_filter_cb : public btOverlapFilterCallback +{ + virtual bool needBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const + { + btCollisionObject *coll0 = (btCollisionObject *)proxy0->m_clientObject; + btCollisionObject *coll1 = (btCollisionObject *)proxy1->m_clientObject; + + EPhysics_Body *body0 = (EPhysics_Body *)coll0->getUserPointer(); + EPhysics_Body *body1 = (EPhysics_Body *)coll1->getUserPointer(); + + if ((!body0 || !body1) || (ephysics_body_filter_collision(body0, body1))) + return EINA_TRUE; + + return EINA_FALSE; + } +}; + static void _ephysics_world_tick_cb(btDynamicsWorld *dynamics_world, btScalar timeStep) { @@ -235,6 +252,7 @@ ephysics_world_new(void) { EPhysics_World *world; + btOverlapFilterCallback *filter_cb; world = (EPhysics_World *) calloc(1, sizeof(EPhysics_World)); if (!world) @@ -297,6 +315,13 @@ world->dynamics_world->getSolverInfo().m_solverMode ^= EPHYSICS_WORLD_SOLVER_SIMD; world->dynamics_world->setGravity(btVector3(0, -9.8, 0)); + + filter_cb = new _ephysics_world_ovelap_filter_cb(); + if (!filter_cb) + INF("Couldn't initialize the collision filter."); + else + world->dynamics_world->getPairCache()->setOverlapFilterCallback(filter_cb); + world->rate = 30; world->dynamics_world->setInternalTickCallback(_ephysics_world_tick_cb, (void *) world); |
From: Enlightenment S. <no-...@en...> - 2012-08-10 21:03:08
|
Log: EPhysics: use inlist for worlds list Author: bdilly Date: 2012-08-10 14:03:01 -0700 (Fri, 10 Aug 2012) New Revision: 75138 Trac: http://trac.enlightenment.org/e/changeset/75138 Modified: trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-08-10 21:02:56 UTC (rev 75137) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-08-10 21:03:01 UTC (rev 75138) @@ -20,6 +20,7 @@ }; struct _EPhysics_World { + EINA_INLIST; btBroadphaseInterface* broadphase; btDefaultCollisionConfiguration* collision; btCollisionDispatcher* dispatcher; @@ -47,7 +48,7 @@ static int _ephysics_world_init_count = 0; static int _worlds_running = 0; -static Eina_List *_worlds = NULL; +static Eina_Inlist *_worlds = NULL; static Ecore_Animator *_anim_simulate = NULL; struct _ephysics_world_ovelap_filter_cb : public btOverlapFilterCallback @@ -126,14 +127,13 @@ static Eina_Bool _simulate_worlds(void *data) { - Eina_List *l, *lworlds = (Eina_List *) data; + Eina_Inlist *lworlds = (Eina_Inlist *) data; + EPhysics_World *world; double time_now; - void *ldata; - EINA_LIST_FOREACH(lworlds, l, ldata) + EINA_INLIST_FOREACH(lworlds, world) { double time_now, delta; - EPhysics_World *world = (EPhysics_World *) ldata; if (!world->running) continue; @@ -232,8 +232,6 @@ int ephysics_world_shutdown(void) { - void *ldata; - if (--_ephysics_world_init_count != 0) return _ephysics_world_init_count; @@ -243,9 +241,11 @@ _anim_simulate = NULL; } - EINA_LIST_FREE(_worlds, ldata) + while (_worlds) { - EPhysics_World *world = (EPhysics_World *) ldata; + EPhysics_World *world = EINA_INLIST_CONTAINER_GET( + _worlds, EPhysics_World); + _worlds = eina_inlist_remove(_worlds, _worlds); ephysics_world_del(world); } @@ -327,7 +327,7 @@ goto no_world; } - _worlds = eina_list_append(_worlds, world); + _worlds = eina_inlist_append(_worlds, EINA_INLIST_GET(world)); if (eina_error_get()) { ERR("Couldn't add world to worlds list."); @@ -435,7 +435,7 @@ } ephysics_world_running_set(world, EINA_FALSE); - _worlds = eina_list_remove(_worlds, world); + _worlds = eina_inlist_remove(_worlds, EINA_INLIST_GET(world)); while (world->callbacks) { |
From: Enlightenment S. <no-...@en...> - 2012-08-10 21:03:36
|
Log: EPhysics: properly handle world delete Author: bdilly Date: 2012-08-10 14:03:29 -0700 (Fri, 10 Aug 2012) New Revision: 75140 Trac: http://trac.enlightenment.org/e/changeset/75140 Modified: trunk/ephysics/src/lib/ephysics_world.cpp Modified: trunk/ephysics/src/lib/ephysics_world.cpp =================================================================== --- trunk/ephysics/src/lib/ephysics_world.cpp 2012-08-10 21:03:06 UTC (rev 75139) +++ trunk/ephysics/src/lib/ephysics_world.cpp 2012-08-10 21:03:29 UTC (rev 75140) @@ -36,20 +36,23 @@ double last_update; double rate; double fixed_time_step; + double max_sleeping_time; Eina_Bool running:1; Eina_Bool active:1; + Eina_Bool deleted:1; Eina_Bool outside_autodel:1; Eina_Bool outside_top:1; Eina_Bool outside_bottom:1; Eina_Bool outside_left:1; Eina_Bool outside_right:1; - double max_sleeping_time; }; static int _ephysics_world_init_count = 0; static int _worlds_running = 0; static Eina_Inlist *_worlds = NULL; +static Eina_List *_worlds_to_delete = NULL; static Ecore_Animator *_anim_simulate = NULL; +static int _worlds_walking = 0; struct _ephysics_world_ovelap_filter_cb : public btOverlapFilterCallback { @@ -124,13 +127,51 @@ cb->func(cb->data, world, NULL); } +static void +_ephysics_world_free(EPhysics_World *world) +{ + EPhysics_World_Callback *cb; + EPhysics_Body *body; + + _worlds = eina_inlist_remove(_worlds, EINA_INLIST_GET(world)); + + while (world->callbacks) + { + cb = EINA_INLIST_CONTAINER_GET(world->callbacks, + EPhysics_World_Callback); + world->callbacks = eina_inlist_remove(world->callbacks, + world->callbacks); + free(cb); + } + + while (world->bodies) + { + body = EINA_INLIST_CONTAINER_GET(world->bodies, EPhysics_Body); + world->bodies = eina_inlist_remove(world->bodies, world->bodies); + ephysics_orphan_body_del(body); + } + + ephysics_camera_del(world->camera); + delete world->dynamics_world; + delete world->solver; + delete world->dispatcher; + delete world->collision; + delete world->broadphase; + + free(world); + INF("World %p deleted.", world); +} + static Eina_Bool _simulate_worlds(void *data) { Eina_Inlist *lworlds = (Eina_Inlist *) data; EPhysics_World *world; double time_now; + void *wrld; + ephysics_init(); + _worlds_walking++; EINA_INLIST_FOREACH(lworlds, world) { double time_now, delta; @@ -146,7 +187,19 @@ world->dynamics_world->stepSimulation(delta, world->max_sub_steps, world->fixed_time_step); } + _worlds_walking--; + if (_worlds_walking > 0) + { + ephysics_shutdown(); + return EINA_TRUE; + } + + EINA_LIST_FREE(_worlds_to_delete, wrld) + _ephysics_world_free((EPhysics_World *)wrld); + + ephysics_shutdown(); + return EINA_TRUE; } @@ -247,7 +300,6 @@ { EPhysics_World *world = EINA_INLIST_CONTAINER_GET( _worlds, EPhysics_World); - _worlds = eina_inlist_remove(_worlds, _worlds); ephysics_world_del(world); } @@ -422,7 +474,6 @@ ephysics_world_del(EPhysics_World *world) { EPhysics_World_Callback *cb; - EPhysics_Body *body; if (!world) { @@ -430,6 +481,9 @@ return; } + if (world->deleted) return; + + world->deleted = EINA_TRUE; EINA_INLIST_FOREACH(world->callbacks, cb) { if (cb->type == EPHYSICS_CALLBACK_WORLD_DEL) @@ -437,33 +491,15 @@ } ephysics_world_running_set(world, EINA_FALSE); - _worlds = eina_inlist_remove(_worlds, EINA_INLIST_GET(world)); - while (world->callbacks) + if (_worlds_walking > 0) { - cb = EINA_INLIST_CONTAINER_GET(world->callbacks, - EPhysics_World_Callback); - world->callbacks = eina_inlist_remove(world->callbacks, - world->callbacks); - free(cb); + _worlds_to_delete = eina_list_append(_worlds_to_delete, world); + INF("World %p marked to delete.", world); + return; } - while (world->bodies) - { - body = EINA_INLIST_CONTAINER_GET(world->bodies, EPhysics_Body); - world->bodies = eina_inlist_remove(world->bodies, world->bodies); - ephysics_orphan_body_del(body); - } - - ephysics_camera_del(world->camera); - delete world->dynamics_world; - delete world->solver; - delete world->dispatcher; - delete world->collision; - delete world->broadphase; - - free(world); - INF("World %p deleted.", world); + _ephysics_world_free(world); } EAPI void |