Enlightenment

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;

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

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)
 {

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)
 {

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;

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 <dorileo@...>
  
  

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)

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

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

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

Log:
EPhysics: constraint solver iterations
  
  Functions to get and set the constraint solver number of iterations.
  
  Patch by Leandro Dorileo <dorileo@...>
  
  

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;

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)

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)

Log:
EPhysics: body damping set
  
  This patch introduces a function for rigid body damping.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

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)

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 <dorileo@...>
  
  

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;

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;
 }

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)

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)
      {

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

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

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.
  *

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 <dorileo@...>
  
  

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

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 <dorileo@...>
  
  

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);

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)
      {

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

Log:
EPhysics: properly handle body delete
  
  
  

Author:       bdilly
Date:         2012-08-10 14:03:39 -0700 (Fri, 10 Aug 2012)
New Revision: 75141
Trac:         http://trac.enlightenment.org/e/changeset/75141

Modified:
  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_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-10 21:03:29 UTC (rev 75140)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-10 21:03:39 UTC (rev 75141)
@@ -289,9 +289,8 @@
        ((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);
+        DBG("Body %p out of render area", body);
+        ephysics_body_del(body);
      }
 }
 
@@ -415,7 +414,7 @@
         return NULL;
      }
 
-   if (!ephysics_world_body_add(body->world, body, body->rigid_body))
+   if (!ephysics_world_body_add(body->world, body))
      {
         ERR("Couldn't add body to world's bodies list");
         _ephysics_body_del(body);
@@ -447,7 +446,7 @@
         return NULL;
      }
 
-   if (!ephysics_world_body_add(body->world, body, body->rigid_body))
+   if (!ephysics_world_body_add(body->world, body))
      {
         ERR("Couldn't add body to world's bodies list");
         _ephysics_body_del(body);
@@ -557,6 +556,7 @@
      }
 
    _ephysics_body_del(body);
+   INF("Body %p deleted.", body);
 }
 
 EAPI void
@@ -568,10 +568,9 @@
         return;
      }
 
-   ephysics_world_body_del(body->world, body, body->rigid_body);
-   ephysics_orphan_body_del(body);
-
-   INF("Body %p deleted.", body);
+   if (body->deleted) return;
+   body->deleted = EINA_TRUE;
+   ephysics_world_body_del(body->world, body);
 }
 
 EAPI void

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-08-10 21:03:29 UTC (rev 75140)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-08-10 21:03:39 UTC (rev 75141)
@@ -62,16 +62,17 @@
      void *data;
      Eina_Inlist *callbacks;
      double mass;
+     Eina_List *collision_groups;
      Eina_Bool active:1;
-     Eina_List *collision_groups;
+     Eina_Bool deleted:1;
 };
 
 extern int _ephysics_log_dom;
 
 int ephysics_world_init(void);
 int ephysics_world_shutdown(void);
-Eina_Bool ephysics_world_body_add(EPhysics_World *world, EPhysics_Body *body, btRigidBody *rigid_body);
-void ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body, btRigidBody *rigid_body);
+Eina_Bool ephysics_world_body_add(EPhysics_World *world, EPhysics_Body *body);
+Eina_Bool ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body);
 void ephysics_world_constraint_add(EPhysics_World *world, btTypedConstraint *bt_constraint);
 void ephysics_world_constraint_del(EPhysics_World *world, btTypedConstraint *bt_constraint);
 void ephysics_body_world_boundaries_resize(EPhysics_World *world);

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-10 21:03:29 UTC (rev 75140)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-10 21:03:39 UTC (rev 75141)
@@ -32,7 +32,9 @@
      Evas_Coord x, y, w, h;
      Eina_Inlist *callbacks;
      Eina_Inlist *bodies;
+     Eina_List *to_delete;
      int max_sub_steps;
+     int walking;
      double last_update;
      double rate;
      double fixed_time_step;
@@ -56,7 +58,8 @@
 
 struct _ephysics_world_ovelap_filter_cb : public btOverlapFilterCallback
 {
-   virtual bool needBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const
+   virtual bool needBroadphaseCollision(btBroadphaseProxy* proxy0,
+                                        btBroadphaseProxy* proxy1) const
    {
       btCollisionObject *coll0 = (btCollisionObject *)proxy0->m_clientObject;
       btCollisionObject *coll1 = (btCollisionObject *)proxy1->m_clientObject;
@@ -168,7 +171,7 @@
    Eina_Inlist *lworlds = (Eina_Inlist *) data;
    EPhysics_World *world;
    double time_now;
-   void *wrld;
+   void *wrld, *bd;
 
    ephysics_init();
    _worlds_walking++;
@@ -179,6 +182,8 @@
         if (!world->running)
           continue;
 
+        world->walking++;
+
         time_now = ecore_time_get();
         delta = time_now - world->last_update;
         world->last_update = time_now;
@@ -186,6 +191,13 @@
         gDeactivationTime = world->max_sleeping_time;
         world->dynamics_world->stepSimulation(delta, world->max_sub_steps,
                                               world->fixed_time_step);
+        world->walking--;
+
+        if (!world->walking)
+          {
+             EINA_LIST_FREE(world->to_delete, bd)
+                ephysics_world_body_del(world, (EPhysics_Body*)bd);
+          }
      }
    _worlds_walking--;
 
@@ -238,7 +250,7 @@
 }
 
 Eina_Bool
-ephysics_world_body_add(EPhysics_World *world, EPhysics_Body *body, btRigidBody *rigid_body)
+ephysics_world_body_add(EPhysics_World *world, EPhysics_Body *body)
 {
    world->bodies = eina_inlist_append(world->bodies,
                                       EINA_INLIST_GET(body));
@@ -247,16 +259,27 @@
         ERR("Couldn't add body to bodies list.");
         return EINA_FALSE;
      }
-   world->dynamics_world->addRigidBody(rigid_body);
+
+   world->dynamics_world->addRigidBody(ephysics_body_rigid_body_get(body));
+
    return EINA_TRUE;
 }
 
-void
-ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body, btRigidBody *rigid_body)
+Eina_Bool
+ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body)
 {
-   world->dynamics_world->removeRigidBody(rigid_body);
+   if (world->walking)
+     {
+        world->to_delete = eina_list_append(world->to_delete, body);
+        return EINA_FALSE;
+     }
+
+   world->dynamics_world->removeRigidBody(ephysics_body_rigid_body_get(body));
    world->bodies = eina_inlist_remove(world->bodies,
                                       EINA_INLIST_GET(body));
+   ephysics_orphan_body_del(body);
+
+   return EINA_TRUE;
 }
 
 void

Log:
EPhysics: improving body's event callbacks management
  
  
  

Author:       bdilly
Date:         2012-08-10 14:04:08 -0700 (Fri, 10 Aug 2012)
New Revision: 75144
Trac:         http://trac.enlightenment.org/e/changeset/75144

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-10 21:03:57 UTC (rev 75143)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-10 21:04:08 UTC (rev 75144)
@@ -17,6 +17,7 @@
      void (*func) (void *data, EPhysics_Body *body, void *event_info);
      void *data;
      EPhysics_Callback_Body_Type type;
+     Eina_Bool deleted:1;
 };
 
 struct _EPhysics_Body_Collision {
@@ -25,6 +26,55 @@
      Evas_Coord y;
 };
 
+
+static void
+_ephysics_body_event_callback_del(EPhysics_Body *body, EPhysics_Body_Callback *cb)
+{
+   if (cb->deleted) return;
+
+   cb->deleted = EINA_TRUE;
+
+   if (body->walking)
+     {
+        body->to_delete = eina_list_append(body->to_delete, cb);
+        return;
+     }
+
+   body->callbacks = eina_inlist_remove(body->callbacks, EINA_INLIST_GET(cb));
+   free(cb);
+}
+
+static Eina_Bool
+_ephysics_body_event_callback_call(EPhysics_Body *body, EPhysics_Callback_Body_Type type, void *event_info)
+{
+   Eina_Bool called = EINA_FALSE;
+   EPhysics_Body_Callback *cb;
+   void *clb;
+
+   body->walking++;
+   EINA_INLIST_FOREACH(body->callbacks, cb)
+     {
+        if ((cb->type == type) && (!cb->deleted))
+          {
+             cb->func(cb->data, body, event_info);
+             called = EINA_TRUE;
+          }
+     }
+   body->walking--;
+
+   if (body->walking > 0) return called;
+
+   EINA_LIST_FREE(body->to_delete, clb)
+     {
+        cb = (EPhysics_Body_Callback *) clb;
+        body->callbacks = eina_inlist_remove(body->callbacks,
+                                             EINA_INLIST_GET(cb));
+        free(cb);
+     }
+
+   return called;
+}
+
 void
 ephysics_body_active_set(EPhysics_Body *body, Eina_Bool active)
 {
@@ -34,9 +84,8 @@
    body->active = !!active;
    if (active) return;
 
-   EINA_INLIST_FOREACH(body->callbacks, cb)
-      if (cb->type == EPHYSICS_CALLBACK_BODY_STOPPED)
-        cb->func(cb->data, body, (void *) body->evas_obj);
+   _ephysics_body_event_callback_call(body, EPHYSICS_CALLBACK_BODY_STOPPED,
+                                      (void *) body->evas_obj);
 };
 
 Eina_Bool
@@ -298,18 +347,12 @@
 ephysics_body_evas_object_update_select(EPhysics_Body *body)
 {
    Eina_Bool callback_called = EINA_FALSE;
-   EPhysics_Body_Callback *cb;
 
    if (!body)
      return;
 
-   EINA_INLIST_FOREACH(body->callbacks, cb)
-     {
-        if (cb->type == EPHYSICS_CALLBACK_BODY_UPDATE) {
-             cb->func(cb->data, body, (void *) body->evas_obj);
-             callback_called = EINA_TRUE;
-        }
-     }
+   callback_called = _ephysics_body_event_callback_call(
+      body, EPHYSICS_CALLBACK_BODY_UPDATE, (void *) body->evas_obj);
 
    if (!callback_called)
      _ephysics_body_evas_object_default_update(body);
@@ -318,20 +361,6 @@
      _ephysics_body_outside_render_area_check(body);
 }
 
-static void
-_ephysics_body_collision_set(EPhysics_Body_Collision *collision, EPhysics_Body *contact_body, btVector3 position)
-{
-   double rate;
-   int wy, wh;
-   EPhysics_World *world = contact_body->world;
-
-   ephysics_world_render_geometry_get(world, NULL, &wy, NULL, &wh);
-   rate = ephysics_world_rate_get(world);
-   collision->contact_body = contact_body;
-   collision->x = position.getX() * rate;
-   collision->y = wh + wy - (position.getY() * rate);
-}
-
 EAPI void
 ephysics_body_collision_position_get(const EPhysics_Body_Collision *collision, Evas_Coord *x, Evas_Coord *y)
 {
@@ -360,31 +389,36 @@
 void
 ephysics_body_contact_processed(EPhysics_Body *body, EPhysics_Body *contact_body, btVector3 position)
 {
+   EPhysics_Body_Collision *collision;
    EPhysics_Body_Callback *cb;
+   EPhysics_World *world;;
+   double rate;
+   int wy, wh;
 
    if ((!body) || (!contact_body))
      return;
 
-   EINA_INLIST_FOREACH(body->callbacks, cb)
+   collision = (EPhysics_Body_Collision *)malloc(
+      sizeof(EPhysics_Body_Collision));
+
+   if (!collision)
      {
-        if (cb->type == EPHYSICS_CALLBACK_BODY_COLLISION)
-          {
-             EPhysics_Body_Collision *collision;
+        ERR("Can't allocate collision data structure.");
+        return;
+     }
 
-             collision = (EPhysics_Body_Collision *)malloc(
-                sizeof(EPhysics_Body_Collision));
+   world = contact_body->world;
+   ephysics_world_render_geometry_get(world, NULL, &wy, NULL, &wh);
+   rate = ephysics_world_rate_get(world);
 
-             if (!collision)
-               {
-                  ERR("Can't allocate collision data structure.");
-                  continue;
-               }
+   collision->contact_body = contact_body;
+   collision->x = position.getX() * rate;
+   collision->y = wh + wy - (position.getY() * rate);
 
-             _ephysics_body_collision_set(collision, contact_body, position);
-             cb->func(cb->data, body, collision);
-             free(collision);
-          }
-     }
+   _ephysics_body_event_callback_call(body, EPHYSICS_CALLBACK_BODY_COLLISION,
+                                      (void *) collision);
+
+   free(collision);
 }
 
 btRigidBody *
@@ -549,12 +583,7 @@
 {
    EPhysics_Body_Callback *cb;
 
-   EINA_INLIST_FOREACH(body->callbacks, cb)
-     {
-        if (cb->type == EPHYSICS_CALLBACK_BODY_DEL)
-          cb->func(cb->data, body, NULL);
-     }
-
+   _ephysics_body_event_callback_call(body, EPHYSICS_CALLBACK_BODY_DEL, NULL);
    _ephysics_body_del(body);
    INF("Body %p deleted.", body);
 }
@@ -900,7 +929,7 @@
 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;
+   void *cb_data = NULL;
 
    if (!body)
      {
@@ -910,23 +939,23 @@
 
    EINA_INLIST_FOREACH(body->callbacks, cb)
      {
-        if ((cb->type == type) && (cb->func == func)) {
-             cb_data = cb->data;
-             body->callbacks = eina_inlist_remove(body->callbacks,
-                                                  EINA_INLIST_GET(cb));
-             free(cb);
-             return cb_data;
-        }
+        if ((cb->type != type) || (cb->func != func))
+          continue;
+
+        cb_data = cb->data;
+        _ephysics_body_event_callback_del(body, cb);
+        break;
+
      }
 
-   return NULL;
+   return cb_data;
 }
 
 EAPI void *
 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;
+   void *cb_data = NULL;
 
    if (!body)
      {
@@ -936,16 +965,15 @@
 
    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;
-        }
+        if ((cb->type != type) || (cb->func != func) || (cb->data != data))
+          continue;
+
+        cb_data = cb->data;
+        _ephysics_body_event_callback_del(body, cb);
+        break;
      }
 
-   return NULL;
+   return cb_data;
 }
 
 EAPI void

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-08-10 21:03:57 UTC (rev 75143)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-08-10 21:04:08 UTC (rev 75144)
@@ -59,10 +59,12 @@
      btRigidBody *rigid_body;
      Evas_Object *evas_obj;
      EPhysics_World *world;
+     int walking;
      void *data;
      Eina_Inlist *callbacks;
+     Eina_List *collision_groups;
+     Eina_List *to_delete;
      double mass;
-     Eina_List *collision_groups;
      Eina_Bool active:1;
      Eina_Bool deleted:1;
 };

Log:
EPhysics: avoid invalid read / writes on world free
  
  Looks like we'll need to fix discrete dynamics world destructor
  on bullet, but current revision is kind of messed.
  I'll see what I can do later.
  
  And yes, it will leak the ddw until it's fixed.
  
  

Author:       bdilly
Date:         2012-08-10 14:04:16 -0700 (Fri, 10 Aug 2012)
New Revision: 75145
Trac:         http://trac.enlightenment.org/e/changeset/75145

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:04:08 UTC (rev 75144)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-10 21:04:16 UTC (rev 75145)
@@ -155,11 +155,15 @@
      }
 
    ephysics_camera_del(world->camera);
+   /* FIXME uncomment lines above when dynamicsworld destructor is fixed
+      on bullet. Right now looks like it will try to acess invalid memory.*/
+   /*
    delete world->dynamics_world;
    delete world->solver;
+   delete world->broadphase;
    delete world->dispatcher;
    delete world->collision;
-   delete world->broadphase;
+   */
 
    free(world);
    INF("World %p deleted.", world);

Log:
EPhysics: fix world event callbacks management
  
  
  

Author:       bdilly
Date:         2012-08-10 14:04:22 -0700 (Fri, 10 Aug 2012)
New Revision: 75146
Trac:         http://trac.enlightenment.org/e/changeset/75146

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:04:16 UTC (rev 75145)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-10 21:04:22 UTC (rev 75146)
@@ -17,6 +17,7 @@
      void (*func) (void *data, EPhysics_World *world, void *event_info);
      void *data;
      EPhysics_Callback_World_Type type;
+     Eina_Bool deleted:1;
 };
 
 struct _EPhysics_World {
@@ -33,8 +34,10 @@
      Eina_Inlist *callbacks;
      Eina_Inlist *bodies;
      Eina_List *to_delete;
+     Eina_List *cb_to_delete;
      int max_sub_steps;
      int walking;
+     int cb_walking;
      double last_update;
      double rate;
      double fixed_time_step;
@@ -75,6 +78,49 @@
 };
 
 static void
+_ephysics_world_event_callback_call(EPhysics_World *world, EPhysics_Callback_World_Type type, void *event_info)
+{
+   EPhysics_World_Callback *cb;
+   void *clb;
+
+   world->cb_walking++;
+   EINA_INLIST_FOREACH(world->callbacks, cb)
+     {
+        if ((cb->type == type) && (!cb->deleted))
+          cb->func(cb->data, world, event_info);
+     }
+   world->cb_walking--;
+
+   if (world->cb_walking > 0) return;
+
+   EINA_LIST_FREE(world->cb_to_delete, clb)
+     {
+        cb = (EPhysics_World_Callback *)clb;
+        world->callbacks = eina_inlist_remove(world->callbacks,
+                                              EINA_INLIST_GET(cb));
+        free(cb);
+     }
+}
+
+static void
+_ephysics_world_event_callback_del(EPhysics_World *world, EPhysics_World_Callback *cb)
+{
+   if (cb->deleted) return;
+
+   cb->deleted = EINA_TRUE;
+
+   if (world->cb_walking)
+     {
+        world->cb_to_delete = eina_list_append(world->cb_to_delete, cb);
+        return;
+     }
+
+   world->callbacks = eina_inlist_remove(world->callbacks,
+                                         EINA_INLIST_GET(cb));
+   free(cb);
+}
+
+static void
 _ephysics_world_tick_cb(btDynamicsWorld *dynamics_world, btScalar timeStep)
 {
    Eina_Bool world_active, camera_moved, tx, ty;
@@ -125,9 +171,8 @@
    world->active = world_active;
    if (world_active) return;
 
-   EINA_INLIST_FOREACH(world->callbacks, cb)
-      if (cb->type == EPHYSICS_CALLBACK_WORLD_STOPPED)
-        cb->func(cb->data, world, NULL);
+   _ephysics_world_event_callback_call(world, EPHYSICS_CALLBACK_WORLD_STOPPED,
+                                       NULL);
 }
 
 static void
@@ -511,12 +556,8 @@
    if (world->deleted) return;
 
    world->deleted = EINA_TRUE;
-   EINA_INLIST_FOREACH(world->callbacks, cb)
-     {
-        if (cb->type == EPHYSICS_CALLBACK_WORLD_DEL)
-          cb->func(cb->data, world, NULL);
-     }
-
+   _ephysics_world_event_callback_call(world, EPHYSICS_CALLBACK_WORLD_DEL,
+                                       NULL);
    ephysics_world_running_set(world, EINA_FALSE);
 
    if (_worlds_walking > 0)
@@ -774,7 +815,7 @@
 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;
+   void *cb_data = NULL;
 
    if (!world)
      {
@@ -784,23 +825,22 @@
 
    EINA_INLIST_FOREACH(world->callbacks, cb)
      {
-        if ((cb->type == type) && (cb->func == func)) {
-             cb_data = cb->data;
-             world->callbacks = eina_inlist_remove(world->callbacks,
-                                                  EINA_INLIST_GET(cb));
-             free(cb);
-             return cb_data;
-        }
+        if ((cb->type != type) || (cb->func != func))
+          continue;
+
+        cb_data = cb->data;
+        _ephysics_world_event_callback_del(world, cb);
+        break;
      }
 
-   return NULL;
+   return cb_data;
 }
 
 EAPI void *
 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;
+   void *cb_data = NULL;
 
    if (!world)
      {
@@ -810,16 +850,15 @@
 
    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;
-        }
+        if ((cb->type != type) || (cb->func != func) || (cb->data != data))
+          continue;
+
+        cb_data = cb->data;
+        _ephysics_world_event_callback_del(world, cb);
+        break;
      }
 
-   return NULL;
+   return cb_data;
 }
 
 EAPI Eina_List *

Log:
EPhysics: optimization and fixes for camera
  
  Avoid calling update of inactive bodies if camera didn't really
  moved.
  
  And update them if camera_position_set is called.
  
  

Author:       bdilly
Date:         2012-08-10 14:04:35 -0700 (Fri, 10 Aug 2012)
New Revision: 75147
Trac:         http://trac.enlightenment.org/e/changeset/75147

Modified:
  trunk/ephysics/src/lib/ephysics_camera.cpp 

Modified: trunk/ephysics/src/lib/ephysics_camera.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_camera.cpp	2012-08-10 21:04:22 UTC (rev 75146)
+++ trunk/ephysics/src/lib/ephysics_camera.cpp	2012-08-10 21:04:35 UTC (rev 75147)
@@ -24,24 +24,32 @@
 _ephysics_camera_target_move_cb(void *data, EPhysics_Body *body, void *event_info __UNUSED__)
 {
    EPhysics_Camera *camera = (EPhysics_Camera *) data;
-   int x, y, w, h, ww, wh;
+   int x, y, w, h, ww, wh, new_x, new_y;
 
    ephysics_body_geometry_get(body, &x, &y, &w, &h);
    ephysics_world_render_geometry_get(camera->world, NULL, NULL, &ww, &wh);
 
    if (camera->track_horizontal)
      {
-        camera->x = x + w / 2 - ww / 2;
-        camera->moved = EINA_TRUE;
+        new_x = x + w / 2 - ww / 2;
+        if (camera->x != new_x)
+          {
+             camera->x = new_x;
+             camera->moved = EINA_TRUE;
+          }
      }
 
    if (camera->track_vertical)
      {
-        camera->y = y + h / 2 - wh / 2;
-        camera->moved = EINA_TRUE;
+        new_y =  y + h / 2 - wh / 2;
+        if (camera->y != new_y)
+          {
+             camera->y = new_y;
+             camera->moved = EINA_TRUE;
+          }
      }
 
-   DBG("Camera position set to (%i, %i).", camera->x, camera->y);
+   WRN("Camera position set to (%i, %i).", camera->x, camera->y);
 }
 
 static void
@@ -125,6 +133,7 @@
 
    camera->x = x;
    camera->y = y;
+   camera->moved = EINA_TRUE;
 
    INF("Camera position set to (%i, %i).", x, y);
 }
@@ -184,7 +193,8 @@
    ephysics_body_event_callback_add(body, EPHYSICS_CALLBACK_BODY_DEL,
                                     _ephysics_camera_target_del_cb, camera);
 
-   INF("Camera is tracking body %p.", body);
+   INF("Camera is tracking body %p: hor = %i, ver = %i.", body,
+       camera->track_horizontal, camera->track_vertical);
 }
 
 EAPI void

Log:
EPhysics: Avoid garbagge in cb objects.
  
  
  

Author:       bdilly
Date:         2012-08-10 14:04:42 -0700 (Fri, 10 Aug 2012)
New Revision: 75148
Trac:         http://trac.enlightenment.org/e/changeset/75148

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-08-10 21:04:35 UTC (rev 75147)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-10 21:04:42 UTC (rev 75148)
@@ -398,8 +398,8 @@
    if ((!body) || (!contact_body))
      return;
 
-   collision = (EPhysics_Body_Collision *)malloc(
-      sizeof(EPhysics_Body_Collision));
+   collision = (EPhysics_Body_Collision *)calloc(
+      1, sizeof(EPhysics_Body_Collision));
 
    if (!collision)
      {
@@ -911,7 +911,7 @@
         return;
      }
 
-   cb = (EPhysics_Body_Callback *) malloc(sizeof(EPhysics_Body_Callback));
+   cb = (EPhysics_Body_Callback *)calloc(1, sizeof(EPhysics_Body_Callback));
    if (!cb)
      {
         ERR("Can't set body event callback, can't create cb instance.");

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-10 21:04:35 UTC (rev 75147)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-10 21:04:42 UTC (rev 75148)
@@ -797,7 +797,7 @@
         return;
      }
 
-   cb = (EPhysics_World_Callback *) malloc(sizeof(EPhysics_World_Callback));
+   cb = (EPhysics_World_Callback *)calloc(1, sizeof(EPhysics_World_Callback));
    if (!cb)
      {
         ERR("Can't set world event callback, can't create cb instance.");

Log:
EPhysics: move code duplication to _ephysics_body_add
  
  Also, add missing checks.
  
  

Author:       bdilly
Date:         2012-08-10 14:05:05 -0700 (Fri, 10 Aug 2012)
New Revision: 75150
Trac:         http://trac.enlightenment.org/e/changeset/75150

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-10 21:04:51 UTC (rev 75149)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-10 21:05:05 UTC (rev 75150)
@@ -26,7 +26,6 @@
      Evas_Coord y;
 };
 
-
 static void
 _ephysics_body_event_callback_del(EPhysics_Body *body, EPhysics_Body_Callback *cb)
 {
@@ -168,39 +167,51 @@
 }
 
 static EPhysics_Body *
-_ephysics_body_add(EPhysics_World *world, btCollisionShape *collision_shape)
+_ephysics_body_add(EPhysics_World *world, btCollisionShape *collision_shape, const char *type)
 {
+   btRigidBody::btRigidBodyConstructionInfo *rigid_body_ci;
+   btDefaultMotionState *motion_state;
+   btRigidBody *rigid_body;
    EPhysics_Body *body;
    btScalar mass = 1;
+   btVector3 inertia;
 
+   if (!collision_shape)
+     {
+        ERR("Couldn't create a %s shape.", type);
+        return NULL;
+     }
+
    body = (EPhysics_Body *) calloc(1, sizeof(EPhysics_Body));
    if (!body)
      {
         ERR("Couldn't create a new body instance.");
-        return NULL;
+        goto err_body;
      }
 
-   btDefaultMotionState *motion_state =
-      new btDefaultMotionState();
+   motion_state = new btDefaultMotionState();
    if (!motion_state)
      {
         ERR("Couldn't create a motion state.");
-        free(body);
-        return NULL;
+        goto err_motion_state;
      }
 
-   btVector3 inertia(0, 0, 0);
+   inertia = btVector3(0, 0, 0);
    collision_shape->calculateLocalInertia(mass, inertia);
 
-   btRigidBody::btRigidBodyConstructionInfo rigid_body_ci(
+   rigid_body_ci = new btRigidBody::btRigidBodyConstructionInfo(
       mass, motion_state, collision_shape, inertia);
-   btRigidBody *rigid_body = new btRigidBody(rigid_body_ci);
+   if (!rigid_body_ci)
+     {
+        ERR("Couldn't create a rigid body construction info.");
+        goto err_rigid_body_ci;
+     }
+
+   rigid_body = new btRigidBody(*rigid_body_ci);
    if (!rigid_body)
      {
         ERR("Couldn't create a rigid body.");
-        delete motion_state;
-        free(body);
-        return NULL;
+        goto err_rigid_body;
      }
 
    body->collision_groups = NULL;
@@ -212,7 +223,28 @@
    body->rigid_body->setLinearFactor(btVector3(1, 1, 0));
    body->rigid_body->setAngularFactor(btVector3(0, 0, 1));
 
+   if (!ephysics_world_body_add(body->world, body))
+     {
+        ERR("Couldn't add body to world's bodies list");
+        goto err_world_add;
+     }
+
+   delete rigid_body_ci;
+
+   INF("Body %p of type %s added.", body, type);
    return body;
+
+err_world_add:
+   delete rigid_body;
+err_rigid_body:
+   delete rigid_body_ci;
+err_rigid_body_ci:
+   delete motion_state;
+err_motion_state:
+   free(body);
+err_body:
+   delete collision_shape;
+   return NULL;
 }
 
 static void
@@ -430,65 +462,33 @@
 EAPI EPhysics_Body *
 ephysics_body_circle_add(EPhysics_World *world)
 {
-   EPhysics_Body *body;
+   btCollisionShape *collision_shape;
 
-   btCollisionShape *collision_shape = new btCylinderShapeZ(
-      btVector3(0.5, 0.5, 0.5));
-   if (!collision_shape)
+   if (!world)
      {
-        ERR("Couldn't create a cylinder shape on z.");
+        ERR("Can't add circle, world is null.");
         return NULL;
      }
 
-   body = _ephysics_body_add(world, collision_shape);
-   if (!body)
-     {
-        ERR("Couldn't create a circle body.");
-        delete collision_shape;
-        return NULL;
-     }
+   collision_shape = new btCylinderShapeZ(btVector3(0.5, 0.5, 0.5));
 
-   if (!ephysics_world_body_add(body->world, body))
-     {
-        ERR("Couldn't add body to world's bodies list");
-        _ephysics_body_del(body);
-        return NULL;
-     }
-
-   INF("Circle body added: %p.", body);
-   return body;
+   return _ephysics_body_add(world, collision_shape, "circle");
 }
 
 EAPI EPhysics_Body *
 ephysics_body_box_add(EPhysics_World *world)
 {
-   EPhysics_Body *body;
+   btCollisionShape *collision_shape;
 
-   btCollisionShape *collision_shape = new btBoxShape(
-      btVector3(0.5, 0.5, 0.5));
-   if (!collision_shape)
+   if (!world)
      {
-        ERR("Couldn't create a 2d box shape.");
+        ERR("Can't add box, world is null.");
         return NULL;
      }
 
-   body = _ephysics_body_add(world, collision_shape);
-   if (!body)
-     {
-        ERR("Couldn't create a box body.");
-        delete collision_shape;
-        return NULL;
-     }
+   collision_shape = new btBoxShape(btVector3(0.5, 0.5, 0.5));
 
-   if (!ephysics_world_body_add(body->world, body))
-     {
-        ERR("Couldn't add body to world's bodies list");
-        _ephysics_body_del(body);
-        return NULL;
-     }
-
-   INF("Box body added: %p.", body);
-   return body;
+   return _ephysics_body_add(world, collision_shape, "box");
 }
 
 void

Log:
EPhysics: add EPhysics Shape
  
  It will be used to create bodies with collision shapes other
  than boxes or circles.
  
  For now, only convex shapes.
  
  

Author:       bdilly
Date:         2012-08-10 14:05:13 -0700 (Fri, 10 Aug 2012)
New Revision: 75151
Trac:         http://trac.enlightenment.org/e/changeset/75151

Added:
  trunk/ephysics/src/lib/ephysics_shape.cpp 
Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/Makefile.am trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-08-10 21:05:05 UTC (rev 75150)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-08-10 21:05:13 UTC (rev 75151)
@@ -21,6 +21,7 @@
  * @li @ref EPhysics_Body
  * @li @ref EPhysics_Camera
  * @li @ref EPhysics_Constraint
+ * @li @ref EPhysics_Shape
  *
  * Please see the @ref authors page for contact details.
  */
@@ -120,6 +121,166 @@
  */
 
 /**
+ * @defgroup EPhysics_Shape EPhysics Shape
+ * @ingroup EPhysics
+ *
+ * @{
+ *
+ * Shapes are used to create bodies with shapes that differ from primitive
+ * ones, like box and circle.
+ *
+ * A shape consists in a group of points, the vertices of the body to be
+ * created later with @ref ephysics_body_shape_add().
+ *
+ * A new shape is created with @ref ephysics_shape_new() and points are
+ * set with @ref ephysics_shape_point_add(). A shape can be used to
+ * create many bodies. When done, it's required to delete the shape
+ * with @ref ephysics_shape_del().
+ *
+ * A shape can be load from a file describing it with
+ * @ref ephysics_shape_load(), and can be saved to a file with
+ * @ref ephysics_shape_save(). With that shapes can be done or visualized
+ * on design applications.
+ *
+ * @note Using primitive shapes has better perfomance than generic shapes.
+ * @note For now, only convex shapes are supported.
+ *
+ */
+
+/**
+ * @typedef EPhysics_Shape
+ *
+ * Shape handle, represents a shape to be used to create a body.
+ *
+ * Created with @ref ephysics_shape_new() and deleted with
+ * @ref ephysics_shape_del().
+ *
+ * @ingroup EPhysics_Shape
+ */
+typedef struct _EPhysics_Shape EPhysics_Shape;
+
+/**
+ * @brief
+ * Create a new shape.
+ *
+ * The returned shape initially doesn't has points set, so it's required
+ * to set vertices with @ref ephysics_shape_point_add().
+ *
+ * After the shape is completelly defined, all the points were added,
+ * it's possible to create one or more bodies with
+ * @ref ephysics_body_shape_add().
+ *
+ * @return The created shape or @c NULL on error.
+ *
+ * @see ephysics_shape_del().
+ * @see ephysics_shape_load().
+ *
+ * @ingroup EPhysics_Shape
+ */
+EAPI EPhysics_Shape *ephysics_shape_new(void);
+
+/**
+ * @brief
+ * Delete a shape.
+ *
+ * After a shape is used to create the wanted bodies, it's required
+ * to delete it. It won't be deleted automatically by ephysics
+ * at any point, even on shutdown. The creator is responsible to
+ * free it after usage is concluded.
+ *
+ * @param shape The shape to be deleted.
+ *
+ * @see ephysics_shape_new().
+ *
+ * @ingroup EPhysics_Shape
+ */
+EAPI void ephysics_shape_del(EPhysics_Shape *shape);
+
+/**
+ * @brief
+ * Add a new point to the shape.
+ *
+ * Any point can be added to a shape, but only vertices matter.
+ * A vertex is a special kind of point that describes a corner of
+ * geometric shapes. The final shape will be constructed in such a way
+ * it will have all the added points and will be convex.
+ *
+ * The order of points doesn't matter.
+ *
+ * For example, to create a pentagon:
+ *
+ * @code
+ * EPhysics_Shape *shape = ephysics_shape_new();
+ *
+ * ephysics_shape_point_add(shape, 0/70., 24/66.);
+ * ephysics_shape_point_add(shape, 35/70., 0/66.);
+ * ephysics_shape_point_add(shape, 70/70., 24/66.);
+ * ephysics_shape_point_add(shape, 56/70., 66/66.);
+ * ephysics_shape_point_add(shape, 14/70., 66/66.);
+ *
+ * ephysics_body_shape_add(world, shape);
+ *
+ * ephysics_shape_del(shape);
+ * @endcode
+ *
+ * @param shape The shape to be modified.
+ * @param x Point position at x axis. Should be a value between 0 and 1.
+ * @param y Point position at y axis. Should be a value between 0 and 1.
+ * @return @c EINA_TRUE on success or EINA_FALSE on error.
+ *
+ * @see ephysics_shape_new().
+ *
+ * @ingroup EPhysics_Shape
+ */
+EAPI Eina_Bool ephysics_shape_point_add(EPhysics_Shape *shape, double x, double y);
+
+/**
+ * @brief
+ * Load the shape from a file.
+ *
+ * Useful to edit shapes on design tools and load it from an exported file.
+ *
+ * Also it helps to avoid lots of @ref ephysics_shape_point_add() in
+ * the code, and keep a better separation between code logic and
+ * design stuff.
+ *
+ * @param filename The path to the file describing the shape.
+ * @return The loaded shape or @c NULL on error.
+ *
+ * @note Not implemented yet.
+ *
+ * @see ephysics_shape_new() for more details.
+ * @see ephysics_shape_save().
+ *
+ * @ingroup EPhysics_Shape
+ */
+EAPI EPhysics_Shape *ephysics_shape_load(const char *filename);
+
+/**
+ * @brief
+ * Save the shape to a file.
+ *
+ * It can be useful to visualize it on design tools.
+ *
+ * @param shape The shape to be saved.
+ * @param filename The path to save the shape.
+ * @return @c EINA_TRUE on success or EINA_FALSE on error.
+ *
+ * @note Not implemented yet.
+ *
+ * @see ephysics_shape_new().
+ * @see ephysics_shape_load().
+ *
+ * @ingroup EPhysics_Shape
+ */
+EAPI Eina_Bool ephysics_shape_save(const EPhysics_Shape *shape, const char *filename);
+
+/**
+ * @}
+ */
+
+
+/**
  * @typedef EPhysics_Body
  *
  * Body handle, represents an object on EPhysics world.

Modified: trunk/ephysics/src/lib/Makefile.am
===================================================================
--- trunk/ephysics/src/lib/Makefile.am	2012-08-10 21:05:05 UTC (rev 75150)
+++ trunk/ephysics/src/lib/Makefile.am	2012-08-10 21:05:13 UTC (rev 75151)
@@ -18,6 +18,7 @@
     ephysics_camera.cpp \
     ephysics_constraints.cpp \
     ephysics_main.cpp \
+    ephysics_shape.cpp \
     ephysics_world.cpp
 
 libephysics_la_SOURCES = $(base_sources)

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-08-10 21:05:05 UTC (rev 75150)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-08-10 21:05:13 UTC (rev 75151)
@@ -44,6 +44,8 @@
 
 #define RAD_TO_DEG 57.29582 /* 2 * pi radians == 360 degree */
 
+typedef struct _EPhysics_Point EPhysics_Point;
+
 typedef enum _EPhysics_World_Boundary
 {
    EPHYSICS_WORLD_BOUNDARY_TOP,
@@ -53,6 +55,12 @@
    EPHYSICS_WORLD_BOUNDARY_LAST
 } EPhysics_World_Boundary;
 
+struct _EPhysics_Point {
+     EINA_INLIST;
+     double x;
+     double y;
+};
+
 struct _EPhysics_Body {
      EINA_INLIST;
      btCollisionShape *collision_shape;
@@ -95,6 +103,8 @@
 void ephysics_camera_moved_set(EPhysics_Camera *camera, Eina_Bool moved);
 Eina_Bool ephysics_camera_moved_get(const EPhysics_Camera *camera);
 
+const Eina_Inlist *ephysics_shape_points_get(const EPhysics_Shape *shape);
+
 #ifdef __cplusplus
 }
 #endif

Log:
EPhysics: support bodies with generic shapes
  
  Using EPhysics Shape.
  
  

Author:       bdilly
Date:         2012-08-10 14:05:19 -0700 (Fri, 10 Aug 2012)
New Revision: 75152
Trac:         http://trac.enlightenment.org/e/changeset/75152

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-08-10 21:05:13 UTC (rev 75151)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-08-10 21:05:19 UTC (rev 75152)
@@ -1336,6 +1336,28 @@
 
 /**
  * @brief
+ * Create a new physics body using a custom shape.
+ *
+ * Its collision shape will be a convex shape that has all the points
+ * added to this @p shape. A shape can be created with
+ * @ref ephysics_shape_new().
+ *
+ * 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.
+ * @param shape The custom shape to be used.
+ * @return a new body or @c NULL, on errors.
+ *
+ * @see ephysics_body_del().
+ * @see ephysics_body_evas_object_set().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI EPhysics_Body *ephysics_body_shape_add(EPhysics_World *world, EPhysics_Shape *shape);
+
+/**
+ * @brief
  * Create a physic top boundary.
  *
  * A physic top boundary will limit the bodies area and placed on top edge of

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-10 21:05:13 UTC (rev 75151)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-10 21:05:19 UTC (rev 75152)
@@ -491,6 +491,47 @@
    return _ephysics_body_add(world, collision_shape, "box");
 }
 
+EAPI EPhysics_Body *
+ephysics_body_shape_add(EPhysics_World *world, EPhysics_Shape *shape)
+{
+   btConvexHullShape* collision_shape;
+   const Eina_Inlist *points;
+   EPhysics_Point *point;
+   btVector3 point3d;
+
+   if (!world)
+     {
+        ERR("Can't add shape, world is null.");
+        return NULL;
+     }
+
+   if (!shape)
+     {
+        ERR("Can't add shape, shape is null.");
+        return NULL;
+     }
+
+   collision_shape = new btConvexHullShape();
+   if (!collision_shape)
+     {
+        ERR("Couldn't create a generic convex shape.");
+        return NULL;
+     }
+
+   points = ephysics_shape_points_get(shape);
+
+   EINA_INLIST_FOREACH(points, point)
+     {
+        point3d = btVector3(point->x, point->y, 0);
+        collision_shape->addPoint(point3d);
+        point3d = btVector3(point->x, point->y, 0.5);
+        collision_shape->addPoint(point3d);
+     }
+
+   return _ephysics_body_add(world, (btCollisionShape *)collision_shape,
+                             "generic");
+}
+
 void
 ephysics_body_world_boundaries_resize(EPhysics_World *world)
 {

Log:
EPhysics: fix updating bodies with evas object without
   geometry
  
  If a evas object associated to a body don't have w or h, don't
  try to apply map / rotation on it.
  
  

Author:       bdilly
Date:         2012-08-13 15:24:36 -0700 (Mon, 13 Aug 2012)
New Revision: 75229
Trac:         http://trac.enlightenment.org/e/changeset/75229

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-13 22:24:28 UTC (rev 75228)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-13 22:24:36 UTC (rev 75229)
@@ -341,6 +341,13 @@
 
    evas_object_move(body->evas_obj, x, y);
 
+   if ((!w) || (!h))
+     {
+        DBG("Evas object with no geometry: %p, w=%i h=%i", body->evas_obj,
+            w, h);
+        return;
+     }
+
    rot = - trans.getRotation().getAngle() * RAD_TO_DEG *
       trans.getRotation().getAxis().getZ();

Log:
EPhysics: small fixes on sleeping threshold docs
  
  
  

Author:       bdilly
Date:         2012-08-16 14:34:34 -0700 (Thu, 16 Aug 2012)
New Revision: 75326
Trac:         http://trac.enlightenment.org/e/changeset/75326

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-08-16 21:34:29 UTC (rev 75325)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-08-16 21:34:34 UTC (rev 75326)
@@ -1672,15 +1672,14 @@
  * increment the sleeping time.
  *
  * After every tick the sleeping time is incremented, if the body's linear and
- * angular velocity is less than the respective thresholds the sleeping time is
- * incremented by the current time step(delta time).
+ * angular speed is less than the respective thresholds the sleeping time is
+ * incremented by the current time step (delta time).
  *
  * After reaching the max sleeping time the body is marked to sleep, that means
  * the rigid body is to be deactivated.
  *
- * @note The expected linear velocity to be informed as @p linear_threshold is
- * the sum of X and Y linear velocity, that's the total velocity. The velocity
- * is measured in Evas coordinates per second.
+ * @note The expected value to be informed as @p linear_threshold is
+ * the body's speed. It is measured in Evas coordinates per second.
  *
  * @note The expected angular velocity to be informed as @p angular_threshold
  * is measured in degrees per second.
@@ -1701,7 +1700,7 @@
  * Get the linear sleeping threshold.
  *
  * @note The linear sleeping threshold is measured in Evas coordinates per
- * second and the angular sleeping threshold is measured in degrees..
+ * second and the angular sleeping threshold is measured in degrees per second.
  *
  * @param body The body to get the linear sleeping threshold from.
  * @param linear_threshold The linear sleeping threshold factor.

Log:
EPhysics: fix constraint angular limit type
  
  
  

Author:       bdilly
Date:         2012-08-16 14:34:39 -0700 (Thu, 16 Aug 2012)
New Revision: 75327
Trac:         http://trac.enlightenment.org/e/changeset/75327

Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_constraints.cpp 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-08-16 21:34:34 UTC (rev 75326)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-08-16 21:34:39 UTC (rev 75327)
@@ -2365,7 +2365,7 @@
  * @see ephysics_constraint_slider_angular_limit_get()
  * @ingroup EPhysics_Constraint
  */
-EAPI void ephysics_constraint_slider_angular_limit_set(EPhysics_Constraint *constraint, Evas_Coord counter_clock_z, Evas_Coord clock_wise_z);
+EAPI void ephysics_constraint_slider_angular_limit_set(EPhysics_Constraint *constraint, double counter_clock_z, double clock_wise_z);
 
 /**
  * @brief
@@ -2378,7 +2378,7 @@
  * @see ephysics_constraint_slider_angular_limit_set()
  * @ingroup EPhysics_Constraint
  */
-EAPI void ephysics_constraint_slider_angular_limit_get(const EPhysics_Constraint *constraint, Evas_Coord *counter_clock_z, Evas_Coord *clock_wise_z);
+EAPI void ephysics_constraint_slider_angular_limit_get(const EPhysics_Constraint *constraint, double *counter_clock_z, double *clock_wise_z);
 
 /**
  * @brief

Modified: trunk/ephysics/src/lib/ephysics_constraints.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_constraints.cpp	2012-08-16 21:34:34 UTC (rev 75326)
+++ trunk/ephysics/src/lib/ephysics_constraints.cpp	2012-08-16 21:34:39 UTC (rev 75327)
@@ -124,7 +124,7 @@
 }
 
 EAPI void
-ephysics_constraint_slider_angular_limit_set(EPhysics_Constraint *constraint, Evas_Coord counter_clock_z, Evas_Coord clock_wise_z)
+ephysics_constraint_slider_angular_limit_set(EPhysics_Constraint *constraint, double counter_clock_z, double clock_wise_z)
 {
    btGeneric6DofConstraint *slider_constraint;
 
@@ -148,7 +148,7 @@
 }
 
 EAPI void
-ephysics_constraint_slider_angular_limit_get(const EPhysics_Constraint *constraint, Evas_Coord *counter_clock_z, Evas_Coord *clock_wise_z)
+ephysics_constraint_slider_angular_limit_get(const EPhysics_Constraint *constraint, double *counter_clock_z, double *clock_wise_z)
 {
    btGeneric6DofConstraint *slider_constraint;
    btVector3 angular_limit;

Log:
EPhysics: delete constraints if world is deleted
  
  
  

Author:       bdilly
Date:         2012-08-16 14:34:44 -0700 (Thu, 16 Aug 2012)
New Revision: 75328
Trac:         http://trac.enlightenment.org/e/changeset/75328

Modified:
  trunk/ephysics/src/lib/ephysics_constraints.cpp trunk/ephysics/src/lib/ephysics_private.h trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_constraints.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_constraints.cpp	2012-08-16 21:34:39 UTC (rev 75327)
+++ trunk/ephysics/src/lib/ephysics_constraints.cpp	2012-08-16 21:34:44 UTC (rev 75328)
@@ -52,7 +52,8 @@
 
    constraint->type = EPHYSICS_CONSTRAINT_SLIDER;
    constraint->world = ephysics_body_world_get(body);
-   ephysics_world_constraint_add(constraint->world, constraint->bt_constraint);
+   ephysics_world_constraint_add(constraint->world, constraint,
+                                 constraint->bt_constraint);
 
    INF("Constraint added.");
    return constraint;
@@ -228,7 +229,8 @@
 
    constraint->type = EPHYSICS_CONSTRAINT_P2P;
    constraint->world = ephysics_body_world_get(body1);
-   ephysics_world_constraint_add(constraint->world, constraint->bt_constraint);
+   ephysics_world_constraint_add(constraint->world, constraint,
+                                 constraint->bt_constraint);
 
    INF("Constraint added.");
    return constraint;
@@ -243,7 +245,8 @@
         return;
      }
 
-   ephysics_world_constraint_del(constraint->world, constraint->bt_constraint);
+   ephysics_world_constraint_del(constraint->world, constraint,
+                                 constraint->bt_constraint);
    delete constraint->bt_constraint;
    free(constraint);
 

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-08-16 21:34:39 UTC (rev 75327)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-08-16 21:34:44 UTC (rev 75328)
@@ -85,8 +85,8 @@
 int ephysics_world_shutdown(void);
 Eina_Bool ephysics_world_body_add(EPhysics_World *world, EPhysics_Body *body);
 Eina_Bool ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body);
-void ephysics_world_constraint_add(EPhysics_World *world, btTypedConstraint *bt_constraint);
-void ephysics_world_constraint_del(EPhysics_World *world, btTypedConstraint *bt_constraint);
+void ephysics_world_constraint_add(EPhysics_World *world, EPhysics_Constraint *constraint, btTypedConstraint *bt_constraint);
+void ephysics_world_constraint_del(EPhysics_World *world, EPhysics_Constraint *constraint, btTypedConstraint *bt_constraint);
 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);

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-16 21:34:39 UTC (rev 75327)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-16 21:34:44 UTC (rev 75328)
@@ -35,6 +35,7 @@
      Eina_Inlist *bodies;
      Eina_List *to_delete;
      Eina_List *cb_to_delete;
+     Eina_List *constraints;
      int max_sub_steps;
      int walking;
      int cb_walking;
@@ -187,6 +188,7 @@
 {
    EPhysics_World_Callback *cb;
    EPhysics_Body *body;
+   void *constraint;
 
    _worlds = eina_inlist_remove(_worlds, EINA_INLIST_GET(world));
 
@@ -206,6 +208,9 @@
         ephysics_orphan_body_del(body);
      }
 
+   EINA_LIST_FREE(world->constraints, constraint)
+      ephysics_constraint_del((EPhysics_Constraint *)constraint);
+
    ephysics_camera_del(world->camera);
    /* FIXME uncomment lines above when dynamicsworld destructor is fixed
       on bullet. Right now looks like it will try to acess invalid memory.*/
@@ -339,15 +344,17 @@
 }
 
 void
-ephysics_world_constraint_add(EPhysics_World *world, btTypedConstraint *bt_constraint)
+ephysics_world_constraint_add(EPhysics_World *world, EPhysics_Constraint *constraint, btTypedConstraint *bt_constraint)
 {
    world->dynamics_world->addConstraint(bt_constraint);
+   world->constraints = eina_list_append(world->constraints, constraint);
 }
 
 void
-ephysics_world_constraint_del(EPhysics_World *world, btTypedConstraint *bt_constraint)
+ephysics_world_constraint_del(EPhysics_World *world, EPhysics_Constraint *constraint, btTypedConstraint *bt_constraint)
 {
    world->dynamics_world->removeConstraint(bt_constraint);
+   world->constraints = eina_list_remove(world->constraints, constraint);
 }
 
 int

Log:
EPhysics: drop camera zoom
  
  Reasons:
   - we don't have previewed cases for that (would be code to be implemented
           and maintained without use)
   - can be done on user side changing world rate, camera position, objects size
  
  

Author:       bdilly
Date:         2012-08-16 14:34:49 -0700 (Thu, 16 Aug 2012)
New Revision: 75329
Trac:         http://trac.enlightenment.org/e/changeset/75329

Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_camera.cpp 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-08-16 21:34:44 UTC (rev 75328)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-08-16 21:34:49 UTC (rev 75329)
@@ -303,13 +303,12 @@
  *
  * 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().
+ * Its position can be set with @ref ephysics_camera_position_set() or
+ * can be set to track a body, with @ref ephysics_camera_body_track();
  *
- * @note WIP: ZOOM API ISN'T 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 @ref ephysics_world_camera_get(). */
+typedef struct _EPhysics_Camera EPhysics_Camera; /**< Camera handle, used to change the position of the frame to be rendered. Every world have a camera that can be get with @ref ephysics_world_camera_get(). */
 
 /**
  * @brief
@@ -416,51 +415,6 @@
 EAPI void ephysics_camera_tracked_body_get(EPhysics_Camera *camera, EPhysics_Body **body, Eina_Bool *horizontal, Eina_Bool *vertical);
 
 /**
- * @brief
- * Set camera's zoom.
- *
- * Zoom affects size and position of evas objects automatically updated
- * by ephysics. With zoom equal to 1, the original size of evas objects is
- * used and their position on canvas depends only on world rate and
- * camera's position.
- *
- * When zoom is smaller than 1, evas objects will be scaled down, and position
- * will take world rate, camera's position and zoom in account. More objects
- * could fit on the screen with small zoom values.
- *
- * If zoom is bigger than 1, evas objects will be scaled up, and position
- * will take world rate, camera's position and zoom in account. Less objects
- * will fit on the screen with big zoom values. It's nice for close-up
- * effects.
- *
- * By default zoom value is 1.
- *
- * @note This change will be noticed on the next physics tick, so evas objects
- * will be updated taking the camera's new zoom in account.
- *
- * @param camera The camera to be zoomed in / out.
- * @param zoom The new zoom value. Must to be bigger than 0.
- *
- * @see ephysics_camera_zoom_get().
- *
- * @ingroup EPhysics_Camera
- */
-EAPI void ephysics_camera_zoom_set(EPhysics_Camera *camera, double zoom);
-
-/**
- * @brief
- * Get camera's zoom.
- *
- * @param camera The world's camera.
- * @return The zoom value or -1 on error.
- *
- * @see ephysics_camera_zoom_set() for more details.
- *
- * @ingroup EPhysics_Camera
- */
-EAPI double ephysics_camera_zoom_get(const EPhysics_Camera *camera);
-
-/**
  * @}
  */
 
@@ -864,7 +818,7 @@
  * @return The camera.
  *
  * @see ephysics_camera_position_set().
- * @see ephysics_camera_zoom_set().
+ * @see ephysics_camera_body_track().
  *
  * @ingroup EPhysics_World
  */

Modified: trunk/ephysics/src/lib/ephysics_camera.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_camera.cpp	2012-08-16 21:34:44 UTC (rev 75328)
+++ trunk/ephysics/src/lib/ephysics_camera.cpp	2012-08-16 21:34:49 UTC (rev 75329)
@@ -13,7 +13,6 @@
 struct _EPhysics_Camera {
      EPhysics_World *world;
      EPhysics_Body *target;
-     double zoom;
      int x, y;
      Eina_Bool track_horizontal:1;
      Eina_Bool track_vertical:1;
@@ -202,37 +201,6 @@
    if (vertical) *vertical = camera->track_vertical;
 }
 
-EAPI void
-ephysics_camera_zoom_set(EPhysics_Camera *camera, double zoom)
-{
-   if (!camera)
-     {
-        ERR("Can't set camera zoom, camera == NULL.");
-        return;
-     }
-
-   if (zoom <= 0)
-     {
-	ERR("Zoom should be a positive value. Keeping the old value: %lf.",
-            camera->zoom);
-        return;
-     }
-
-   camera->zoom = zoom;
-}
-
-EAPI double
-ephysics_camera_zoom_get(const EPhysics_Camera *camera)
-{
-   if (!camera)
-     {
-        ERR("Can't get camera zoom, camera == NULL.");
-        return -1;
-     }
-
-   return camera->zoom;
-}
-
 #ifdef  __cplusplus
 }
 #endif

Log:
EPhysics: small fix on body docs
  
  
  

Author:       bdilly
Date:         2012-08-16 14:34:59 -0700 (Thu, 16 Aug 2012)
New Revision: 75331
Trac:         http://trac.enlightenment.org/e/changeset/75331

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-08-16 21:34:54 UTC (rev 75330)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-08-16 21:34:59 UTC (rev 75331)
@@ -1596,8 +1596,8 @@
  *
  * @note EPhysics unit for angular velocity is degrees per second.
  *
- * @see ephysics_body_angular_velocity_set().
- * @see ephysics_body_linear_velocity_get().
+ * @see ephysics_body_angular_velocity_get().
+ * @see ephysics_body_linear_velocity_set().
  *
  * @ingroup EPhysics_Body
  */
@@ -1612,6 +1612,7 @@
  *
  * @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

Log:
EPhysics: implement body recalc
  
  
  

Author:       bdilly
Date:         2012-08-16 14:35:04 -0700 (Thu, 16 Aug 2012)
New Revision: 75332
Trac:         http://trac.enlightenment.org/e/changeset/75332

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-16 21:34:59 UTC (rev 75331)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-16 21:35:04 UTC (rev 75332)
@@ -26,6 +26,19 @@
      Evas_Coord y;
 };
 
+static inline void
+_ephysics_body_sleeping_threshold_set(EPhysics_Body *body, double linear_threshold, double angular_threshold, double rate)
+{
+   body->rigid_body->setSleepingThresholds(linear_threshold / rate,
+                                           angular_threshold / RAD_TO_DEG);
+}
+
+static inline void
+_ephysics_body_linear_velocity_set(EPhysics_Body *body, double x, double y, double rate)
+{
+   body->rigid_body->setLinearVelocity(btVector3(x / rate, y / rate, 0));
+}
+
 static void
 _ephysics_body_event_callback_del(EPhysics_Body *body, EPhysics_Body_Callback *cb)
 {
@@ -256,13 +269,12 @@
 }
 
 static void
-_ephysics_body_geometry_set(EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
+_ephysics_body_geometry_set(EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, double rate)
 {
-   double rate, mx, my, sx, sy;
+   double mx, my, sx, sy;
    btTransform trans;
    int wy, height;
 
-   rate = ephysics_world_rate_get(body->world);
    ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, &height);
    height += wy;
 
@@ -285,6 +297,8 @@
    body->w = w;
    body->h = h;
 
+   body->rigid_body->activate(1);
+
    DBG("Body %p position changed to %lf, %lf.", body, mx, my);
    DBG("Body %p scale changed to %lf, %lf.", body, sx, sy);
 }
@@ -301,7 +315,8 @@
 
    DBG("Resizing body %p to w=%i, h=%i", body, w, h);
    ephysics_body_geometry_get(body, &x, &y, NULL, NULL);
-   _ephysics_body_geometry_set(body, x, y, w, h);
+   _ephysics_body_geometry_set(body, x, y, w, h,
+                               ephysics_world_rate_get(body->world));
 }
 
 static void
@@ -405,6 +420,21 @@
 }
 
 void
+ephysics_body_recalc(EPhysics_Body *body, double rate)
+{
+   Evas_Coord x, y, w, h;
+   double vx, vy, lt, at;
+
+   ephysics_body_geometry_get(body, &x, &y, &w, &h);
+   ephysics_body_linear_velocity_get(body, &vx, &vy);
+   ephysics_body_sleeping_threshold_get(body, &lt, &at);
+
+   _ephysics_body_geometry_set(body, x, y, w, h, rate);
+   _ephysics_body_linear_velocity_set(body, vx, vy, rate);
+   _ephysics_body_sleeping_threshold_set(body, lt, at, rate);
+}
+
+void
 ephysics_body_evas_object_update_select(EPhysics_Body *body)
 {
    Eina_Bool callback_called = EINA_FALSE;
@@ -707,7 +737,8 @@
    evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE,
                                   _ephysics_body_evas_obj_resize_cb, body);
    evas_object_geometry_get(body->evas_obj, &obj_x, &obj_y, &obj_w, &obj_h);
-   _ephysics_body_geometry_set(body, obj_x, obj_y, obj_w, obj_h);
+   _ephysics_body_geometry_set(body, obj_x, obj_y, obj_w, obj_h,
+                               ephysics_world_rate_get(body->world));
 }
 
 EAPI Evas_Object *
@@ -761,7 +792,8 @@
         return;
      }
 
-   _ephysics_body_geometry_set(body, x, y, w, h);
+   _ephysics_body_geometry_set(body, x, y, w, h,
+                               ephysics_world_rate_get(body->world));
 }
 
 EAPI void
@@ -833,8 +865,8 @@
         return;
      }
 
-   rate = ephysics_world_rate_get(body->world);
-   body->rigid_body->setLinearVelocity(btVector3(x / rate, y / rate, 0));
+   _ephysics_body_linear_velocity_set(body, x, y,
+                                      ephysics_world_rate_get(body->world));
    DBG("Linear velocity of body %p set to %lf, %lf", body, x, y);
 }
 
@@ -882,17 +914,15 @@
 EAPI void
 ephysics_body_sleeping_threshold_set(EPhysics_Body *body, double linear_threshold, double angular_threshold)
 {
-   double rate;
-
    if (!body)
      {
         ERR("Can't set sleeping thresholds, body is null.");
         return;
      }
 
-   rate = ephysics_world_rate_get(body->world);
-   body->rigid_body->setSleepingThresholds(linear_threshold / rate,
-                                           angular_threshold / RAD_TO_DEG);
+   _ephysics_body_sleeping_threshold_set(body, linear_threshold,
+                                         angular_threshold,
+                                         ephysics_world_rate_get(body->world));
 }
 
 EAPI void

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-08-16 21:34:59 UTC (rev 75331)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-08-16 21:35:04 UTC (rev 75332)
@@ -99,6 +99,7 @@
 void ephysics_body_contact_processed(EPhysics_Body *body, EPhysics_Body *contact_body, btVector3 position);
 btRigidBody *ephysics_body_rigid_body_get(const EPhysics_Body *body);
 void ephysics_body_active_set(EPhysics_Body *body, Eina_Bool active);
+void ephysics_body_recalc(EPhysics_Body *body, double rate);
 
 EPhysics_Camera *ephysics_camera_add(EPhysics_World *world);
 void ephysics_camera_del(EPhysics_Camera *camera);

Log:
EPhysics: constraint recalc
  
  Just making it possible to fix world rate set.
  This code will be modified when all constraints are added as generic
  and modified later.
  
  

Author:       bdilly
Date:         2012-08-16 14:35:09 -0700 (Thu, 16 Aug 2012)
New Revision: 75333
Trac:         http://trac.enlightenment.org/e/changeset/75333

Modified:
  trunk/ephysics/src/lib/ephysics_constraints.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_constraints.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_constraints.cpp	2012-08-16 21:35:04 UTC (rev 75332)
+++ trunk/ephysics/src/lib/ephysics_constraints.cpp	2012-08-16 21:35:09 UTC (rev 75333)
@@ -17,8 +17,97 @@
      btTypedConstraint *bt_constraint;
      EPhysics_World *world;
      EPhysics_Constraint_Type type;
+     struct {
+          EPhysics_Body *body1;
+          EPhysics_Body *body2;
+          Evas_Coord anchor_b1_x;
+          Evas_Coord anchor_b1_y;
+          Evas_Coord anchor_b2_x;
+          Evas_Coord anchor_b2_y;
+     } p2p;
 };
 
+/* FIXME: it shouldn't be this way.
+ * All constraints should be generic and have all these options
+ * set after add().
+ */
+static Eina_Bool
+_ephysics_constraint_p2p_set(EPhysics_Constraint *constraint, double rate)
+{
+   if (!constraint->p2p.body2)
+     constraint->bt_constraint = new btPoint2PointConstraint(
+        *ephysics_body_rigid_body_get(constraint->p2p.body1),
+        btVector3(constraint->p2p.anchor_b1_x / rate,
+                  constraint->p2p.anchor_b1_y / rate, 0));
+   else
+     constraint->bt_constraint = new btPoint2PointConstraint(
+        *ephysics_body_rigid_body_get(constraint->p2p.body1),
+        *ephysics_body_rigid_body_get(constraint->p2p.body2),
+        btVector3(constraint->p2p.anchor_b1_x / rate,
+                  constraint->p2p.anchor_b1_y / rate, 0),
+        btVector3(constraint->p2p.anchor_b2_x / rate,
+                  constraint->p2p.anchor_b2_y / rate, 0));
+
+   if (!constraint->bt_constraint)
+     {
+        ERR("Failed to create a btConstraint");
+        free(constraint);
+        return EINA_FALSE;
+     }
+
+   constraint->type = EPHYSICS_CONSTRAINT_P2P;
+   constraint->world = ephysics_body_world_get(constraint->p2p.body1);
+   ephysics_world_constraint_add(constraint->world, constraint,
+                                 constraint->bt_constraint);
+
+   return EINA_TRUE;
+}
+
+static void
+_ephysics_constraint_p2p_recalc(EPhysics_Constraint *constraint, double rate)
+{
+   ephysics_world_constraint_del(constraint->world, constraint,
+                                 constraint->bt_constraint);
+   delete constraint->bt_constraint;
+
+   _ephysics_constraint_p2p_set(constraint, rate);
+}
+
+static void
+_ephysics_constraint_slider_linear_limit_set(EPhysics_Constraint *constraint, Evas_Coord left_x, Evas_Coord under_y, Evas_Coord right_x, Evas_Coord above_y, double rate)
+{
+   btGeneric6DofConstraint *slider_constraint;
+
+   slider_constraint = (btGeneric6DofConstraint *)constraint->bt_constraint;
+   rate = ephysics_world_rate_get(constraint->world);
+
+   left_x = (left_x) / rate;
+   right_x = (right_x) / rate;
+
+   under_y = (under_y) / rate;
+   above_y = (above_y) / rate;
+
+   slider_constraint->setLinearLowerLimit(btVector3(-left_x, -under_y, 0));
+   slider_constraint->setLinearUpperLimit(btVector3(right_x, above_y, 0));
+}
+
+void
+ephysics_constraint_recalc(EPhysics_Constraint *constraint, double rate)
+{
+   Evas_Coord left_x, under_y, right_x, above_y;
+
+   if (constraint->type == EPHYSICS_CONSTRAINT_P2P)
+     {
+        _ephysics_constraint_p2p_recalc(constraint, rate);
+        return;
+     }
+
+   ephysics_constraint_slider_linear_limit_get(constraint, &left_x, &under_y,
+                                               &right_x, &above_y);
+   _ephysics_constraint_slider_linear_limit_set(constraint, left_x, under_y,
+                                                right_x, above_y, rate);
+}
+
 EAPI EPhysics_Constraint *
 ephysics_constraint_slider_add(EPhysics_Body *body)
 {
@@ -62,9 +151,6 @@
 EAPI void
 ephysics_constraint_slider_linear_limit_set(EPhysics_Constraint *constraint, Evas_Coord left_x, Evas_Coord under_y, Evas_Coord right_x, Evas_Coord above_y)
 {
-   btGeneric6DofConstraint *slider_constraint;
-   int rate;
-
    if (!constraint)
      {
         ERR("Can't set constraint's linear limit, constraint is null.");
@@ -77,17 +163,9 @@
         return;
      }
 
-   slider_constraint = (btGeneric6DofConstraint *)constraint->bt_constraint;
-   rate = ephysics_world_rate_get(constraint->world);
-
-   left_x = (left_x) / rate;
-   right_x = (right_x) / rate;
-
-   under_y = (under_y) / rate;
-   above_y = (above_y) / rate;
-
-   slider_constraint->setLinearLowerLimit(btVector3(-left_x, -under_y, 0));
-   slider_constraint->setLinearUpperLimit(btVector3(right_x, above_y, 0));
+   _ephysics_constraint_slider_linear_limit_set(
+      constraint, left_x, under_y, right_x, above_y,
+      ephysics_world_rate_get(constraint->world));
 }
 
 EAPI void
@@ -184,7 +262,6 @@
 ephysics_constraint_p2p_add(EPhysics_Body *body1, EPhysics_Body *body2, Evas_Coord anchor_b1_x, Evas_Coord anchor_b1_y, Evas_Coord anchor_b2_x, Evas_Coord anchor_b2_y)
 {
    EPhysics_Constraint *constraint;
-   int rate;
 
    if (!body1)
      {
@@ -207,31 +284,18 @@
         return NULL;
      }
 
-   rate = ephysics_world_rate_get(ephysics_body_world_get(body1));
+   constraint->p2p.body1 = body1;
+   constraint->p2p.body2 = body2;
+   constraint->p2p.anchor_b1_x = anchor_b1_x;
+   constraint->p2p.anchor_b1_y = anchor_b1_y;
+   constraint->p2p.anchor_b2_x = anchor_b2_x;
+   constraint->p2p.anchor_b2_y = anchor_b2_y;
 
-   if (!body2)
-     constraint->bt_constraint = new btPoint2PointConstraint(
-        *ephysics_body_rigid_body_get(body1),
-        btVector3(anchor_b1_x / rate, anchor_b1_y / rate, 0));
-   else
-     constraint->bt_constraint = new btPoint2PointConstraint(
-        *ephysics_body_rigid_body_get(body1),
-        *ephysics_body_rigid_body_get(body2),
-        btVector3(anchor_b1_x / rate, anchor_b1_y / rate, 0),
-        btVector3(anchor_b2_x / rate, anchor_b2_y / rate, 0));
+   if (!_ephysics_constraint_p2p_set(
+         constraint, ephysics_world_rate_get(ephysics_body_world_get(
+               constraint->p2p.body1))))
+     return NULL;
 
-   if (!constraint->bt_constraint)
-     {
-        ERR("Failed to create a btConstraint");
-        free(constraint);
-        return NULL;
-     }
-
-   constraint->type = EPHYSICS_CONSTRAINT_P2P;
-   constraint->world = ephysics_body_world_get(body1);
-   ephysics_world_constraint_add(constraint->world, constraint,
-                                 constraint->bt_constraint);
-
    INF("Constraint added.");
    return constraint;
 }

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-08-16 21:35:04 UTC (rev 75332)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-08-16 21:35:09 UTC (rev 75333)
@@ -81,6 +81,7 @@
 
 extern int _ephysics_log_dom;
 
+/* World */
 int ephysics_world_init(void);
 int ephysics_world_shutdown(void);
 Eina_Bool ephysics_world_body_add(EPhysics_World *world, EPhysics_Body *body);
@@ -92,8 +93,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);
 
+/* Body */
 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);
@@ -101,14 +102,19 @@
 void ephysics_body_active_set(EPhysics_Body *body, Eina_Bool active);
 void ephysics_body_recalc(EPhysics_Body *body, double rate);
 
+/* Camera */
 EPhysics_Camera *ephysics_camera_add(EPhysics_World *world);
 void ephysics_camera_del(EPhysics_Camera *camera);
 void ephysics_camera_moved_set(EPhysics_Camera *camera, Eina_Bool moved);
 Eina_Bool ephysics_camera_moved_get(const EPhysics_Camera *camera);
 void ephysics_camera_target_moved(EPhysics_Camera *camera, EPhysics_Body *body);
 
+/* Shape */
 const Eina_Inlist *ephysics_shape_points_get(const EPhysics_Shape *shape);
 
+/* Constraint */
+void ephysics_constraint_recalc(EPhysics_Constraint *constraint, double rate);
+
 #ifdef __cplusplus
 }
 #endif

Log:
EPhysics: make it possible to recalculate gravity
  
  
  

Author:       bdilly
Date:         2012-08-16 14:35:14 -0700 (Thu, 16 Aug 2012)
New Revision: 75334
Trac:         http://trac.enlightenment.org/e/changeset/75334

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-16 21:35:09 UTC (rev 75333)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-16 21:35:14 UTC (rev 75334)
@@ -78,6 +78,12 @@
    }
 };
 
+static inline void
+_ephysics_world_gravity_set(EPhysics_World *world, double gx, double gy, double rate)
+{
+   world->dynamics_world->setGravity(btVector3(gx / rate, -gy / rate, 0));
+}
+
 static void
 _ephysics_world_event_callback_call(EPhysics_World *world, EPhysics_Callback_World_Type type, void *event_info)
 {
@@ -670,8 +676,7 @@
         return;
      }
 
-   world->dynamics_world->setGravity(btVector3(gx / world->rate,
-                                               -gy / world->rate, 0));
+   _ephysics_world_gravity_set(world, gx, gy, world->rate);
    DBG("World %p gravity set to X:%lf, Y:%lf.", world, gx, gy);
 }

Log:
EPhysics: fix rate set implementation
  
  Update everything that depends on rate:
   - worlds
   - bodies
   - constraints
  
  

Author:       bdilly
Date:         2012-08-16 14:35:20 -0700 (Thu, 16 Aug 2012)
New Revision: 75335
Trac:         http://trac.enlightenment.org/e/changeset/75335

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-16 21:35:14 UTC (rev 75334)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-16 21:35:20 UTC (rev 75335)
@@ -752,6 +752,11 @@
 EAPI void
 ephysics_world_rate_set(EPhysics_World *world, double rate)
 {
+   EPhysics_Body *body;
+   void *constraint;
+   double gx, gy;
+   Eina_List *l;
+
    if (!world)
      {
 	ERR("No world, can't set rate.");
@@ -765,7 +770,16 @@
         return;
      }
 
-   /* FIXME update objects considering new rate */
+   /* Force to recalculate sizes, velocities and accelerations with new rate */
+   ephysics_world_gravity_get(world, &gx, &gy);
+   _ephysics_world_gravity_set(world, gx, gy, rate);
+
+   EINA_INLIST_FOREACH(world->bodies, body)
+      ephysics_body_recalc(body, rate);
+
+   EINA_LIST_FOREACH(world->constraints, l, constraint)
+        ephysics_constraint_recalc((EPhysics_Constraint *)constraint, rate);
+
    world->rate = rate;
 }

Log:
EPhysics: add forces API
  
  Implement functions to make it possible to control forces acting
  over a body.
  
  

Author:       bdilly
Date:         2012-08-20 15:15:52 -0700 (Mon, 20 Aug 2012)
New Revision: 75476
Trac:         http://trac.enlightenment.org/e/changeset/75476

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-08-20 22:14:43 UTC (rev 75475)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-08-20 22:15:52 UTC (rev 75476)
@@ -2185,7 +2185,7 @@
  * or can be used to lead to both behaviors with
  * @ref ephysics_body_impulse_apply().
  *
- * It will resulte in a central impulse with impulse (@p x, @p y) and a
+ * It will result in a central impulse with impulse (@p x, @p y) and a
  * torque impulse that will be calculated as a cross product on impulse
  * and relative position.
  *
@@ -2300,7 +2300,7 @@
  * @note The unit used for rotation is degrees.
  *
  * @param body The physics body.
- * @param The amount of degrees @p body should be rotated.
+ * @param rotation The amount of degrees @p body should be rotated.
  *
  * @see ephysics_body_rotation_get()
  *
@@ -2347,6 +2347,143 @@
 EAPI void *ephysics_body_data_get(const EPhysics_Body *body);
 
 /**
+ * @brief
+ * Apply a force on the center of a body.
+ *
+ * Applying a force to a body will lead it to change its velocity.
+ *
+ * Force is the product of mass and acceleration. So, keeping the mass
+ * fixed, when force is applied acceleration will change, and consequently,
+ * velocity will gradually be changes.
+ *
+ * Force = mass * acceleration
+ *
+ * Final velocity = initial velocity + acceleration * time
+ *
+ * While a force is applied, it will be acting over a body. It can be canceled
+ * by applying an inverse force, or just calling
+ * @ref ephysics_body_forces_clear().
+ *
+ * This force will be applied on body's center, so it won't implies in
+ * changing angular acceleration. For that, it is possible to apply a torque
+ * with @ref ephysics_body_torque_apply().
+ *
+ * If the force shouldn't be applied on body's center, it can be applied on
+ * a relative point with @ref ephysics_body_force_apply().
+ *
+ * @note Force is measured in kg * p / s / s.
+ *
+ * @param body The physics body which over the force will be applied.
+ * @param x The axis x component of force.
+ * @param y The axis y component of force.
+ *
+ * @see ephysics_body_torque_apply().
+ * @see ephysics_body_force_apply().
+ * @see ephysics_body_forces_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_central_force_apply(EPhysics_Body *body, double x, double y);
+
+/**
+ * @brief
+ * Apply a torque over a body.
+ *
+ * A torque will be applied over the @p body to change the angular acceleration
+ * of this body. It will leads to a change on angular velocity over time.
+ * And the body will rotate around Z axis considering this angular velocity.
+ *
+ * @param body The physics body that will receive the torque.
+ * @param torque Torque to change angular acceleration of the body around Z
+ * axis (rotate on x - y plane).
+ * Negative values will accelerate it on anti clock rotation.
+ *
+ * @see ephysics_body_central_force_apply().
+ * @see ephysics_body_force_apply().
+ * @see ephysics_body_forces_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_torque_apply(EPhysics_Body *body, double torque);
+
+/**
+ * @brief
+ * Apply a force over a body.
+ *
+ * A force will be applied over the body to change it's linear and angular
+ * accelerations.
+ *
+ * It can be applied in the center of the body, avoiding affecting angular
+ * acceleration, with @ref ephysics_body_central_force_apply(),
+ * it can be applied only to change angular acceleration, with
+ * @ref ephysics_body_torque_apply(), or can be used to lead to both
+ * behaviors with @ref ephysics_body_force_apply().
+ *
+ * It will result in a central force with force (@p x, @p y) and a
+ * torque that will be calculated as a cross product on force
+ * and relative position.
+ *
+ * @param body The physics body that will receive the impulse.
+ * @param x The axis x component of force.
+ * @param y The axis y component of force.
+ * @param pos_x The axis x component of the relative position to apply force.
+ * @param pos_y The axis y component of the relative position to apply force.
+ *
+ * @note Force is measured in kg * p / s / s and position in p (pixels, or
+ * Evas coordinates).
+ *
+ * @see ephysics_body_central_force_apply().
+ * @see ephysics_body_torque_apply().
+ * @see ephysics_body_forces_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_force_apply(EPhysics_Body *body, double x, double y, Evas_Coord pos_x, Evas_Coord pos_y);
+
+/**
+ * @brief
+ * Get physics body forces.
+ *
+ * Get all the forces applied over a body.
+ *
+ * @param body The physics body.
+ * @param x The axis x component of total force.
+ * @param y The axis y component of total force.
+ * @param torque The torque.
+ *
+ * @see ephysics_body_force_apply() for more details.
+ * @see ephysics_body_central_force_apply().
+ * @see ephysics_body_torque_apply().
+ * @see ephysics_body_forces_clear().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_forces_get(const EPhysics_Body *body, double *x, double *y, double *torque);
+
+/**
+ * @brief
+ * Clear all the forces applied to a body.
+ *
+ * It will remove all the forces previously applied. So linear acceleration
+ * and angular acceleration will be set to 0.
+ *
+ * It won't interfere with world's gravity, the body will continue to be
+ * accelerated considering gravity.
+ *
+ * It won't affect damping.
+ *
+ * @param body The physics body that will have applied forces set to 0.
+ *
+ * @see ephysics_body_central_force_apply().
+ * @see ephysics_body_torque_apply().
+ * @see ephysics_body_force_apply().
+ * @see ephysics_body_forces_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_forces_clear(EPhysics_Body *body);
+
+/**
  * @}
  */
 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-20 22:14:43 UTC (rev 75475)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-20 22:15:52 UTC (rev 75476)
@@ -26,6 +26,15 @@
      Evas_Coord y;
 };
 
+static void
+_ephysics_body_forces_update(EPhysics_Body *body)
+{
+   body->force.x = body->rigid_body->getTotalForce().getX();
+   body->force.y = body->rigid_body->getTotalForce().getY();
+   body->force.torque = body->rigid_body->getTotalTorque().getZ();
+   body->rigid_body->clearForces();
+}
+
 static inline void
 _ephysics_body_sleeping_threshold_set(EPhysics_Body *body, double linear_threshold, double angular_threshold, double rate)
 {
@@ -464,6 +473,16 @@
 }
 
 void
+ephysics_body_forces_apply(EPhysics_Body *body)
+{
+   double rate = ephysics_world_rate_get(body->world);
+   body->rigid_body->activate(1);
+   body->rigid_body->applyCentralForce(btVector3(body->force.x / rate,
+                                                 body->force.y / rate, 0));
+   body->rigid_body->applyTorque(btVector3(0, 0, body->force.torque));
+}
+
+void
 ephysics_body_recalc(EPhysics_Body *body, double rate)
 {
    Evas_Coord x, y, w, h;
@@ -1386,6 +1405,91 @@
    return body->data;
 }
 
+EAPI void
+ephysics_body_central_force_apply(EPhysics_Body *body, double x, double y)
+{
+   double rate;
+
+   if (!body)
+     {
+        ERR("Can't apply force to a null body.");
+        return;
+     }
+
+   rate = ephysics_world_rate_get(body->world);
+   ephysics_body_forces_apply(body);
+   body->rigid_body->applyCentralForce(btVector3(x / rate, y / rate, 0));
+   _ephysics_body_forces_update(body);
+}
+
+EAPI void
+ephysics_body_force_apply(EPhysics_Body *body, double x, double y, Evas_Coord pos_x, Evas_Coord pos_y)
+{
+   double rate;
+
+   if (!body)
+     {
+        ERR("Can't apply force to a null body.");
+        return;
+     }
+
+   rate = ephysics_world_rate_get(body->world);
+   ephysics_body_forces_apply(body);
+   body->rigid_body->applyForce(btVector3(x / rate, y / rate, 0),
+                                btVector3((double) pos_x / rate,
+                                          (double) pos_y / rate, 0));
+   _ephysics_body_forces_update(body);
+}
+
+EAPI void
+ephysics_body_torque_apply(EPhysics_Body *body, double torque)
+{
+   double rate;
+
+   if (!body)
+     {
+        ERR("Can't apply force to a null body.");
+        return;
+     }
+
+   rate = ephysics_world_rate_get(body->world);
+   ephysics_body_forces_apply(body);
+   body->rigid_body->applyTorque(btVector3(0, 0, -torque));
+   _ephysics_body_forces_update(body);
+}
+
+EAPI void
+ephysics_body_forces_get(const EPhysics_Body *body, double *x, double *y, double *torque)
+{
+   double rate;
+
+   if (!body)
+     {
+        ERR("Can't get forces from a null body.");
+        return;
+     }
+
+   rate = ephysics_world_rate_get(body->world);
+
+   if (x) *x = body->force.x * rate;
+   if (y) *y = body->force.y * rate;
+   if (torque) *torque = -body->force.torque;
+}
+
+EAPI void
+ephysics_body_forces_clear(EPhysics_Body *body)
+{
+   if (!body)
+     {
+        ERR("Can't clear forces of a null body.");
+        return;
+     }
+
+   body->force.x = 0;
+   body->force.y = 0;
+   body->force.torque = 0;
+}
+
 #ifdef  __cplusplus
 }
 #endif

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-08-20 22:14:43 UTC (rev 75475)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-08-20 22:15:52 UTC (rev 75476)
@@ -75,6 +75,11 @@
      Eina_List *collision_groups;
      Eina_List *to_delete;
      double mass;
+     struct {
+          double x;
+          double y;
+          double torque;
+     } force;
      Eina_Bool active:1;
      Eina_Bool deleted:1;
 };
@@ -101,6 +106,7 @@
 btRigidBody *ephysics_body_rigid_body_get(const EPhysics_Body *body);
 void ephysics_body_active_set(EPhysics_Body *body, Eina_Bool active);
 void ephysics_body_recalc(EPhysics_Body *body, double rate);
+void ephysics_body_forces_apply(EPhysics_Body *body);
 
 /* Camera */
 EPhysics_Camera *ephysics_camera_add(EPhysics_World *world);

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-20 22:14:43 UTC (rev 75475)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-20 22:15:52 UTC (rev 75476)
@@ -245,12 +245,16 @@
    EINA_INLIST_FOREACH(lworlds, world)
      {
         double time_now, delta;
+        EPhysics_Body *body;
 
         if (!world->running)
           continue;
 
         world->walking++;
 
+        EINA_INLIST_FOREACH(world->bodies, body)
+           ephysics_body_forces_apply(body);
+
         time_now = ecore_time_get();
         delta = time_now - world->last_update;
         world->last_update = time_now;

Log:
EPhysics: consider gravity on forces getter
  
  
  

Author:       bdilly
Date:         2012-08-20 15:17:34 -0700 (Mon, 20 Aug 2012)
New Revision: 75479
Trac:         http://trac.enlightenment.org/e/changeset/75479

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-08-20 22:17:11 UTC (rev 75478)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-08-20 22:17:34 UTC (rev 75479)
@@ -2444,7 +2444,8 @@
  * @brief
  * Get physics body forces.
  *
- * Get all the forces applied over a body.
+ * Get all the forces applied over a body, including gravity.
+ * Damping is not considered.
  *
  * @param body The physics body.
  * @param x The axis x component of total force.
@@ -2455,6 +2456,7 @@
  * @see ephysics_body_central_force_apply().
  * @see ephysics_body_torque_apply().
  * @see ephysics_body_forces_clear().
+ * @see ephysics_world_gravity_set().
  *
  * @ingroup EPhysics_Body
  */

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-20 22:17:11 UTC (rev 75478)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-20 22:17:34 UTC (rev 75479)
@@ -1461,7 +1461,7 @@
 EAPI void
 ephysics_body_forces_get(const EPhysics_Body *body, double *x, double *y, double *torque)
 {
-   double rate;
+   double rate, gx, gy;
 
    if (!body)
      {
@@ -1470,9 +1470,10 @@
      }
 
    rate = ephysics_world_rate_get(body->world);
+   ephysics_world_gravity_get(body->world, &gx, &gy);
 
-   if (x) *x = body->force.x * rate;
-   if (y) *y = body->force.y * rate;
+   if (x) *x = body->force.x * rate + gx;
+   if (y) *y = body->force.y * rate + gy;
    if (torque) *torque = -body->force.torque;
 }

Log:
EPhysics: fix y component convertion on forces and
   impulses
  
  
  

Author:       bdilly
Date:         2012-08-20 15:18:14 -0700 (Mon, 20 Aug 2012)
New Revision: 75480
Trac:         http://trac.enlightenment.org/e/changeset/75480

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-20 22:17:34 UTC (rev 75479)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-20 22:18:14 UTC (rev 75480)
@@ -1253,7 +1253,7 @@
    rate = ephysics_world_rate_get(body->world);
 
    body->rigid_body->activate(1);
-   body->rigid_body->applyCentralImpulse(btVector3(x / rate, y / rate, 0));
+   body->rigid_body->applyCentralImpulse(btVector3(x / rate, - y / rate, 0));
 }
 
 EAPI void
@@ -1270,7 +1270,7 @@
    rate = ephysics_world_rate_get(body->world);
 
    body->rigid_body->activate(1);
-   body->rigid_body->applyImpulse(btVector3(x / rate, y / rate, 0),
+   body->rigid_body->applyImpulse(btVector3(x / rate, - y / rate, 0),
                                   btVector3((double) pos_x / rate,
                                             (double) pos_y / rate, 0));
 }
@@ -1418,7 +1418,7 @@
 
    rate = ephysics_world_rate_get(body->world);
    ephysics_body_forces_apply(body);
-   body->rigid_body->applyCentralForce(btVector3(x / rate, y / rate, 0));
+   body->rigid_body->applyCentralForce(btVector3(x / rate, - y / rate, 0));
    _ephysics_body_forces_update(body);
 }
 
@@ -1435,7 +1435,7 @@
 
    rate = ephysics_world_rate_get(body->world);
    ephysics_body_forces_apply(body);
-   body->rigid_body->applyForce(btVector3(x / rate, y / rate, 0),
+   body->rigid_body->applyForce(btVector3(x / rate, - y / rate, 0),
                                 btVector3((double) pos_x / rate,
                                           (double) pos_y / rate, 0));
    _ephysics_body_forces_update(body);
@@ -1473,7 +1473,7 @@
    ephysics_world_gravity_get(body->world, &gx, &gy);
 
    if (x) *x = body->force.x * rate + gx;
-   if (y) *y = body->force.y * rate + gy;
+   if (y) *y = -body->force.y * rate + gy;
    if (torque) *torque = -body->force.torque;
 }

Log:
EPhysics: don't activate body if not going to apply
   forces
  
  Otherwise it won't stop, sleeping thresholds won't work...
  
  

Author:       bdilly
Date:         2012-08-21 10:47:18 -0700 (Tue, 21 Aug 2012)
New Revision: 75508
Trac:         http://trac.enlightenment.org/e/changeset/75508

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-21 15:04:36 UTC (rev 75507)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-08-21 17:47:18 UTC (rev 75508)
@@ -475,7 +475,12 @@
 void
 ephysics_body_forces_apply(EPhysics_Body *body)
 {
-   double rate = ephysics_world_rate_get(body->world);
+   double rate;
+
+   if (!((body->force.x) || (body->force.y) || (body->force.torque)))
+       return;
+
+   rate = ephysics_world_rate_get(body->world);
    body->rigid_body->activate(1);
    body->rigid_body->applyCentralForce(btVector3(body->force.x / rate,
                                                  body->force.y / rate, 0));

Log:
EPhysics: improve bodies group description documentation
  
  
  

Author:       bdilly
Date:         2012-08-21 10:47:24 -0700 (Tue, 21 Aug 2012)
New Revision: 75509
Trac:         http://trac.enlightenment.org/e/changeset/75509

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-08-21 17:47:18 UTC (rev 75508)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-08-21 17:47:24 UTC (rev 75509)
@@ -108,7 +108,7 @@
  * Shutdown Bullet physics engine. If init count reaches 0, all the existing
  * worlds will be deleted, and consequently all the bodies.
  *
- * @return Ephysics' init counter value.
+ * @return EPhysics' init counter value.
  *
  * @see ephysics_init().
  *
@@ -1184,15 +1184,33 @@
  * @ref ephysics_body_resize();
  * @ref ephysics_body_geometry_set().
  *
+ * Their rotation can be set directly with @ref ephysics_body_rotation_set().
+ *
  * Also, they can have an associated evas object, done with
  * @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 @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:
+ * Bodies can have velocity set with @ref ephysics_body_linear_velocity_set()
+ * and @ref ephysics_body_angular_velocity_set().
+ *
+ * Also, bodies can have forces and impulses applied over them, and they will
+ * be affected by gravity.
+ *
+ * Forces will be acting while they're set, changing bodies velocity over time.
+ * Impulses are applied only once, modifying bodies velocity imediatelly to the
+ * new value.
+ *
+ * Forces can be managed with:
+ * @li @ref ephysics_body_central_force_apply();
+ * @li @ref ephysics_body_torque_apply().
+ * @li @ref ephysics_body_force_apply();
+ * @li @ref ephysics_body_forces_clear();
+ *
+ * Impulses can be applied with:
  * @li @ref ephysics_body_central_impulse_apply();
  * @li @ref ephysics_body_torque_impulse_apply().
+ * @li @ref ephysics_body_impulse_apply();
  *
  * Bodies can be removed from the world being directly deleted with
  * @ref ephysics_body_del() or when the world is deleted, case when all the

Log:
EPhysics: fix bug when changing head of worlds list
  
  Animator callback was working with a not updated list pointer.
  
  

Author:       bdilly
Date:         2012-08-21 10:47:29 -0700 (Tue, 21 Aug 2012)
New Revision: 75510
Trac:         http://trac.enlightenment.org/e/changeset/75510

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-21 17:47:24 UTC (rev 75509)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-08-21 17:47:29 UTC (rev 75510)
@@ -233,16 +233,15 @@
 }
 
 static Eina_Bool
-_simulate_worlds(void *data)
+_simulate_worlds(void *data __UNUSED__)
 {
-   Eina_Inlist *lworlds = (Eina_Inlist *) data;
    EPhysics_World *world;
    double time_now;
    void *wrld, *bd;
 
    ephysics_init();
    _worlds_walking++;
-   EINA_INLIST_FOREACH(lworlds, world)
+   EINA_INLIST_FOREACH(_worlds, world)
      {
         double time_now, delta;
         EPhysics_Body *body;
@@ -505,7 +504,7 @@
    world->last_update = ecore_time_get();
    _worlds_running++;
    if (!_anim_simulate)
-     _anim_simulate = ecore_animator_add(_simulate_worlds, _worlds);
+     _anim_simulate = ecore_animator_add(_simulate_worlds, NULL);
 
    INF("World %p added.", world);
    return world;
@@ -632,7 +631,7 @@
    if (_anim_simulate)
      return;
 
-   _anim_simulate = ecore_animator_add(_simulate_worlds, _worlds);
+   _anim_simulate = ecore_animator_add(_simulate_worlds, NULL);
 }
 
 EAPI Eina_Bool

Log:
ephysics: fix camera move callback call
  
  it should be called after moved flag was set to false
  otherwise callback functions moving camera won't work correctly
  
  

Author:       bdilly
Date:         2012-09-04 15:42:10 -0700 (Tue, 04 Sep 2012)
New Revision: 76152
Trac:         http://trac.enlightenment.org/e/changeset/76152

Modified:
  trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-09-04 22:42:02 UTC (rev 76151)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-09-04 22:42:10 UTC (rev 76152)
@@ -190,9 +190,9 @@
 
    if (camera_moved)
      {
+        ephysics_camera_moved_set(world->camera, EINA_FALSE);
         _ephysics_world_event_callback_call(
            world, EPHYSICS_CALLBACK_WORLD_CAMERA_MOVED, world->camera);
-        ephysics_camera_moved_set(world->camera, EINA_FALSE);
      }

Log:
ephysics: pass evas object associated to body on del
   event
  
  
  

Author:       bdilly
Date:         2012-09-04 15:42:20 -0700 (Tue, 04 Sep 2012)
New Revision: 76153
Trac:         http://trac.enlightenment.org/e/changeset/76153

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-09-04 22:42:10 UTC (rev 76152)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-09-04 22:42:20 UTC (rev 76153)
@@ -1984,11 +1984,6 @@
  *
  * So it's enough to do customized updates or fix pointers in your program.
  *
- * Regarding EPHYSICS_CALLBACK_BODY_DEL:
- *
- * Registered callbacks will be called before body is freed.
- * No event_info is passed.
- *
  * Regarding EPHYSICS_CALLBACK_BODY_UPDATE:
  *
  * This update event happens after each physics world tick. Its main use
@@ -2035,7 +2030,8 @@
  *
  * - #EPHYSICS_CALLBACK_BODY_DEL: Called when a body deletion has been issued
  *   and just before the deletion actually happens. @p body points to the body
- *   being deleted and no @p event_info is provided.
+ *   being deleted and @p event_info is a pointer to the evas object
+ *   associated to it.
  *
  * - #EPHYSICS_CALLBACK_BODY_STOPPED: Called when a body is found to be
  *   stopped. @p body points to the body of interest and @p event_info is a

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-09-04 22:42:10 UTC (rev 76152)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-09-04 22:42:20 UTC (rev 76153)
@@ -1079,7 +1079,8 @@
 {
    EPhysics_Body_Callback *cb;
 
-   _ephysics_body_event_callback_call(body, EPHYSICS_CALLBACK_BODY_DEL, NULL);
+   _ephysics_body_event_callback_call(body, EPHYSICS_CALLBACK_BODY_DEL,
+                                      (void *) body->evas_obj);
    _ephysics_body_del(body);
    INF("Body %p deleted.", body);
 }

Log:
ephysics: activate all bodies when one is deleted
  
  Otherwise it can lead to scenarios when a body 1, below body 2 is deleted
  and body 2 will stay freezed in the air. Gravity won't start to
  act over it until it's activated again.
  
  

Author:       bdilly
Date:         2012-09-04 15:42:35 -0700 (Tue, 04 Sep 2012)
New Revision: 76155
Trac:         http://trac.enlightenment.org/e/changeset/76155

Modified:
  trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-09-04 22:42:28 UTC (rev 76154)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-09-04 22:42:35 UTC (rev 76155)
@@ -360,6 +360,7 @@
 ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body)
 {
    btSoftBody *soft_body;
+   EPhysics_Body *bd;
 
    if (world->walking)
      {
@@ -379,6 +380,16 @@
    world->bodies = eina_inlist_remove(world->bodies, EINA_INLIST_GET(body));
    ephysics_orphan_body_del(body);
 
+   /* Activate all the bodies after a body is deleted.
+      Otherwise it can lead to scenarios when a body 1, below body 2 is deleted
+      and body 2 will stay freezed in the air. Gravity won't start to
+      act over it until it's activated again. */
+   EINA_INLIST_FOREACH(world->bodies, bd)
+     {
+        btRigidBody *rigid_body = ephysics_body_rigid_body_get(bd);
+        rigid_body->activate(1);
+     }
+
    return EINA_TRUE;
 }

Log:
ephysics: soft body memory usage/leak
  
  Added a call for sparsesdf garbage collector after every simulation
  avoiding bullet's soft dynamics leaks.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-09-12 14:49:29 -0700 (Wed, 12 Sep 2012)
New Revision: 76561
Trac:         http://trac.enlightenment.org/e/changeset/76561

Modified:
  trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-09-12 21:49:14 UTC (rev 76560)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-09-12 21:49:29 UTC (rev 76561)
@@ -276,8 +276,11 @@
         gDeactivationTime = world->max_sleeping_time;
 
         if (world->soft_body_ref)
-          world->dynamics_world->stepSimulation(delta, world->max_sub_steps,
+          {
+             world->dynamics_world->stepSimulation(delta, world->max_sub_steps,
                                                 world->fixed_time_step);
+             world->world_info->m_sparsesdf.GarbageCollect();
+          }
         else
           ((btDiscreteDynamicsWorld *)world->dynamics_world)->stepSimulation(
              delta, world->max_sub_steps, world->fixed_time_step);

Log:
ephysics: fix issues with world destructor
  
  Makes sure the body is removed from the world before deleting it
  so it will not mess with overlapping pair caches, proxies and so on.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-09-12 14:49:47 -0700 (Wed, 12 Sep 2012)
New Revision: 76562
Trac:         http://trac.enlightenment.org/e/changeset/76562

Modified:
  trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-09-12 21:49:29 UTC (rev 76561)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-09-12 21:49:47 UTC (rev 76562)
@@ -204,6 +204,50 @@
 }
 
 static void
+_ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body)
+{
+   btSoftBody *soft_body;
+
+   world->dynamics_world->removeRigidBody(ephysics_body_rigid_body_get(body));
+
+   soft_body = ephysics_body_soft_body_get(body);
+   if (soft_body)
+     {
+        world->dynamics_world->removeSoftBody(soft_body);
+        --world->soft_body_ref;
+     }
+
+   world->bodies = eina_inlist_remove(world->bodies, EINA_INLIST_GET(body));
+   ephysics_orphan_body_del(body);
+}
+
+Eina_Bool
+ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body)
+{
+   EPhysics_Body *bd;
+
+   if (world->walking)
+     {
+        world->to_delete = eina_list_append(world->to_delete, body);
+        return EINA_FALSE;
+     }
+
+   _ephysics_world_body_del(world, body);
+
+   /* Activate all the bodies after a body is deleted.
+      Otherwise it can lead to scenarios when a body 1, below body 2 is deleted
+      and body 2 will stay freezed in the air. Gravity won't start to
+      act over it until it's activated again. */
+   EINA_INLIST_FOREACH(world->bodies, bd)
+     {
+        btRigidBody *rigid_body = ephysics_body_rigid_body_get(bd);
+        rigid_body->activate(1);
+     }
+
+   return EINA_TRUE;
+}
+
+static void
 _ephysics_world_free(EPhysics_World *world)
 {
    EPhysics_World_Callback *cb;
@@ -224,17 +268,14 @@
    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_world_body_del(world, body);
      }
 
    EINA_LIST_FREE(world->constraints, constraint)
       ephysics_constraint_del((EPhysics_Constraint *)constraint);
 
    ephysics_camera_del(world->camera);
-   /* FIXME uncomment lines above when dynamicsworld destructor is fixed
-      on bullet. Right now looks like it will try to acess invalid memory.*/
-   /*
+
    delete world->dynamics_world;
    delete world->solver;
    delete world->broadphase;
@@ -242,7 +283,6 @@
    delete world->collision;
    delete world->soft_solver;
    delete world->world_info;
-   */
 
    free(world);
    INF("World %p deleted.", world);
@@ -360,43 +400,6 @@
 }
 
 Eina_Bool
-ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body)
-{
-   btSoftBody *soft_body;
-   EPhysics_Body *bd;
-
-   if (world->walking)
-     {
-        world->to_delete = eina_list_append(world->to_delete, body);
-        return EINA_FALSE;
-     }
-
-   world->dynamics_world->removeRigidBody(ephysics_body_rigid_body_get(body));
-
-   soft_body = ephysics_body_soft_body_get(body);
-   if (soft_body)
-     {
-        world->dynamics_world->removeSoftBody(soft_body);
-        --world->soft_body_ref;
-     }
-
-   world->bodies = eina_inlist_remove(world->bodies, EINA_INLIST_GET(body));
-   ephysics_orphan_body_del(body);
-
-   /* Activate all the bodies after a body is deleted.
-      Otherwise it can lead to scenarios when a body 1, below body 2 is deleted
-      and body 2 will stay freezed in the air. Gravity won't start to
-      act over it until it's activated again. */
-   EINA_INLIST_FOREACH(world->bodies, bd)
-     {
-        btRigidBody *rigid_body = ephysics_body_rigid_body_get(bd);
-        rigid_body->activate(1);
-     }
-
-   return EINA_TRUE;
-}
-
-Eina_Bool
 ephysics_world_soft_body_add(EPhysics_World *world, EPhysics_Body *body)
 {
    if (!eina_inlist_find(world->bodies, EINA_INLIST_GET(body)))

Log:
ephysics: improve doc description and remove redundant
   links
  
  
  

Author:       bdilly
Date:         2012-09-14 15:06:09 -0700 (Fri, 14 Sep 2012)
New Revision: 76701
Trac:         http://trac.enlightenment.org/e/changeset/76701

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-09-14 22:05:54 UTC (rev 76700)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-09-14 22:06:09 UTC (rev 76701)
@@ -9,8 +9,8 @@
  *
  * @section intro What is EPhysics ?
  *
- * EPhysics is a library that manages Ecore, Evas and Bullet Physics into
- * an easy to use way. It's a kind of wrapper, a glue, between these libraries.
+ * EPhysics is a library that makes it easy to use Ecore, Evas and Bullet
+ * Physics together. It's a kind of wrapper, a glue, between these libraries.
  * It's not intended to be a physics library (we already have many out there).
  *
  * @image html diagram_ephysics.png
@@ -85,9 +85,6 @@
  *
  * @{
  *
- * See @ref EPhysics and @ref EPhysics_World for details about
- * these interfaces.
- *
  */
 
 /**

Log:
ephysics: add some references to technical terms.
  
  
  
  Patch by: Ricardo de Almeida Gonzaga <ricardo@...>
  
  

Author:       bdilly
Date:         2012-10-04 15:37:47 -0700 (Thu, 04 Oct 2012)
New Revision: 77452
Trac:         http://trac.enlightenment.org/e/changeset/77452

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:37:40 UTC (rev 77451)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:37:47 UTC (rev 77452)
@@ -432,8 +432,14 @@
  * @{
  *
  * A world is required to simulate physics between bodies.
- * It will setup collision configuration, constraint solver, the
- * broadphase interface and a dispatcher to dispatch calculations
+ * It will setup collision configuration,
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>,
+ * the
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Broadphase">
+ * broadphase</a></b>
+ * interface and a dispatcher to dispatch calculations
  * for overlapping pairs.
  *
  * A new world can be created with @ref ephysics_world_new() and deleted with
@@ -469,7 +475,10 @@
  * @enum _EPhysics_World_Constraint_Solver_Mode
  * typedef EPhysics_World_Constraint_Solver_Mode
  *
- * Identifies the worlds contact and joint constraint solver mode. By default
+ * Identifies the worlds contact and
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Glossary_of_
+ * Terms#Joint.2C_constraint"> joint constraint</a></b>
+ * solver mode. By default
  * EPHYSICS_WORLD_SOLVER_USE_WARMSTARTING is the only enabled solver mode.
  *
  * @see ephysics_world_constraint_solver_mode_enable_set()
@@ -508,7 +517,12 @@
  * Create a new physics world.
  *
  * A new world will be created with set collision configuration,
- * constraint solver, broadphase interface and dispatcher.
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>,
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Broadphase">
+ * broadphase</a></b>
+ * interface and dispatcher.
  *
  * It can be paused / unpaused with @ref ephysics_world_running_set() and its
  * gravity can be changed with @ref ephysics_world_gravity_set().
@@ -688,15 +702,28 @@
 
 /**
  * @brief
- * Set the number of iterations the constraint solver will have for contact and
- * joint constraints.
+ * Set the number of iterations the
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>
+ * will have for contact and
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Glossary_of_
+ * Terms#Joint.2C_constraint">
+ * joint constraints</a></b>.
  *
  * 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'.
+ * By default, the Projected Gauss Seidel
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>
+ * is used for contact and
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Glossary_of_
+ * Terms#Joint.2C_constraint">
+ * joint constraints</a></b>.
+ * 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).
@@ -711,8 +738,14 @@
 
 /**
  * @brief
- * Get the number of iterations the constraint solver will have for contact and
- * joint constraints.
+ * Get the number of iterations the
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>
+ * will have for contact and
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Glossary_of_
+ * Terms#Joint.2C_constraint">
+ * joint constraints</a></b>.
  *
  * @param world The world to get number of iterations from.
  * @return the number of iterations set to @p world, or 0 on failure.
@@ -724,8 +757,16 @@
 
 /**
  * @brief
- * Enable or disable a constraint solver mode to @p world. A world can operate
- * on several constraint solver modes.
+ * Enable or disable a
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>
+ * mode to @p world. A world can operate
+ * on several
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>
+ * modes.
  *
  * @param world The world to be set.
  * @param solver_mode The solver mode to set.
@@ -908,17 +949,27 @@
  * @brief
  * Set linear slop to be used by world.
  *
- * Constraint solver can be configured using some advanced settings, like
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * Constraint solver</a></b>
+ * 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.
+ * Linear slop on sequencial impulse
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>
+ * 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
+ * @param linear_slop New linear slop value to be used by
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>
  * of physics engine.
  *
  * @ingroup EPhysics_World
@@ -930,8 +981,11 @@
  * 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.
+ * @return Linear slop value used by
+ * <b><a href="http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_
+ * Detection_and_Physics_FAQ#How_do_most_physics_engines_solve_constraints.3F">
+ * constraint solver</a></b>
+ * of physics engine or 0 on failure.
  *
  * @see ephysics_world_linear_slop_set() for details.
  *

Log:
ephysics: free overlap filter callback
  
  This patch makes sure the overlap filter callback instance is removed
  on world removal.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-04 15:38:00 -0700 (Thu, 04 Oct 2012)
New Revision: 77454
Trac:         http://trac.enlightenment.org/e/changeset/77454

Modified:
  trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-04 22:37:54 UTC (rev 77453)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-04 22:38:00 UTC (rev 77454)
@@ -31,6 +31,7 @@
      btSoftRigidDynamicsWorld* dynamics_world;
      btSoftBodyWorldInfo* world_info;
      btSoftBodySolver* soft_solver;
+     btOverlapFilterCallback *filter_cb;
 
      EPhysics_Body *boundaries[4];
      EPhysics_Camera *camera;
@@ -276,6 +277,7 @@
 
    ephysics_camera_del(world->camera);
 
+   delete world->filter_cb;
    delete world->dynamics_world;
    delete world->solver;
    delete world->broadphase;
@@ -487,7 +489,6 @@
 ephysics_world_new(void)
 {
    EPhysics_World *world;
-   btOverlapFilterCallback *filter_cb;
 
    world = (EPhysics_World *) calloc(1, sizeof(EPhysics_World));
    if (!world)
@@ -570,11 +571,12 @@
       EPHYSICS_WORLD_SOLVER_SIMD;
    world->dynamics_world->setGravity(DEFAULT_GRAVITY);
 
-   filter_cb = new _ephysics_world_ovelap_filter_cb();
-   if (!filter_cb)
+   world->filter_cb = new _ephysics_world_ovelap_filter_cb();
+   if (!world->filter_cb)
      INF("Couldn't initialize the collision filter.");
    else
-     world->dynamics_world->getPairCache()->setOverlapFilterCallback(filter_cb);
+     world->dynamics_world->getPairCache()->setOverlapFilterCallback(
+                                                               world->filter_cb);
 
    world->rate = 30;
    world->max_sub_steps = 3;

Log:
ephysics: use multiple threads
  
  Use a mainloop thread and one thread per world dedicated to simulation.
  
  It's using ecore threads, out of the pool.
  
  For now there are still some locks when trying to change physics
  elements properties while a simulation is going on, but soon it will
  have a queue of properties to be applied after a simulation step, so
  it won't lock.
  
  

Author:       bdilly
Date:         2012-10-04 15:38:06 -0700 (Thu, 04 Oct 2012)
New Revision: 77455
Trac:         http://trac.enlightenment.org/e/changeset/77455

Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_constraints.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-10-04 22:38:00 UTC (rev 77454)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:38:06 UTC (rev 77455)
@@ -602,7 +602,7 @@
  *
  * @ingroup EPhysics_World
  */
-EAPI Eina_Bool ephysics_world_serialize(const EPhysics_World *world, const char *path);
+EAPI Eina_Bool ephysics_world_serialize(EPhysics_World *world, const char *path);
 
 /**
  * @brief

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-04 22:38:00 UTC (rev 77454)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-04 22:38:06 UTC (rev 77455)
@@ -141,15 +141,18 @@
         return EINA_FALSE;
      }
 
+   ephysics_world_lock_take(body->world);
    group_str = eina_stringshare_add(group);
    if (eina_list_data_find(body->collision_groups, group_str))
      {
         INF("Body already added to group: %s", group);
         eina_stringshare_del(group_str);
+        ephysics_world_lock_release(body->world);
         return EINA_TRUE;
      }
 
    body->collision_groups = eina_list_append(body->collision_groups, group_str);
+   ephysics_world_lock_release(body->world);
    return EINA_TRUE;
 }
 
@@ -164,17 +167,20 @@
         return EINA_FALSE;
      }
 
+   ephysics_world_lock_take(body->world);
    group_str = eina_stringshare_add(group);
    if (!eina_list_data_find(body->collision_groups, group_str))
      {
         INF("Body isn't part of group: %s", group);
         eina_stringshare_del(group_str);
+        ephysics_world_lock_release(body->world);
         return EINA_TRUE;
      }
 
    body->collision_groups = eina_list_remove(body->collision_groups, group_str);
    eina_stringshare_del(group_str);
    eina_stringshare_del(group_str);
+   ephysics_world_lock_release(body->world);
    return EINA_TRUE;
 }
 
@@ -342,6 +348,24 @@
 }
 
 static void
+_ephysics_body_mass_set(EPhysics_Body *body, double mass)
+{
+   btVector3 inertia(0, 0, 0);
+
+   if (body->soft_body)
+     body->soft_body->setTotalMass(mass);
+   else
+     {
+        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);
+}
+
+static void
 _ephysics_body_resize(EPhysics_Body *body, Evas_Coord w, Evas_Coord h)
 {
    double rate, sx, sy;
@@ -360,7 +384,7 @@
         body->collision_shape->setLocalScaling(btVector3(sx, sy, 1));
 
         if(!body->rigid_body->isStaticObject())
-          ephysics_body_mass_set(body, ephysics_body_mass_get(body));
+          _ephysics_body_mass_set(body, ephysics_body_mass_get(body));
      }
 
    body->w = w;
@@ -429,7 +453,7 @@
         body->rigid_body->proceedToTransform(trans);
 
         if (!body->rigid_body->isStaticObject())
-          ephysics_body_mass_set(body, ephysics_body_mass_get(body));
+          _ephysics_body_mass_set(body, ephysics_body_mass_get(body));
      }
 
    body->rigid_body->getMotionState()->setWorldTransform(trans);
@@ -480,7 +504,9 @@
      return;
 
    DBG("Resizing body %p to w=%i, h=%i", body, w, h);
+   ephysics_world_lock_take(body->world);
    _ephysics_body_resize(body, w, h);
+   ephysics_world_lock_release(body->world);
 }
 
 static void
@@ -708,11 +734,20 @@
    return body->soft_body;
 }
 
+static void
+_ephysics_body_soft_body_hardness_set(EPhysics_Body *body, double hardness)
+{
+   btSoftBody *soft_body = body->soft_body;
+   soft_body->m_cfg.kAHR = (hardness / 100) * 0.6;
+   soft_body->m_materials[0]->m_kVST = (hardness / 100);
+   soft_body->m_materials[0]->m_kLST = (hardness / 100);
+   soft_body->m_materials[0]->m_kAST = (hardness / 100);
+   DBG("Soft body %p hardness set to %lf.", body, hardness);
+}
+
 EAPI void
 ephysics_body_soft_body_hardness_set(EPhysics_Body *body, double hardness)
 {
-   btSoftBody *soft_body;
-
    if (!body)
      {
         ERR("Can't set soft body's hardness, body is null.");
@@ -731,12 +766,9 @@
         return;
      }
 
-   soft_body = body->soft_body;
-   soft_body->m_cfg.kAHR = (hardness / 100) * 0.6;
-   soft_body->m_materials[0]->m_kVST = (hardness / 100);
-   soft_body->m_materials[0]->m_kLST = (hardness / 100);
-   soft_body->m_materials[0]->m_kAST = (hardness / 100);
-   DBG("Soft body hardness set.");
+   ephysics_world_lock_take(body->world);
+   _ephysics_body_soft_body_hardness_set(body, hardness);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI double
@@ -775,7 +807,7 @@
    body->soft_body->m_cfg.collisions += btSoftBody::fCollision::SDF_RS;
    body->soft_body->m_cfg.collisions += btSoftBody::fCollision::VF_SS;
 
-   ephysics_body_soft_body_hardness_set(body, 100);
+   _ephysics_body_soft_body_hardness_set(body, 100);
 
    body->rigid_body->setCollisionFlags(
                                       btCollisionObject::CF_NO_CONTACT_RESPONSE);
@@ -799,6 +831,7 @@
         return NULL;
      }
 
+   ephysics_world_lock_take(world);
    shape = new btCylinderShapeZ(btVector3(0.25, 0.25, 0.25));
    if (!shape)
      {
@@ -836,6 +869,7 @@
    body->points_deform[3][1] = 3;
    body->points_deform[3][2] = 76;
 
+   ephysics_world_lock_release(world);
    return body;
 
 no_body:
@@ -843,6 +877,7 @@
 no_soft_body:
    delete shape;
 no_collision_shape:
+   ephysics_world_lock_release(world);
    return NULL;
 }
 
@@ -850,6 +885,7 @@
 ephysics_body_circle_add(EPhysics_World *world)
 {
    btCollisionShape *collision_shape;
+   EPhysics_Body *body;
 
    if (!world)
      {
@@ -864,7 +900,10 @@
         return NULL;
      }
 
-   return _ephysics_body_add(world, collision_shape, "circle", 0.5, 0.5);
+   ephysics_world_lock_take(world);
+   body = _ephysics_body_add(world, collision_shape, "circle", 0.5, 0.5);
+   ephysics_world_lock_release(world);
+   return body;
 }
 
 EAPI EPhysics_Body *
@@ -881,6 +920,7 @@
         return NULL;
      }
 
+   ephysics_world_lock_take(world);
    shape = new btBoxShape(btVector3(0.25, 0.25, 0.25));
    if (!shape)
      {
@@ -918,6 +958,7 @@
    body->points_deform[3][1] = 62;
    body->points_deform[3][2] = 8;
 
+   ephysics_world_lock_release(world);
    return body;
 
 no_body:
@@ -925,6 +966,7 @@
 no_soft_body:
    delete shape;
 no_collision_shape:
+   ephysics_world_lock_release(world);
    return NULL;
 }
 
@@ -932,6 +974,7 @@
 ephysics_body_box_add(EPhysics_World *world)
 {
    btCollisionShape *collision_shape;
+   EPhysics_Body *body;
 
    if (!world)
      {
@@ -941,7 +984,10 @@
 
    collision_shape = new btBoxShape(btVector3(0.5, 0.5, 0.5));
 
-   return _ephysics_body_add(world, collision_shape, "box", 0.5, 0.5);
+   ephysics_world_lock_take(world);
+   body = _ephysics_body_add(world, collision_shape, "box", 0.5, 0.5);
+   ephysics_world_lock_release(world);
+   return body;
 }
 
 EAPI EPhysics_Body *
@@ -952,6 +998,7 @@
    btAlignedObjectArray<btVector3> vertexes, planes;
    const Eina_Inlist *points;
    EPhysics_Point *point;
+   EPhysics_Body *body;
    int array_size, i;
    btShapeHull *hull;
    btVector3 point3d;
@@ -1052,9 +1099,12 @@
         return NULL;
      }
 
-   return _ephysics_body_add(world, (btCollisionShape *)simplified_shape,
+   ephysics_world_lock_take(world);
+   body = _ephysics_body_add(world, (btCollisionShape *)simplified_shape,
                              "generic", (cm_x - min_x) / range_x,
                              1 - (cm_y - min_y) / range_y);
+   ephysics_world_lock_release(world);
+   return body;
 }
 
 void
@@ -1111,37 +1161,49 @@
 EAPI EPhysics_Body *
 ephysics_body_top_boundary_add(EPhysics_World *world)
 {
+   EPhysics_Body *body;
    Evas_Coord x, y, w;
+
    ephysics_world_render_geometry_get(world, &x, &y, &w, NULL);
-   return _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_TOP,
-                                      0, y - 10, x + w, 10);
+   body =  _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_TOP,
+                                       0, y - 10, x + w, 10);
+   return body;
 }
 
 EAPI EPhysics_Body *
 ephysics_body_bottom_boundary_add(EPhysics_World *world)
 {
    Evas_Coord x, y, w, h;
+   EPhysics_Body *body;
+
    ephysics_world_render_geometry_get(world, &x, &y, &w, &h);
-   return _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_BOTTOM,
+   body = _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_BOTTOM,
                                       x, y + h, w, 10);
+   return body;
 }
 
 EAPI EPhysics_Body *
 ephysics_body_left_boundary_add(EPhysics_World *world)
 {
+   EPhysics_Body *body;
    Evas_Coord x, y, h;
+
    ephysics_world_render_geometry_get(world, &x, &y, NULL, &h);
-   return _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_LEFT,
+   body = _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_LEFT,
                                       x - 10, 0, 10, y + h);
+   return body;
 }
 
 EAPI EPhysics_Body *
 ephysics_body_right_boundary_add(EPhysics_World *world)
 {
    Evas_Coord x, y, w, h;
+   EPhysics_Body *body;
+
    ephysics_world_render_geometry_get(world, &x, &y, &w, &h);
-   return _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_RIGHT,
+   body = _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_RIGHT,
                                       x + w, 0, 10, y + h);
+   return body;
 }
 
 void
@@ -1163,8 +1225,10 @@
      }
 
    if (body->deleted) return;
+   ephysics_world_lock_take(body->world);
    body->deleted = EINA_TRUE;
    ephysics_world_body_del(body->world, body);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1200,11 +1264,13 @@
    if (!use_obj_pos)
      return;
 
-   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE,
-                                  _ephysics_body_evas_obj_resize_cb, body);
    evas_object_geometry_get(body->evas_obj, &obj_x, &obj_y, &obj_w, &obj_h);
+   ephysics_world_lock_take(body->world);
    _ephysics_body_geometry_set(body, obj_x, obj_y, obj_w, obj_h,
                                ephysics_world_rate_get(body->world));
+   ephysics_world_lock_release(body->world);
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE,
+                                  _ephysics_body_evas_obj_resize_cb, body);
 }
 
 EAPI Evas_Object *
@@ -1258,8 +1324,10 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    _ephysics_body_geometry_set(body, x, y, w, h,
                                ephysics_world_rate_get(body->world));
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1277,7 +1345,9 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    _ephysics_body_resize(body, w, h);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1289,7 +1359,9 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    _ephysics_body_move(body, x, y);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1329,18 +1401,9 @@
         return;
      }
 
-   btVector3 inertia(0, 0, 0);
-   if (body->soft_body)
-     body->soft_body->setTotalMass(mass);
-   else
-     {
-        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);
+   ephysics_world_lock_take(body->world);
+   _ephysics_body_mass_set(body, mass);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI double
@@ -1394,8 +1457,10 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    body->rigid_body->setAngularVelocity(btVector3(0, 0, -z/RAD_TO_DEG));
    DBG("Angular velocity of body %p set to %lf", body, z);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI double
@@ -1419,9 +1484,11 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    _ephysics_body_sleeping_threshold_set(body, linear_threshold,
                                          angular_threshold,
                                          ephysics_world_rate_get(body->world));
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1452,8 +1519,10 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    body->rigid_body->setLinearVelocity(btVector3(0, 0, 0));
    body->rigid_body->setAngularVelocity(btVector3(0, 0, 0));
+   ephysics_world_lock_release(body->world);
 
    DBG("Body %p stopped", body);
 }
@@ -1467,8 +1536,10 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
     body->rigid_body->setDamping(btScalar(linear_damping),
                                  btScalar(angular_damping));
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1594,7 +1665,10 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    body->rigid_body->setRestitution(btScalar(restitution));
+   DBG("Body %p restitution set to %lf", body, restitution);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI double
@@ -1618,7 +1692,10 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    body->rigid_body->setFriction(btScalar(friction));
+   DBG("Body %p friction set to %lf", body, friction);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI double
@@ -1658,8 +1735,10 @@
 
    rate = ephysics_world_rate_get(body->world);
 
+   ephysics_world_lock_take(body->world);
    body->rigid_body->activate(1);
    body->rigid_body->applyCentralImpulse(btVector3(x / rate, - y / rate, 0));
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1675,10 +1754,12 @@
 
    rate = ephysics_world_rate_get(body->world);
 
+   ephysics_world_lock_take(body->world);
    body->rigid_body->activate(1);
    body->rigid_body->applyImpulse(btVector3(x / rate, - y / rate, 0),
                                   btVector3((double) pos_x / rate,
                                             (double) pos_y / rate, 0));
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1690,7 +1771,9 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    body->rigid_body->setLinearFactor(btVector3(!!enable_x, !!enable_y, 0));
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1715,8 +1798,10 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    body->rigid_body->activate(1);
    body->rigid_body->applyTorqueImpulse(btVector3(0, 0, -roll));
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1728,10 +1813,12 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    if (!enable)
      body->rigid_body->setAngularFactor(btVector3(0, 0, 0));
    else
      body->rigid_body->setAngularFactor(btVector3(0, 0, 1));
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI Eina_Bool
@@ -1777,6 +1864,7 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    body->rigid_body->activate(1);
    body->rigid_body->getMotionState()->getWorldTransform(trans);
    quat.setEuler(0, 0, -rotation / RAD_TO_DEG);
@@ -1789,6 +1877,7 @@
    body->rigid_body->getMotionState()->setWorldTransform(trans);
 
    DBG("Body %p rotation set to %lf", body, rotation);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1826,10 +1915,12 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    rate = ephysics_world_rate_get(body->world);
    ephysics_body_forces_apply(body);
    body->rigid_body->applyCentralForce(btVector3(x / rate, - y / rate, 0));
    _ephysics_body_forces_update(body);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1844,11 +1935,13 @@
      }
 
    rate = ephysics_world_rate_get(body->world);
+   ephysics_world_lock_take(body->world);
    ephysics_body_forces_apply(body);
    body->rigid_body->applyForce(btVector3(x / rate, - y / rate, 0),
                                 btVector3((double) pos_x / rate,
                                           (double) pos_y / rate, 0));
    _ephysics_body_forces_update(body);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void
@@ -1860,9 +1953,11 @@
         return;
      }
 
+   ephysics_world_lock_take(body->world);
    ephysics_body_forces_apply(body);
    body->rigid_body->applyTorque(btVector3(0, 0, -torque));
    _ephysics_body_forces_update(body);
+   ephysics_world_lock_release(body->world);
 }
 
 EAPI void

Modified: trunk/ephysics/src/lib/ephysics_constraints.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_constraints.cpp	2012-10-04 22:38:00 UTC (rev 77454)
+++ trunk/ephysics/src/lib/ephysics_constraints.cpp	2012-10-04 22:38:06 UTC (rev 77455)
@@ -56,7 +56,6 @@
      }
 
    constraint->type = EPHYSICS_CONSTRAINT_P2P;
-   constraint->world = ephysics_body_world_get(constraint->p2p.body1);
    ephysics_world_constraint_add(constraint->world, constraint,
                                  constraint->bt_constraint);
 
@@ -127,6 +126,7 @@
         return NULL;
      }
 
+   ephysics_world_lock_take(ephysics_body_world_get(body));
    trans.setIdentity();
    constraint->bt_constraint = new
        btGeneric6DofConstraint(*ephysics_body_rigid_body_get(body), trans,
@@ -145,6 +145,7 @@
                                  constraint->bt_constraint);
 
    INF("Constraint added.");
+   ephysics_world_lock_release(ephysics_body_world_get(body));
    return constraint;
 }
 
@@ -163,9 +164,11 @@
         return;
      }
 
+   ephysics_world_lock_take(constraint->world);
    _ephysics_constraint_slider_linear_limit_set(
       constraint, left_x, under_y, right_x, above_y,
       ephysics_world_rate_get(constraint->world));
+   ephysics_world_lock_release(constraint->world);
 }
 
 EAPI void
@@ -219,11 +222,13 @@
         return;
      }
 
+   ephysics_world_lock_take(constraint->world);
    slider_constraint = (btGeneric6DofConstraint *)constraint->bt_constraint;
    slider_constraint->setAngularLowerLimit(btVector3(0, 0,
                                                  -counter_clock_z/RAD_TO_DEG));
    slider_constraint->setAngularUpperLimit(btVector3(0, 0,
                                                  clock_wise_z/RAD_TO_DEG));
+   ephysics_world_lock_release(constraint->world);
 }
 
 EAPI void
@@ -284,6 +289,7 @@
         return NULL;
      }
 
+   constraint->world = ephysics_body_world_get(body1);
    constraint->p2p.body1 = body1;
    constraint->p2p.body2 = body2;
    constraint->p2p.anchor_b1_x = anchor_b1_x;
@@ -291,11 +297,17 @@
    constraint->p2p.anchor_b2_x = anchor_b2_x;
    constraint->p2p.anchor_b2_y = anchor_b2_y;
 
+   ephysics_world_lock_take(constraint->world);
    if (!_ephysics_constraint_p2p_set(
          constraint, ephysics_world_rate_get(ephysics_body_world_get(
                constraint->p2p.body1))))
-     return NULL;
+     {
+        ephysics_world_lock_release(constraint->world);
+        free(constraint);
+        return NULL;
+     }
 
+   ephysics_world_lock_release(constraint->world);
    INF("Constraint added.");
    return constraint;
 }
@@ -309,12 +321,14 @@
         return;
      }
 
+   ephysics_world_lock_take(constraint->world);
    ephysics_world_constraint_del(constraint->world, constraint,
                                  constraint->bt_constraint);
    delete constraint->bt_constraint;
    free(constraint);
 
    INF("Constraint deleted.");
+   ephysics_world_lock_release(constraint->world);
 }
 
 

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-04 22:38:00 UTC (rev 77454)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-04 22:38:06 UTC (rev 77455)
@@ -121,6 +121,8 @@
 void ephysics_body_active_set(EPhysics_Body *body, Eina_Bool active);
 void ephysics_body_recalc(EPhysics_Body *body, double rate);
 void ephysics_body_forces_apply(EPhysics_Body *body);
+void ephysics_world_lock_take(EPhysics_World *world);
+void ephysics_world_lock_release(EPhysics_World *world);
 
 /* Camera */
 EPhysics_Camera *ephysics_camera_add(EPhysics_World *world);

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-04 22:38:00 UTC (rev 77454)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-04 22:38:06 UTC (rev 77455)
@@ -12,6 +12,16 @@
 
 #define DEFAULT_GRAVITY btVector3(0, -9.8, 0)
 
+typedef struct _Simulation_Msg Simulation_Msg;
+
+struct _Simulation_Msg {
+     EPhysics_Body *body_0;
+     EPhysics_Body *body_1;
+     btVector3 pos_a;
+     btVector3 pos_b;
+     Eina_Bool tick:1;
+};
+
 typedef struct _EPhysics_World_Callback EPhysics_World_Callback;
 
 struct _EPhysics_World_Callback {
@@ -41,14 +51,18 @@
      Eina_List *to_delete;
      Eina_List *cb_to_delete;
      Eina_List *constraints;
+     Ecore_Thread *simulation_th;
+     Ecore_Thread *cur_th;
      int max_sub_steps;
-     int walking;
      int cb_walking;
      int soft_body_ref;
+     int pending_ticks;
      double last_update;
      double rate;
      double fixed_time_step;
      double max_sleeping_time;
+     Eina_Lock mutex;
+     Eina_Condition condition;
      Eina_Bool running:1;
      Eina_Bool active:1;
      Eina_Bool deleted:1;
@@ -57,6 +71,7 @@
      Eina_Bool outside_bottom:1;
      Eina_Bool outside_left:1;
      Eina_Bool outside_right:1;
+     Eina_Bool pending_simulation:1;
 };
 
 static int _ephysics_world_init_count = 0;
@@ -101,6 +116,14 @@
 }
 
 static void
+_ephysics_world_th_cancel(EPhysics_World *world)
+{
+   _worlds = eina_inlist_remove(_worlds, EINA_INLIST_GET(world));
+   if (!ecore_thread_cancel(world->simulation_th))
+     eina_condition_signal(&world->condition);
+}
+
+static void
 _ephysics_world_event_callback_call(EPhysics_World *world, EPhysics_Callback_World_Type type, void *event_info)
 {
    EPhysics_World_Callback *cb;
@@ -144,7 +167,7 @@
 }
 
 static void
-_ephysics_world_tick_cb(btDynamicsWorld *dynamics_world, btScalar timeStep __UNUSED__)
+_ephysics_world_tick(btDynamicsWorld *dynamics_world)
 {
    Eina_Bool world_active, camera_moved, tx, ty;
    btCollisionObjectArray objects;
@@ -195,16 +218,44 @@
            world, EPHYSICS_CALLBACK_WORLD_CAMERA_MOVED, world->camera);
      }
 
-
-   if (world->active == world_active) return;
+   if (world->active == world_active) goto body_del;
    world->active = world_active;
-   if (world_active) return;
+   if (world_active) goto body_del;
 
    _ephysics_world_event_callback_call(world, EPHYSICS_CALLBACK_WORLD_STOPPED,
                                        NULL);
+
+body_del:
+   world->pending_ticks--;
+   if (!world->pending_ticks)
+     {
+        void *bd;
+        EINA_LIST_FREE(world->to_delete, bd)
+           ephysics_world_body_del(world, (EPhysics_Body*)bd);
+     }
+
+   if ((world->pending_simulation) && (!world->pending_ticks))
+     {
+        world->pending_simulation = EINA_FALSE;
+        eina_condition_signal(&world->condition);
+     }
 }
 
 static void
+_ephysics_world_tick_cb(btDynamicsWorld *dynamics_world, btScalar timeStep __UNUSED__)
+{
+   EPhysics_World *world;
+   Simulation_Msg *msg;
+
+   msg = (Simulation_Msg *) calloc(1, sizeof(Simulation_Msg));
+   msg->tick = EINA_TRUE;
+
+   world = (EPhysics_World *) dynamics_world->getWorldUserInfo();
+   world->pending_ticks++;
+   ecore_thread_feedback(world->cur_th, msg);
+}
+
+static void
 _ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body)
 {
    btSoftBody *soft_body;
@@ -227,7 +278,7 @@
 {
    EPhysics_Body *bd;
 
-   if (world->walking)
+   if (world->pending_ticks)
      {
         world->to_delete = eina_list_append(world->to_delete, body);
         return EINA_FALSE;
@@ -255,8 +306,6 @@
    EPhysics_Body *body;
    void *constraint;
 
-   _worlds = eina_inlist_remove(_worlds, EINA_INLIST_GET(world));
-
    while (world->callbacks)
      {
         cb = EINA_INLIST_CONTAINER_GET(world->callbacks,
@@ -286,6 +335,9 @@
    delete world->soft_solver;
    delete world->world_info;
 
+   eina_condition_free(&world->condition);
+   eina_lock_free(&world->mutex);
+
    free(world);
    INF("World %p deleted.", world);
 }
@@ -294,46 +346,24 @@
 _simulate_worlds(void *data __UNUSED__)
 {
    EPhysics_World *world;
-   void *wrld, *bd;
+   void *wrld;
 
    ephysics_init();
    _worlds_walking++;
    EINA_INLIST_FOREACH(_worlds, world)
      {
-        double time_now, delta;
-        EPhysics_Body *body;
-
         if (!world->running)
           continue;
 
-        world->walking++;
-
-        EINA_INLIST_FOREACH(world->bodies, body)
-           ephysics_body_forces_apply(body);
-
-        time_now = ecore_time_get();
-        delta = time_now - world->last_update;
-        world->last_update = time_now;
-
-        gDeactivationTime = world->max_sleeping_time;
-
-        if (world->soft_body_ref)
+        if (world->pending_ticks)
           {
-             world->dynamics_world->stepSimulation(delta, world->max_sub_steps,
-                                                world->fixed_time_step);
-             world->world_info->m_sparsesdf.GarbageCollect();
+             world->pending_simulation = EINA_TRUE;
+             continue;
           }
-        else
-          ((btDiscreteDynamicsWorld *)world->dynamics_world)->stepSimulation(
-             delta, world->max_sub_steps, world->fixed_time_step);
 
-        world->walking--;
+        world->pending_simulation = EINA_FALSE;
 
-        if (!world->walking)
-          {
-             EINA_LIST_FREE(world->to_delete, bd)
-                ephysics_world_body_del(world, (EPhysics_Body*)bd);
-          }
+        eina_condition_signal(&world->condition);
      }
    _worlds_walking--;
 
@@ -344,7 +374,7 @@
      }
 
    EINA_LIST_FREE(_worlds_to_delete, wrld)
-      _ephysics_world_free((EPhysics_World *)wrld);
+      _ephysics_world_th_cancel((EPhysics_World *)wrld);
 
    ephysics_shutdown();
 
@@ -356,6 +386,8 @@
 {
    btRigidBody *rigid_body_0, *rigid_body_1;
    EPhysics_Body *body_0, *body_1;
+   EPhysics_World *world;
+   Simulation_Msg *msg;
 
    rigid_body_0 = (btRigidBody *) b0;
    rigid_body_1 = (btRigidBody *) b1;
@@ -363,9 +395,15 @@
    body_0 = (EPhysics_Body *) rigid_body_0->getUserPointer();
    body_1 = (EPhysics_Body *) rigid_body_1->getUserPointer();
 
-   ephysics_body_contact_processed(body_0, body_1, cp.getPositionWorldOnA());
-   ephysics_body_contact_processed(body_1, body_0, cp.getPositionWorldOnB());
+   world = ephysics_body_world_get(body_0);
 
+   msg = (Simulation_Msg *) calloc(1, sizeof(Simulation_Msg));
+   msg->body_0 = body_0;
+   msg->body_1 = body_1;
+   msg->pos_a = cp.getPositionWorldOnA();
+   msg->pos_b = cp.getPositionWorldOnB();
+   ecore_thread_feedback(world->cur_th, msg);
+
    return EINA_TRUE;
 }
 
@@ -485,6 +523,85 @@
    return world->boundaries[boundary];
 }
 
+static void
+_th_simulate(void *data, Ecore_Thread *th)
+{
+   EPhysics_World *world = (EPhysics_World *) data;
+
+   while (1)
+     {
+        double time_now, delta;
+        EPhysics_Body *body;
+
+        eina_condition_wait(&world->condition);
+        if (ecore_thread_check(th))
+          {
+             INF("Thread canceled by main loop thread");
+             eina_lock_release(&world->mutex);
+             return;
+          }
+
+        world->pending_ticks++;
+        world->cur_th = th;
+
+        EINA_INLIST_FOREACH(world->bodies, body)
+           ephysics_body_forces_apply(body);
+
+        time_now = ecore_time_get();
+        delta = time_now - world->last_update;
+        world->last_update = time_now;
+
+        gDeactivationTime = world->max_sleeping_time;
+
+        if (world->soft_body_ref)
+          {
+             world->dynamics_world->stepSimulation(delta, world->max_sub_steps,
+                                                world->fixed_time_step);
+             world->world_info->m_sparsesdf.GarbageCollect();
+          }
+        else
+          ((btDiscreteDynamicsWorld *)world->dynamics_world)->stepSimulation(
+             delta, world->max_sub_steps, world->fixed_time_step);
+
+        world->pending_ticks--;
+        eina_lock_release(&world->mutex);
+     }
+}
+
+static void
+_th_msg_cb(void *data, Ecore_Thread *th __UNUSED__, void *msg_data)
+{
+   EPhysics_World *world = (EPhysics_World *) data;
+   Simulation_Msg *msg = (Simulation_Msg *) msg_data;
+
+   if (msg->tick)
+     _ephysics_world_tick(world->dynamics_world);
+   else
+     {
+        ephysics_body_contact_processed(msg->body_0, msg->body_1, msg->pos_a);
+        ephysics_body_contact_processed(msg->body_1, msg->body_0, msg->pos_b);
+     }
+   free(msg);
+}
+
+static void
+_th_end_cb(void *data, Ecore_Thread *th)
+{
+   EPhysics_World *world = (EPhysics_World *) data;
+   INF("World %p simulation thread %p end", world, th);
+   world->simulation_th = NULL;
+   _ephysics_world_free(world);
+}
+
+static void
+_th_cancel_cb(void *data, Ecore_Thread *th)
+{
+   EPhysics_World *world = (EPhysics_World *) data;
+   INF("World %p simulation thread %p canceled", world, th);
+   world->simulation_th = NULL;
+   _ephysics_world_free(world);
+}
+
 EAPI EPhysics_World *
 ephysics_world_new(void)
 {
@@ -566,6 +683,15 @@
         ERR("Couldn't add world to worlds list.");
         goto no_list;
      }
+   world->simulation_th = ecore_thread_feedback_run(
+      _th_simulate, _th_msg_cb, _th_end_cb, _th_cancel_cb, world, EINA_TRUE);
+   if (!world->simulation_th)
+     {
+        ERR("Failed to create simulation thread.");
+        goto no_thread;
+     }
+   eina_lock_new(&world->mutex);
+   eina_condition_new(&world->condition, &world->mutex);
 
    world->dynamics_world->getSolverInfo().m_solverMode ^=
       EPHYSICS_WORLD_SOLVER_SIMD;
@@ -594,6 +720,8 @@
    INF("World %p added.", world);
    return world;
 
+no_thread:
+   _worlds = eina_inlist_remove(_worlds, EINA_INLIST_GET(world));
 no_list:
    delete world->world_info;
 no_world_info:
@@ -616,7 +744,7 @@
 }
 
 EAPI Eina_Bool
-ephysics_world_serialize(const EPhysics_World *world, const char *path)
+ephysics_world_serialize(EPhysics_World *world, const char *path)
 {
    btDefaultSerializer *serializer;
    FILE *file;
@@ -627,10 +755,13 @@
         return EINA_FALSE;
       }
 
+   eina_lock_take(&world->mutex);
+
    file = fopen(path, "wb");
    if (!file)
      {
         WRN("Could not serialize, could not open file: %s", path);
+        eina_lock_release(&world->mutex);
         return EINA_FALSE;
      }
 
@@ -643,6 +774,7 @@
         WRN("Problems on writing to: %s.", path);
         fclose(file);
         delete serializer;
+        eina_lock_release(&world->mutex);
         return EINA_FALSE;
      }
 
@@ -651,9 +783,45 @@
 
    INF("Serialization of world %p written to file: %s.", world, path);
 
+   eina_lock_release(&world->mutex);
    return EINA_TRUE;
 }
 
+static void
+_ephysics_world_running_set(EPhysics_World *world, Eina_Bool running)
+{
+   if ((!!running) == world->running) return;
+
+   world->running = !!running;
+
+   if (world->running)
+     {
+        world->last_update = ecore_time_get();
+        _worlds_running++;
+        INF("World unpaused.");
+     }
+   else
+     {
+        _worlds_running--;
+        INF("World paused.");
+     }
+
+   if (!_worlds_running)
+     {
+        if (_anim_simulate)
+          {
+             ecore_animator_del(_anim_simulate);
+             _anim_simulate = NULL;
+          }
+        return;
+     }
+
+   if (_anim_simulate)
+     return;
+
+   _anim_simulate = ecore_animator_add(_simulate_worlds, NULL);
+}
+
 EAPI void
 ephysics_world_del(EPhysics_World *world)
 {
@@ -665,19 +833,23 @@
 
    if (world->deleted) return;
 
+   eina_lock_take(&world->mutex);
+
    world->deleted = EINA_TRUE;
    _ephysics_world_event_callback_call(world, EPHYSICS_CALLBACK_WORLD_DEL,
                                        NULL);
-   ephysics_world_running_set(world, EINA_FALSE);
+   _ephysics_world_running_set(world, EINA_FALSE);
 
    if (_worlds_walking > 0)
      {
         _worlds_to_delete = eina_list_append(_worlds_to_delete, world);
         INF("World %p marked to delete.", world);
+        eina_lock_release(&world->mutex);
         return;
      }
 
-   _ephysics_world_free(world);
+   eina_lock_release(&world->mutex);
+   _ephysics_world_th_cancel(world);
 }
 
 EAPI void
@@ -689,36 +861,9 @@
         return;
      }
 
-   if ((!!running) == world->running) return;
-
-   world->running = !!running;
-
-   if (world->running)
-     {
-        world->last_update = ecore_time_get();
-        _worlds_running++;
-        INF("World unpaused.");
-     }
-   else
-     {
-        _worlds_running--;
-        INF("World paused.");
-     }
-
-   if (!_worlds_running)
-     {
-        if (_anim_simulate)
-          {
-             ecore_animator_del(_anim_simulate);
-             _anim_simulate = NULL;
-          }
-        return;
-     }
-
-   if (_anim_simulate)
-     return;
-
-   _anim_simulate = ecore_animator_add(_simulate_worlds, NULL);
+   eina_lock_take(&world->mutex);
+   _ephysics_world_running_set(world, running);
+   eina_lock_release(&world->mutex);
 }
 
 EAPI Eina_Bool
@@ -742,7 +887,9 @@
 	return;
      }
 
+   eina_lock_take(&world->mutex);
    world->max_sleeping_time = sleeping_time;
+   eina_lock_release(&world->mutex);
 }
 
 EAPI double
@@ -766,8 +913,10 @@
         return;
      }
 
+   eina_lock_take(&world->mutex);
    _ephysics_world_gravity_set(world, gx, gy, world->rate);
    DBG("World %p gravity set to X:%lf, Y:%lf.", world, gx, gy);
+   eina_lock_release(&world->mutex);
 }
 
 EAPI void
@@ -779,7 +928,9 @@
         return;
      }
 
+   eina_lock_take(&world->mutex);
    world->dynamics_world->getSolverInfo().m_numIterations = iterations;
+   eina_lock_release(&world->mutex);
 }
 
 EAPI int
@@ -804,10 +955,12 @@
         return;
      }
 
+   eina_lock_take(&world->mutex);
    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;
+   eina_lock_release(&world->mutex);
 }
 
 EAPI Eina_Bool
@@ -860,6 +1013,7 @@
         return;
      }
 
+   eina_lock_take(&world->mutex);
    /* Force to recalculate sizes, velocities and accelerations with new rate */
    ephysics_world_gravity_get(world, &gx, &gy);
    _ephysics_world_gravity_set(world, gx, gy, rate);
@@ -871,6 +1025,7 @@
         ephysics_constraint_recalc((EPhysics_Constraint *)constraint, rate);
 
    world->rate = rate;
+   eina_lock_release(&world->mutex);
 }
 
 EAPI double
@@ -1050,7 +1205,9 @@
         return;
      }
 
+   eina_lock_take(&world->mutex);
    world->dynamics_world->getSolverInfo().m_linearSlop = btScalar(linear_slop);
+   eina_lock_release(&world->mutex);
 }
 
 EAPI double
@@ -1202,11 +1359,13 @@
         return;
      }
 
+   eina_lock_take(&world->mutex);
    world->max_sub_steps = max_sub_steps;
    world->fixed_time_step = fixed_time_step;
 
    DBG("World %p simulation set to fixed time step: %lf, max substeps:%i.",
        world, fixed_time_step, max_sub_steps);
+   eina_lock_release(&world->mutex);
 }
 
 EAPI void
@@ -1222,6 +1381,18 @@
    if (max_sub_steps) *max_sub_steps = world->max_sub_steps;
 }
 
+void
+ephysics_world_lock_take(EPhysics_World *world)
+{
+   eina_lock_take(&world->mutex);
+}
+
+void
+ephysics_world_lock_release(EPhysics_World *world)
+{
+   eina_lock_release(&world->mutex);
+}
+
 #ifdef  __cplusplus
 }
 #endif

Log:
ephysics: add a log domain usage counter
  
  This way we assure eina log will be working until the last
  thread ends.
  
  

Author:       bdilly
Date:         2012-10-04 15:38:11 -0700 (Thu, 04 Oct 2012)
New Revision: 77456
Trac:         http://trac.enlightenment.org/e/changeset/77456

Modified:
  trunk/ephysics/src/lib/ephysics_main.cpp trunk/ephysics/src/lib/ephysics_private.h trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_main.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_main.cpp	2012-10-04 22:38:06 UTC (rev 77455)
+++ trunk/ephysics/src/lib/ephysics_main.cpp	2012-10-04 22:38:11 UTC (rev 77456)
@@ -12,8 +12,30 @@
 #endif
 
 int _ephysics_log_dom = -1;
+static int _ephysics_dom_count = 0;
 static int _ephysics_init_count = 0;
 
+void
+ephysics_dom_count_inc(void)
+{
+   _ephysics_dom_count++;
+}
+
+void
+ephysics_dom_count_dec(void)
+{
+   _ephysics_dom_count--;
+   if (_ephysics_dom_count)
+     return;
+
+   INF("EPhysics shutdown");
+
+   eina_log_domain_unregister(_ephysics_log_dom);
+   _ephysics_log_dom = -1;
+
+   eina_shutdown();
+}
+
 EAPI int
 ephysics_init()
 {
@@ -45,6 +67,7 @@
         goto no_world;
      }
 
+   ephysics_dom_count_inc();
    INF("EPhysics initialized");
 
    return _ephysics_init_count;
@@ -66,14 +89,8 @@
      return _ephysics_init_count;
 
    ephysics_world_shutdown();
-
-   INF("EPhysics shutdown");
-
-   eina_log_domain_unregister(_ephysics_log_dom);
-   _ephysics_log_dom = -1;
-
    ecore_shutdown();
-   eina_shutdown();
+   ephysics_dom_count_dec();
 
    return _ephysics_init_count;
 }

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-04 22:38:06 UTC (rev 77455)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-04 22:38:11 UTC (rev 77456)
@@ -97,6 +97,10 @@
 
 extern int _ephysics_log_dom;
 
+/* Main */
+void ephysics_dom_count_inc(void);
+void ephysics_dom_count_dec(void);
+
 /* World */
 int ephysics_world_init(void);
 int ephysics_world_shutdown(void);

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-04 22:38:06 UTC (rev 77455)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-04 22:38:11 UTC (rev 77456)
@@ -340,6 +340,7 @@
 
    free(world);
    INF("World %p deleted.", world);
+   ephysics_dom_count_dec();
 }
 
 static Eina_Bool
@@ -717,6 +718,7 @@
    if (!_anim_simulate)
      _anim_simulate = ecore_animator_add(_simulate_worlds, NULL);
 
+   ephysics_dom_count_inc();
    INF("World %p added.", world);
    return world;

Log:
ephysics: support density
  
  
  

Author:       bdilly
Date:         2012-10-04 15:39:29 -0700 (Thu, 04 Oct 2012)
New Revision: 77460
Trac:         http://trac.enlightenment.org/e/changeset/77460

Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:39:10 UTC (rev 77459)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:39:29 UTC (rev 77460)
@@ -2699,6 +2699,47 @@
 EAPI void ephysics_body_center_mass_get(const EPhysics_Body *body, double *x, double *y);
 
 /**
+ * @brief
+ * Set body's material density.
+ *
+ * The density of a material is its mass per unit volume. It will set the
+ * body mass considering its volume. While a density is set, resizing
+ * a body will always recalculate its mass.
+ *
+ * When a mass is explicitely set with @ref ephysics_body_mass_set(),
+ * the density will be unset.
+ *
+ * It's useful in cases where a specific material needs to be simulated,
+ * so its density can be set and ephysics will calcute the body's mass.
+ *
+ * By default, no density is set.
+ *
+ * @note The unit used for density is kilograms / meters ^ 3.
+ *
+ * @param body The body to has its material density set.
+ * @param density The @p body's material density, in kilograms / meters ^ 3.
+ *
+ * @see ephysics_body_density_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_density_set(EPhysics_Body *body, double density);
+
+/**
+ * @brief
+ * Get body's material density.
+ *
+ * @param body The physics body.
+ * @return the @p body material's density, in kilograms / meters ^ 3 or 0
+ * if no density is set.
+ *
+ * @see ephysics_body_density_set() for details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI double ephysics_body_density_get(const EPhysics_Body *body);
+
+/**
  * @}
  */
 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-04 22:39:10 UTC (rev 77459)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-04 22:39:29 UTC (rev 77460)
@@ -347,11 +347,21 @@
    _ephysics_body_soft_body_points_distance_get(body, body->distances);
 }
 
+inline static double
+_ephysics_body_volume_get(const EPhysics_Body *body)
+{
+   btVector3 vector = body->collision_shape->getLocalScaling();
+   return vector.x() * vector.y() * vector.z();
+}
+
 static void
 _ephysics_body_mass_set(EPhysics_Body *body, double mass)
 {
    btVector3 inertia(0, 0, 0);
 
+   if (body->density)
+     mass = body->density * _ephysics_body_volume_get(body);
+
    if (body->soft_body)
      body->soft_body->setTotalMass(mass);
    else
@@ -1408,6 +1418,7 @@
      }
 
    ephysics_world_lock_take(body->world);
+   body->density = 0;
    _ephysics_body_mass_set(body, mass);
    ephysics_world_lock_release(body->world);
 }
@@ -2012,6 +2023,33 @@
    if (y) *y = body->cm.y;
 }
 
+EAPI void
+ephysics_body_density_set(EPhysics_Body *body, double density)
+{
+   if (!body)
+     {
+        ERR("Can't set the density of a null body's material.");
+        return;
+     }
+
+   body->density = density;
+   ephysics_world_lock_take(body->world);
+   _ephysics_body_mass_set(body, 0);
+   ephysics_world_lock_release(body->world);
+}
+
+EAPI double
+ephysics_body_density_get(const EPhysics_Body *body)
+{
+   if (!body)
+     {
+        ERR("Can't get the density of a null body's material.");
+        return 0;
+     }
+
+   return body->density;
+}
+
 #ifdef  __cplusplus
 }
 #endif

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-04 22:39:10 UTC (rev 77459)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-04 22:39:29 UTC (rev 77460)
@@ -80,6 +80,7 @@
      Eina_List *collision_groups;
      Eina_List *to_delete;
      double mass;
+     double density;
      struct {
           double x;
           double y;

Log:
ephysics: add some material constants
  
  Pre-defined values of some properties, as density, friction and
  restitution.
  
  Ricardo researched these values on the following sources:
  
  http://www.matbase.com/
  http://www.matweb.com/
  http://physics.info/density/
  http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=616
  http://www.woodweb.com/knowledge_base/Wood_Handbook.html
  http://www.engineershandbook.com/Tables/frictioncoefficients.htm
  http://www.engineeringtoolbox.com/friction-coefficients-d_778.html
  http://hypertextbook.com/facts/2006/restitution.shtml
  
  Since they diverge a lot, he calculated an average value.
  
  

Author:       bdilly
Date:         2012-10-04 15:39:35 -0700 (Thu, 04 Oct 2012)
New Revision: 77461
Trac:         http://trac.enlightenment.org/e/changeset/77461

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:39:29 UTC (rev 77460)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:39:35 UTC (rev 77461)
@@ -1298,6 +1298,135 @@
 #define EPHYSICS_BODY_MASS_STATIC (0.0)
 
 /**
+ * @def EPHYSICS_BODY_DENSITY_WOOD
+ * @brief Density of wood in kg / m ^ 3.
+ *
+ * It can be set to a body with @ref ephysics_body_density_set().
+ */
+#define EPHYSICS_BODY_DENSITY_WOOD (680.0)
+/**
+ * @def EPHYSICS_BODY_DENSITY_IRON
+ * @brief Density of iron in kg / m ^ 3.
+ *
+ * It can be set to a body with @ref ephysics_body_density_set().
+ */
+#define EPHYSICS_BODY_DENSITY_IRON (7400.0)
+/**
+ * @def EPHYSICS_BODY_DENSITY_CONCRETE
+ * @brief Density of concrete in kg / m ^ 3.
+ *
+ * It can be set to a body with @ref ephysics_body_density_set().
+ */
+#define EPHYSICS_BODY_DENSITY_CONCRETE (2300.0)
+/**
+ * @def EPHYSICS_BODY_DENSITY_RUBBER
+ * @brief Density of rubber in kg / m ^ 3.
+ *
+ * It can be set to a body with @ref ephysics_body_density_set().
+ */
+#define EPHYSICS_BODY_DENSITY_RUBBER (920.0)
+/**
+ * @def EPHYSICS_BODY_DENSITY_POLYSTYRENE
+ * @brief Density of polystyrene in kg / m ^ 3.
+ *
+ * It can be set to a body with @ref ephysics_body_density_set().
+ */
+#define EPHYSICS_BODY_DENSITY_POLYSTYRENE (80.0)
+/**
+ * @def EPHYSICS_BODY_DENSITY_PLASTIC
+ * @brief Density of plastic in kg / m ^ 3.
+ *
+ * It can be set to a body with @ref ephysics_body_density_set().
+ */
+#define EPHYSICS_BODY_DENSITY_PLASTIC (1300.0)
+
+/**
+ * @def EPHYSICS_BODY_FRICTION_WOOD
+ * @brief Friction coefficient of wood.
+ *
+ * It can be set to a body with @ref ephysics_body_friction_set().
+ */
+#define EPHYSICS_BODY_FRICTION_WOOD (0.4)
+/**
+ * @def EPHYSICS_BODY_FRICTION_IRON
+ * @brief Friction coefficient of iron.
+ *
+ * It can be set to a body with @ref ephysics_body_friction_set().
+ */
+#define EPHYSICS_BODY_FRICTION_IRON (0.8)
+/**
+ * @def EPHYSICS_BODY_FRICTION_CONCRETE
+ * @brief Friction coefficient of concrete.
+ *
+ * It can be set to a body with @ref ephysics_body_friction_set().
+ */
+#define EPHYSICS_BODY_FRICTION_CONCRETE (0.65)
+/**
+ * @def EPHYSICS_BODY_FRICTION_RUBBER
+ * @brief Friction coefficient of rubber.
+ *
+ * It can be set to a body with @ref ephysics_body_friction_set().
+ */
+#define EPHYSICS_BODY_FRICTION_RUBBER (0.75)
+/**
+ * @def EPHYSICS_BODY_FRICTION_POLYSTYRENE
+ * @brief Friction coefficient of polystyrene.
+ *
+ * It can be set to a body with @ref ephysics_body_friction_set().
+ */
+#define EPHYSICS_BODY_FRICTION_POLYSTYRENE (0.5)
+/**
+ * @def EPHYSICS_BODY_FRICTION_PLASTIC
+ * @brief Friction coefficient of plastic.
+ *
+ * It can be set to a body with @ref ephysics_body_friction_set().
+ */
+#define EPHYSICS_BODY_FRICTION_PLASTIC (0.35)
+
+/**
+ * @def EPHYSICS_BODY_RESTITUTION_WOOD
+ * @brief Restitution coefficient of wood.
+ *
+ * It can be set to a body with @ref ephysics_body_restitution_set().
+ */
+#define EPHYSICS_BODY_RESTITUTION_WOOD (0.7)
+/**
+ * @def EPHYSICS_BODY_RESTITUTION_IRON
+ * @brief Restitution coefficient of iron.
+ *
+ * It can be set to a body with @ref ephysics_body_restitution_set().
+ */
+#define EPHYSICS_BODY_RESTITUTION_IRON (0.85)
+/**
+ * @def EPHYSICS_BODY_RESTITUTION_CONCRETE
+ * @brief Restitution coefficient of concrete.
+ *
+ * It can be set to a body with @ref ephysics_body_restitution_set().
+ */
+#define EPHYSICS_BODY_RESTITUTION_CONCRETE (0.75)
+/**
+ * @def EPHYSICS_BODY_RESTITUTION_RUBBER
+ * @brief Restitution coefficient of rubber.
+ *
+ * It can be set to a body with @ref ephysics_body_restitution_set().
+ */
+#define EPHYSICS_BODY_RESTITUTION_RUBBER (0.3)
+/**
+ * @def EPHYSICS_BODY_RESTITUTION_POLYSTYRENE
+ * @brief Restitution coefficient of polystyrene.
+ *
+ * It can be set to a body with @ref ephysics_body_restitution_set().
+ */
+#define EPHYSICS_BODY_RESTITUTION_POLYSTYRENE (0.5)
+/**
+ * @def EPHYSICS_BODY_RESTITUTION_PLASTIC
+ * @brief Restitution coefficient of plastic.
+ *
+ * It can be set to a body with @ref ephysics_body_restitution_set().
+ */
+#define EPHYSICS_BODY_RESTITUTION_PLASTIC (0.6)
+
+/**
  * @typedef EPhysics_Body_Collision
  *
  * Body collision wraps collision informations.
@@ -2244,6 +2373,14 @@
  *
  * By default restitution coefficient of each body is 0.
  *
+ * EPhysics has some pre-defined restitution coefficients for materials:
+ * @li @ref EPHYSICS_BODY_RESTITUTION_CONCRETE
+ * @li @ref EPHYSICS_BODY_RESTITUTION_IRON
+ * @li @ref EPHYSICS_BODY_RESTITUTION_PLASTIC
+ * @li @ref EPHYSICS_BODY_RESTITUTION_POLYSTYRENE
+ * @li @ref EPHYSICS_BODY_RESTITUTION_RUBBER
+ * @li @ref EPHYSICS_BODY_RESTITUTION_WOOD
+ *
  * @param body The body to has its restitution coefficient set.
  * @param restitution The new @p body's restitution coefficient.
  *
@@ -2279,6 +2416,14 @@
  * By default friction value is 0.5 and simulation results will be better
  * when friction in non-zero.
  *
+ * EPhysics has some pre-defined friction coefficients for materials:
+ * @li @ref EPHYSICS_BODY_FRICTION_CONCRETE
+ * @li @ref EPHYSICS_BODY_FRICTION_IRON
+ * @li @ref EPHYSICS_BODY_FRICTION_PLASTIC
+ * @li @ref EPHYSICS_BODY_FRICTION_POLYSTYRENE
+ * @li @ref EPHYSICS_BODY_FRICTION_RUBBER
+ * @li @ref EPHYSICS_BODY_FRICTION_WOOD
+ *
  * @param body The body to has its friction set.
  * @param friction The new @p body's friction value.
  *
@@ -2714,6 +2859,14 @@
  *
  * By default, no density is set.
  *
+ * EPhysics has some pre-defined density values for materials:
+ * @li @ref EPHYSICS_BODY_DENSITY_CONCRETE
+ * @li @ref EPHYSICS_BODY_DENSITY_IRON
+ * @li @ref EPHYSICS_BODY_DENSITY_PLASTIC
+ * @li @ref EPHYSICS_BODY_DENSITY_POLYSTYRENE
+ * @li @ref EPHYSICS_BODY_DENSITY_RUBBER
+ * @li @ref EPHYSICS_BODY_DENSITY_WOOD
+ *
  * @note The unit used for density is kilograms / meters ^ 3.
  *
  * @param body The body to has its material density set.

Log:
ephysics: support body material
  
  Using material_set it will be easier to set density, friction
  and restitution to a body, simulating properties of the selected
  material.
  
  

Author:       bdilly
Date:         2012-10-04 15:39:42 -0700 (Thu, 04 Oct 2012)
New Revision: 77462
Trac:         http://trac.enlightenment.org/e/changeset/77462

Added:
  trunk/ephysics/src/lib/ephysics_body_materials.h 
Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/Makefile.am trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:39:35 UTC (rev 77461)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:39:42 UTC (rev 77462)
@@ -1465,6 +1465,28 @@
    EPHYSICS_CALLBACK_BODY_LAST, /**< kept as sentinel, not really an event */
 } EPhysics_Callback_Body_Type; /**< The types of events triggering a callback */
 
+/**
+ * @enum _EPhysics_Body_Material
+ * @typedef EPhysics_Body_Material
+ *
+ * EPhysics bodies materials. Each material has specific properties to be
+ * applied on the body, as density, friction and restitution.
+ *
+ * @see ephysics_body_material_set() for details.
+ *
+ * @ingroup EPhysics_Body
+ */
+typedef enum _EPhysics_Body_Material
+{
+   EPHYSICS_BODY_MATERIAL_CUSTOM, /**< Custom properties set by the user */
+   EPHYSICS_BODY_MATERIAL_CONCRETE, /**< Density:2300,Fric:0.65,Rest:0.75 */
+   EPHYSICS_BODY_MATERIAL_IRON, /**< Density:7400,Fric:0.8,Rest:0.85 */
+   EPHYSICS_BODY_MATERIAL_PLASTIC, /**< Density:1300,Fric:0.35,Rest:0.6 */
+   EPHYSICS_BODY_MATERIAL_POLYSTYRENE, /**< Density:80,Fric:0.5,Rest:0.5*/
+   EPHYSICS_BODY_MATERIAL_RUBBER, /**< Density:920,Fric:0.75,Rest:0.3*/
+   EPHYSICS_BODY_MATERIAL_WOOD, /**< Density:680,Fric:0.4,Rest:0.7*/
+   EPHYSICS_BODY_MATERIAL_LAST, /**< kept as sentinel, not really a material */
+} EPhysics_Body_Material; /**< The types of materials to be set on a body */
 
 /**
  * @typedef EPhysics_Body_Event_Cb
@@ -2893,6 +2915,46 @@
 EAPI double ephysics_body_density_get(const EPhysics_Body *body);
 
 /**
+ * @brief
+ * Set body's material.
+ *
+ * This function makes properties setting easy. When a material is set to
+ * a body, it will update its friction, restitution and density,
+ * recalculating its mass.
+ *
+ * EPhysics support some materials defined by @ref EPhysics_Body_Material.
+ *
+ * So, for example, if @ref EPHYSICS_BODY_MATERIAL_WOOD is set, it will
+ * set body's density to @ref EPHYSICS_BODY_DENSITY_WOOD, restitution
+ * to @ref EPHSYICS_BODY_RESTITUTION_WOOD and friction to
+ * @ref EPHYSICS_BODY_FRICTION_WOOD.
+ *
+ * If any of these values are later explicitely set, the material will
+ * be set back to @ref EPHYSICS_BODY_MATERIAL_CUSTOM, the default.
+ *
+ * @param body The body to has its material set.
+ * @param material The @p material to be used by the body.
+ *
+ * @see ephysics_body_material_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_material_set(EPhysics_Body *body, EPhysics_Body_Material material);
+
+/**
+ * @brief
+ * Get body's material.
+ *
+ * @param body The physics body.
+ * @return the @p material used by the body.
+ *
+ * @see ephysics_body_body_set() for more details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI EPhysics_Body_Material ephysics_body_material_get(const EPhysics_Body *body);
+
+/**
  * @}
  */
 

Modified: trunk/ephysics/src/lib/Makefile.am
===================================================================
--- trunk/ephysics/src/lib/Makefile.am	2012-10-04 22:39:35 UTC (rev 77461)
+++ trunk/ephysics/src/lib/Makefile.am	2012-10-04 22:39:42 UTC (rev 77462)
@@ -26,4 +26,4 @@
 libephysics_la_LIBADD = @EPHYSICS_LIBS@ @EVIL_LIBS@ -lm
 libephysics_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-EXTRA_DIST = ephysics_private.h ephysics_trimesh.h
+EXTRA_DIST = ephysics_private.h ephysics_trimesh.h ephysics_body_materials.h

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-04 22:39:35 UTC (rev 77461)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-04 22:39:42 UTC (rev 77462)
@@ -10,6 +10,7 @@
 
 #include "ephysics_private.h"
 #include "ephysics_trimesh.h"
+#include "ephysics_body_materials.h"
 
 #ifdef  __cplusplus
 extern "C" {
@@ -1418,6 +1419,7 @@
      }
 
    ephysics_world_lock_take(body->world);
+   body->material = EPHYSICS_BODY_MATERIAL_CUSTOM;
    body->density = 0;
    _ephysics_body_mass_set(body, mass);
    ephysics_world_lock_release(body->world);
@@ -1673,6 +1675,13 @@
    return cb_data;
 }
 
+static void
+_ephysics_body_restitution_set(EPhysics_Body *body, double restitution)
+{
+   body->rigid_body->setRestitution(btScalar(restitution));
+   DBG("Body %p restitution set to %lf", body, restitution);
+}
+
 EAPI void
 ephysics_body_restitution_set(EPhysics_Body *body, double restitution)
 {
@@ -1683,8 +1692,8 @@
      }
 
    ephysics_world_lock_take(body->world);
-   body->rigid_body->setRestitution(btScalar(restitution));
-   DBG("Body %p restitution set to %lf", body, restitution);
+   body->material = EPHYSICS_BODY_MATERIAL_CUSTOM;
+   _ephysics_body_restitution_set(body, restitution);
    ephysics_world_lock_release(body->world);
 }
 
@@ -1700,6 +1709,13 @@
    return body->rigid_body->getRestitution();
 }
 
+static void
+_ephysics_body_friction_set(EPhysics_Body *body, double friction)
+{
+   body->rigid_body->setFriction(btScalar(friction));
+   DBG("Body %p friction set to %lf", body, friction);
+}
+
 EAPI void
 ephysics_body_friction_set(EPhysics_Body *body, double friction)
 {
@@ -1710,8 +1726,8 @@
      }
 
    ephysics_world_lock_take(body->world);
-   body->rigid_body->setFriction(btScalar(friction));
-   DBG("Body %p friction set to %lf", body, friction);
+   body->material = EPHYSICS_BODY_MATERIAL_CUSTOM;
+   _ephysics_body_friction_set(body, friction);
    ephysics_world_lock_release(body->world);
 }
 
@@ -2032,6 +2048,7 @@
         return;
      }
 
+   body->material = EPHYSICS_BODY_MATERIAL_CUSTOM;
    body->density = density;
    ephysics_world_lock_take(body->world);
    _ephysics_body_mass_set(body, 0);
@@ -2050,6 +2067,50 @@
    return body->density;
 }
 
+EAPI void
+ephysics_body_material_set(EPhysics_Body *body, EPhysics_Body_Material material)
+{
+   if (!body)
+     {
+        ERR("Can't set body's material.");
+        return;
+     }
+
+   if (material >= EPHYSICS_BODY_MATERIAL_LAST)
+     {
+        ERR("Invalid material.");
+        return;
+     }
+
+   if (material != ephysics_material_props[material].material)
+     {
+        ERR("Material properties weren't found.");
+        return;
+     }
+
+   ephysics_world_lock_take(body->world);
+   body->density = ephysics_material_props[material].density;
+   _ephysics_body_mass_set(body, 0);
+   _ephysics_body_friction_set(body,
+                               ephysics_material_props[material].friction);
+   _ephysics_body_restitution_set(
+      body, ephysics_material_props[material].restitution);
+   body->material = material;
+   ephysics_world_lock_release(body->world);
+}
+
+EAPI EPhysics_Body_Material
+ephysics_body_material_get(const EPhysics_Body *body)
+{
+   if (!body)
+     {
+        ERR("Can't get body's material.");
+        return EPHYSICS_BODY_MATERIAL_LAST;
+     }
+
+   return body->material;
+}
+
 #ifdef  __cplusplus
 }
 #endif

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-04 22:39:35 UTC (rev 77461)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-04 22:39:42 UTC (rev 77462)
@@ -79,6 +79,7 @@
      Eina_Inlist *callbacks;
      Eina_List *collision_groups;
      Eina_List *to_delete;
+     EPhysics_Body_Material material;
      double mass;
      double density;
      struct {

Log:
ephysics: don't try to lock on internal delete
  
  
  

Author:       bdilly
Date:         2012-10-04 15:39:53 -0700 (Thu, 04 Oct 2012)
New Revision: 77464
Trac:         http://trac.enlightenment.org/e/changeset/77464

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-04 22:39:47 UTC (rev 77463)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-04 22:39:53 UTC (rev 77464)
@@ -808,7 +808,9 @@
    body = _ephysics_body_add(world, collision_shape, "soft box", 0.5, 0.5);
    if (!body)
      {
-        ephysics_body_del(body);
+        if (body->deleted) return NULL;
+        body->deleted = EINA_TRUE;
+        ephysics_world_body_del(body->world, body);
         return NULL;
      }
    body->soft_body = soft_body;

Log:
ephysics: fix typos on docs
  
  
  

Author:       bdilly
Date:         2012-10-04 15:40:35 -0700 (Thu, 04 Oct 2012)
New Revision: 77469
Trac:         http://trac.enlightenment.org/e/changeset/77469

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:40:29 UTC (rev 77468)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-04 22:40:35 UTC (rev 77469)
@@ -1661,7 +1661,8 @@
  * @brief
  * Create a new deformable cloth physics body.
  *
- * A cloth has its points of deformation conceptually split into rows and columns
+ * A cloth has its points of deformation conceptually split into rows and
+ * columns
  * where every square is also split into two triangles - afore named nodes. To
  * fine tune the deformation one can increase this granularity by increasing the
  * @p granularity parameter.
@@ -1670,15 +1671,15 @@
  * example passing @p granularity of 20 will create a cloth with 20 rows and 20
  * columns.
  *
- * By default EPhysics creates a cloth with 10 rows and 10 columns, these default
- * values will generally fit the most common scenarios.
+ * By default EPhysics creates a cloth with 10 rows and 10 columns, these
+ * default values will generally fit the most common scenarios.
  *
  * If the informed @p granularity is of 0 then the default value - of 10 - is
  * assumed.
  *
  * @param world The world this body will belong to.
- * @granularity Define - proportionally - the number of rows and columns, if 0
- * the default value - of 10 - is assumed.
+ * @param granularity Define - proportionally - the number of rows and columns,
+ * if 0 the default value - of 10 - is assumed.
  * @return a bew body or @c NULL on erros.
  *
  * @see ephysics_body_del().
@@ -3056,7 +3057,7 @@
  *
  * So, for example, if @ref EPHYSICS_BODY_MATERIAL_WOOD is set, it will
  * set body's density to @ref EPHYSICS_BODY_DENSITY_WOOD, restitution
- * to @ref EPHSYICS_BODY_RESTITUTION_WOOD and friction to
+ * to @ref EPHYSICS_BODY_RESTITUTION_WOOD and friction to
  * @ref EPHYSICS_BODY_FRICTION_WOOD.
  *
  * If any of these values are later explicitely set, the material will

Log:
ephysics: don't send a msg per sub step
  
  Only send one msg at the end of the simulation step.
  
  

Author:       bdilly
Date:         2012-10-04 15:40:52 -0700 (Thu, 04 Oct 2012)
New Revision: 77471
Trac:         http://trac.enlightenment.org/e/changeset/77471

Modified:
  trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-04 22:40:46 UTC (rev 77470)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-04 22:40:52 UTC (rev 77471)
@@ -64,6 +64,7 @@
      Eina_Lock mutex;
      Eina_Condition condition;
      Eina_Bool running:1;
+     Eina_Bool ticked:1;
      Eina_Bool active:1;
      Eina_Bool deleted:1;
      Eina_Bool outside_autodel:1;
@@ -244,17 +245,27 @@
 }
 
 static void
-_ephysics_world_tick_cb(btDynamicsWorld *dynamics_world, btScalar timeStep __UNUSED__)
+_ephysics_world_tick_dispatch(EPhysics_World *world)
 {
-   EPhysics_World *world;
    Simulation_Msg *msg;
 
+   if (!world->ticked)
+     return;
+
+   world->ticked = EINA_FALSE;
+   world->pending_ticks++;
+
    msg = (Simulation_Msg *) calloc(1, sizeof(Simulation_Msg));
    msg->tick = EINA_TRUE;
+   ecore_thread_feedback(world->cur_th, msg);
+}
 
+static void
+_ephysics_world_tick_cb(btDynamicsWorld *dynamics_world, btScalar timeStep __UNUSED__)
+{
+   EPhysics_World *world;
    world = (EPhysics_World *) dynamics_world->getWorldUserInfo();
-   world->pending_ticks++;
-   ecore_thread_feedback(world->cur_th, msg);
+   world->ticked = EINA_TRUE;
 }
 
 static void
@@ -564,6 +575,7 @@
           ((btDiscreteDynamicsWorld *)world->dynamics_world)->stepSimulation(
              delta, world->max_sub_steps, world->fixed_time_step);
 
+        _ephysics_world_tick_dispatch(world);
         world->pending_ticks--;
         eina_lock_release(&world->mutex);
      }

Log:
ephysics: re-activate body when velocity is set
  
  
  

Author:       bdilly
Date:         2012-10-08 11:00:55 -0700 (Mon, 08 Oct 2012)
New Revision: 77584
Trac:         http://trac.enlightenment.org/e/changeset/77584

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-08 17:48:38 UTC (rev 77583)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-08 18:00:55 UTC (rev 77584)
@@ -438,6 +438,7 @@
 static inline void
 _ephysics_body_linear_velocity_set(EPhysics_Body *body, double x, double y, double rate)
 {
+   ephysics_body_activate(body, EINA_TRUE);
    body->rigid_body->setLinearVelocity(btVector3(x / rate, -y / rate, 0));
 }

Log:
ephysics: fix a reference on doc
  
  
  
  Patch by: Ricardo de Almeida Gonzaga <ricardo@...>
  
  

Author:       bdilly
Date:         2012-10-09 12:59:43 -0700 (Tue, 09 Oct 2012)
New Revision: 77675
Trac:         http://trac.enlightenment.org/e/changeset/77675

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-09 19:59:34 UTC (rev 77674)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-09 19:59:43 UTC (rev 77675)
@@ -2733,7 +2733,7 @@
  * @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_linear_movement_enable_get().
  * @see ephysics_body_rotation_on_z_axis_enable_set().
  *
  * @ingroup EPhysics_Body
@@ -2750,7 +2750,7 @@
  * @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_linear_movement_enable_set().
  * @see ephysics_body_rotation_on_z_axis_enable_get().
  *
  * @ingroup EPhysics_Body

Log:
EPhysics: body evas object unset return the base
   object
  
  In the unset operation return the base object, not the smart one.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-09 12:59:53 -0700 (Tue, 09 Oct 2012)
New Revision: 77676
Trac:         http://trac.enlightenment.org/e/changeset/77676

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-09 19:59:43 UTC (rev 77675)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-09 19:59:53 UTC (rev 77676)
@@ -362,6 +362,15 @@
    return obj;
 }
 
+static Evas_Object *
+_ephysics_body_soft_body_evas_base_obj_get(Evas_Object *obj)
+{
+   EPhysics_Body_Soft_Body_Smart_Data *priv;
+
+   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, priv);
+   return priv->base_obj;
+}
+
 static btTransform
 _ephysics_body_transform_get(const EPhysics_Body *body)
 {
@@ -1862,7 +1871,8 @@
 EAPI Evas_Object *
 ephysics_body_evas_object_unset(EPhysics_Body *body)
 {
-   Evas_Object *obj;
+   Evas_Object *obj, *smart;
+
    if (!body)
      {
         ERR("Can't unset evas object from body, it wasn't provided.");
@@ -1880,6 +1890,13 @@
                                        _ephysics_body_evas_obj_resize_cb);
      }
 
+   if (evas_object_smart_type_check(obj, SMART_CLASS_NAME))
+     {
+        smart = obj;
+        obj = _ephysics_body_soft_body_evas_base_obj_get(obj);
+        evas_object_del(smart);
+     }
+
    return obj;
 }

Log:
EPhysics: soft body members stacking
  
  Using evas stacking for soft body slices members.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-09 13:00:03 -0700 (Tue, 09 Oct 2012)
New Revision: 77677
Trac:         http://trac.enlightenment.org/e/changeset/77677

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-09 19:59:53 UTC (rev 77676)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-09 20:00:03 UTC (rev 77677)
@@ -36,6 +36,7 @@
 {
      int index;
      Evas_Object *evas_obj;
+     int stacking;
 } EPhysics_Body_Soft_Body_Slice;
 
 static const Evas_Smart_Cb_Description _smart_callbacks[] =
@@ -62,6 +63,23 @@
 			Evas_Smart_Class, evas_object_smart_clipped_class_get,
                         _smart_callbacks);
 
+static int
+_ephysics_body_soft_body_slice_stacking_sort_cb(const void *d1, const void *d2)
+{
+   const EPhysics_Body_Soft_Body_Slice *slice1, *slice2;
+
+   slice1 = (const EPhysics_Body_Soft_Body_Slice *)d1;
+   slice2 = (const EPhysics_Body_Soft_Body_Slice *)d2;
+
+   if (!slice1) return 1;
+   if (!slice2) return -1;
+
+   if (slice1->stacking < slice2->stacking) return -1;
+   if (slice2->stacking > slice2->stacking) return 1;
+
+   return 0;
+}
+
 static void
 _ephysics_body_soft_body_slices_apply(Evas_Object *obj)
 {
@@ -75,7 +93,7 @@
    EPhysics_Body_Soft_Body_Slice *slice;
    EPhysics_Body_Soft_Body_Smart_Data *smart_data;
    EPhysics_Body *body;
-   short z_factor;
+   Evas_Object *prev_obj = NULL;
 
    EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, smart_data);
    body = smart_data->body;
@@ -103,10 +121,8 @@
         z1 = p1.z() * rate;
         z2 = p2.z() * rate;
 
-        z_factor = p0.z() + p1.z() + p2.z();
-        z_factor = (z_factor < 0) ? -z_factor : z_factor;
+        slice->stacking = p0.z() + p1.z() + p2.z();
 
-        evas_object_layer_set(slice->evas_obj, z_factor);
         evas_object_map_enable_set(slice->evas_obj, EINA_FALSE);
         map = (Evas_Map *)evas_object_map_get((const Evas_Object *)
                                               slice->evas_obj);
@@ -122,6 +138,22 @@
         evas_object_map_enable_set(slice->evas_obj, EINA_TRUE);
         evas_object_show(slice->evas_obj);
      }
+
+   smart_data->slices = eina_list_sort(smart_data->slices,
+                                eina_list_count(smart_data->slices),
+                                _ephysics_body_soft_body_slice_stacking_sort_cb);
+
+   EINA_LIST_FOREACH(smart_data->slices, l, data)
+     {
+        slice = (EPhysics_Body_Soft_Body_Slice *)data;
+
+        if (!prev_obj)
+          evas_object_lower(slice->evas_obj);
+        else
+          evas_object_stack_above(slice->evas_obj, prev_obj);
+
+        prev_obj = slice->evas_obj;
+     }
 }
 
 static EPhysics_Body_Soft_Body_Slice *
@@ -209,6 +241,7 @@
         evas_map_free(map);
 
         smart_data->slices = eina_list_append(smart_data->slices, slice);
+        evas_object_smart_member_add(slice->evas_obj, obj);
      }
 
    return EINA_TRUE;

Log:
ephysics: fix default rate on docs
  
  
  

Author:       bdilly
Date:         2012-10-09 13:00:15 -0700 (Tue, 09 Oct 2012)
New Revision: 77678
Trac:         http://trac.enlightenment.org/e/changeset/77678

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-09 20:00:03 UTC (rev 77677)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-09 20:00:15 UTC (rev 77678)
@@ -813,7 +813,7 @@
  * It will be used by automatic updates of evas objects associated to
  * physics bodies.
  *
- * By default its value is 20 Evas coordinates (pixels) per meter.
+ * By default its value is 30 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.

Log:
ephysics: re-activate bodies when gravity is set
  
  So it can be applied on all the bodies.
  
  

Author:       bdilly
Date:         2012-10-09 13:00:36 -0700 (Tue, 09 Oct 2012)
New Revision: 77680
Trac:         http://trac.enlightenment.org/e/changeset/77680

Modified:
  trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-09 20:00:27 UTC (rev 77679)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-09 20:00:36 UTC (rev 77680)
@@ -921,6 +921,8 @@
 EAPI void
 ephysics_world_gravity_set(EPhysics_World *world, double gx, double gy)
 {
+   EPhysics_Body *bd;
+
    if (!world)
      {
         ERR("Can't set gravity, no world provided.");
@@ -928,6 +930,8 @@
      }
 
    eina_lock_take(&world->mutex);
+   EINA_INLIST_FOREACH(world->bodies, bd)
+      ephysics_body_activate(bd, EINA_TRUE);
    _ephysics_world_gravity_set(world, gx, gy, world->rate);
    DBG("World %p gravity set to X:%lf, Y:%lf.", world, gx, gy);
    eina_lock_release(&world->mutex);

Log:
ephysics: support enabling moves on z axis
  
  
  

Author:       bdilly
Date:         2012-10-10 12:16:43 -0700 (Wed, 10 Oct 2012)
New Revision: 77774
Trac:         http://trac.enlightenment.org/e/changeset/77774

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-10-10 19:16:37 UTC (rev 77773)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-10 19:16:43 UTC (rev 77774)
@@ -2723,39 +2723,43 @@
 
 /**
  * @brief
- * Enable or disable body's movement on x and y axes.
+ * Enable or disable body's movement on x, y and z axes.
  *
- * Enabled by default on both axes.
+ * Enabled by default on x and y axes, disabled on z axis.
  *
  * @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.
+ * @param enable_z If @c EINA_TRUE allow movement on z axis, if @c EINA_FALSE
+ * disallow it.
  *
  * @see ephysics_body_linear_movement_enable_get().
  * @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);
+EAPI void ephysics_body_linear_movement_enable_set(EPhysics_Body *body, Eina_Bool enable_x, Eina_Bool enable_y, Eina_Bool enable_z);
 
 /**
  * @brief
- * Get body's movement on x and y axes behavior.
+ * Get body's movement on x, y and z axes 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.
+ * @param enable_z @c EINA_TRUE if movement on z axis is allowed, or
+ * @c EINA_FALSE if it's not.
  *
  * @see ephysics_body_linear_movement_enable_set().
  * @see ephysics_body_rotation_on_z_axis_enable_get().
  *
  * @ingroup EPhysics_Body
  */
-EAPI void ephysics_body_linear_movement_enable_get(const 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, Eina_Bool *enable_z);
 
 /**
  * @brief

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-10 19:16:37 UTC (rev 77773)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-10 19:16:43 UTC (rev 77774)
@@ -2439,7 +2439,7 @@
 }
 
 EAPI void
-ephysics_body_linear_movement_enable_set(EPhysics_Body *body, Eina_Bool enable_x, Eina_Bool enable_y)
+ephysics_body_linear_movement_enable_set(EPhysics_Body *body, Eina_Bool enable_x, Eina_Bool enable_y, Eina_Bool enable_z)
 {
    if (!body)
      {
@@ -2448,12 +2448,13 @@
      }
 
    ephysics_world_lock_take(body->world);
-   body->rigid_body->setLinearFactor(btVector3(!!enable_x, !!enable_y, 0));
+   body->rigid_body->setLinearFactor(btVector3(!!enable_x, !!enable_y,
+                                               !!enable_z));
    ephysics_world_lock_release(body->world);
 }
 
 EAPI void
-ephysics_body_linear_movement_enable_get(const 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, Eina_Bool *enable_z)
 {
    if (!body)
      {
@@ -2463,6 +2464,7 @@
 
    if (enable_x) *enable_x = !!body->rigid_body->getLinearFactor().x();
    if (enable_y) *enable_y = !!body->rigid_body->getLinearFactor().y();
+   if (enable_z) *enable_z = !!body->rigid_body->getLinearFactor().z();
 }
 
 EAPI void

Log:
ephysics: fix z position on geometry set using cm
  
  
  

Author:       bdilly
Date:         2012-10-10 12:18:02 -0700 (Wed, 10 Oct 2012)
New Revision: 77784
Trac:         http://trac.enlightenment.org/e/changeset/77784

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-10 19:17:54 UTC (rev 77783)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-10 19:18:02 UTC (rev 77784)
@@ -904,7 +904,7 @@
 
    mx = (x + w * body->cm.x) / rate;
    my = (height - (y + h * body->cm.y)) / rate;
-   mz = z / rate;
+   mz = (z + d * body->cm.z) / rate;
    sx = w / rate;
    sy = h / rate;
    sz = d / rate;

Log:
ephysics: lights, camera, action!
  
  Add light support.
  
  It uses evas_map_util_3d_lighting() internally and is only applied
  over selected bodies.
  
  

Author:       bdilly
Date:         2012-10-10 13:32:08 -0700 (Wed, 10 Oct 2012)
New Revision: 77803
Trac:         http://trac.enlightenment.org/e/changeset/77803

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-10-10 20:30:39 UTC (rev 77802)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-10 20:32:08 UTC (rev 77803)
@@ -1227,6 +1227,118 @@
 EAPI void ephysics_world_simulation_get(const EPhysics_World *world, double *fixed_time_step, int *max_sub_steps);
 
 /**
+ * @brief
+ * Set light properties to be applied on the scene.
+ *
+ * It will perform lighting calculations on the evas map applied on evas
+ * objects associated with all the bodies to have light applied over.
+ *
+ * This is used to apply lighting calculations (from a single light source)
+ * to a given object. The R, G and B values of each vertex will be modified to
+ * reflect the lighting based on the lixth point coordinates, the light color
+ * and the ambient color, and at what angle the map is facing the light source.
+ * A surface should have its points be declared in a clockwise fashion if the
+ * face is "facing" towards you (as opposed to away from you) as faces have a
+ * "logical" side for lighting.
+ *
+ * More details can be found on evas_map_util_3d_lighting() documentation,
+ * since this function is used internally by EPhysics.
+ *
+ * There are two ways of setting a body to receive lighting. One is to simple
+ * set all the bodies to be affected, with
+ * @ref ephysics_world_light_all_bodies_set(). The other, is to set each body
+ * individually, with @ref ephysics_body_light_set().
+ *
+ * By default, no light is set. And after a light is set, by default,
+ * no body will be affected. No change will be visible until
+ * some bodies are set to be enlightened.
+ *
+ * @param world The physics world.
+ * @param lx X coordinate in space of light point
+ * @param ly Y coordinate in space of light point
+ * @param lz Z coordinate in space of light point
+ * @param lr light red value (0 - 255)
+ * @param lg light green value (0 - 255)
+ * @param lb light blue value (0 - 255)
+ * @param ar ambient color red value (0 - 255)
+ * @param ag ambient color green value (0 - 255)
+ * @param ab ambient color blue value (0 - 255)
+ *
+ * @see ephysics_world_light_get().
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI void ephysics_world_light_set(EPhysics_World *world, Evas_Coord lx, Evas_Coord ly, Evas_Coord lz, int lr, int lg, int lb, int ar, int ag, int ab);
+
+/**
+ * @brief
+ * Get light properties.
+ *
+ * @param world The physics world.
+ * @param lx X coordinate in space of light point
+ * @param ly Y coordinate in space of light point
+ * @param lz Z coordinate in space of light point
+ * @param lr light red value (0 - 255)
+ * @param lg light green value (0 - 255)
+ * @param lb light blue value (0 - 255)
+ * @param ar ambient color red value (0 - 255)
+ * @param ag ambient color green value (0 - 255)
+ * @param ab ambient color blue value (0 - 255)
+ * @return @c EINA_TRUE if light is set, or @c EINA_FALSE if it isn't set,
+ * or on error. On this case the other parameters won't be set.
+ *
+ * @see ephysics_world_light_set() for more details.
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI Eina_Bool ephysics_world_light_get(const EPhysics_World *world, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lz, int *lr, int *lg, int *lb, int *ar, int *ag, int *ab);
+
+/**
+ * @brief
+ * Unset light on the scene.
+ *
+ * It will unset light, so no body will be enlightened anymore.
+ *
+ * @param world The physics world.
+ *
+ * @see ephysics_world_light_set() for more details.
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI void ephysics_world_light_unset(EPhysics_World *world);
+
+/**
+ * @brief
+ * Set if light should be applied over all the bodies.
+ *
+ * @param world The physics world.
+ * @param enable @c EINA_TRUE if light should be obligatory applied over
+ * all the bodies, or @c EINA_FALSE if it only should be applied on bodies with
+ * light property set.
+ *
+ * @see ephysics_world_light_set() for more details.
+ * @see ephysics_world_light_all_bodies_get().
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI void ephysics_world_light_all_bodies_set(EPhysics_World *world, Eina_Bool enable);
+
+/**
+ * @brief
+ * Get light setting regarding being applied over all the bodies.
+ *
+ * @param world The physics world.
+ * @return @c EINA_TRUE if light will be obligatory applied over all the bodies,
+ * or @c EINA_FALSE if it only will be applied on bodies with light property
+ * set, or on error.
+ *
+ * @see ephysics_world_light_all_bodies_set() for details.
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI Eina_Bool ephysics_world_light_all_bodies_get(const EPhysics_World *world);
+
+/**
  * @}
  */
 
@@ -3159,13 +3271,57 @@
  * @param body The physics body.
  * @return the @p material used by the body.
  *
- * @see ephysics_body_body_set() for more details.
+ * @see ephysics_body_material_set() for more details.
  *
  * @ingroup EPhysics_Body
  */
 EAPI EPhysics_Body_Material ephysics_body_material_get(const EPhysics_Body *body);
 
 /**
+ * @brief
+ * Set light effect over body.
+ *
+ * @param body The physics body.
+ * @param enable If @c EINA_TRUE, light will be applied over this @p body,
+ * otherwise it won't.
+ *
+ * It's possible to set the light to apply over all the bodies with
+ * @ref ephysics_world_light_all_bodies_set(). This will have priority
+ * over body's individual light settings.
+ *
+ * So, if @p body is set to doesn't be affect by the light, but light
+ * is set to be applied over all the bodies, @p body will be displayed
+ * with light over it.
+ *
+ * Also, if no light is set on the world with @ref ephysics_world_light_set(),
+ * nothing will happens.
+ *
+ * @see ephysics_body_light_get().
+ * @see ephysics_world_light_set() for more details regarding lighting.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_light_set(EPhysics_Body *body, Eina_Bool enable);
+
+/**
+ * @brief
+ * Get light effect over body.
+ *
+ * @param body The physics body.
+ * @return @c EINA_TRUE if light is applied over this @p body or @c EINA_FALSE
+ * in the other case, or on error.
+ *
+ * @note If light is applied over all the bodies it may return @c EINA_FALSE
+ * even if it's being affect by lights. This need to be checked with
+ * @ref ephysics_world_light_all_bodies_get().
+ *
+ * @see ephysics_body_light_set() for more details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Eina_Bool ephysics_body_light_get(const EPhysics_Body *body);
+
+/**
  * @}
  */
 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-10 20:30:39 UTC (rev 77802)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-10 20:32:08 UTC (rev 77803)
@@ -1045,6 +1045,18 @@
 
    evas_map_util_rotate(map, rot, x + (w * body->cm.x), y +
                         (h * body->cm.y));
+
+   if ((body->light_apply) ||
+       (ephysics_world_light_all_bodies_get(body->world)))
+     {
+        int lr, lg, lb, ar, ag, ab;
+        Evas_Coord lx, ly, lz;
+
+        if (ephysics_world_light_get(body->world, &lx, &ly, &lz,
+                                     &lr, &lg, &lb, &ar, &ag, &ab))
+          evas_map_util_3d_lighting(map, lx, ly, lz, lr, lg, lb, ar, ag, ab);
+     }
+
    evas_object_map_set(body->evas_obj, map);
    evas_object_map_enable_set(body->evas_obj, EINA_TRUE);
    evas_map_free(map);
@@ -2816,6 +2828,31 @@
    return body->material;
 }
 
+EAPI void
+ephysics_body_light_set(EPhysics_Body *body, Eina_Bool enable)
+{
+   if (!body)
+     {
+        ERR("No body, no light.");
+        return;
+     }
+
+   body->light_apply = !!enable;
+}
+
+EAPI Eina_Bool
+ephysics_body_light_get(const EPhysics_Body *body)
+{
+   if (!body)
+     {
+        ERR("No body, no light.");
+        return EINA_FALSE;
+     }
+
+   return body->light_apply;
+}
+
+
 #ifdef  __cplusplus
 }
 #endif

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-10 20:30:39 UTC (rev 77802)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-10 20:32:08 UTC (rev 77803)
@@ -104,14 +104,15 @@
           double y;
           double z;
      } cm;
-     Eina_Bool active:1;
-     Eina_Bool deleted:1;
      int slices;
      int *points_deform;
      EPhysics_Body_Type type;
      int cloth_columns;
      int cloth_rows;
      int anchor_prop;
+     Eina_Bool active:1;
+     Eina_Bool deleted:1;
+     Eina_Bool light_apply:1;
 };
 
 extern int _ephysics_log_dom;

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-10 20:30:39 UTC (rev 77802)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-10 20:32:08 UTC (rev 77803)
@@ -32,6 +32,21 @@
      Eina_Bool deleted:1;
 };
 
+typedef struct _EPhysics_Light EPhysics_Light;
+
+struct _EPhysics_Light {
+     Evas_Coord lx;
+     Evas_Coord ly;
+     Evas_Coord lz;
+     int lr;
+     int lg;
+     int lb;
+     int ar;
+     int ag;
+     int ab;
+     Eina_Bool all_bodies:1;
+};
+
 struct _EPhysics_World {
      EINA_INLIST;
      btBroadphaseInterface* broadphase;
@@ -45,6 +60,7 @@
 
      EPhysics_Body *boundaries[4];
      EPhysics_Camera *camera;
+     EPhysics_Light *light;
      Evas_Coord x, y, w, h;
      Eina_Inlist *callbacks;
      Eina_Inlist *bodies;
@@ -349,6 +365,9 @@
    eina_condition_free(&world->condition);
    eina_lock_free(&world->mutex);
 
+   if (world->light)
+     free(world->light);
+
    free(world);
    INF("World %p deleted.", world);
    ephysics_dom_count_dec();
@@ -1412,6 +1431,122 @@
    eina_lock_release(&world->mutex);
 }
 
+EAPI void
+ephysics_world_light_set(EPhysics_World *world,
+                         Evas_Coord lx, Evas_Coord ly, Evas_Coord lz,
+                         int lr, int lg, int lb,
+                         int ar, int ag, int ab)
+{
+   if (!world)
+     {
+	ERR("No world, can't set light.");
+	return;
+     }
+
+   if (!world->light)
+     world->light = (EPhysics_Light *) calloc(1, sizeof(EPhysics_Light));
+
+   if (!world->light)
+     {
+	ERR("Failed to create light.");
+	return;
+     }
+
+   world->light->lx = lx;
+   world->light->ly = ly;
+   world->light->lz = lz;
+   world->light->lr = lr;
+   world->light->lg = lg;
+   world->light->lb = lb;
+   world->light->ar = ar;
+   world->light->ag = ag;
+   world->light->ab = ab;
+   world->light->all_bodies = EINA_FALSE;
+}
+
+EAPI Eina_Bool
+ephysics_world_light_get(const EPhysics_World *world,
+                         Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lz,
+                         int *lr, int *lg, int *lb,
+                         int *ar, int *ag, int *ab)
+{
+   if (!world)
+     {
+	ERR("No world, can't get light.");
+	return EINA_FALSE;
+     }
+
+   if (!world->light)
+     {
+	INF("Light isn't set.");
+	return EINA_FALSE;
+     }
+
+   if (lx) *lx = world->light->lx;
+   if (ly) *ly = world->light->ly;
+   if (lz) *lz = world->light->lz;
+   if (lr) *lr = world->light->lr;
+   if (lg) *lg = world->light->lg;
+   if (lb) *lb = world->light->lb;
+   if (ar) *ar = world->light->ar;
+   if (ag) *ag = world->light->ag;
+   if (ab) *ab = world->light->ab;
+
+   return EINA_TRUE;
+}
+
+EAPI void
+ephysics_world_light_unset(EPhysics_World *world)
+{
+   if (!world)
+     {
+	ERR("No world, can't unset light.");
+	return;
+     }
+
+   if (!world->light)
+     return;
+
+   free(world->light);
+   world->light = NULL;
+}
+
+EAPI void
+ephysics_world_light_all_bodies_set(EPhysics_World *world, Eina_Bool enable)
+{
+   if (!world)
+     {
+	ERR("No world, can't set light property.");
+	return;
+     }
+
+   if (!world->light)
+     {
+	ERR("Light isn't set, can't apply on bodies");
+	return;
+     }
+
+   world->light->all_bodies = !!enable;
+}
+
+EAPI Eina_Bool
+ephysics_world_light_all_bodies_get(const EPhysics_World *world)
+{
+   if (!world)
+     {
+	ERR("No world, can't get light property.");
+	return EINA_FALSE;
+     }
+
+   if (!world->light)
+     {
+	INF("Light isn't set, can't get light property");
+	return EINA_FALSE;
+     }
+
+   return world->light->all_bodies;
+}
+
 #ifdef  __cplusplus
 }
 #endif

Log:
ephysics: fix world structure coding style
  
  
  

Author:       bdilly
Date:         2012-10-10 13:32:29 -0700 (Wed, 10 Oct 2012)
New Revision: 77804
Trac:         http://trac.enlightenment.org/e/changeset/77804

Modified:
  trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-10 20:32:08 UTC (rev 77803)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-10 20:32:29 UTC (rev 77804)
@@ -49,13 +49,13 @@
 
 struct _EPhysics_World {
      EINA_INLIST;
-     btBroadphaseInterface* broadphase;
-     btDefaultCollisionConfiguration* collision;
-     btCollisionDispatcher* dispatcher;
-     btSequentialImpulseConstraintSolver* solver;
-     btSoftRigidDynamicsWorld* dynamics_world;
-     btSoftBodyWorldInfo* world_info;
-     btSoftBodySolver* soft_solver;
+     btBroadphaseInterface *broadphase;
+     btDefaultCollisionConfiguration *collision;
+     btCollisionDispatcher *dispatcher;
+     btSequentialImpulseConstraintSolver *solver;
+     btSoftRigidDynamicsWorld *dynamics_world;
+     btSoftBodyWorldInfo *world_info;
+     btSoftBodySolver *soft_solver;
      btOverlapFilterCallback *filter_cb;
 
      EPhysics_Body *boundaries[4];

Log:
ephysics: render 3d rotation
  
  
  

Author:       bdilly
Date:         2012-10-15 14:53:51 -0700 (Mon, 15 Oct 2012)
New Revision: 78009
Trac:         http://trac.enlightenment.org/e/changeset/78009

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-15 21:53:43 UTC (rev 78008)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-15 21:53:51 UTC (rev 78009)
@@ -879,7 +879,7 @@
 
    mx = (x + body->w * body->cm.x) / rate;
    my = (height - (y + body->h * body->cm.y)) / rate;
-   mz = z / rate;
+   mz = (z + body->d * body->cm.z) / rate;
 
    trans = _ephysics_body_transform_get(body);
    trans.setOrigin(btVector3(mx, my, mz));
@@ -1004,11 +1004,12 @@
 static void
 _ephysics_body_evas_object_default_update(EPhysics_Body *body)
 {
-   int x, y, w, h, wx, wy, wh, cx, cy;
+   int x, y, z, w, h, wx, wy, wh, cx, cy;
    EPhysics_Camera *camera;
    btTransform trans;
-   double rate, rot;
+   btQuaternion quat;
    Evas_Map *map;
+   double rate;
 
    if (!body->evas_obj)
      return;
@@ -1024,6 +1025,7 @@
    rate = ephysics_world_rate_get(body->world);
    x = (int) (trans.getOrigin().getX() * rate) - w * body->cm.x - cx;
    y = wh + wy - (int) (trans.getOrigin().getY() * rate) - h * body->cm.y - cy;
+   z = (int) (trans.getOrigin().getZ() * rate);
 
    evas_object_move(body->evas_obj, x, y);
 
@@ -1037,14 +1039,13 @@
    if (body->type != EPHYSICS_BODY_TYPE_RIGID)
      return;
 
-   rot = - trans.getRotation().getAngle() * RAD_TO_DEG *
-      trans.getRotation().getAxis().getZ();
-
    map = evas_map_new(4);
    evas_map_util_points_populate_from_object(map, body->evas_obj);
 
-   evas_map_util_rotate(map, rot, x + (w * body->cm.x), y +
-                        (h * body->cm.y));
+   quat = trans.getRotation();
+   quat.normalize();
+   evas_map_util_quat_rotate(map, quat.x(), quat.y(), quat.z(), -quat.w(),
+                             x + (w * body->cm.x), y + (h * body->cm.y), z);
 
    if ((body->light_apply) ||
        (ephysics_world_light_all_bodies_get(body->world)))

Log:
ephysics: implement rotation quartenion getter
  
  So it's possible to create a custom body update callback using
  it with evas_map_util_quat_rotate().
  
  

Author:       bdilly
Date:         2012-10-15 14:53:56 -0700 (Mon, 15 Oct 2012)
New Revision: 78010
Trac:         http://trac.enlightenment.org/e/changeset/78010

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-10-15 21:53:51 UTC (rev 78009)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-15 21:53:56 UTC (rev 78010)
@@ -2924,6 +2924,7 @@
  * @param rot_z The amount of degrees @p body is rotated on z axis.
  *
  * @see ephysics_body_rotation_set()
+ * @see ephysics_body_rotation_quaternion_get()
  *
  * @ingroup EPhysics_Body
  */
@@ -2951,6 +2952,24 @@
 
 /**
  * @brief
+ * Get body's normalized rotation quaternion (x, y, z and w).
+ *
+ * @param body The physics body.
+ * @param x the x component of the imaginary part of the quaternion.
+ * @param y the y component of the imaginary part of the quaternion.
+ * @param z the z component of the imaginary part of the quaternion.
+ * @param w the w component of the real part of the quaternion.
+ *
+ * @see ephysics_body_rotation_set()
+ * @see ephysics_body_rotation_get()
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void
+ephysics_body_rotation_quaternion_get(const EPhysics_Body *body, double *x, double *y, double *z, double *w);
+
+/**
+ * @brief
  * Set data to @p body.
  *
  * If a previous data was set, it's reference will be lost and body
@@ -3169,7 +3188,7 @@
  *
  * If a body of width = 30, height = 20 and depth = 20, and has the center of
  * mass at x component = 20, y component = 10 and z = 10, it will return
- * @p x = 0.666, @p y = 0.5 and @z = 0.5.
+ * @p x = 0.666, @p y = 0.5 and @p z = 0.5.
  *
  * For primitive shapes, like box and circle, the center of mass
  * is (0.5, 0.5, 0.5).

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-15 21:53:51 UTC (rev 78009)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-15 21:53:56 UTC (rev 78010)
@@ -2612,6 +2612,28 @@
 }
 
 EAPI void
+ephysics_body_rotation_quaternion_get(const EPhysics_Body *body, double *x, double *y, double *z, double *w)
+{
+   btTransform trans;
+   btQuaternion quat;
+
+   if (!body)
+     {
+        ERR("Can't get rotation, body is null.");
+        return;
+     }
+
+   trans = _ephysics_body_transform_get(body);
+   quat = trans.getRotation();
+   quat.normalize();
+
+   if (x) *x = quat.x();
+   if (y) *y = quat.y();
+   if (z) *z = quat.z();
+   if (w) *w = -quat.w();
+}
+
+EAPI void
 ephysics_body_data_set(EPhysics_Body *body, void *data)
 {
    if (!body)

Log:
ephysics: show default value of sleeping threshold on
   doc
  
  
  
  Patch by: Ricardo de Almeida Gonzaga <ricardo@...>
  
  

Author:       bdilly
Date:         2012-10-15 14:54:08 -0700 (Mon, 15 Oct 2012)
New Revision: 78012
Trac:         http://trac.enlightenment.org/e/changeset/78012

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-15 21:54:02 UTC (rev 78011)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-15 21:54:08 UTC (rev 78012)
@@ -2317,8 +2317,10 @@
  * is measured in degrees per second.
  *
  * @param body The body to be set.
- * @param linear_threshold The linear sleeping threshold factor.
- * @param angular_threshold The angular sleeping threshold factor.
+ * @param linear_threshold The linear sleeping threshold factor, default value
+ * is 24.
+ * @param angular_threshold The angular sleeping threshold factor, default value
+ * is 57.29 (1 rad).
  *
  * @see ephysics_body_sleeping_threshold_get().
  * @see ephysics_world_max_sleeping_time_set() for sleeping time details.

Log:
ephysics: fix boundaries position
  
  
  

Author:       bdilly
Date:         2012-10-15 14:54:22 -0700 (Mon, 15 Oct 2012)
New Revision: 78014
Trac:         http://trac.enlightenment.org/e/changeset/78014

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-15 21:54:14 UTC (rev 78013)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-15 21:54:22 UTC (rev 78014)
@@ -1772,15 +1772,15 @@
 
    right = ephysics_world_boundary_get(world, EPHYSICS_WORLD_BOUNDARY_RIGHT);
    if (right)
-     ephysics_body_geometry_set(right, x + width, 0, -5, 10, y + height, 10);
+     ephysics_body_geometry_set(right, x + width, y, -5, 10, height, 10);
 
    left = ephysics_world_boundary_get(world, EPHYSICS_WORLD_BOUNDARY_LEFT);
    if (left)
-     ephysics_body_geometry_set(left,  x - 10, 0, -5, 10, y + height, 10);
+     ephysics_body_geometry_set(left,  x - 10, y, -5, 10, height, 10);
 
    top = ephysics_world_boundary_get(world, EPHYSICS_WORLD_BOUNDARY_TOP);
    if (top)
-     ephysics_body_geometry_set(top, 0, y - 10, -5, x + width, 10, 10);
+     ephysics_body_geometry_set(top, x, y - 10, -5, width, 10, 10);
 }
 
 static EPhysics_Body *
@@ -1817,7 +1817,7 @@
 
    ephysics_world_render_geometry_get(world, &x, &y, &w, NULL);
    body =  _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_TOP,
-                                       0, y - 10, x + w, 10);
+                                       x, y - 10, w, 10);
    return body;
 }
 
@@ -1841,7 +1841,7 @@
 
    ephysics_world_render_geometry_get(world, &x, &y, NULL, &h);
    body = _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_LEFT,
-                                      x - 10, 0, 10, y + h);
+                                      x - 10, y, 10, h);
    return body;
 }
 
@@ -1853,7 +1853,7 @@
 
    ephysics_world_render_geometry_get(world, &x, &y, &w, &h);
    body = _ephysics_body_boundary_add(world, EPHYSICS_WORLD_BOUNDARY_RIGHT,
-                                      x + w, 0, 10, y + h);
+                                      x + w, y, 10, h);
    return body;
 }

Log:
ephysics: add autodel functions for front and back of
   the scene
  
  
  

Author:       bdilly
Date:         2012-10-15 14:54:35 -0700 (Mon, 15 Oct 2012)
New Revision: 78016
Trac:         http://trac.enlightenment.org/e/changeset/78016

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-10-15 21:54:29 UTC (rev 78015)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-15 21:54:35 UTC (rev 78016)
@@ -1033,6 +1033,8 @@
  * @see ephysics_world_bodies_outside_bottom_autodel_set().
  * @see ephysics_world_bodies_outside_left_autodel_set().
  * @see ephysics_world_bodies_outside_right_autodel_set().
+ * @see ephysics_world_bodies_outside_front_autodel_set().
+ * @see ephysics_world_bodies_outside_back_autodel_set().
  *
  * @ingroup EPhysics_World
  */
@@ -1066,6 +1068,8 @@
  * @see ephysics_world_bodies_outside_bottom_autodel_get().
  * @see ephysics_world_bodies_outside_left_autodel_set().
  * @see ephysics_world_bodies_outside_right_autodel_set().
+ * @see ephysics_world_bodies_outside_front_autodel_set().
+ * @see ephysics_world_bodies_outside_back_autodel_set().
  *
  * @ingroup EPhysics_World
  */
@@ -1099,6 +1103,8 @@
  * @see ephysics_world_bodies_outside_right_autodel_get().
  * @see ephysics_world_bodies_outside_bottom_autodel_set().
  * @see ephysics_world_bodies_outside_left_autodel_set().
+ * @see ephysics_world_bodies_outside_front_autodel_set().
+ * @see ephysics_world_bodies_outside_back_autodel_set().
  *
  * @ingroup EPhysics_World
  */
@@ -1132,6 +1138,8 @@
  * @see ephysics_world_bodies_outside_left_autodel_get().
  * @see ephysics_world_bodies_outside_bottom_autodel_set().
  * @see ephysics_world_bodies_outside_right_autodel_set().
+ * @see ephysics_world_bodies_outside_front_autodel_set().
+ * @see ephysics_world_bodies_outside_back_autodel_set().
  *
  * @ingroup EPhysics_World
  */
@@ -1154,6 +1162,76 @@
 
 /**
  * @brief
+ * Set world autodeleting bodies mode when they're outside of render area
+ * by the front.
+ *
+ * @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().
+ * @see ephysics_world_bodies_outside_front_autodel_set().
+ * @see ephysics_world_bodies_outside_back_autodel_set().
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI void ephysics_world_bodies_outside_front_autodel_set(EPhysics_World *world, Eina_Bool autodel);
+
+/**
+ * @brief
+ * Get world autodeleting bodies mode when they're outside of render area by
+ * the front.
+ *
+ * @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_front_autodel_set() for details.
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI Eina_Bool ephysics_world_bodies_outside_front_autodel_get(const EPhysics_World *world);
+
+/**
+ * @brief
+ * Set world autodeleting bodies mode when they're outside of render area
+ * by the back.
+ *
+ * @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().
+ * @see ephysics_world_bodies_outside_front_autodel_set().
+ * @see ephysics_world_bodies_outside_back_autodel_set().
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI void ephysics_world_bodies_outside_back_autodel_set(EPhysics_World *world, Eina_Bool autodel);
+
+/**
+ * @brief
+ * Get world autodeleting bodies mode when they're outside of render area by
+ * the back.
+ *
+ * @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_back_autodel_set() for details.
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI Eina_Bool ephysics_world_bodies_outside_back_autodel_get(const EPhysics_World *world);
+
+/**
+ * @brief
  * Set world simulation's fixed time step and max number of sub steps
  * configuration.
  *

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-15 21:54:29 UTC (rev 78015)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-15 21:54:35 UTC (rev 78016)
@@ -1071,11 +1071,11 @@
 static void
 _ephysics_body_outside_render_area_check(EPhysics_Body *body)
 {
-   int wx, wy, ww, wh, bx, by, bw, bh;
+   int wx, wy, wz, ww, wh, wd, bx, by, bz, bw, bh, bd;
 
-   ephysics_world_render_geometry_get(body->world, &wx, &wy, NULL,
-                                      &ww, &wh, NULL);
-   ephysics_body_geometry_get(body, &bx, &by, NULL, &bw, &bh, NULL);
+   ephysics_world_render_geometry_get(body->world, &wx, &wy, &wz,
+                                      &ww, &wh, &wd);
+   ephysics_body_geometry_get(body, &bx, &by, &bz, &bw, &bh, &bd);
 
    // FIXME: check what should be done regarding rotated bodies
    if (((ephysics_world_bodies_outside_top_autodel_get(body->world)) &&
@@ -1085,7 +1085,11 @@
        ((ephysics_world_bodies_outside_left_autodel_get(body->world)) &&
         (bx + bh < wx)) ||
        ((ephysics_world_bodies_outside_right_autodel_get(body->world)) &&
-        (bx > wx + ww)))
+        (bx > wx + ww)) ||
+       ((ephysics_world_bodies_outside_front_autodel_get(body->world)) &&
+        (bz + bd < wz)) ||
+       ((ephysics_world_bodies_outside_back_autodel_get(body->world)) &&
+        (bz > wz + wd)))
      {
         DBG("Body %p out of render area", body);
         ephysics_body_del(body);

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-15 21:54:29 UTC (rev 78015)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-15 21:54:35 UTC (rev 78016)
@@ -97,6 +97,8 @@
      Eina_Bool outside_bottom:1;
      Eina_Bool outside_left:1;
      Eina_Bool outside_right:1;
+     Eina_Bool outside_front:1;
+     Eina_Bool outside_back:1;
      Eina_Bool pending_simulation:1;
 };
 
@@ -1284,7 +1286,8 @@
 
    world->outside_top = !!autodel;
    world->outside_autodel = world->outside_top || world->outside_bottom ||
-      world->outside_left || world->outside_right;
+      world->outside_left || world->outside_right ||
+      world->outside_front || world->outside_back;
 }
 
 EAPI Eina_Bool
@@ -1310,7 +1313,8 @@
 
    world->outside_bottom = !!autodel;
    world->outside_autodel = world->outside_top || world->outside_bottom ||
-      world->outside_left || world->outside_right;
+      world->outside_left || world->outside_right ||
+      world->outside_front || world->outside_back;
 }
 
 EAPI Eina_Bool
@@ -1336,7 +1340,8 @@
 
    world->outside_left = !!autodel;
    world->outside_autodel = world->outside_top || world->outside_bottom ||
-      world->outside_left || world->outside_right;
+      world->outside_left || world->outside_right ||
+      world->outside_front || world->outside_back;
 }
 
 EAPI Eina_Bool
@@ -1362,7 +1367,8 @@
 
    world->outside_right = !!autodel;
    world->outside_autodel = world->outside_top || world->outside_bottom ||
-      world->outside_left || world->outside_right;
+      world->outside_left || world->outside_right ||
+      world->outside_front || world->outside_back;
 }
 
 EAPI Eina_Bool
@@ -1377,7 +1383,61 @@
    return world->outside_right;
 }
 
+EAPI void
+ephysics_world_bodies_outside_front_autodel_set(EPhysics_World *world, Eina_Bool autodel)
+{
+   if (!world)
+     {
+        ERR("Can't set autodelete mode, world is null.");
+        return;
+     }
+
+   world->outside_front = !!autodel;
+   world->outside_autodel = world->outside_top || world->outside_bottom ||
+      world->outside_left || world->outside_right ||
+      world->outside_front || world->outside_back;
+}
+
 EAPI Eina_Bool
+ephysics_world_bodies_outside_front_autodel_get(const EPhysics_World *world)
+{
+   if (!world)
+     {
+        ERR("Can't get autodelete mode, world is null.");
+        return EINA_FALSE;
+     }
+
+   return world->outside_front;
+}
+
+EAPI void
+ephysics_world_bodies_outside_back_autodel_set(EPhysics_World *world, Eina_Bool autodel)
+{
+   if (!world)
+     {
+        ERR("Can't set autodelete mode, world is null.");
+        return;
+     }
+
+   world->outside_back = !!autodel;
+   world->outside_autodel = world->outside_top || world->outside_bottom ||
+      world->outside_left || world->outside_right ||
+      world->outside_front || world->outside_back;
+}
+
+EAPI Eina_Bool
+ephysics_world_bodies_outside_back_autodel_get(const EPhysics_World *world)
+{
+   if (!world)
+     {
+        ERR("Can't get autodelete mode, world is null.");
+        return EINA_FALSE;
+     }
+
+   return world->outside_back;
+}
+
+EAPI Eina_Bool
 ephysics_world_bodies_outside_autodel_get(const EPhysics_World *world)
 {
    if (!world)

Log:
ephysics: remove annoying debug info
  
  Since it's very frequent to not have light set.
  
  

Author:       bdilly
Date:         2012-10-16 16:12:08 -0700 (Tue, 16 Oct 2012)
New Revision: 78081
Trac:         http://trac.enlightenment.org/e/changeset/78081

Modified:
  trunk/ephysics/src/lib/ephysics_world.cpp 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-16 23:12:03 UTC (rev 78080)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-16 23:12:08 UTC (rev 78081)
@@ -1612,10 +1612,7 @@
      }
 
    if (!world->light)
-     {
-	INF("Light isn't set, can't get light property");
-	return EINA_FALSE;
-     }
+     return EINA_FALSE;
 
    return world->light->all_bodies;
 }

Log:
EPhysics: triangle API
  
  This patch introduces soft body's mesh triangle manipulation, for picking
  the triangle of a body in X and Y and moving it as well.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-16 16:12:47 -0700 (Tue, 16 Oct 2012)
New Revision: 78088
Trac:         http://trac.enlightenment.org/e/changeset/78088

Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-16 23:12:40 UTC (rev 78087)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-16 23:12:47 UTC (rev 78088)
@@ -1764,6 +1764,42 @@
 
 /**
  * @brief
+ * Get the triangle index of a soft body in @p x and @p y.
+ *
+ * Given a point in @p x and @p y a ray cast is performed and if a triangle is
+ * found its index is returned.
+ *
+ * @param body The body to get the triangle index from.
+ * @param x The x coord.
+ * @param y The y coord.
+ * @return -1 If no triangle is found, a triangle index otherwise.
+ *
+ * @see ephysics_body_soft_body_triangle_move().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI int ephysics_body_soft_body_triangle_index_get(EPhysics_Body *body, Evas_Coord x, Evas_Coord y);
+
+/**
+ * @brief
+ * Move a body's triangle.
+ *
+ * Move the triangle of @p idx of @p body to @p x, @p y and @p z.
+ *
+ * @param body The body of interest.
+ * @param idx The triangle index.
+ * @param x The x coordinate.
+ * @param y The y coordinate.
+ * @param z The z coordinate.
+ *
+ * @see ephysics_body_soft_body_triangle_index_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_soft_body_triangle_move(EPhysics_Body *body, int idx, Evas_Coord x, Evas_Coord y, Evas_Coord z);
+
+/**
+ * @brief
  * Create a new circle physics body.
  *
  * Its collision shape will be a circle of diameter 1. To change it's size
@@ -1875,15 +1911,15 @@
  * example passing @p granularity of 20 will create a cloth with 20 rows and 20
  * columns.
  *
- * By default EPhysics creates a cloth with 10 rows and 10 columns, these
+ * By default EPhysics creates a cloth with 15 rows and 15 columns, these
  * default values will generally fit the most common scenarios.
  *
- * If the informed @p granularity is of 0 then the default value - of 10 - is
+ * If the informed @p granularity is of 0 then the default value - of 15 - is
  * assumed.
  *
  * @param world The world this body will belong to.
  * @param granularity Define - proportionally - the number of rows and columns,
- * if 0 the default value - of 10 - is assumed.
+ * if 0 the default value - of 15 - is assumed.
  * @return a bew body or @c NULL on erros.
  *
  * @see ephysics_body_del().

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-16 23:12:40 UTC (rev 78087)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-16 23:12:47 UTC (rev 78088)
@@ -3,6 +3,7 @@
 #endif
 
 #include <Evas.h>
+#include <Ecore.h>
 #include <BulletCollision/CollisionShapes/btShapeHull.h>
 #include <LinearMath/btGeometryUtil.h>
 
@@ -37,7 +38,7 @@
 {
      int index;
      Evas_Object *evas_obj;
-     int stacking;
+     double stacking;
 } EPhysics_Body_Soft_Body_Slice;
 
 static const Evas_Smart_Cb_Description _smart_callbacks[] =
@@ -781,9 +782,9 @@
                }
           }
      }
-
    soft_body->generateClusters(0);
-   soft_body->generateBendingConstraints(2, soft_body->m_materials[0]);
+   soft_body->generateBendingConstraints(2, soft_body->m_materials[
+                                                          body->material_index]);
 }
 
 static void
@@ -804,7 +805,8 @@
      }
 
    soft_body->generateClusters(0);
-   soft_body->generateBendingConstraints(10, soft_body->m_materials[0]);
+   soft_body->generateBendingConstraints(10, soft_body->m_materials[
+                                                          body->material_index]);
 }
 
 inline static double
@@ -1225,11 +1227,12 @@
 static void
 _ephysics_body_soft_body_hardness_set(EPhysics_Body *body, double hardness)
 {
+   int m = body->material_index;
    btSoftBody *soft_body = body->soft_body;
    soft_body->m_cfg.kAHR = (hardness / body->anchor_prop) * 0.6;
-   soft_body->m_materials[0]->m_kVST = (hardness / 1000);
-   soft_body->m_materials[0]->m_kLST = (hardness / 1000);
-   soft_body->m_materials[0]->m_kAST = (hardness / 1000);
+   soft_body->m_materials[m]->m_kVST = (hardness / 1000);
+   soft_body->m_materials[m]->m_kLST = (hardness / 1000);
+   soft_body->m_materials[m]->m_kAST = (hardness / 1000);
    DBG("Soft body %p hardness set to %lf.", body, hardness);
 }
 
@@ -1274,7 +1277,7 @@
         return 0;
      }
 
-   return (body->soft_body->m_materials[0]->m_kVST * 100);
+   return (body->soft_body->m_materials[body->material_index]->m_kVST * 100);
 }
 
 static void
@@ -1287,7 +1290,6 @@
 
    body->soft_body->m_cfg.collisions += btSoftBody::fCollision::SDF_RS;
    body->soft_body->m_cfg.collisions += btSoftBody::fCollision::VF_SS;
-
    _ephysics_body_soft_body_hardness_set(body, 100);
 }
 
@@ -1306,6 +1308,7 @@
         return NULL;
      }
 
+   body->material_index = 0;
    body->anchor_prop = 1000;
    body->type = EPHYSICS_BODY_TYPE_SOFT;
    _ephysics_body_soft_body_default_config(body, soft_body);
@@ -1413,8 +1416,8 @@
    EPhysics_Body *body;
    btSoftBodyWorldInfo *world_info;
    btSoftBody *soft_body;
-   const int rows = (!granularity) ? 10 : granularity;
-   const int columns = (!granularity) ? 10 : granularity;
+   const int rows = (!granularity) ? 15 : granularity;
+   const int columns = (!granularity) ? 15 : granularity;
 
    if (!world)
      {
@@ -1424,10 +1427,10 @@
 
    world_info = ephysics_world_info_get(world);
    soft_body = btSoftBodyHelpers::CreatePatch(*world_info,
-                                              btVector3(1, 2, 0.5),
-                                              btVector3(1, 1, 0.5),
-                                              btVector3(2, 2, 0.5),
-                                              btVector3(2, 1, 0.5),
+                                              btVector3(1, 2, 0),
+                                              btVector3(1, 1, 0),
+                                              btVector3(2, 2, 0),
+                                              btVector3(2, 1, 0),
                                               rows, columns, 0, false);
    if (!soft_body)
      {
@@ -1439,8 +1442,13 @@
    if (!body)
      goto no_body;
 
+   soft_body->setPose(false, true);
+
+   soft_body->appendMaterial();
+   body->material_index = 1;
+   soft_body->m_cfg.piterations = 5;
+
    _ephysics_body_soft_body_default_config(body, soft_body);
-   soft_body->m_cfg.piterations = 10;
    _ephysics_body_cloth_constraints_rebuild(body);
 
    body->slices = soft_body->m_faces.size();
@@ -1456,7 +1464,7 @@
 
    body->cloth_columns = columns;
    body->cloth_rows = rows;
-   body->anchor_prop = 100;
+   body->anchor_prop = 1;
    body->type = EPHYSICS_BODY_TYPE_CLOTH;
 
    ephysics_world_soft_body_add(world, body);
@@ -1469,6 +1477,118 @@
    return NULL;
 }
 
+static void
+_ephysics_body_soft_body_single_face_transform(btSoftBody *soft_body, int face_idx, int node_idx, btTransform trans, btScalar vel_reduction)
+{
+   btSoftBody::Node *node;
+   ATTRIBUTE_ALIGNED16(btDbvtVolume) vol;
+   const btScalar margin = soft_body->getCollisionShape()->getMargin();
+
+   node = soft_body->m_faces[face_idx].m_n[node_idx];
+   node->m_x = trans * node->m_x;
+   node->m_q = trans * node->m_q;
+   node->m_n = trans.getBasis() * node->m_n;
+   node->m_v *= vel_reduction;
+   vol = btDbvtVolume::FromCR(node->m_x, margin);
+   soft_body->m_ndbvt.update(node->m_leaf, vol);
+}
+
+EAPI void
+ephysics_body_soft_body_triangle_move(EPhysics_Body *body, int idx, Evas_Coord x, Evas_Coord y, Evas_Coord z)
+{
+   btScalar xx, yy, zz;
+   Evas_Coord wh;
+   double rate;
+   btVector3 new_pos;
+   btTransform diff;
+   btSoftBody::Face face;
+   btSoftBody::Node *node;
+
+   if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+     {
+        ERR("Could not move soft body triangle, body must be soft or cloth.");
+        return;
+     }
+
+   if (idx < 0 || idx >= body->soft_body->m_faces.size())
+     {
+        ERR("Could not move soft body triangle, provided body triangle index "
+            "ranges from 0 to %d", body->soft_body->m_faces.size());
+        return;
+     }
+
+   rate = ephysics_world_rate_get(body->world);
+   ephysics_world_render_geometry_get(body->world, NULL, NULL, NULL, &wh);
+
+   xx = x / rate;
+   yy = (wh -  y) / rate;
+   zz = z / rate;
+
+   new_pos = btVector3(xx, yy, zz);
+   ephysics_world_lock_take(body->world);
+
+   face = body->soft_body->m_faces[idx];
+   for (int i = 0; i < 3; i++)
+     {
+        node = face.m_n[i];
+        diff.setIdentity();
+        diff.setOrigin(new_pos - node->m_x);
+        _ephysics_body_soft_body_single_face_transform(body->soft_body, idx, i,
+                                                       diff, 0.25);
+
+        if (!i) continue;
+
+        diff.setOrigin(diff.getOrigin() * 0.1);
+        for (int m = 0; m < body->soft_body->m_faces.size(); m++)
+          {
+             if (m == idx) continue;
+             _ephysics_body_soft_body_single_face_transform(body->soft_body, m,
+                                                            i, diff, 0.05);
+          }
+     }
+
+   body->soft_body->updateClusters();
+   body->soft_body->updateBounds();
+   body->soft_body->updateNormals();
+   body->soft_body->updatePose();
+   ephysics_world_lock_release(body->world);
+}
+
+EAPI int
+ephysics_body_soft_body_triangle_index_get(EPhysics_Body *body, Evas_Coord x, Evas_Coord y)
+{
+   btVector3 ray_from;
+   btVector3 ray_to;
+   btSoftBody::sRayCast result;
+   Evas_Coord wh, bw;
+   btScalar xx, yy;
+   double rate;
+   int index = -1;
+
+   if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+     {
+        ERR("Can't get node index, operation not permited to rigid bodies");
+        return -1;
+     }
+
+   ephysics_world_lock_take(body->world);
+   rate = ephysics_world_rate_get(body->world);
+   ephysics_world_render_geometry_get(body->world, NULL, NULL, NULL, &wh);
+   ephysics_body_geometry_get(body, NULL, NULL, NULL, &bw, NULL, NULL);
+
+   xx =  x / rate;
+   yy = (wh -  y) / rate;
+
+   ray_from = btVector3(xx, yy, -100);
+   ray_to = btVector3(xx, yy, 100);
+
+   if (body->soft_body->rayTest(ray_from, ray_to, result))
+     index = result.index;
+   ephysics_world_lock_release(body->world);
+
+   return index;
+}
+
 EAPI EPhysics_Body *
 ephysics_body_soft_circle_add(EPhysics_World *world)
 {

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-16 23:12:40 UTC (rev 78087)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-16 23:12:47 UTC (rev 78088)
@@ -115,6 +115,7 @@
      Eina_Bool active:1;
      Eina_Bool deleted:1;
      Eina_Bool light_apply:1;
+     int material_index;
 };
 
 extern int _ephysics_log_dom;

Log:
EPhysics: get rid of soft body smart object
  
  Since we want to restack all the bodies evas objects against each other,
  being it a soft body or not, we can't have the soft body slices member
  of something else.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-16 16:12:59 -0700 (Tue, 16 Oct 2012)
New Revision: 78090
Trac:         http://trac.enlightenment.org/e/changeset/78090

Modified:
  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_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-16 23:12:53 UTC (rev 78089)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-16 23:12:59 UTC (rev 78090)
@@ -17,6 +17,8 @@
 extern "C" {
 #endif
 
+#define SOFT_DATA "soft_data"
+
 typedef struct _EPhysics_Body_Callback EPhysics_Body_Callback;
 
 struct _EPhysics_Body_Callback {
@@ -34,77 +36,50 @@
      Evas_Coord z;
 };
 
+typedef struct _EPhysics_Body_Evas_Stacking {
+     Evas_Object *evas;
+     float stacking;
+} EPhysics_Body_Evas_Stacking;
+
 typedef struct _EPhysics_Body_Soft_Body_Slice
 {
      int index;
      Evas_Object *evas_obj;
-     double stacking;
+     float stacking;
 } EPhysics_Body_Soft_Body_Slice;
 
-static const Evas_Smart_Cb_Description _smart_callbacks[] =
+typedef struct _EPhysics_Body_Soft_Body_Data
 {
-   {"children,changed", "i"},
-   {NULL, NULL}
-};
-
-typedef struct _EPhysics_Body_Soft_Body_Smart_Data
-{
-   Evas_Object_Smart_Clipped_Data base;
    Evas_Object *base_obj;
    EPhysics_Body *body;
    Eina_List *slices;
-} EPhysics_Body_Soft_Body_Smart_Data;
+} EPhysics_Body_Soft_Body_Data;
 
-#define SMART_CLASS_NAME "EPhysics_Body_Soft_Body"
-
-#define EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(o, ptr)                  \
-  ptr = (EPhysics_Body_Soft_Body_Smart_Data *) evas_object_smart_data_get(o) \
-
-EVAS_SMART_SUBCLASS_NEW(SMART_CLASS_NAME,
-			_ephysics_body_soft_body_evas, Evas_Smart_Class,
-			Evas_Smart_Class, evas_object_smart_clipped_class_get,
-                        _smart_callbacks);
-
-static int
-_ephysics_body_soft_body_slice_stacking_sort_cb(const void *d1, const void *d2)
-{
-   const EPhysics_Body_Soft_Body_Slice *slice1, *slice2;
-
-   slice1 = (const EPhysics_Body_Soft_Body_Slice *)d1;
-   slice2 = (const EPhysics_Body_Soft_Body_Slice *)d2;
-
-   if (!slice1) return 1;
-   if (!slice2) return -1;
-
-   if (slice1->stacking < slice2->stacking) return -1;
-   if (slice2->stacking > slice2->stacking) return 1;
-
-   return 0;
-}
-
 static void
-_ephysics_body_soft_body_slices_apply(Evas_Object *obj)
+_ephysics_body_soft_body_slices_apply(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    double rate;
-   void *data;
+   void *list_data;
    Eina_List *l;
-   Evas_Coord x, y, h, wy, wh, y0, y1, y2, x0, x1, x2, z0, z1, z2;
+   Evas_Coord x, y, h, wy, wh, y0, y1, y2, x0, x1, x2, z0, z1, z2, bw, bh;
    Evas_Map *map;
    btVector3 p0, p1, p2;
    btSoftBody::tFaceArray faces;
    EPhysics_Body_Soft_Body_Slice *slice;
-   EPhysics_Body_Soft_Body_Smart_Data *smart_data;
+   EPhysics_Body_Soft_Body_Data *soft_data;
    EPhysics_Body *body;
-   Evas_Object *prev_obj = NULL;
+   btVector3 b0, b1;
 
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, smart_data);
-   body = smart_data->body;
+   soft_data = (EPhysics_Body_Soft_Body_Data *)evas_object_data_get(obj,
+                                                                    SOFT_DATA);
+   body = soft_data->body;
    rate = ephysics_world_rate_get(body->world);
-   ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL,
-                                      NULL, &wh, NULL);
-   EINA_LIST_FOREACH(smart_data->slices, l, data)
+
+   ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
+                                      NULL);
+   EINA_LIST_FOREACH(soft_data->slices, l, list_data)
      {
-        slice = (EPhysics_Body_Soft_Body_Slice *)data;
+        slice = (EPhysics_Body_Soft_Body_Slice *)list_data;
         evas_object_geometry_get(slice->evas_obj, &x, &y, NULL, &h);
 
         faces = body->soft_body->m_faces;
@@ -142,21 +117,14 @@
         evas_object_show(slice->evas_obj);
      }
 
-   smart_data->slices = eina_list_sort(smart_data->slices,
-                                eina_list_count(smart_data->slices),
-                                _ephysics_body_soft_body_slice_stacking_sort_cb);
+   b0 = body->soft_body->m_bounds[0];
+   b1 = body->soft_body->m_bounds[1];
 
-   EINA_LIST_FOREACH(smart_data->slices, l, data)
-     {
-        slice = (EPhysics_Body_Soft_Body_Slice *)data;
+   bh = (b1.y() - b0.y()) * rate;
+   bw = (b1.x() - b0.x()) * rate;
 
-        if (!prev_obj)
-          evas_object_lower(slice->evas_obj);
-        else
-          evas_object_stack_above(slice->evas_obj, prev_obj);
-
-        prev_obj = slice->evas_obj;
-     }
+   body->rebounding = EINA_TRUE;
+   evas_object_resize(obj, bw, bh);
 }
 
 static EPhysics_Body_Soft_Body_Slice *
@@ -164,6 +132,8 @@
 {
    EPhysics_Body_Soft_Body_Slice *slice;
 
+   if (!evas_obj) return NULL;
+
    slice = (EPhysics_Body_Soft_Body_Slice *)malloc(
                                           sizeof(EPhysics_Body_Soft_Body_Slice));
    if (!slice)
@@ -178,21 +148,20 @@
 }
 
 static Eina_Bool
-_ephysics_body_soft_body_slices_init(EPhysics_Body *body, Evas_Object *obj)
+_ephysics_body_soft_body_slices_init(EPhysics_Body *body, EPhysics_Body_Soft_Body_Data *soft_data)
 {
    double rate;
    Evas_Coord x, y, w, h, wy, wh, y0, y1, y2, x0, x1, x2, z0, z1, z2;
    Evas_Map *map;
    Evas *evas;
-   EPhysics_Body_Soft_Body_Smart_Data *smart_data;
    btSoftBody::tFaceArray faces;
    EPhysics_Body_Soft_Body_Slice *slice;
    btVector3 p0, p1, p2;
 
    evas = evas_object_evas_get(body->evas_obj);
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, smart_data);
-   ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL,
-                                      &wh, NULL);
+
+   ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
+                                      NULL);
    rate = ephysics_world_rate_get(body->world);
 
    for (int i = 0; i < body->slices; i++)
@@ -200,12 +169,11 @@
         slice = _ephysics_body_soft_body_slice_new(body->points_deform[i],
                                              evas_object_image_filled_add(evas));
 
-        if (!slice)
-          return EINA_FALSE;
+        if (!slice) return EINA_FALSE;
 
-        evas_object_image_source_set(slice->evas_obj, smart_data->base_obj);
+        evas_object_image_source_set(slice->evas_obj, soft_data->base_obj);
 
-        evas_object_geometry_get(smart_data->base_obj, &x, &y, &w, &h);
+        evas_object_geometry_get(soft_data->base_obj, &x, &y, &w, &h);
         evas_object_resize(slice->evas_obj, w, h);
         evas_object_move(slice->evas_obj, x, y);
         evas_object_show(slice->evas_obj);
@@ -244,168 +212,79 @@
         evas_object_map_enable_set(slice->evas_obj, EINA_TRUE);
         evas_map_free(map);
 
-        smart_data->slices = eina_list_append(smart_data->slices, slice);
-        evas_object_smart_member_add(slice->evas_obj, obj);
+        soft_data->slices = eina_list_append(soft_data->slices, slice);
      }
 
    return EINA_TRUE;
 }
 
 static void
-_ephysics_body_soft_body_evas_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+_ephysics_body_soft_body_evas_del_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
-   EPhysics_Body_Soft_Body_Smart_Data *smart_data;
-   Eina_List *l;
-   void *data;
+   EPhysics_Body_Soft_Body_Data *soft_data;
+   void *slice;
 
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, smart_data);
-   EINA_LIST_FOREACH(smart_data->slices, l, data)
-     {
-        EPhysics_Body_Soft_Body_Slice *slice;
+   soft_data = (EPhysics_Body_Soft_Body_Data *)evas_object_data_del(obj,
+                                                                    SOFT_DATA);
 
-        slice = (EPhysics_Body_Soft_Body_Slice *)data;
-        evas_object_move(slice->evas_obj, x, y);
-     }
-   _ephysics_body_soft_body_slices_apply(obj);
-}
-
-static void
-_ephysics_body_soft_body_evas_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
-{
-   EPhysics_Body_Soft_Body_Smart_Data *smart_data;
-   Eina_List *l;
-   void *data;
-
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, smart_data);
-   EINA_LIST_FOREACH(smart_data->slices, l, data)
-     {
-        EPhysics_Body_Soft_Body_Slice *slice;
-
-        slice = (EPhysics_Body_Soft_Body_Slice *)data;
-        evas_object_resize(slice->evas_obj, w, h);
-     }
-   _ephysics_body_soft_body_slices_apply(obj);
-}
-
-static void
-_ephysics_body_soft_body_evas_smart_hide(Evas_Object *obj)
-{
-   EPhysics_Body_Soft_Body_Smart_Data *smart_data;
-
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, smart_data);
-   evas_object_hide(smart_data->base_obj);
-}
-
-static void
-_ephysics_body_soft_body_evas_smart_show(Evas_Object *obj)
-{
-   EPhysics_Body_Soft_Body_Smart_Data *smart_data;
-
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, smart_data);
-   evas_object_show(smart_data->base_obj);
-}
-
-static void
-_ephysics_body_soft_body_evas_smart_del(Evas_Object *obj)
-{
-   EPhysics_Body_Soft_Body_Smart_Data *smart_data;
-   void *data;
-
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, smart_data);
-   EINA_LIST_FREE(smart_data->slices, data)
-     {
-        EPhysics_Body_Soft_Body_Slice *slice;
-
-        slice = (EPhysics_Body_Soft_Body_Slice *)data;
-        evas_object_del(slice->evas_obj);
+   evas_object_del(soft_data->base_obj);
+   EINA_LIST_FREE(soft_data->slices, slice)
         free(slice);
-     }
-   _ephysics_body_soft_body_evas_parent_sc->del(obj);
-}
 
-static void
-_ephysics_body_soft_body_evas_smart_calculate(Evas_Object *obj)
-{
-   EPhysics_Body_Soft_Body_Smart_Data *smart_data;
-   Evas_Coord x, y, w, h;
-   Eina_List *l;
-   void *data;
-
-   evas_object_geometry_get(obj, &x, &y, &w, &h);
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, smart_data);
-   EINA_LIST_FOREACH(smart_data->slices, l, data)
-     {
-        EPhysics_Body_Soft_Body_Slice *slice;
-
-        slice = (EPhysics_Body_Soft_Body_Slice *)data;
-        evas_object_move(slice->evas_obj, x, y);
-        evas_object_resize(slice->evas_obj, w, h);
-     }
+   free(soft_data);
 }
 
-static void
-_ephysics_body_soft_body_evas_smart_add(Evas_Object *obj)
-{
-   EPhysics_Body_Soft_Body_Smart_Data *priv;
-
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, priv);
-   if (!priv) {
-      priv = (EPhysics_Body_Soft_Body_Smart_Data *)calloc(1,
-                                     sizeof(EPhysics_Body_Soft_Body_Smart_Data));
-      if (!priv) return;
-      evas_object_smart_data_set(obj, priv);
-   }
-
-   _ephysics_body_soft_body_evas_parent_sc->add(obj);
-}
-
-static void
-_ephysics_body_soft_body_evas_smart_set_user(Evas_Smart_Class *sc)
-{
-   sc->add = _ephysics_body_soft_body_evas_smart_add;
-   sc->move = _ephysics_body_soft_body_evas_smart_move;
-   sc->del = _ephysics_body_soft_body_evas_smart_del;
-   sc->resize = _ephysics_body_soft_body_evas_smart_resize;
-   sc->hide = _ephysics_body_soft_body_evas_smart_hide;
-   sc->show = _ephysics_body_soft_body_evas_smart_show;
-   sc->calculate = _ephysics_body_soft_body_evas_smart_calculate;
-}
-
 static Evas_Object *
 _ephysics_body_soft_body_evas_add(EPhysics_Body *body)
 {
-   EPhysics_Body_Soft_Body_Smart_Data *priv;
-   Evas *evas;
    Evas_Object *obj;
    Evas_Coord x, y, w, h;
+   EPhysics_Body_Soft_Body_Data *soft_data;
 
-   evas = evas_object_evas_get(body->evas_obj);
-   obj = evas_object_smart_add(evas,
-                               _ephysics_body_soft_body_evas_smart_class_new());
+   soft_data = (EPhysics_Body_Soft_Body_Data *)malloc(
+                                           sizeof(EPhysics_Body_Soft_Body_Data));
+   if (!soft_data)
+     {
+        ERR("Could not allocate soft body data struct.");
+        return NULL;
+     }
 
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, priv);
-   priv->base_obj = body->evas_obj;
-   priv->body = body;
+   soft_data->body = body;
+   soft_data->slices = NULL;
+   soft_data->base_obj = body->evas_obj;
 
+   if (!_ephysics_body_soft_body_slices_init(body, soft_data))
+     goto error;
+
    evas_object_geometry_get(body->evas_obj, &x, &y, &w, &h);
+   evas_object_move(body->evas_obj, 0, -h);
+
+   obj = evas_object_rectangle_add(evas_object_evas_get(body->evas_obj));
+   evas_object_color_set(obj, 0, 0, 0, 0);
    evas_object_move(obj, x, y);
    evas_object_resize(obj, w, h);
    evas_object_show(obj);
+   evas_object_data_set(obj, SOFT_DATA, soft_data);
 
-   if(!_ephysics_body_soft_body_slices_init(body, obj))
-     return NULL;
-
-   evas_object_move(priv->base_obj, 0, -h);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE,
+                                  _ephysics_body_soft_body_slices_apply, NULL);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
+                                  _ephysics_body_soft_body_evas_del_cb, NULL);
    return obj;
+
+ error:
+   free(soft_data);
+   return NULL;
 }
 
 static Evas_Object *
 _ephysics_body_soft_body_evas_base_obj_get(Evas_Object *obj)
 {
-   EPhysics_Body_Soft_Body_Smart_Data *priv;
+   EPhysics_Body_Soft_Body_Data *soft_data;
 
-   EPHYSICS_BODY_SOFT_BODY_SMART_DATA_GET(obj, priv);
-   return priv->base_obj;
+   soft_data = (EPhysics_Body_Soft_Body_Data *)evas_object_data_get(obj,
+                                                                    SOFT_DATA);
+   return soft_data->base_obj;
 }
 
 static btTransform
@@ -427,6 +306,91 @@
    return trans;
 }
 
+static int
+_ephysics_body_evas_stacking_sort_cb(const void *d1, const void *d2)
+{
+   const EPhysics_Body_Evas_Stacking *stacking1, *stacking2;
+
+   stacking1 = (const EPhysics_Body_Evas_Stacking *)d1;
+   stacking2 = (const EPhysics_Body_Evas_Stacking *)d2;
+
+   if (!stacking1) return 1;
+   if (!stacking2) return -1;
+
+   if (stacking1->stacking < stacking2->stacking) return -1;
+   if (stacking2->stacking > stacking2->stacking) return 1;
+
+   return 0;
+}
+
+void
+ephysics_body_evas_objects_restack(EPhysics_World *world)
+{
+   void *data, *slice_data;
+   EPhysics_Body *body;
+   btTransform trans;
+   EPhysics_Body_Evas_Stacking *stacking;
+   EPhysics_Body_Soft_Body_Data *soft_data;
+   EPhysics_Body_Soft_Body_Slice *slice;
+   Eina_List *l, *slices, *bodies, *stack_list = NULL;
+   Evas_Object *prev_obj = NULL;
+
+   bodies = ephysics_world_bodies_get(world);
+   EINA_LIST_FOREACH(bodies, l, data)
+     {
+        body = (EPhysics_Body *)data;
+        if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+          {
+             if (!body->evas_obj) continue;
+             trans = _ephysics_body_transform_get(body);
+             stacking = (EPhysics_Body_Evas_Stacking *)calloc(1,
+                                            sizeof(EPhysics_Body_Evas_Stacking));
+             if (!stacking) goto error;
+             stacking->stacking = trans.getOrigin().z();
+             stacking->evas = body->evas_obj;
+             stack_list = eina_list_append(stack_list, stacking);
+             continue;
+          }
+
+        soft_data = (EPhysics_Body_Soft_Body_Data *)evas_object_data_get(
+                                                      body->evas_obj, SOFT_DATA);
+
+        if (!soft_data) continue;
+
+        EINA_LIST_FOREACH(soft_data->slices, slices, slice_data)
+          {
+             slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
+             stacking = (EPhysics_Body_Evas_Stacking *)calloc(1,
+                                            sizeof(EPhysics_Body_Evas_Stacking));
+             if (!stacking) goto error;
+             stacking->stacking = slice->stacking;
+             stacking->evas = slice->evas_obj;
+             stack_list = eina_list_append(stack_list, stacking);
+          }
+     }
+
+   stack_list = eina_list_sort(stack_list, eina_list_count(stack_list),
+                               _ephysics_body_evas_stacking_sort_cb);
+
+   EINA_LIST_FREE(stack_list, data)
+     {
+        stacking = (EPhysics_Body_Evas_Stacking *)data;
+
+        if (prev_obj)
+          evas_object_stack_above(stacking->evas, prev_obj);
+
+        prev_obj = stacking->evas;
+        free(stacking);
+     }
+
+   return;
+
+ error:
+   ERR("Could not allocate evas stacking data memory.");
+   EINA_LIST_FREE(stack_list, data)
+        free(data);
+}
+
 static void
 _ephysics_body_transform_set(EPhysics_Body *body, btTransform trans)
 {
@@ -958,6 +922,12 @@
    EPhysics_Body *body = (EPhysics_Body *) data;
    int w, h;
 
+   if (body->rebounding)
+     {
+        body->rebounding = EINA_FALSE;
+        return;
+     }
+
    evas_object_geometry_get(obj, NULL, NULL, &w, &h);
    if ((w == body->w) && (h == body->h))
      return;
@@ -1446,7 +1416,7 @@
 
    soft_body->appendMaterial();
    body->material_index = 1;
-   soft_body->m_cfg.piterations = 5;
+   soft_body->m_cfg.piterations = rows / 5;
 
    _ephysics_body_soft_body_default_config(body, soft_body);
    _ephysics_body_cloth_constraints_rebuild(body);
@@ -1518,7 +1488,8 @@
      }
 
    rate = ephysics_world_rate_get(body->world);
-   ephysics_world_render_geometry_get(body->world, NULL, NULL, NULL, &wh);
+   ephysics_world_render_geometry_get(body->world, NULL, NULL, NULL, NULL, &wh,
+                                      NULL);
 
    xx = x / rate;
    yy = (wh -  y) / rate;
@@ -1573,7 +1544,8 @@
 
    ephysics_world_lock_take(body->world);
    rate = ephysics_world_rate_get(body->world);
-   ephysics_world_render_geometry_get(body->world, NULL, NULL, NULL, &wh);
+   ephysics_world_render_geometry_get(body->world, NULL, NULL, NULL, NULL, &wh,
+                                      NULL);
    ephysics_body_geometry_get(body, NULL, NULL, NULL, &bw, NULL, NULL);
 
    xx =  x / rate;
@@ -2031,6 +2003,8 @@
 EAPI void
 ephysics_body_del(EPhysics_Body *body)
 {
+   EPhysics_World *world;
+
    if (!body)
      {
         ERR("Can't delete body, it wasn't provided.");
@@ -2038,10 +2012,12 @@
      }
 
    if (body->deleted) return;
-   ephysics_world_lock_take(body->world);
+
+   world = body->world;
+   ephysics_world_lock_take(world);
    body->deleted = EINA_TRUE;
-   ephysics_world_body_del(body->world, body);
-   ephysics_world_lock_release(body->world);
+   ephysics_world_body_del(world, body);
+   ephysics_world_lock_release(world);
 }
 
 EAPI Evas_Object *
@@ -2107,7 +2083,7 @@
 EAPI Evas_Object *
 ephysics_body_evas_object_unset(EPhysics_Body *body)
 {
-   Evas_Object *obj, *smart;
+   Evas_Object *obj, *wrapper;
 
    if (!body)
      {
@@ -2126,11 +2102,11 @@
                                        _ephysics_body_evas_obj_resize_cb);
      }
 
-   if (evas_object_smart_type_check(obj, SMART_CLASS_NAME))
+   if (body->type != EPHYSICS_BODY_TYPE_RIGID)
      {
-        smart = obj;
+        wrapper = obj;
         obj = _ephysics_body_soft_body_evas_base_obj_get(obj);
-        evas_object_del(smart);
+        evas_object_del(wrapper);
      }
 
    return obj;

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-16 23:12:53 UTC (rev 78089)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-16 23:12:59 UTC (rev 78090)
@@ -116,6 +116,7 @@
      Eina_Bool deleted:1;
      Eina_Bool light_apply:1;
      int material_index;
+     Eina_Bool rebounding;
 };
 
 extern int _ephysics_log_dom;
@@ -151,6 +152,7 @@
 void ephysics_body_recalc(EPhysics_Body *body, double rate);
 void ephysics_body_forces_apply(EPhysics_Body *body);
 void ephysics_body_activate(const EPhysics_Body *body, Eina_Bool activate);
+void ephysics_body_evas_objects_restack(EPhysics_World *world);
 
 /* Camera */
 EPhysics_Camera *ephysics_camera_add(EPhysics_World *world);

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-16 23:12:53 UTC (rev 78089)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-16 23:12:59 UTC (rev 78090)
@@ -241,6 +241,8 @@
           }
      }
 
+   ephysics_body_evas_objects_restack(world);
+
    if (camera_moved)
      {
         ephysics_camera_moved_set(world->camera, EINA_FALSE);

Log:
EPhysics: random fixes
  
  This patch fixes:
  + the scale_get function(the soft body shape scale was not been set),
  + the soft body evas object deletion callback, it wasn't properly freeing
  the slices evas objects;
  + puts the soft body base evas object back to canvas;
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-16 16:18:35 -0700 (Tue, 16 Oct 2012)
New Revision: 78093
Trac:         http://trac.enlightenment.org/e/changeset/78093

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-16 23:18:29 UTC (rev 78092)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-16 23:18:35 UTC (rev 78093)
@@ -222,14 +222,18 @@
 _ephysics_body_soft_body_evas_del_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    EPhysics_Body_Soft_Body_Data *soft_data;
-   void *slice;
+   void *ldata;
+   EPhysics_Body_Soft_Body_Slice *slice;
 
    soft_data = (EPhysics_Body_Soft_Body_Data *)evas_object_data_del(obj,
                                                                     SOFT_DATA);
 
-   evas_object_del(soft_data->base_obj);
-   EINA_LIST_FREE(soft_data->slices, slice)
+   EINA_LIST_FREE(soft_data->slices, ldata)
+     {
+        slice = (EPhysics_Body_Soft_Body_Slice *)ldata;
+        evas_object_del(slice->evas_obj);
         free(slice);
+     }
 
    free(soft_data);
 }
@@ -908,6 +912,7 @@
    if (body->type == EPHYSICS_BODY_TYPE_SOFT)
      {
         body->soft_body->scale(body_scale);
+        body->soft_body->getCollisionShape()->setLocalScaling(body_scale);
         body->rigid_body->proceedToTransform(trans);
         body->soft_body->transform(trans);
         _ephysics_body_soft_body_constraints_rebuild(body);
@@ -2182,6 +2187,7 @@
 ephysics_body_evas_object_unset(EPhysics_Body *body)
 {
    Evas_Object *obj, *wrapper;
+   Evas_Coord x, y;
 
    if (!body)
      {
@@ -2205,6 +2211,8 @@
         wrapper = obj;
         obj = _ephysics_body_soft_body_evas_base_obj_get(obj);
         evas_object_del(wrapper);
+        ephysics_body_geometry_get(body, &x, &y, NULL, NULL, NULL, NULL);
+        evas_object_move(obj, x, y);
      }
 
    return obj;

Log:
ephysics: don't try to unset dragging if it's not set
  
  Otherwise weird behaviors could happens
  <evil laughs>
  
  

Author:       bdilly
Date:         2012-10-16 16:18:48 -0700 (Tue, 16 Oct 2012)
New Revision: 78095
Trac:         http://trac.enlightenment.org/e/changeset/78095

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-16 23:18:42 UTC (rev 78094)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-16 23:18:48 UTC (rev 78095)
@@ -1307,6 +1307,12 @@
         return;
      }
 
+   if (!body->dragging_data.dragging)
+     {
+        INF("Dragging isn't set");
+        return;
+     }
+
    ephysics_world_lock_take(body->world);
    face = body->soft_body->m_faces[body->dragging_data.triangle];
    for (int i = 0; i < 3; i++)
@@ -1562,7 +1568,7 @@
      {
         node = face.m_n[i];
         node->m_v *= 0;
-	node->m_im *= 0;
+        node->m_im *= 0;
      }
 }

Log:
ephysics: don't change body properties if custom
   material is set
  
  It shouldn't imply in specific properties
  
  

Author:       bdilly
Date:         2012-10-17 14:37:10 -0700 (Wed, 17 Oct 2012)
New Revision: 78134
Trac:         http://trac.enlightenment.org/e/changeset/78134

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-17 21:37:00 UTC (rev 78133)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-17 21:37:10 UTC (rev 78134)
@@ -3079,6 +3079,12 @@
         return;
      }
 
+   if (material == EPHYSICS_BODY_MATERIAL_CUSTOM)
+     {
+        body->material = material;
+        return;
+     }
+
    ephysics_world_lock_take(body->world);
    body->density = ephysics_material_props[material].density;
    _ephysics_body_mass_set(body, 0);

Log:
EPhysics: avoid restacking objects on different layers
  
  If the two objects are not in the same layer avoid restacking it.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-18 12:18:00 -0700 (Thu, 18 Oct 2012)
New Revision: 78193
Trac:         http://trac.enlightenment.org/e/changeset/78193

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-18 17:00:28 UTC (rev 78192)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-18 19:18:00 UTC (rev 78193)
@@ -380,6 +380,16 @@
      {
         stacking = (EPhysics_Body_Evas_Stacking *)data;
 
+        if (prev_obj && evas_object_layer_get(prev_obj) !=
+            evas_object_layer_get(stacking->evas))
+          {
+             INF("The world %p has bodies with associated evas objects on"
+                 " different layers, skipping the restaking for %p and %p",
+                 world, prev_obj, stacking->evas);
+             free(stacking);
+             continue;
+          }
+
         if (prev_obj)
           evas_object_stack_above(stacking->evas, prev_obj);

Log:
ephysics: expose volume getter
  
  useful to calculate density given a mass
  
  

Author:       bdilly
Date:         2012-10-18 14:23:05 -0700 (Thu, 18 Oct 2012)
New Revision: 78201
Trac:         http://trac.enlightenment.org/e/changeset/78201

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-10-18 20:41:03 UTC (rev 78200)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-18 21:23:05 UTC (rev 78201)
@@ -3448,6 +3448,23 @@
 
 /**
  * @brief
+ * Get body's volume.
+ *
+ * @note The unit of the returned value is meters ^ 3. Not pixels. Useful
+ * for calculation with mass and density.
+ *
+ * @param body The physics body.
+ * @return the @p body's volume, in meters ^ 3 or -1 on error.
+ *
+ * @see ephysics_body_geometry_set().
+ * @see ephysics_body_geometry_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI double ephysics_body_volume_get(const EPhysics_Body *body);
+
+/**
+ * @brief
  * Set body's material.
  *
  * This function makes properties setting easy. When a material is set to

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-18 20:41:03 UTC (rev 78200)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-18 21:23:05 UTC (rev 78201)
@@ -3142,6 +3142,16 @@
    return body->light_apply;
 }
 
+EAPI double
+ephysics_body_volume_get(const EPhysics_Body *body)
+{
+   if (!body)
+     {
+        ERR("No body, no volume.");
+        return -1;
+     }
+   return _ephysics_body_volume_get(body);
+}
 
 #ifdef  __cplusplus
 }

Log:
ephysics: support back-face culling
  
  
  

Author:       bdilly
Date:         2012-10-19 11:50:46 -0700 (Fri, 19 Oct 2012)
New Revision: 78265
Trac:         http://trac.enlightenment.org/e/changeset/78265

Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-19 18:50:38 UTC (rev 78264)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-19 18:50:46 UTC (rev 78265)
@@ -3642,6 +3642,68 @@
 EAPI Eina_Bool ephysics_body_light_get(const EPhysics_Body *body);
 
 /**
+ * @brief
+ * Set body's evas object to be hidden when it is counter-clockwise.
+ *
+ * @param body The physics body.
+ * @param enable If @c EINA_TRUE, evas object will be hidden,
+ * otherwise it will be visible, rotated.
+ *
+ * An object is said to be facing the user when all its points are placed in
+ * a clockwise fashion.
+ *
+ * @note When back-face culling is enabled, evas object visibility
+ * will be handled by @ref ephysics_body_evas_object_update().
+ *
+ * @see ephysics_body_back_face_culling_get().
+ * @see ephysics_body_clockwise_get().
+ * @see ephysics_body_evas_object_set().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_back_face_culling_set(EPhysics_Body *body, Eina_Bool enable);
+
+/**
+ * @brief
+ * Return if body's evas object will be hidden when it is counter-clockwise or
+ * not.
+ *
+ * @param body The physics body.
+ * @return @c EINA_TRUE if evas object will be hidden, or @c EINA_FALSE
+ * in the other case, or on error.
+ *
+ * @see ephysics_body_back_face_culling_set() for more details.
+ * @see ephysics_body_clockwise_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Eina_Bool ephysics_body_back_face_culling_get(const EPhysics_Body *body);
+
+/**
+ * @brief
+ * Get the clockwise state of a body.
+ *
+ * This determines if the points of the evas object associated to the @p body
+ * are clockwise or counter-clockwise. This can be used for "back-face culling". * This is where you hide objects that "face away" from you.
+ * In this case objects that are not clockwise.
+ *
+ * It can be set with @ref ephysics_body_back_face_culling_set(), so EPhysics
+ * will handle visibility automatically on evas object update.
+ *
+ * @note This information only will be updated on
+ * ephysics_body_evas_object_update(). So if a custom rendering is being done,
+ * this function won't return the current value of the evas object.
+ *
+ * @param body The physics body.
+ * @return @c EINA_TRUE if clockwise, @c EINA_FALSE otherwise or on error.
+ *
+ * @see ephysics_body_back_face_culling_set() for more details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Eina_Bool ephysics_body_clockwise_get(const EPhysics_Body *body);
+
+/**
  * @}
  */
 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-19 18:50:38 UTC (rev 78264)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-19 18:50:46 UTC (rev 78265)
@@ -1068,6 +1068,22 @@
         evas_map_util_3d_perspective(map, px, py, z0, foc);
      }
 
+   if (body->back_face_culling)
+     {
+        if (evas_map_util_clockwise_get(map))
+          {
+             body->clockwise = EINA_TRUE;
+             evas_object_show(body->evas_obj);
+          }
+        else
+          {
+             body->clockwise = EINA_FALSE;
+             evas_map_free(map);
+             evas_object_hide(body->evas_obj);
+             return;
+          }
+     }
+
    if ((body->light_apply) ||
        (ephysics_world_light_all_bodies_get(body->world)))
      {
@@ -2173,8 +2189,6 @@
      }
 
    body->evas_obj = evas_obj;
-
-
    evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL,
                                   _ephysics_body_evas_obj_del_cb, body);
 
@@ -3160,6 +3174,39 @@
    return _ephysics_body_volume_get(body);
 }
 
+EAPI void
+ephysics_body_back_face_culling_set(EPhysics_Body *body, Eina_Bool enable)
+{
+   if (!body)
+     {
+        ERR("Body is NULL.");
+        return;
+     }
+   body->back_face_culling = !!enable;
+}
+
+EAPI Eina_Bool
+ephysics_body_back_face_culling_get(const EPhysics_Body *body)
+{
+   if (!body)
+     {
+        ERR("Body is NULL.");
+        return EINA_FALSE;
+     }
+   return body->back_face_culling;
+}
+
+EAPI Eina_Bool
+ephysics_body_clockwise_get(const EPhysics_Body *body)
+{
+   if (!body)
+     {
+        ERR("Body is NULL.");
+        return EINA_FALSE;
+     }
+   return body->clockwise;
+}
+
 #ifdef  __cplusplus
 }
 #endif

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-19 18:50:38 UTC (rev 78264)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-19 18:50:46 UTC (rev 78265)
@@ -112,16 +112,19 @@
      int cloth_columns;
      int cloth_rows;
      int anchor_prop;
-     Eina_Bool active:1;
-     Eina_Bool deleted:1;
-     Eina_Bool light_apply:1;
      int material_index;
-     Eina_Bool rebounding;
      struct {
        int triangle;
        double mass[3];
        Eina_Bool dragging;
      } dragging_data;
+
+     Eina_Bool active:1;
+     Eina_Bool deleted:1;
+     Eina_Bool light_apply:1;
+     Eina_Bool rebounding:1;
+     Eina_Bool back_face_culling:1;
+     Eina_Bool clockwise:1;
 };
 
 extern int _ephysics_log_dom;

Log:
EPhysics: do not call update deleted object
  
  If a body has been marked for deletion do not updated it neither call
  its BODY_UPDATE callbacks.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-25 14:53:08 -0700 (Thu, 25 Oct 2012)
New Revision: 78474
Trac:         http://trac.enlightenment.org/e/changeset/78474

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:25:59 UTC (rev 78473)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:08 UTC (rev 78474)
@@ -1168,7 +1168,7 @@
 {
    Eina_Bool callback_called = EINA_FALSE;
 
-   if (!body)
+   if (!body || body->deleted)
      return;
 
    callback_called = _ephysics_body_event_callback_call(

Log:
ephysics: let all slice map stuff only on slice apply
  
  Instead of some settings on slice init and others on apply.
  It will be required to apply light and other things.
  
  

Author:       bdilly
Date:         2012-10-25 14:53:16 -0700 (Thu, 25 Oct 2012)
New Revision: 78475
Trac:         http://trac.enlightenment.org/e/changeset/78475

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:08 UTC (rev 78474)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:16 UTC (rev 78475)
@@ -43,8 +43,14 @@
 
 typedef struct _EPhysics_Body_Soft_Body_Slice
 {
-     int index;
      Evas_Object *evas_obj;
+     int index;
+     Evas_Coord x0;
+     Evas_Coord x1;
+     Evas_Coord x2;
+     Evas_Coord y0;
+     Evas_Coord y1;
+     Evas_Coord y2;
      float stacking;
 } EPhysics_Body_Soft_Body_Slice;
 
@@ -61,7 +67,7 @@
    double rate;
    void *list_data;
    Eina_List *l;
-   Evas_Coord x, y, h, wy, wh, y0, y1, y2, x0, x1, x2, z0, z1, z2, bw, bh;
+   Evas_Coord wy, wh, y0, y1, y2, x0, x1, x2, z0, z1, z2, bw, bh;
    Evas_Map *map;
    btVector3 p0, p1, p2;
    btSoftBody::tFaceArray faces;
@@ -80,7 +86,6 @@
    EINA_LIST_FOREACH(soft_data->slices, l, list_data)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *)list_data;
-        evas_object_geometry_get(slice->evas_obj, &x, &y, NULL, &h);
 
         faces = body->soft_body->m_faces;
         p0 = faces[slice->index].m_n[0]->m_x;
@@ -101,11 +106,12 @@
 
         slice->stacking = p0.z() + p1.z() + p2.z();
 
-        evas_object_map_enable_set(slice->evas_obj, EINA_FALSE);
-        map = (Evas_Map *)evas_object_map_get((const Evas_Object *)
-                                              slice->evas_obj);
+        map = evas_map_new(4);
 
-        evas_object_image_smooth_scale_set(slice->evas_obj, EINA_TRUE);
+        evas_map_point_image_uv_set(map, 0, slice->x0, slice->y0);
+        evas_map_point_image_uv_set(map, 1, slice->x1, slice->y1);
+        evas_map_point_image_uv_set(map, 2, slice->x2, slice->y2);
+        evas_map_point_image_uv_set(map, 3, slice->x2, slice->y2);
 
         evas_map_point_coord_set(map, 0, x0, y0, z0);
         evas_map_point_coord_set(map, 1, x1, y1, z1);
@@ -114,7 +120,7 @@
 
         evas_object_map_set(slice->evas_obj, map);
         evas_object_map_enable_set(slice->evas_obj, EINA_TRUE);
-        evas_object_show(slice->evas_obj);
+        evas_map_free(map);
      }
 
    b0 = body->soft_body->m_bounds[0];
@@ -150,13 +156,12 @@
 static Eina_Bool
 _ephysics_body_soft_body_slices_init(EPhysics_Body *body, EPhysics_Body_Soft_Body_Data *soft_data)
 {
-   double rate;
-   Evas_Coord x, y, w, h, wy, wh, y0, y1, y2, x0, x1, x2, z0, z1, z2;
-   Evas_Map *map;
-   Evas *evas;
+   EPhysics_Body_Soft_Body_Slice *slice = NULL;
+   Evas_Coord x, y, w, h, wy, wh;
    btSoftBody::tFaceArray faces;
-   EPhysics_Body_Soft_Body_Slice *slice;
    btVector3 p0, p1, p2;
+   double rate;
+   Evas *evas;
 
    evas = evas_object_evas_get(body->evas_obj);
 
@@ -166,8 +171,8 @@
 
    for (int i = 0; i < body->slices; i++)
      {
-        slice = _ephysics_body_soft_body_slice_new(body->points_deform[i],
-                                             evas_object_image_filled_add(evas));
+        slice = _ephysics_body_soft_body_slice_new(
+           body->points_deform[i], evas_object_image_filled_add(evas));
 
         if (!slice) return EINA_FALSE;
 
@@ -177,44 +182,27 @@
         evas_object_resize(slice->evas_obj, w, h);
         evas_object_move(slice->evas_obj, x, y);
         evas_object_show(slice->evas_obj);
+        evas_object_image_smooth_scale_set(slice->evas_obj, EINA_TRUE);
 
         faces = body->soft_body->m_faces;
         p0 = faces[slice->index].m_n[0]->m_x;
         p1 = faces[slice->index].m_n[1]->m_x;
         p2 = faces[slice->index].m_n[2]->m_x;
 
-        y0 = wh + wy - (p0.y() * rate);
-        y1 = wh + wy - (p1.y() * rate);
-        y2 = wh + wy - (p2.y() * rate);
+        slice->x0 = p0.x() * rate - x;
+        slice->x1 = p1.x() * rate - x;
+        slice->x2 = p2.x() * rate - x;
+        slice->y0 = wh + wy - (p0.y() * rate) - y;
+        slice->y1 = wh + wy - (p1.y() * rate) - y;
+        slice->y2 = wh + wy - (p2.y() * rate) - y;
 
-        x0 = p0.x() * rate;
-        x1 = p1.x() * rate;
-        x2 = p2.x() * rate;
-
-        z0 = p0.z() * rate;
-        z1 = p1.z() * rate;
-        z2 = p2.z() * rate;
-
-        map = evas_map_new(4);
-        evas_map_util_points_populate_from_object(map, slice->evas_obj);
-
-        evas_map_point_image_uv_set(map, 0, x0 - x, y0 - y);
-        evas_map_point_image_uv_set(map, 1, x1 - x, y1 - y);
-        evas_map_point_image_uv_set(map, 2, x2 - x, y2 - y);
-        evas_map_point_image_uv_set(map, 3, x2 - x, y2 - y);
-
-        evas_map_point_coord_set(map, 0, x0, y0, z0);
-        evas_map_point_coord_set(map, 1, x1, y1, z1);
-        evas_map_point_coord_set(map, 2, x2, y2, z2);
-        evas_map_point_coord_set(map, 3, x2, y2, z2);
-
-        evas_object_map_set(slice->evas_obj, map);
-        evas_object_map_enable_set(slice->evas_obj, EINA_TRUE);
-        evas_map_free(map);
-
         soft_data->slices = eina_list_append(soft_data->slices, slice);
      }
 
+   if (slice)
+     evas_object_stack_above(body->evas_obj, slice->evas_obj);
+
+   _ephysics_body_soft_body_slices_apply(NULL, NULL, body->evas_obj, NULL);
    return EINA_TRUE;
 }
 
@@ -238,7 +226,7 @@
    free(soft_data);
 }
 
-static Evas_Object *
+static void
 _ephysics_body_soft_body_evas_add(EPhysics_Body *body)
 {
    Evas_Object *obj;
@@ -250,35 +238,39 @@
    if (!soft_data)
      {
         ERR("Could not allocate soft body data struct.");
-        return NULL;
+        return;
      }
 
    soft_data->body = body;
    soft_data->slices = NULL;
    soft_data->base_obj = body->evas_obj;
 
-   if (!_ephysics_body_soft_body_slices_init(body, soft_data))
-     goto error;
-
    evas_object_geometry_get(body->evas_obj, &x, &y, &w, &h);
-   evas_object_move(body->evas_obj, 0, -h);
 
    obj = evas_object_rectangle_add(evas_object_evas_get(body->evas_obj));
    evas_object_color_set(obj, 0, 0, 0, 0);
    evas_object_move(obj, x, y);
    evas_object_resize(obj, w, h);
-   evas_object_show(obj);
    evas_object_data_set(obj, SOFT_DATA, soft_data);
+   evas_object_show(obj);
 
+   body->evas_obj = obj;
+
+   if (!_ephysics_body_soft_body_slices_init(body, soft_data))
+     goto error;
+
+   evas_object_move(soft_data->base_obj, 0, -h);
+
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE,
                                   _ephysics_body_soft_body_slices_apply, NULL);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                   _ephysics_body_soft_body_evas_del_cb, NULL);
-   return obj;
 
+   return;
+
  error:
    free(soft_data);
-   return NULL;
+   return;
 }
 
 static Evas_Object *
@@ -2206,8 +2198,8 @@
         evas_object_event_callback_del(evas_obj, EVAS_CALLBACK_DEL,
                                        _ephysics_body_evas_obj_del_cb);
 
-        evas_obj = _ephysics_body_soft_body_evas_add(body);
-        body->evas_obj = evas_obj;
+        _ephysics_body_soft_body_evas_add(body);
+        evas_obj = body->evas_obj;
 
         evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_DEL,
                                        _ephysics_body_evas_obj_del_cb, body);

Log:
ephysics: invert clothes mesh
  
  So objects won't be back-facing the camera.
  
  

Author:       bdilly
Date:         2012-10-25 14:53:30 -0700 (Thu, 25 Oct 2012)
New Revision: 78477
Trac:         http://trac.enlightenment.org/e/changeset/78477

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:23 UTC (rev 78476)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:30 UTC (rev 78477)
@@ -1449,14 +1449,14 @@
    rows = body1->cloth_rows;
    columns = body1->cloth_columns;
 
-   if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_LEFT)
+   if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_RIGHT)
      {
         for (int i = 0; i < rows; i++)
           body1->soft_body->appendAnchor(i, body2->rigid_body);
         return;
      }
 
-   if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_RIGHT)
+   if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_LEFT)
      {
         for (int i = 1; i <= rows; i++)
           body1->soft_body->appendAnchor((rows * columns) - i,
@@ -1464,14 +1464,14 @@
         return;
      }
 
-   if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_TOP)
+   if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_BOTTOM)
      {
         for (int i = 0; i <= rows; i++)
           body1->soft_body->appendAnchor(i * rows, body2->rigid_body);
         return;
      }
 
-   if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_BOTTOM)
+   if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_TOP)
      {
         for (int i = 0; i < columns; i++)
              body1->soft_body->appendAnchor((rows - 1) + rows * i,
@@ -1533,10 +1533,10 @@
 
    world_info = ephysics_world_info_get(world);
    soft_body = btSoftBodyHelpers::CreatePatch(*world_info,
+                                              btVector3(2, 2, 0),
+                                              btVector3(2, 1, 0),
                                               btVector3(1, 2, 0),
                                               btVector3(1, 1, 0),
-                                              btVector3(2, 2, 0),
-                                              btVector3(2, 1, 0),
                                               rows, columns, 0, false);
    if (!soft_body)
      {

Log:
EPhysics: no need to anchor props
  
  Actually for cloth anchors its hardness must always be 0.8.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-25 14:53:44 -0700 (Thu, 25 Oct 2012)
New Revision: 78479
Trac:         http://trac.enlightenment.org/e/changeset/78479

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:37 UTC (rev 78478)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:44 UTC (rev 78479)
@@ -1292,7 +1292,12 @@
 {
    int m = body->material_index;
    btSoftBody *soft_body = body->soft_body;
-   soft_body->m_cfg.kAHR = (hardness / body->anchor_prop) * 0.6;
+
+   if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+     soft_body->m_cfg.kAHR = 0.8;
+   else
+     soft_body->m_cfg.kAHR = (hardness / 1000) * 0.6;
+
    soft_body->m_materials[m]->m_kVST = (hardness / 1000);
    soft_body->m_materials[m]->m_kLST = (hardness / 1000);
    soft_body->m_materials[m]->m_kAST = (hardness / 1000);
@@ -1440,7 +1445,6 @@
      }
 
    body->material_index = 0;
-   body->anchor_prop = 1000;
    body->type = EPHYSICS_BODY_TYPE_SOFT;
    _ephysics_body_soft_body_default_config(body, soft_body);
 
@@ -1595,7 +1599,6 @@
 
    body->cloth_columns = columns;
    body->cloth_rows = rows;
-   body->anchor_prop = 1;
    body->type = EPHYSICS_BODY_TYPE_CLOTH;
 
    ephysics_world_soft_body_add(world, body);

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-25 21:53:37 UTC (rev 78478)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-25 21:53:44 UTC (rev 78479)
@@ -111,7 +111,6 @@
      EPhysics_Body_Type type;
      int cloth_columns;
      int cloth_rows;
-     int anchor_prop;
      int material_index;
      struct {
        int triangle;

Log:
EPhysics: implement central impulse apply for cloth
   bodies
  
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-25 14:53:51 -0700 (Thu, 25 Oct 2012)
New Revision: 78480
Trac:         http://trac.enlightenment.org/e/changeset/78480

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:44 UTC (rev 78479)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:51 UTC (rev 78480)
@@ -2764,10 +2764,24 @@
    return body->world;
 }
 
+static void
+_ephysics_body_soft_body_central_impulse_apply(EPhysics_Body *body, btVector3 impulse)
+{
+   btSoftBody::Face *face;
+
+   for (int m = 0; m < body->soft_body->m_faces.size(); m++)
+     {
+        face = &body->soft_body->m_faces[m];
+        for (int n = 0; n < 3; n++)
+             face->m_n[n]->m_v += impulse * face->m_n[n]->m_im;
+     }
+}
+
 EAPI void
 ephysics_body_central_impulse_apply(EPhysics_Body *body, double x, double y, double z)
 {
    double rate;
+   btVector3 impulse;
 
    if (!body)
      {
@@ -2779,8 +2793,14 @@
 
    ephysics_world_lock_take(body->world);
    ephysics_body_activate(body, EINA_TRUE);
-   body->rigid_body->applyCentralImpulse(btVector3(x / rate, - y / rate,
-                                                   z / rate));
+
+   impulse = btVector3(x / rate, - y / rate, z / rate);
+
+   if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+     _ephysics_body_soft_body_central_impulse_apply(body, impulse);
+   else
+     body->rigid_body->applyCentralImpulse(impulse);
+
    ephysics_world_lock_release(body->world);
 }

Log:
EPhysics: ephysics_body_move cloth support
  
  Implementation of body moving for cloth bodies.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-25 14:53:59 -0700 (Thu, 25 Oct 2012)
New Revision: 78481
Trac:         http://trac.enlightenment.org/e/changeset/78481

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:51 UTC (rev 78480)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:59 UTC (rev 78481)
@@ -921,9 +921,15 @@
 
    trans = _ephysics_body_transform_get(body);
    trans.setOrigin(btVector3(mx, my, mz));
-   body->rigid_body->proceedToTransform(trans);
-   body->rigid_body->getMotionState()->setWorldTransform(trans);
 
+   if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+     _ephysics_body_transform_set(body, trans);
+   else
+     {
+        body->rigid_body->proceedToTransform(trans);
+        body->rigid_body->getMotionState()->setWorldTransform(trans);
+     }
+
    ephysics_body_activate(body, EINA_TRUE);
 
    DBG("Body %p position changed to (%lf, %lf, %lf).", body, mx, my, mz);

Log:
EPhysics: soft body geometry get fix
  
  Since every shape has its own implementation for local scaling it`s
  better to trust just our selves and hold it for further calculations.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-25 14:54:06 -0700 (Thu, 25 Oct 2012)
New Revision: 78482
Trac:         http://trac.enlightenment.org/e/changeset/78482

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:53:59 UTC (rev 78481)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:06 UTC (rev 78482)
@@ -455,15 +455,6 @@
    body->rigid_body->getMotionState()->setWorldTransform(trans);
 }
 
-static btVector3
-_ephysics_body_scale_get(const EPhysics_Body *body)
-{
-   if (body->type == EPHYSICS_BODY_TYPE_RIGID)
-     return body->collision_shape->getLocalScaling();
-
-   return body->soft_body->getCollisionShape()->getLocalScaling();
-}
-
 void
 ephysics_body_activate(const EPhysics_Body *body, Eina_Bool activate)
 {
@@ -658,6 +649,7 @@
         return NULL;
      }
 
+   body->scale = btVector3(1, 1, 1);
    body->mass = mass;
    body->world = world;
    body->cm.x = cm_x;
@@ -987,6 +979,7 @@
    body->w = w;
    body->h = h;
    body->d = d;
+   body->scale = body_scale;
 
    DBG("Body %p position changed to (%lf, %lf, %lf).", body, mx, my, mz);
    DBG("Body %p scale changed to (%lf, %lf, %lf).", body, sx, sy, sz);
@@ -2379,7 +2372,7 @@
      }
 
    trans = _ephysics_body_transform_get(body);
-   scale = _ephysics_body_scale_get(body);
+   scale = body->scale;
 
    rate = ephysics_world_rate_get(body->world);
    ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL,

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-25 21:53:59 UTC (rev 78481)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-25 21:54:06 UTC (rev 78482)
@@ -86,6 +86,7 @@
      Evas_Coord w;
      Evas_Coord h;
      Evas_Coord d;
+     btVector3 scale;
      void *data;
      Eina_Inlist *callbacks;
      Eina_List *collision_groups;

Log:
ephysics: fix soft body slicing
  
  Also, fix evas_object_set on cases when it shouldn't use
  evas object geometry.
  
  

Author:       bdilly
Date:         2012-10-25 14:54:14 -0700 (Thu, 25 Oct 2012)
New Revision: 78483
Trac:         http://trac.enlightenment.org/e/changeset/78483

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:06 UTC (rev 78482)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:14 UTC (rev 78483)
@@ -17,9 +17,11 @@
 extern "C" {
 #endif
 
-#define SOFT_DATA "soft_data"
+#define BODY "body"
 
 typedef struct _EPhysics_Body_Callback EPhysics_Body_Callback;
+typedef struct _EPhysics_Body_Evas_Stacking EPhysics_Body_Evas_Stacking;
+typedef struct _EPhysics_Body_Soft_Body_Slice EPhysics_Body_Soft_Body_Slice;
 
 struct _EPhysics_Body_Callback {
      EINA_INLIST;
@@ -36,30 +38,28 @@
      Evas_Coord z;
 };
 
-typedef struct _EPhysics_Body_Evas_Stacking {
+struct _EPhysics_Body_Evas_Stacking {
      Evas_Object *evas;
      float stacking;
-} EPhysics_Body_Evas_Stacking;
+};
 
-typedef struct _EPhysics_Body_Soft_Body_Slice
+struct _EPhysics_Body_Soft_Body_Slice
 {
      Evas_Object *evas_obj;
      int index;
-     Evas_Coord x0;
-     Evas_Coord x1;
-     Evas_Coord x2;
-     Evas_Coord y0;
-     Evas_Coord y1;
-     Evas_Coord y2;
+     struct {
+          double x;
+          double y;
+     } p[3];
      float stacking;
-} EPhysics_Body_Soft_Body_Slice;
+};
 
-typedef struct _EPhysics_Body_Soft_Body_Data
+struct _EPhysics_Body_Soft_Body_Data
 {
    Evas_Object *base_obj;
    EPhysics_Body *body;
    Eina_List *slices;
-} EPhysics_Body_Soft_Body_Data;
+};
 
 static void
 _ephysics_body_soft_body_slices_apply(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
@@ -67,12 +67,11 @@
    double rate;
    void *list_data;
    Eina_List *l;
-   Evas_Coord wy, wh, y0, y1, y2, x0, x1, x2, z0, z1, z2, bw, bh;
+   Evas_Coord wy, wh, y0, y1, y2, x0, x1, x2, z0, z1, z2, bw, bh, w, h;
    Evas_Map *map;
    btVector3 p0, p1, p2;
    btSoftBody::tFaceArray faces;
    EPhysics_Body_Soft_Body_Slice *slice;
-   EPhysics_Body_Soft_Body_Data *soft_data;
    EPhysics_Body *body;
    btVector3 b0, b1;
    int lr, lg, lb, ar, ag, ab;
@@ -82,14 +81,13 @@
    int px, py, pz, foc;
    Eina_Bool perspective = EINA_FALSE;
 
-   soft_data = (EPhysics_Body_Soft_Body_Data *)evas_object_data_get(obj,
-                                                                    SOFT_DATA);
-   body = soft_data->body;
+   body = (EPhysics_Body *) evas_object_data_get(obj, BODY);
    camera = ephysics_world_camera_get(body->world);
    rate = ephysics_world_rate_get(body->world);
 
    ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
                                       NULL);
+   evas_object_geometry_get(body->soft_data->base_obj, NULL, NULL, &w, &h);
 
    if ((body->light_apply) ||
        (ephysics_world_light_all_bodies_get(body->world)))
@@ -106,7 +104,7 @@
         perspective = EINA_TRUE;
      }
 
-   EINA_LIST_FOREACH(soft_data->slices, l, list_data)
+   EINA_LIST_FOREACH(body->soft_data->slices, l, list_data)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *)list_data;
 
@@ -115,27 +113,31 @@
         p1 = faces[slice->index].m_n[1]->m_x;
         p2 = faces[slice->index].m_n[2]->m_x;
 
-        y0 = wh + wy - (p0.y() * rate);
-        y1 = wh + wy - (p1.y() * rate);
-        y2 = wh + wy - (p2.y() * rate);
+        slice->stacking = p0.z() + p1.z() + p2.z();
 
+        map = evas_map_new(4);
+
+        evas_map_point_image_uv_set(map, 0, slice->p[0].x * w,
+                                    slice->p[0].y * h);
+        evas_map_point_image_uv_set(map, 1, slice->p[1].x * w,
+                                    slice->p[1].y * h);
+        evas_map_point_image_uv_set(map, 2, slice->p[2].x * w,
+                                    slice->p[2].y * h);
+        evas_map_point_image_uv_set(map, 3, slice->p[2].x * w,
+                                    slice->p[2].y * h);
+
         x0 = p0.x() * rate;
         x1 = p1.x() * rate;
         x2 = p2.x() * rate;
 
+        y0 = wh + wy - (p0.y() * rate);
+        y1 = wh + wy - (p1.y() * rate);
+        y2 = wh + wy - (p2.y() * rate);
+
         z0 = p0.z() * rate;
         z1 = p1.z() * rate;
         z2 = p2.z() * rate;
 
-        slice->stacking = p0.z() + p1.z() + p2.z();
-
-        map = evas_map_new(4);
-
-        evas_map_point_image_uv_set(map, 0, slice->x0, slice->y0);
-        evas_map_point_image_uv_set(map, 1, slice->x1, slice->y1);
-        evas_map_point_image_uv_set(map, 2, slice->x2, slice->y2);
-        evas_map_point_image_uv_set(map, 3, slice->x2, slice->y2);
-
         evas_map_point_coord_set(map, 0, x0, y0, z0);
         evas_map_point_coord_set(map, 1, x1, y1, z1);
         evas_map_point_coord_set(map, 2, x2, y2, z2);
@@ -174,156 +176,167 @@
    evas_object_resize(obj, bw, bh);
 }
 
+static inline double
+_ephysics_body_soft_body_slice_calc(double val, double delta, double max)
+{
+   double ret = val + delta / max;
+   if (ret < 0)
+     ret = 0;
+   else if (ret > 1)
+     ret = 1;
+   return ret;
+}
+
 static EPhysics_Body_Soft_Body_Slice *
-_ephysics_body_soft_body_slice_new(int index, Evas_Object *evas_obj)
+_ephysics_body_soft_body_slice_new(EPhysics_Body *body, double delta, double max, int index)
 {
    EPhysics_Body_Soft_Body_Slice *slice;
+   btSoftBody::tFaceArray faces;
 
-   if (!evas_obj) return NULL;
-
-   slice = (EPhysics_Body_Soft_Body_Slice *)malloc(
-                                          sizeof(EPhysics_Body_Soft_Body_Slice));
+   slice = (EPhysics_Body_Soft_Body_Slice *)calloc(
+      1, sizeof(EPhysics_Body_Soft_Body_Slice));
    if (!slice)
      {
         ERR("Couldn't allocate EPhysics_Soft_Body_Slice memory.");
         return NULL;
      }
 
+   faces = body->soft_body->m_faces;
+
    slice->index = index;
-   slice->evas_obj = evas_obj;
+   slice->p[0].x = _ephysics_body_soft_body_slice_calc(
+      faces[slice->index].m_n[0]->m_x.x(), delta, max);
+   slice->p[0].y = 1 - _ephysics_body_soft_body_slice_calc(
+      faces[slice->index].m_n[0]->m_x.y(), delta, max);
+   slice->p[1].x = _ephysics_body_soft_body_slice_calc(
+      faces[slice->index].m_n[1]->m_x.x(), delta, max);
+   slice->p[1].y = 1 - _ephysics_body_soft_body_slice_calc(
+      faces[slice->index].m_n[1]->m_x.y(), delta, max);
+   slice->p[2].x = _ephysics_body_soft_body_slice_calc(
+      faces[slice->index].m_n[2]->m_x.x(), delta, max);
+   slice->p[2].y = 1 - _ephysics_body_soft_body_slice_calc(
+      faces[slice->index].m_n[2]->m_x.y(), delta, max);
+
    return slice;
 }
 
-static Eina_Bool
-_ephysics_body_soft_body_slices_init(EPhysics_Body *body, EPhysics_Body_Soft_Body_Data *soft_data)
+static void
+_ephysics_body_soft_body_slices_init(EPhysics_Body *body)
 {
    EPhysics_Body_Soft_Body_Slice *slice = NULL;
    Evas_Coord x, y, w, h, wy, wh;
-   btSoftBody::tFaceArray faces;
    btVector3 p0, p1, p2;
-   double rate;
+   void *slice_data;
+   Eina_List *l;
    Evas *evas;
 
    evas = evas_object_evas_get(body->evas_obj);
-
    ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
                                       NULL);
-   rate = ephysics_world_rate_get(body->world);
 
-   for (int i = 0; i < body->slices; i++)
+   EINA_LIST_FOREACH(body->soft_data->slices, l, slice_data)
      {
-        slice = _ephysics_body_soft_body_slice_new(
-           body->points_deform[i], evas_object_image_filled_add(evas));
+        slice = (EPhysics_Body_Soft_Body_Slice *) slice_data;
+        slice->evas_obj = evas_object_image_filled_add(evas);
+        evas_object_image_source_set(slice->evas_obj,
+                                     body->soft_data->base_obj);
 
-        if (!slice) return EINA_FALSE;
-
-        evas_object_image_source_set(slice->evas_obj, soft_data->base_obj);
-
-        evas_object_geometry_get(soft_data->base_obj, &x, &y, &w, &h);
+        evas_object_geometry_get(body->soft_data->base_obj, &x, &y, &w, &h);
         evas_object_resize(slice->evas_obj, w, h);
         evas_object_move(slice->evas_obj, x, y);
         evas_object_show(slice->evas_obj);
         evas_object_image_smooth_scale_set(slice->evas_obj, EINA_TRUE);
-
-        faces = body->soft_body->m_faces;
-        p0 = faces[slice->index].m_n[0]->m_x;
-        p1 = faces[slice->index].m_n[1]->m_x;
-        p2 = faces[slice->index].m_n[2]->m_x;
-
-        slice->x0 = p0.x() * rate - x;
-        slice->x1 = p1.x() * rate - x;
-        slice->x2 = p2.x() * rate - x;
-        slice->y0 = wh + wy - (p0.y() * rate) - y;
-        slice->y1 = wh + wy - (p1.y() * rate) - y;
-        slice->y2 = wh + wy - (p2.y() * rate) - y;
-
-        soft_data->slices = eina_list_append(soft_data->slices, slice);
      }
 
    if (slice)
      evas_object_stack_above(body->evas_obj, slice->evas_obj);
 
    _ephysics_body_soft_body_slices_apply(NULL, NULL, body->evas_obj, NULL);
-   return EINA_TRUE;
 }
 
 static void
-_ephysics_body_soft_body_evas_del_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_ephysics_body_soft_body_data_free(EPhysics_Body_Soft_Body_Data *soft_data)
 {
-   EPhysics_Body_Soft_Body_Data *soft_data;
+   EPhysics_Body_Soft_Body_Slice *slice;
    void *ldata;
-   EPhysics_Body_Soft_Body_Slice *slice;
 
-   soft_data = (EPhysics_Body_Soft_Body_Data *)evas_object_data_del(obj,
-                                                                    SOFT_DATA);
-
    EINA_LIST_FREE(soft_data->slices, ldata)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *)ldata;
         evas_object_del(slice->evas_obj);
         free(slice);
      }
-
    free(soft_data);
 }
 
 static void
-_ephysics_body_soft_body_evas_add(EPhysics_Body *body)
+_ephysics_body_soft_body_slices_clean(EPhysics_Body_Soft_Body_Data *soft_data)
 {
-   Evas_Object *obj;
-   Evas_Coord x, y, w, h;
+   EPhysics_Body_Soft_Body_Slice *slice;
+   void *slice_data;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(soft_data->slices, l, slice_data)
+     {
+        slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
+        evas_object_del(slice->evas_obj);
+        slice->evas_obj = NULL;
+     }
+}
+
+static void
+_ephysics_body_soft_body_evas_del_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   EPhysics_Body *body;
+   body = (EPhysics_Body *) evas_object_data_del(obj, BODY);
+   _ephysics_body_soft_body_data_free(body->soft_data);
+}
+
+static EPhysics_Body_Soft_Body_Data *
+_ephysics_body_soft_body_data_new(EPhysics_Body *body)
+{
    EPhysics_Body_Soft_Body_Data *soft_data;
 
-   soft_data = (EPhysics_Body_Soft_Body_Data *)malloc(
-                                           sizeof(EPhysics_Body_Soft_Body_Data));
+   soft_data = (EPhysics_Body_Soft_Body_Data *)calloc(
+      1, sizeof(EPhysics_Body_Soft_Body_Data));
+
    if (!soft_data)
      {
         ERR("Could not allocate soft body data struct.");
-        return;
+        return NULL;
      }
 
    soft_data->body = body;
-   soft_data->slices = NULL;
-   soft_data->base_obj = body->evas_obj;
 
+   return soft_data;
+}
+
+static void
+_ephysics_body_soft_body_evas_add(EPhysics_Body *body)
+{
+   Evas_Object *obj;
+   Evas_Coord x, y, w, h;
+
+   body->soft_data->base_obj = body->evas_obj;
    evas_object_geometry_get(body->evas_obj, &x, &y, &w, &h);
 
    obj = evas_object_rectangle_add(evas_object_evas_get(body->evas_obj));
    evas_object_color_set(obj, 0, 0, 0, 0);
    evas_object_move(obj, x, y);
    evas_object_resize(obj, w, h);
-   evas_object_data_set(obj, SOFT_DATA, soft_data);
+   evas_object_data_set(obj, BODY, body);
    evas_object_show(obj);
 
    body->evas_obj = obj;
+   _ephysics_body_soft_body_slices_init(body);
+   evas_object_move(body->soft_data->base_obj, 0, -h);
 
-   if (!_ephysics_body_soft_body_slices_init(body, soft_data))
-     goto error;
-
-   evas_object_move(soft_data->base_obj, 0, -h);
-
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE,
                                   _ephysics_body_soft_body_slices_apply, NULL);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                   _ephysics_body_soft_body_evas_del_cb, NULL);
-
-   return;
-
- error:
-   free(soft_data);
-   return;
 }
 
-static Evas_Object *
-_ephysics_body_soft_body_evas_base_obj_get(Evas_Object *obj)
-{
-   EPhysics_Body_Soft_Body_Data *soft_data;
-
-   soft_data = (EPhysics_Body_Soft_Body_Data *)evas_object_data_get(obj,
-                                                                    SOFT_DATA);
-   return soft_data->base_obj;
-}
-
 static btTransform
 _ephysics_body_transform_get(const EPhysics_Body *body)
 {
@@ -367,7 +380,6 @@
    EPhysics_Body *body;
    btTransform trans;
    EPhysics_Body_Evas_Stacking *stacking;
-   EPhysics_Body_Soft_Body_Data *soft_data;
    EPhysics_Body_Soft_Body_Slice *slice;
    Eina_List *l, *slices, *bodies, *stack_list = NULL;
    Evas_Object *prev_obj = NULL;
@@ -380,8 +392,8 @@
           {
              if (!body->evas_obj) continue;
              trans = _ephysics_body_transform_get(body);
-             stacking = (EPhysics_Body_Evas_Stacking *)calloc(1,
-                                            sizeof(EPhysics_Body_Evas_Stacking));
+             stacking = (EPhysics_Body_Evas_Stacking *)calloc(
+                1, sizeof(EPhysics_Body_Evas_Stacking));
              if (!stacking) goto error;
              stacking->stacking = trans.getOrigin().z();
              stacking->evas = body->evas_obj;
@@ -389,16 +401,13 @@
              continue;
           }
 
-        soft_data = (EPhysics_Body_Soft_Body_Data *)evas_object_data_get(
-                                                      body->evas_obj, SOFT_DATA);
+        if (!body->soft_data) continue;
 
-        if (!soft_data) continue;
-
-        EINA_LIST_FOREACH(soft_data->slices, slices, slice_data)
+        EINA_LIST_FOREACH(body->soft_data->slices, slices, slice_data)
           {
              slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
-             stacking = (EPhysics_Body_Evas_Stacking *)calloc(1,
-                                            sizeof(EPhysics_Body_Evas_Stacking));
+             stacking = (EPhysics_Body_Evas_Stacking *)calloc(
+                1, sizeof(EPhysics_Body_Evas_Stacking));
              if (!stacking) goto error;
              stacking->stacking = slice->stacking;
              stacking->evas = slice->evas_obj;
@@ -1448,10 +1457,11 @@
    _ephysics_body_soft_body_default_config(body, soft_body);
 
    body->rigid_body->setCollisionFlags(
-                                      btCollisionObject::CF_NO_CONTACT_RESPONSE);
+      btCollisionObject::CF_NO_CONTACT_RESPONSE);
 
    _ephysics_body_soft_body_constraints_rebuild(body);
    ephysics_world_soft_body_add(world, body);
+
    return body;
 }
 
@@ -1544,6 +1554,26 @@
    body->soft_body->m_anchors.resize(0);
 }
 
+static Eina_Bool
+_ephysics_body_slices_add(EPhysics_Body *body, double delta, double max)
+{
+   EPhysics_Body_Soft_Body_Slice *slice;
+   btSoftBody::tFaceArray faces;
+
+   for (int i = 0; i < body->slices; i++)
+     {
+        faces = body->soft_body->m_faces;
+
+        slice = _ephysics_body_soft_body_slice_new(body, delta, max,
+                                                   body->points_deform[i]);
+        if (!slice) return EINA_FALSE;
+
+        body->soft_data->slices = eina_list_append(body->soft_data->slices,
+                                                   slice);
+     }
+   return EINA_TRUE;
+}
+
 EAPI EPhysics_Body *
 ephysics_body_cloth_add(EPhysics_World *world, unsigned short granularity)
 {
@@ -1596,13 +1626,31 @@
    for (int i = 0; i < body->slices; i++)
      body->points_deform[i] = i;
 
+   body->soft_data = _ephysics_body_soft_body_data_new(body);
+   if (!body->soft_data)
+     {
+        ERR("Couldn't create soft data.");
+        goto no_soft_data;
+     }
+
+   if (!_ephysics_body_slices_add(body, -1, 1))
+     {
+        ERR("Couldn't create slices.");
+        goto no_slices;
+     }
+
    body->cloth_columns = columns;
    body->cloth_rows = rows;
    body->type = EPHYSICS_BODY_TYPE_CLOTH;
 
    ephysics_world_soft_body_add(world, body);
+
    return body;
 
+no_slices:
+   free(body->soft_data);
+no_soft_data:
+   free(body->points_deform);
 no_deform:
    free(body);
 no_body:
@@ -1788,15 +1836,32 @@
    for (int i = 0; i < body->slices; i++)
      body->points_deform[i] = points[i];
 
+   body->soft_data = _ephysics_body_soft_body_data_new(body);
+   if (!body->soft_data)
+     {
+        ERR("Couldn't create soft data.");
+        goto no_soft_data;
+     }
+
+   if (!_ephysics_body_slices_add(body, 0.55, 1.1))
+     {
+        ERR("Couldn't create slices.");
+        goto no_slices;
+     }
+
    ephysics_world_lock_release(world);
    return body;
 
+no_slices:
+   free(body->soft_data);
+no_soft_data:
+   free(body->points_deform);
+no_deform:
+   ephysics_world_body_del(world, body);
 no_body:
    delete soft_body;
 no_soft_body:
    delete shape;
-no_deform:
-   ephysics_world_body_del(world, body);
 no_collision_shape:
    ephysics_world_lock_release(world);
    return NULL;
@@ -1878,15 +1943,32 @@
    for (int i = 0; i < body->slices; i++)
      body->points_deform[i] = points[i];
 
+   body->soft_data = _ephysics_body_soft_body_data_new(body);
+   if (!body->soft_data)
+     {
+        ERR("Couldn't create soft data.");
+        goto no_soft_data;
+     }
+
+   if (!_ephysics_body_slices_add(body, 0.55, 1.1))
+     {
+        ERR("Couldn't create slices.");
+        goto no_slices;
+     }
+
    ephysics_world_lock_release(world);
    return body;
 
+no_slices:
+   free(body->soft_data);
+no_soft_data:
+   free(body->points_deform);
+no_deform:
+   ephysics_world_body_del(world, body);
 no_body:
    delete soft_body;
 no_soft_body:
    delete shape;
-no_deform:
-   ephysics_world_body_del(world, body);
 no_collision_shape:
    ephysics_world_lock_release(world);
    return NULL;
@@ -2221,33 +2303,31 @@
                                        _ephysics_body_evas_obj_del_cb);
         evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
                                        _ephysics_body_evas_obj_resize_cb);
+        if (body->soft_data)
+          _ephysics_body_soft_body_slices_clean(body->soft_data);
      }
 
    body->evas_obj = evas_obj;
+   evas_object_geometry_get(body->evas_obj, &obj_x, &obj_y, &obj_w, &obj_h);
+
+   if (body->soft_body)
+     {
+        _ephysics_body_soft_body_evas_add(body);
+        evas_obj = body->evas_obj;
+     }
+
    evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL,
                                   _ephysics_body_evas_obj_del_cb, body);
 
    if (!use_obj_pos)
      return evas_obj;
 
-   evas_object_geometry_get(body->evas_obj, &obj_x, &obj_y, &obj_w, &obj_h);
    rate = ephysics_world_rate_get(body->world);
    ephysics_world_lock_take(body->world);
    _ephysics_body_geometry_set(body, obj_x, obj_y, - rate / 2,
                                obj_w, obj_h, rate, rate);
 
-   if (body->soft_body)
-     {
-        evas_object_event_callback_del(evas_obj, EVAS_CALLBACK_DEL,
-                                       _ephysics_body_evas_obj_del_cb);
 
-        _ephysics_body_soft_body_evas_add(body);
-        evas_obj = body->evas_obj;
-
-        evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_DEL,
-                                       _ephysics_body_evas_obj_del_cb, body);
-     }
-
    ephysics_world_lock_release(body->world);
    evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_RESIZE,
                                   _ephysics_body_evas_obj_resize_cb, body);
@@ -2281,7 +2361,7 @@
    if (body->type != EPHYSICS_BODY_TYPE_RIGID)
      {
         wrapper = obj;
-        obj = _ephysics_body_soft_body_evas_base_obj_get(obj);
+        obj = body->soft_data->base_obj;
         evas_object_del(wrapper);
         ephysics_body_geometry_get(body, &x, &y, NULL, NULL, NULL, NULL);
         evas_object_move(obj, x, y);

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-25 21:54:06 UTC (rev 78482)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-25 21:54:14 UTC (rev 78483)
@@ -49,6 +49,7 @@
 #define RAD_TO_DEG 57.29582 /* 2 * pi radians == 360 degree */
 
 typedef struct _EPhysics_Point EPhysics_Point;
+typedef struct _EPhysics_Body_Soft_Body_Data EPhysics_Body_Soft_Body_Data;
 
 typedef enum _EPhysics_World_Boundary
 {
@@ -113,6 +114,7 @@
      int cloth_columns;
      int cloth_rows;
      int material_index;
+     EPhysics_Body_Soft_Body_Data *soft_data;
      struct {
        int triangle;
        double mass[3];

Log:
ephysics: fix segfault on restack
  
  
  

Author:       bdilly
Date:         2012-10-25 14:54:22 -0700 (Thu, 25 Oct 2012)
New Revision: 78484
Trac:         http://trac.enlightenment.org/e/changeset/78484

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:14 UTC (rev 78483)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:22 UTC (rev 78484)
@@ -290,6 +290,7 @@
    EPhysics_Body *body;
    body = (EPhysics_Body *) evas_object_data_del(obj, BODY);
    _ephysics_body_soft_body_data_free(body->soft_data);
+   body->soft_data = NULL;
 }
 
 static EPhysics_Body_Soft_Body_Data *
@@ -388,6 +389,8 @@
    EINA_LIST_FOREACH(bodies, l, data)
      {
         body = (EPhysics_Body *)data;
+        if (body->deleted) continue;
+
         if (body->type == EPHYSICS_BODY_TYPE_RIGID)
           {
              if (!body->evas_obj) continue;

Log:
ephysics: remove unneeded code from slices init
   function
  
  
  

Author:       bdilly
Date:         2012-10-25 14:54:29 -0700 (Thu, 25 Oct 2012)
New Revision: 78485
Trac:         http://trac.enlightenment.org/e/changeset/78485

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:22 UTC (rev 78484)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:29 UTC (rev 78485)
@@ -224,15 +224,12 @@
 _ephysics_body_soft_body_slices_init(EPhysics_Body *body)
 {
    EPhysics_Body_Soft_Body_Slice *slice = NULL;
-   Evas_Coord x, y, w, h, wy, wh;
    btVector3 p0, p1, p2;
    void *slice_data;
    Eina_List *l;
    Evas *evas;
 
    evas = evas_object_evas_get(body->evas_obj);
-   ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
-                                      NULL);
 
    EINA_LIST_FOREACH(body->soft_data->slices, l, slice_data)
      {
@@ -240,10 +237,7 @@
         slice->evas_obj = evas_object_image_filled_add(evas);
         evas_object_image_source_set(slice->evas_obj,
                                      body->soft_data->base_obj);
-
-        evas_object_geometry_get(body->soft_data->base_obj, &x, &y, &w, &h);
-        evas_object_resize(slice->evas_obj, w, h);
-        evas_object_move(slice->evas_obj, x, y);
+        evas_object_resize(slice->evas_obj, 1, 1);
         evas_object_show(slice->evas_obj);
         evas_object_image_smooth_scale_set(slice->evas_obj, EINA_TRUE);
      }

Log:
EPhysics: soft body position solver iterations
  
  This patch introduces getters and setters API for setting the
  soft body position solver iterations.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-25 14:54:37 -0700 (Thu, 25 Oct 2012)
New Revision: 78486
Trac:         http://trac.enlightenment.org/e/changeset/78486

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-10-25 21:54:29 UTC (rev 78485)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-25 21:54:37 UTC (rev 78486)
@@ -1914,6 +1914,42 @@
 
 /**
  * @brief
+ * Set the soft body number of position iterations.
+ *
+ * Both soft body and cloth can have its number of position iterations changed.
+ * The number of position iterations will change how many time the physics engine
+ * will iterate the position solver, a greater value will change deformation
+ * behaves and how hard the soft body looks like. The greater position iterations
+ * the harder the soft body will be.
+ *
+ * @node For soft bodies the default value is set to 1, and for cloth it's set to
+ * the number of rows / 5;
+ *
+ * @param body The body to be set.
+ * @param iterations The number of iterations.
+ *
+ * @see ephysics_body_cloth_add() for more informations about cloth.
+ * @see ephysics_body_soft_body_position_iterations_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_soft_body_position_iterations_set(EPhysics_Body *body, int iterations);
+
+/**
+ * @brief
+ * Get the soft body number of position iterations.
+ *
+ * @param body The body to get the number os position iterations from.
+ * @return The number of position solver iterations of a soft @p body.
+ *
+ * @see ephysics_body_soft_body_position_iterations_set().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI int ephysics_body_soft_body_position_iterations_get(EPhysics_Body *body);
+
+/**
+ * @brief
  * Move a body's triangle.
  *
  * Move the triangle of @p idx of @p body to @p x, @p y and @p z.

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:29 UTC (rev 78485)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:37 UTC (rev 78486)
@@ -1571,6 +1571,47 @@
    return EINA_TRUE;
 }
 
+EAPI void
+ephysics_body_soft_body_position_iterations_set(EPhysics_Body *body, int iterations)
+{
+   if (!body)
+     {
+        ERR("Could not set the number of iterations for position solver, body "
+            "is null.");
+        return;
+     }
+
+   if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+     {
+        ERR("Could not set the number of iterations for position solver, body "
+            "must be a soft body or a cloth");
+        return;
+     }
+
+   body->soft_body->m_cfg.piterations = iterations;
+   DBG("Soft body position solver iterations set to: %d", iterations);
+}
+
+EAPI int
+ephysics_body_soft_body_position_iterations_get(EPhysics_Body *body)
+{
+   if (!body)
+     {
+        ERR("Could not get the number of iterations for position solver, body "
+            "is null.");
+        return 0;
+     }
+
+   if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+     {
+        ERR("Could not get the number of iterations for position solver, body "
+            "must be a soft body or a cloth");
+        return 0;
+     }
+
+   return body->soft_body->m_cfg.piterations;
+}
+
 EAPI EPhysics_Body *
 ephysics_body_cloth_add(EPhysics_World *world, unsigned short granularity)
 {

Log:
EPhysics: make anchors harder
  
  This patch resets the anchors nodes mass proportional to the mesh
  size so it becomes harder. For that we also handle the mass resetting
  to leave anchors and dragging nodes in their current state.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-25 14:54:55 -0700 (Thu, 25 Oct 2012)
New Revision: 78488
Trac:         http://trac.enlightenment.org/e/changeset/78488

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:48 UTC (rev 78487)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:55 UTC (rev 78488)
@@ -843,6 +843,43 @@
 }
 
 static void
+_ephysics_body_soft_body_mass_set(EPhysics_Body *body, double mass)
+{
+   int valid_nodes;
+   btSoftBody::Node node;
+   double inverse_mass;
+
+   if (body->type == EPHYSICS_BODY_TYPE_SOFT)
+        body->soft_body->setTotalMass(mass);
+   else
+     {
+        valid_nodes = 0;
+        for (int i = 0; i < body->soft_body->m_nodes.size(); i++)
+          {
+             node = body->soft_body->m_nodes[i];
+             if (node.m_im && !node.m_battach)
+               valid_nodes++;
+          }
+
+        inverse_mass = 1 / (mass / valid_nodes);
+        if (body->dragging_data.dragging)
+          {
+             valid_nodes++;
+             inverse_mass = 1 / (mass / valid_nodes);
+             for (int i = 0; i < 3; i++)
+               body->dragging_data.mass[i] = inverse_mass;
+          }
+
+        for (int i = 0; i < body->soft_body->m_nodes.size(); i++)
+          {
+             node = body->soft_body->m_nodes[i];
+             if (node.m_im && !node.m_battach)
+                  node.m_im = inverse_mass;
+          }
+     }
+}
+
+static void
 _ephysics_body_mass_set(EPhysics_Body *body, double mass)
 {
    btVector3 inertia(0, 0, 0);
@@ -851,12 +888,7 @@
      mass = body->density * _ephysics_body_volume_get(body);
 
    if (body->soft_body)
-     {
-        body->soft_body->setTotalMass(mass);
-        if (body->dragging_data.dragging)
-          _ephysics_body_soft_body_dragging_set(body,
-                                                body->dragging_data.triangle);
-     }
+     _ephysics_body_soft_body_mass_set(body, mass);
    else
      {
         body->collision_shape->calculateLocalInertia(mass, inertia);
@@ -1467,6 +1499,7 @@
 {
    int rows;
    int columns;
+   double anchor_mass;
 
    if (!body1 || !body2)
      {
@@ -1483,34 +1516,47 @@
 
    rows = body1->cloth_rows;
    columns = body1->cloth_columns;
+   anchor_mass = body1->soft_body->m_nodes.size() * 0.025;
 
    if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_RIGHT)
      {
         for (int i = 0; i < rows; i++)
-          body1->soft_body->appendAnchor(i, body2->rigid_body);
+          {
+             body1->soft_body->setMass(i, anchor_mass);
+             body1->soft_body->appendAnchor(i, body2->rigid_body);
+          }
         return;
      }
 
    if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_LEFT)
      {
         for (int i = 1; i <= rows; i++)
-          body1->soft_body->appendAnchor((rows * columns) - i,
-                                         body2->rigid_body);
+          {
+             body1->soft_body->setMass((rows * columns) - i, anchor_mass);
+             body1->soft_body->appendAnchor((rows * columns) - i,
+                                            body2->rigid_body);
+          }
         return;
      }
 
    if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_BOTTOM)
      {
         for (int i = 0; i <= rows; i++)
-          body1->soft_body->appendAnchor(i * rows, body2->rigid_body);
+          {
+             body1->soft_body->setMass((i * rows), anchor_mass);
+             body1->soft_body->appendAnchor(i * rows, body2->rigid_body);
+          }
         return;
      }
 
    if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_TOP)
      {
         for (int i = 0; i < columns; i++)
+          {
+             body1->soft_body->setMass((rows - 1) + rows * i, anchor_mass);
              body1->soft_body->appendAnchor((rows - 1) + rows * i,
                                            body2->rigid_body);
+          }
      }
 }
 
@@ -1705,6 +1751,10 @@
    const btScalar margin = soft_body->getCollisionShape()->getMargin();
 
    node = soft_body->m_faces[face_idx].m_n[node_idx];
+
+   if (node->m_battach)
+     return;
+
    node->m_x = trans * node->m_x;
    node->m_q = trans * node->m_q;
    node->m_n = trans.getBasis() * node->m_n;

Log:
ephysics: stack respect body adding order for same z
  
  When bodies have the same z coordinate, the added first will
  be below the others.
  
  

Author:       bdilly
Date:         2012-10-25 14:55:03 -0700 (Thu, 25 Oct 2012)
New Revision: 78489
Trac:         http://trac.enlightenment.org/e/changeset/78489

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:54:55 UTC (rev 78488)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-25 21:55:03 UTC (rev 78489)
@@ -359,11 +359,11 @@
    stacking1 = (const EPhysics_Body_Evas_Stacking *)d1;
    stacking2 = (const EPhysics_Body_Evas_Stacking *)d2;
 
-   if (!stacking1) return 1;
-   if (!stacking2) return -1;
+   if (!stacking1) return -1;
+   if (!stacking2) return 1;
 
-   if (stacking1->stacking < stacking2->stacking) return -1;
-   if (stacking2->stacking > stacking2->stacking) return 1;
+   if (stacking1->stacking < stacking2->stacking) return 1;
+   if (stacking2->stacking > stacking2->stacking) return -1;
 
    return 0;
 }
@@ -430,7 +430,7 @@
           }
 
         if (prev_obj)
-          evas_object_stack_above(stacking->evas, prev_obj);
+          evas_object_stack_below(stacking->evas, prev_obj);
 
         prev_obj = stacking->evas;
         free(stacking);

Log:
ephysics: docs fixes (missing params / typos)
  
  
  

Author:       bdilly
Date:         2012-10-25 14:55:14 -0700 (Thu, 25 Oct 2012)
New Revision: 78490
Trac:         http://trac.enlightenment.org/e/changeset/78490

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-10-25 21:55:03 UTC (rev 78489)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-25 21:55:14 UTC (rev 78490)
@@ -735,6 +735,9 @@
  *
  * When a world is created it starts running.
  *
+ * @param world The world to be played / paused.
+ * @param running If @c EINA_TRUE it will play, otherwise it will pause.
+ *
  * @see ephysics_world_running_get()
  *
  * @ingroup EPhysics_World
@@ -747,6 +750,10 @@
  *
  * By default a world starts running.
  *
+ * @param world The physics world.
+ * @return @c EINA_TRUE if it's running, or @c EINA_FALSE if it's paused or on
+ * error.
+ *
  * @see ephysics_world_running_set() for more details.
  *
  * @ingroup EPhysics_World
@@ -1917,13 +1924,14 @@
  * Set the soft body number of position iterations.
  *
  * Both soft body and cloth can have its number of position iterations changed.
- * The number of position iterations will change how many time the physics engine
+ * The number of position iterations will change how many time the physics
+ * engine
  * will iterate the position solver, a greater value will change deformation
- * behaves and how hard the soft body looks like. The greater position iterations
- * the harder the soft body will be.
+ * behaves and how hard the soft body looks like. The greater position
+ * iterations the harder the soft body will be.
  *
- * @node For soft bodies the default value is set to 1, and for cloth it's set to
- * the number of rows / 5;
+ * @note For soft bodies the default value is set to 1, and for cloth it's set
+ * to the number of rows / 5;
  *
  * @param body The body to be set.
  * @param iterations The number of iterations.
@@ -2004,8 +2012,8 @@
  * Just like rotation, deformation will be applied on associated
  * evas object using evas map.
  *
- * @note When working with soft bodies it's importante to adjust the simulation's
- * fixed time step due its multi point nature.
+ * @note When working with soft bodies it's importante to adjust the
+ * simulation's fixed time step due its multi point nature.
  *
  * For a rigid circle, check @ref ephysics_body_circle_add().
  *
@@ -2049,8 +2057,8 @@
  * Just like rotation, deformation will be applied on associated
  * evas object using evas map.
  *
- * @note When working with soft bodies it's importante to adjust the simulation's
- * fixed time step due its multi point nature.
+ * @note When working with soft bodies it's importante to adjust the
+ * simulation's fixed time step due its multi point nature.
  *
  * For a rigid circle, check @ref ephysics_body_circle_add().
  *

Log:
ephysics: support disabling stacking based on Z axis
  
  Since now we support movement on Z axis the evas objects
  associated to bodies need to be re-stacked to be below / above
  each other.
  
  But if Z axis movement is disabled, no cloth is used, ...,
  it can be safely disabled, since evas objects won't overlap.
  And it will save performance.
  
  

Author:       bdilly
Date:         2012-10-25 14:55:23 -0700 (Thu, 25 Oct 2012)
New Revision: 78491
Trac:         http://trac.enlightenment.org/e/changeset/78491

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-10-25 21:55:14 UTC (rev 78490)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-10-25 21:55:23 UTC (rev 78491)
@@ -1524,6 +1524,50 @@
 EAPI Eina_Bool ephysics_world_light_all_bodies_get(const EPhysics_World *world);
 
 /**
+ * @brief
+ * Enable / disable stacking based on bodies z coordinates.
+ *
+ * Evas objects associated to bodies will be restacked when it's enabled.
+ * So if a body A has coordinates x = 10, y = 10, z = 8 and a body B
+ * has coordinates x = 10, y = 10, z = 10, the evas object associated to B
+ * will be displayed below the evas object associated to A.
+ *
+ * Evas objects will be restacked at each simulation tick. It's enabled by
+ * default, and disabling it can lead to wrong scenarios when movement
+ * on Z axis is enabled or when cloths are used.
+ *
+ * But disabling it can save performance, so if you won't face these
+ * scenarios, it safe to disable it, since no evas object will be moved to
+ * be below or above others.
+ *
+ * @param world The physics world.
+ * @param enabled If @c EINA_TRUE, stacking based on Z coordinates will be
+ * enabled, otherwise it will be disabled.
+ *
+ * @see ephysics_world_stack_enable_get()
+ * @see ephysics_body_evas_object_set()
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI void ephysics_world_stack_enable_set(EPhysics_World *world, Eina_Bool enabled);
+
+/**
+ * @brief
+ * Get stacking status of world.
+ *
+ * Stacking based on bodies z coordinates can be enabled or disabled.
+ *
+ * @param world The physics world.
+ * @return @c EINA_TRUE if it's running, or @c EINA_FALSE if it's paused or on
+ * error.
+ *
+ * @see ephysics_world_stack_enable_set() for more details.
+ *
+ * @ingroup EPhysics_World
+ */
+EAPI Eina_Bool ephysics_world_stack_enable_get(const EPhysics_World *world);
+
+/**
  * @}
  */
 

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-25 21:55:14 UTC (rev 78490)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-10-25 21:55:23 UTC (rev 78491)
@@ -101,6 +101,7 @@
      Eina_Bool outside_front:1;
      Eina_Bool outside_back:1;
      Eina_Bool pending_simulation:1;
+     Eina_Bool stacking:1;
 };
 
 static int _ephysics_world_init_count = 0;
@@ -242,7 +243,8 @@
           }
      }
 
-   ephysics_body_evas_objects_restack(world);
+   if (world->stacking)
+     ephysics_body_evas_objects_restack(world);
 
    if (camera_moved)
      {
@@ -752,8 +754,9 @@
      INF("Couldn't initialize the collision filter.");
    else
      world->dynamics_world->getPairCache()->setOverlapFilterCallback(
-                                                               world->filter_cb);
+        world->filter_cb);
 
+   world->stacking = EINA_TRUE;
    world->rate = 30;
    world->max_sub_steps = 3;
    world->fixed_time_step = 1/60.f;
@@ -1627,6 +1630,29 @@
    return world->light->all_bodies;
 }
 
+EAPI void
+ephysics_world_stack_enable_set(EPhysics_World *world, Eina_Bool enabled)
+{
+   if (!world)
+     {
+        ERR("Can't enable / disable stacking, world wasn't provided.");
+        return;
+     }
+   world->stacking = !!enabled;
+}
+
+EAPI Eina_Bool
+ephysics_world_stack_enable_get(const EPhysics_World *world)
+{
+   if (!world)
+     {
+	ERR("No world, no stacking status for you.");
+	return EINA_FALSE;
+     }
+
+   return world->stacking;
+}
+
 #ifdef  __cplusplus
 }
 #endif

Log:
EPhysics: soft body rotation set
  
  Fix implementation for ephysics_body_rotation_set for soft bodies.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-30 11:31:38 -0700 (Tue, 30 Oct 2012)
New Revision: 78679
Trac:         http://trac.enlightenment.org/e/changeset/78679

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-30 18:31:32 UTC (rev 78678)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-30 18:31:38 UTC (rev 78679)
@@ -3103,17 +3103,19 @@
 
    ephysics_world_lock_take(body->world);
    ephysics_body_activate(body, EINA_TRUE);
-   trans = _ephysics_body_transform_get(body);
 
    quat.setEuler(-rot_x / RAD_TO_DEG, -rot_y / RAD_TO_DEG, -rot_z / RAD_TO_DEG);
-   trans.setRotation(quat);
 
    if (body->soft_body)
-     body->soft_body->transform(trans);
+     body->soft_body->rotate(quat);
+   else
+     {
+        trans = _ephysics_body_transform_get(body);
+        trans.setRotation(quat);
+        body->rigid_body->proceedToTransform(trans);
+        body->rigid_body->getMotionState()->setWorldTransform(trans);
+     }
 
-   body->rigid_body->proceedToTransform(trans);
-   body->rigid_body->getMotionState()->setWorldTransform(trans);
-
    DBG("Body %p rotation set to (%lf, %lf, %lf)", body, rot_x, rot_y, rot_z);
    ephysics_world_lock_release(body->world);
 }

Log:
EPhysics: disable evas map on
   ephysics_body_evas_object_set/unset
  
  When unsetting or chaging the body's associated evas object we must
  disable the evas map so the user can handle it afterwards.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-30 11:31:45 -0700 (Tue, 30 Oct 2012)
New Revision: 78680
Trac:         http://trac.enlightenment.org/e/changeset/78680

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-30 18:31:38 UTC (rev 78679)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-30 18:31:45 UTC (rev 78680)
@@ -2393,6 +2393,7 @@
                                        _ephysics_body_evas_obj_del_cb);
         evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
                                        _ephysics_body_evas_obj_resize_cb);
+        evas_object_map_enable_set(body->evas_obj, EINA_FALSE);
         if (body->soft_data)
           _ephysics_body_soft_body_slices_clean(body->soft_data);
      }
@@ -2446,6 +2447,7 @@
                                        _ephysics_body_evas_obj_del_cb);
         evas_object_event_callback_del(obj, EVAS_CALLBACK_RESIZE,
                                        _ephysics_body_evas_obj_resize_cb);
+        evas_object_map_enable_set(obj, EINA_FALSE);
      }
 
    if (body->type != EPHYSICS_BODY_TYPE_RIGID)

Log:
EPhysics: restacking per layer
  
  This patch fixes issues with restacking bodies in different evas
  layers.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-30 11:31:52 -0700 (Tue, 30 Oct 2012)
New Revision: 78681
Trac:         http://trac.enlightenment.org/e/changeset/78681

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-30 18:31:45 UTC (rev 78680)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-30 18:31:52 UTC (rev 78681)
@@ -237,6 +237,8 @@
         slice->evas_obj = evas_object_image_filled_add(evas);
         evas_object_image_source_set(slice->evas_obj,
                                      body->soft_data->base_obj);
+        evas_object_layer_set(slice->evas_obj,
+                              evas_object_layer_get(body->soft_data->base_obj));
         evas_object_resize(slice->evas_obj, 1, 1);
         evas_object_show(slice->evas_obj);
         evas_object_image_smooth_scale_set(slice->evas_obj, EINA_TRUE);
@@ -321,6 +323,7 @@
    evas_object_resize(obj, w, h);
    evas_object_data_set(obj, BODY, body);
    evas_object_show(obj);
+   evas_object_layer_set(obj, evas_object_layer_get(body->evas_obj));
 
    body->evas_obj = obj;
    _ephysics_body_soft_body_slices_init(body);
@@ -368,33 +371,84 @@
    return 0;
 }
 
+static void
+_ephysics_body_evas_objects_restack_free(void *data)
+{
+   Eina_List *l, *stack_list = (Eina_List *)data;
+   void *ldata;
+
+   EINA_LIST_FOREACH(stack_list, l, ldata)
+     free(ldata);
+
+   eina_list_free(stack_list);
+}
+
+static EPhysics_Body_Evas_Stacking *
+_ephysics_body_evas_stacking_new(Evas_Object *obj, float index)
+{
+   EPhysics_Body_Evas_Stacking *stacking;
+
+   stacking = (EPhysics_Body_Evas_Stacking *)calloc(
+                1, sizeof(EPhysics_Body_Evas_Stacking));
+
+   if (!stacking)
+     {
+        ERR("Could not allocate ephysics soft body evas stacking data.");
+        return NULL;
+     }
+
+   stacking->evas = obj;
+   stacking->stacking = index;
+   return stacking;
+}
+
 void
 ephysics_body_evas_objects_restack(EPhysics_World *world)
 {
-   void *data, *slice_data;
+   void *data, *slice_data, *stack_data;
    EPhysics_Body *body;
    btTransform trans;
    EPhysics_Body_Evas_Stacking *stacking;
    EPhysics_Body_Soft_Body_Slice *slice;
    Eina_List *l, *slices, *bodies, *stack_list = NULL;
    Evas_Object *prev_obj = NULL;
+   Eina_Hash *hash;
+   Eina_Iterator *it;
+   int layer;
+   Eina_Bool previously_added;
 
    bodies = ephysics_world_bodies_get(world);
+
+   if (!eina_list_count(bodies))
+     return;
+
+   hash = eina_hash_int32_new(_ephysics_body_evas_objects_restack_free);
+
    EINA_LIST_FOREACH(bodies, l, data)
      {
         body = (EPhysics_Body *)data;
         if (body->deleted) continue;
+        previously_added = EINA_FALSE;
 
         if (body->type == EPHYSICS_BODY_TYPE_RIGID)
           {
              if (!body->evas_obj) continue;
              trans = _ephysics_body_transform_get(body);
-             stacking = (EPhysics_Body_Evas_Stacking *)calloc(
-                1, sizeof(EPhysics_Body_Evas_Stacking));
+             stacking = _ephysics_body_evas_stacking_new(body->evas_obj,
+                                                         trans.getOrigin().z());
              if (!stacking) goto error;
-             stacking->stacking = trans.getOrigin().z();
-             stacking->evas = body->evas_obj;
+
+             layer = evas_object_layer_get(stacking->evas);
+             stack_list = (Eina_List *)eina_hash_find(hash, &layer);
+
+             if (stack_list)
+               previously_added = EINA_TRUE;
+
              stack_list = eina_list_append(stack_list, stacking);
+
+             if (!previously_added)
+               eina_hash_add(hash, &layer, stack_list);
+
              continue;
           }
 
@@ -402,46 +456,53 @@
 
         EINA_LIST_FOREACH(body->soft_data->slices, slices, slice_data)
           {
+             previously_added = EINA_FALSE;
              slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
-             stacking = (EPhysics_Body_Evas_Stacking *)calloc(
-                1, sizeof(EPhysics_Body_Evas_Stacking));
+
+             stacking = _ephysics_body_evas_stacking_new(slice->evas_obj,
+                                                         slice->stacking);
              if (!stacking) goto error;
-             stacking->stacking = slice->stacking;
-             stacking->evas = slice->evas_obj;
+
+             layer = evas_object_layer_get(stacking->evas);
+             stack_list = (Eina_List *)eina_hash_find(hash, &layer);
+
+             if (stack_list)
+               previously_added = EINA_TRUE;
+
              stack_list = eina_list_append(stack_list, stacking);
+
+             if (!previously_added)
+               eina_hash_add(hash, &layer, stack_list);
           }
      }
 
-   stack_list = eina_list_sort(stack_list, eina_list_count(stack_list),
-                               _ephysics_body_evas_stacking_sort_cb);
 
-   EINA_LIST_FREE(stack_list, data)
+   it = eina_hash_iterator_data_new(hash);
+   while (eina_iterator_next(it, &data))
      {
-        stacking = (EPhysics_Body_Evas_Stacking *)data;
+        stack_list = (Eina_List *)data;
+        stack_list = eina_list_sort(stack_list, eina_list_count(stack_list),
+                                    _ephysics_body_evas_stacking_sort_cb);
+        prev_obj = NULL;
 
-        if (prev_obj && evas_object_layer_get(prev_obj) !=
-            evas_object_layer_get(stacking->evas))
+        EINA_LIST_FOREACH(stack_list, l, stack_data)
           {
-             INF("The world %p has bodies with associated evas objects on"
-                 " different layers, skipping the restaking for %p and %p",
-                 world, prev_obj, stacking->evas);
-             free(stacking);
-             continue;
-          }
+             stacking = (EPhysics_Body_Evas_Stacking *)stack_data;
 
-        if (prev_obj)
-          evas_object_stack_below(stacking->evas, prev_obj);
+             if (prev_obj)
+               evas_object_stack_below(stacking->evas, prev_obj);
 
-        prev_obj = stacking->evas;
-        free(stacking);
+             prev_obj = stacking->evas;
+          }
      }
 
+   eina_iterator_free(it);
+   eina_hash_free(hash);
    return;
 
  error:
    ERR("Could not allocate evas stacking data memory.");
-   EINA_LIST_FREE(stack_list, data)
-        free(data);
+   eina_hash_free(hash);
 }
 
 static void

Log:
EPhysics: the z axis is inverted
  
  The z axis is inverted so the greater the lower it is, the smaller
  the above it is.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-10-30 11:31:58 -0700 (Tue, 30 Oct 2012)
New Revision: 78682
Trac:         http://trac.enlightenment.org/e/changeset/78682

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-30 18:31:52 UTC (rev 78681)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-30 18:31:58 UTC (rev 78682)
@@ -362,11 +362,11 @@
    stacking1 = (const EPhysics_Body_Evas_Stacking *)d1;
    stacking2 = (const EPhysics_Body_Evas_Stacking *)d2;
 
-   if (!stacking1) return -1;
-   if (!stacking2) return 1;
+   if (!stacking1) return 1;
+   if (!stacking2) return -1;
 
-   if (stacking1->stacking < stacking2->stacking) return 1;
-   if (stacking2->stacking > stacking2->stacking) return -1;
+   if (stacking1->stacking < stacking2->stacking) return -1;
+   if (stacking2->stacking > stacking2->stacking) return 1;
 
    return 0;
 }

Log:
ephysics: avoid many unecessary allocs / free on
   collision detection
  
  Only allocates data when it has a callback registered.
  
  

Author:       bdilly
Date:         2012-10-31 14:02:43 -0700 (Wed, 31 Oct 2012)
New Revision: 78725
Trac:         http://trac.enlightenment.org/e/changeset/78725

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 20:41:01 UTC (rev 78724)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:02:43 UTC (rev 78725)
@@ -1347,7 +1347,7 @@
    double rate;
    int wy, wh;
 
-   if ((!body) || (!contact_body))
+   if ((!body) || (!contact_body) || (body->collision_cb < 1))
      return;
 
    collision = (EPhysics_Body_Collision *)calloc(
@@ -2845,6 +2845,8 @@
    cb->data = (void *)data;
 
    body->callbacks = eina_inlist_append(body->callbacks, EINA_INLIST_GET(cb));
+   if (type == EPHYSICS_CALLBACK_BODY_COLLISION)
+       body->collision_cb++;
 }
 
 EAPI void *
@@ -2866,8 +2868,9 @@
 
         cb_data = cb->data;
         _ephysics_body_event_callback_del(body, cb);
+        if (type == EPHYSICS_CALLBACK_BODY_COLLISION)
+            body->collision_cb--;
         break;
-
      }
 
    return cb_data;

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-10-31 20:41:01 UTC (rev 78724)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-10-31 21:02:43 UTC (rev 78725)
@@ -114,6 +114,7 @@
      int cloth_columns;
      int cloth_rows;
      int material_index;
+     int collision_cb;
      EPhysics_Body_Soft_Body_Data *soft_data;
      struct {
        int triangle;

Log:
ephysics: update slices at each tick
  
  No reason to call it only when evas object moves.
  Makes soft bodies animations smoother.
  
  

Author:       bdilly
Date:         2012-10-31 14:02:55 -0700 (Wed, 31 Oct 2012)
New Revision: 78727
Trac:         http://trac.enlightenment.org/e/changeset/78727

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:02:50 UTC (rev 78726)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:02:55 UTC (rev 78727)
@@ -17,8 +17,6 @@
 extern "C" {
 #endif
 
-#define BODY "body"
-
 typedef struct _EPhysics_Body_Callback EPhysics_Body_Callback;
 typedef struct _EPhysics_Body_Evas_Stacking EPhysics_Body_Evas_Stacking;
 typedef struct _EPhysics_Body_Soft_Body_Slice EPhysics_Body_Soft_Body_Slice;
@@ -55,7 +53,7 @@
 };
 
 static void
-_ephysics_body_soft_body_slices_apply(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_ephysics_body_soft_body_slices_apply(EPhysics_Body *body)
 {
    double rate;
    void *list_data;
@@ -65,7 +63,6 @@
    btVector3 p0, p1, p2;
    btSoftBody::tFaceArray faces;
    EPhysics_Body_Soft_Body_Slice *slice;
-   EPhysics_Body *body;
    int lr, lg, lb, ar, ag, ab;
    Evas_Coord lx, ly, lz;
    Eina_Bool light = EINA_FALSE;
@@ -73,10 +70,8 @@
    int px, py, pz, foc;
    Eina_Bool perspective = EINA_FALSE;
 
-   body = (EPhysics_Body *) evas_object_data_get(obj, BODY);
    camera = ephysics_world_camera_get(body->world);
    rate = ephysics_world_rate_get(body->world);
-
    ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
                                       NULL);
    evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h);
@@ -213,7 +208,6 @@
    Evas *evas;
 
    evas = evas_object_evas_get(body->evas_obj);
-   evas_object_data_set(body->evas_obj, BODY, body);
 
    EINA_LIST_FOREACH(body->slices_list, l, slice_data)
      {
@@ -231,7 +225,7 @@
    if (slice)
      evas_object_image_source_visible_set(slice->evas_obj, EINA_FALSE);
 
-   _ephysics_body_soft_body_slices_apply(NULL, NULL, body->evas_obj, NULL);
+   _ephysics_body_soft_body_slices_apply(body);
 }
 
 static void
@@ -1091,7 +1085,10 @@
      }
 
    if (body->type != EPHYSICS_BODY_TYPE_RIGID)
-     return;
+     {
+        _ephysics_body_soft_body_slices_apply(body);
+        return;
+     }
 
    map = evas_map_new(4);
    evas_map_util_points_populate_from_object(map, body->evas_obj);
@@ -2337,12 +2334,7 @@
         evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
                                        _ephysics_body_evas_obj_resize_cb);
         if (body->slices_list)
-          {
-             _ephysics_body_soft_body_slices_clean(body);
-             evas_object_event_callback_del(
-                body->evas_obj, EVAS_CALLBACK_MOVE,
-                _ephysics_body_soft_body_slices_apply);
-          }
+          _ephysics_body_soft_body_slices_clean(body);
      }
 
    body->evas_obj = evas_obj;
@@ -2350,12 +2342,7 @@
                                   _ephysics_body_evas_obj_del_cb, body);
 
    if (body->soft_body)
-     {
-        _ephysics_body_soft_body_slices_init(body);
-        evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_MOVE,
-                                       _ephysics_body_soft_body_slices_apply,
-                                       NULL);
-     }
+     _ephysics_body_soft_body_slices_init(body);
 
    if (!use_obj_pos)
      return;
@@ -2395,11 +2382,7 @@
      }
 
    if (body->slices_list)
-     {
-        _ephysics_body_soft_body_slices_clean(body);
-        evas_object_event_callback_del(obj, EVAS_CALLBACK_MOVE,
-                                       _ephysics_body_soft_body_slices_apply);
-     }
+     _ephysics_body_soft_body_slices_clean(body);
 
    return obj;
 }

Log:
ephysics: fix slices size
  
  with 1,1 events conversion won't works fine
  
  

Author:       bdilly
Date:         2012-10-31 14:03:02 -0700 (Wed, 31 Oct 2012)
New Revision: 78728
Trac:         http://trac.enlightenment.org/e/changeset/78728

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:02:55 UTC (rev 78727)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:03:02 UTC (rev 78728)
@@ -204,10 +204,12 @@
    EPhysics_Body_Soft_Body_Slice *slice = NULL;
    btVector3 p0, p1, p2;
    void *slice_data;
+   Evas_Coord w, h;
    Eina_List *l;
    Evas *evas;
 
    evas = evas_object_evas_get(body->evas_obj);
+   evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h);
 
    EINA_LIST_FOREACH(body->slices_list, l, slice_data)
      {
@@ -217,7 +219,7 @@
                               evas_object_layer_get(body->evas_obj));
         evas_object_image_source_set(slice->evas_obj, body->evas_obj);
         evas_object_image_source_events_set(slice->evas_obj, EINA_TRUE);
-        evas_object_resize(slice->evas_obj, 1, 1);
+        evas_object_resize(slice->evas_obj, w, h);
         evas_object_show(slice->evas_obj);
         evas_object_image_smooth_scale_set(slice->evas_obj, EINA_TRUE);
      }

Log:
ephysics: fix cols / rows account
  
  It was creating meshes with cols - 1, rows - 1.
  
  

Author:       bdilly
Date:         2012-10-31 14:03:09 -0700 (Wed, 31 Oct 2012)
New Revision: 78729
Trac:         http://trac.enlightenment.org/e/changeset/78729

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:03:02 UTC (rev 78728)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:03:09 UTC (rev 78729)
@@ -1484,8 +1484,8 @@
         return;
      }
 
-   rows = body1->cloth_rows;
-   columns = body1->cloth_columns;
+   rows = body1->cloth_rows + 1;
+   columns = body1->cloth_columns + 1;
    anchor_mass = body1->soft_body->m_nodes.size() * 0.025;
 
    if (side == EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_RIGHT)
@@ -1648,7 +1648,8 @@
                                               btVector3(2, 1, 0),
                                               btVector3(1, 2, 0),
                                               btVector3(1, 1, 0),
-                                              body_rows, body_columns, 0, false);
+                                              body_rows + 1, body_columns + 1,
+                                              0, false);
 
    if (!soft_body)
      {

Log:
ephysics: fix triangles index get
  
  It will works only with cloths for now.
  
  

Author:       bdilly
Date:         2012-10-31 14:03:17 -0700 (Wed, 31 Oct 2012)
New Revision: 78730
Trac:         http://trac.enlightenment.org/e/changeset/78730

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:03:09 UTC (rev 78729)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:03:17 UTC (rev 78730)
@@ -1803,36 +1803,32 @@
 EAPI int
 ephysics_body_soft_body_triangle_index_get(EPhysics_Body *body, Evas_Coord x, Evas_Coord y)
 {
-   btVector3 ray_from;
-   btVector3 ray_to;
-   btSoftBody::sRayCast result;
-   Evas_Coord wh, bw;
-   btScalar xx, yy;
-   double rate;
-   int index = -1;
+   int w, h, r, c, index = -1;
 
+   if (!body->evas_obj)
+     {
+        ERR("No evas object associated to body");
+        return -1;
+     }
+
    if (body->type == EPHYSICS_BODY_TYPE_RIGID)
      {
         ERR("Can't get node index, operation not permited to rigid bodies");
         return -1;
      }
 
-   ephysics_world_lock_take(body->world);
-   rate = ephysics_world_rate_get(body->world);
-   ephysics_world_render_geometry_get(body->world, NULL, NULL, NULL, NULL, &wh,
-                                      NULL);
-   ephysics_body_geometry_get(body, NULL, NULL, NULL, &bw, NULL, NULL);
+   if (body->type == EPHYSICS_BODY_TYPE_SOFT)
+     {
+        ERR("Can't get node index, not implemented for soft bodies yet.");
+        return -1;
+     }
 
-   xx =  x / rate;
-   yy = (wh -  y) / rate;
+   evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h);
+   r = y * body->cloth_rows / h;
+   c = (w - x) * body->cloth_columns / w;
 
-   ray_from = btVector3(xx, yy, -100);
-   ray_to = btVector3(xx, yy, 100);
+   index = 2 * r + c * body->cloth_rows * 2;
 
-   if (body->soft_body->rayTest(ray_from, ray_to, result))
-     index = result.index;
-   ephysics_world_lock_release(body->world);
-
    return index;
 }

Log:
ephysics: cosmetic fix
  
  
  

Author:       bdilly
Date:         2012-10-31 14:03:36 -0700 (Wed, 31 Oct 2012)
New Revision: 78732
Trac:         http://trac.enlightenment.org/e/changeset/78732

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:03:23 UTC (rev 78731)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-10-31 21:03:36 UTC (rev 78732)
@@ -2635,30 +2635,30 @@
 EAPI void
 ephysics_body_damping_set(EPhysics_Body *body, double linear_damping, double angular_damping)
 {
-    if (!body)
+   if (!body)
      {
         ERR("Can't set body damping, body is null.");
         return;
      }
 
    ephysics_world_lock_take(body->world);
-    body->rigid_body->setDamping(btScalar(linear_damping),
-                                 btScalar(angular_damping));
+   body->rigid_body->setDamping(btScalar(linear_damping),
+                                btScalar(angular_damping));
    ephysics_world_lock_release(body->world);
 }
 
 EAPI void
 ephysics_body_damping_get(const EPhysics_Body *body, double *linear_damping, double *angular_damping)
 {
-    if (!body)
+   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();
+   if (linear_damping) *linear_damping = body->rigid_body->getLinearDamping();
+   if (angular_damping) *angular_damping =
+     body->rigid_body->getAngularDamping();
 }
 
 EAPI void

Log:
ephysics: check for side value on anchors full add
   function
  
  
  

Author:       bdilly
Date:         2012-11-09 10:52:16 -0800 (Fri, 09 Nov 2012)
New Revision: 79037
Trac:         http://trac.enlightenment.org/e/changeset/79037

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-11-09 18:35:20 UTC (rev 79036)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-09 18:52:16 UTC (rev 79037)
@@ -1838,6 +1838,7 @@
   EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_RIGHT,
   EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_TOP,
   EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_BOTTOM,
+  EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_LAST,
 } EPhysics_Body_Cloth_Anchor_Side;
 
 /**

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:35:20 UTC (rev 79036)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:16 UTC (rev 79037)
@@ -1484,6 +1484,12 @@
         return;
      }
 
+   if ((side < 0) || (side >= EPHYSICS_BODY_CLOTH_ANCHOR_SIDE_LAST))
+     {
+        ERR("Could not add anchors, side is invalid.");
+        return;
+     }
+
    rows = body1->cloth_rows + 1;
    columns = body1->cloth_columns + 1;
    anchor_mass = body1->soft_body->m_nodes.size() * 0.025;

Log:
ephysics: improve body struct readability a bit
  
  Actually ephysics body deserves a redesign, since it differs
  a lot between types. It wasn't previewed.
  
  

Author:       bdilly
Date:         2012-11-09 10:52:22 -0800 (Fri, 09 Nov 2012)
New Revision: 79038
Trac:         http://trac.enlightenment.org/e/changeset/79038

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:16 UTC (rev 79037)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:22 UTC (rev 79038)
@@ -895,9 +895,9 @@
           _ephysics_body_mass_set(body, ephysics_body_mass_get(body));
      }
 
-   body->w = w;
-   body->h = h;
-   body->d = d;
+   body->size.w = w;
+   body->size.h = h;
+   body->size.d = d;
 
    ephysics_body_activate(body, EINA_TRUE);
 
@@ -917,9 +917,9 @@
                                       NULL, &height, NULL);
    height += wy;
 
-   mx = (x + body->w * body->cm.x) / rate;
-   my = (height - (y + body->h * body->cm.y)) / rate;
-   mz = (z + body->d * body->cm.z) / rate;
+   mx = (x + body->size.w * body->cm.x) / rate;
+   my = (height - (y + body->size.h * body->cm.y)) / rate;
+   mz = (z + body->size.d * body->cm.z) / rate;
 
    trans = _ephysics_body_transform_get(body);
    trans.setOrigin(btVector3(mx, my, mz));
@@ -986,9 +986,9 @@
    _ephysics_body_transform_set(body, trans);
    ephysics_body_activate(body, EINA_TRUE);
 
-   body->w = w;
-   body->h = h;
-   body->d = d;
+   body->size.w = w;
+   body->size.h = h;
+   body->size.d = d;
    body->scale = body_scale;
 
    DBG("Body %p position changed to (%lf, %lf, %lf).", body, mx, my, mz);
@@ -1002,12 +1002,12 @@
    int w, h;
 
    evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-   if ((w == body->w) && (h == body->h))
+   if ((w == body->size.w) && (h == body->size.h))
      return;
 
-   DBG("Resizing body %p to w=%i, h=%i, d=%i", body, w, h, body->d);
+   DBG("Resizing body %p to w=%i, h=%i, d=%i", body, w, h, body->size.d);
    ephysics_world_lock_take(body->world);
-   _ephysics_body_resize(body, w, h, body->d);
+   _ephysics_body_resize(body, w, h, body->size.d);
    ephysics_world_lock_release(body->world);
 }
 
@@ -2485,9 +2485,9 @@
    if (y) *y = height - round((trans.getOrigin().getY() + scale.y() / 2)
                               * rate);
    if (z) *z = round((trans.getOrigin().getZ() - scale.z() / 2) * rate);
-   if (w) *w = body->w;
-   if (h) *h = body->h;
-   if (d) *d = body->d;
+   if (w) *w = body->size.w;
+   if (h) *h = body->size.h;
+   if (d) *d = body->size.d;
 }
 
 EAPI void

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:52:16 UTC (rev 79037)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:52:22 UTC (rev 79038)
@@ -48,7 +48,11 @@
 
 #define RAD_TO_DEG 57.29582 /* 2 * pi radians == 360 degree */
 
+typedef struct _EPhysics_Force EPhysics_Force;
+typedef struct _EPhysics_Body_Center_Mass EPhysics_Body_Center_Mass;
+typedef struct _EPhysics_Body_Size EPhysics_Body_Size;
 typedef struct _EPhysics_Point EPhysics_Point;
+typedef struct _EPhysics_Dragging_Data EPhysics_Dragging_Data;
 typedef struct _EPhysics_Body_Soft_Body_Data EPhysics_Body_Soft_Body_Data;
 
 typedef enum _EPhysics_World_Boundary
@@ -62,6 +66,13 @@
    EPHYSICS_WORLD_BOUNDARY_LAST
 } EPhysics_World_Boundary;
 
+typedef enum _EPhysics_Body_Type
+{
+  EPHYSICS_BODY_TYPE_RIGID,
+  EPHYSICS_BODY_TYPE_SOFT,
+  EPHYSICS_BODY_TYPE_CLOTH,
+} EPhysics_Body_Type;
+
 struct _EPhysics_Point {
      EINA_INLIST;
      double x;
@@ -69,13 +80,33 @@
      double z;
 };
 
-typedef enum _EPhysics_Body_Type
-{
-  EPHYSICS_BODY_TYPE_RIGID,
-  EPHYSICS_BODY_TYPE_SOFT,
-  EPHYSICS_BODY_TYPE_CLOTH,
-} EPhysics_Body_Type;
+struct _EPhysics_Force {
+     double x;
+     double y;
+     double z;
+     double torque_x;
+     double torque_y;
+     double torque_z;
+};
 
+struct _EPhysics_Dragging_Data {
+     int triangle;
+     double mass[3];
+     Eina_Bool dragging:1;
+};
+
+struct _EPhysics_Body_Center_Mass {
+     double x;
+     double y;
+     double z;
+};
+
+struct _EPhysics_Body_Size {
+     Evas_Coord w;
+     Evas_Coord h;
+     Evas_Coord d;
+};
+
 struct _EPhysics_Body {
      EINA_INLIST;
      btCollisionShape *collision_shape;
@@ -84,9 +115,7 @@
      Evas_Object *evas_obj;
      EPhysics_World *world;
      int walking;
-     Evas_Coord w;
-     Evas_Coord h;
-     Evas_Coord d;
+     EPhysics_Body_Size size;
      btVector3 scale;
      void *data;
      Eina_Inlist *callbacks;
@@ -96,19 +125,8 @@
      EPhysics_Body_Material material;
      double mass;
      double density;
-     struct {
-          double x;
-          double y;
-          double z;
-          double torque_x;
-          double torque_y;
-          double torque_z;
-     } force;
-     struct {
-          double x;
-          double y;
-          double z;
-     } cm;
+     EPhysics_Force force;
+     EPhysics_Body_Center_Mass cm;
      int slices;
      int *points_deform;
      EPhysics_Body_Type type;
@@ -117,11 +135,7 @@
      int material_index;
      int collision_cb;
      EPhysics_Body_Soft_Body_Data *soft_data;
-     struct {
-       int triangle;
-       double mass[3];
-       Eina_Bool dragging;
-     } dragging_data;
+     EPhysics_Dragging_Data dragging_data;
 
      Eina_Bool active:1;
      Eina_Bool deleted:1;

Log:
ephysics: fix body geometry initialization
  
  Getting geometry from a recently created body was retuning zeros.
  
  

Author:       bdilly
Date:         2012-11-09 10:52:28 -0800 (Fri, 09 Nov 2012)
New Revision: 79039
Trac:         http://trac.enlightenment.org/e/changeset/79039

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:22 UTC (rev 79038)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:28 UTC (rev 79039)
@@ -618,6 +618,7 @@
 _ephysics_body_new(EPhysics_World *world, btScalar mass, double cm_x, double cm_y, double cm_z)
 {
    EPhysics_Body *body;
+   double rate;
 
    body = (EPhysics_Body *) calloc(1, sizeof(EPhysics_Body));
    if (!body)
@@ -626,7 +627,11 @@
         return NULL;
      }
 
+   rate = ephysics_world_rate_get(world);
    body->scale = btVector3(1, 1, 1);
+   body->size.w = rate;
+   body->size.h = rate;
+   body->size.d = rate;
    body->mass = mass;
    body->world = world;
    body->cm.x = cm_x;
@@ -898,6 +903,7 @@
    body->size.w = w;
    body->size.h = h;
    body->size.d = d;
+   body->scale = btVector3(sx, sy, sz);
 
    ephysics_body_activate(body, EINA_TRUE);

Log:
ephysics: don't mess with body's depth when setting
   evas object
  
  
  

Author:       bdilly
Date:         2012-11-09 10:52:35 -0800 (Fri, 09 Nov 2012)
New Revision: 79040
Trac:         http://trac.enlightenment.org/e/changeset/79040

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:28 UTC (rev 79039)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:35 UTC (rev 79040)
@@ -2322,7 +2322,7 @@
 EAPI void
 ephysics_body_evas_object_set(EPhysics_Body *body, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
 {
-   int obj_x, obj_y, obj_w, obj_h;
+   int obj_x, obj_y, obj_w, obj_h, bz, bd;
    double rate;
 
    if (!body)
@@ -2360,10 +2360,10 @@
 
    rate = ephysics_world_rate_get(body->world);
    evas_object_geometry_get(body->evas_obj, &obj_x, &obj_y, &obj_w, &obj_h);
+   ephysics_body_geometry_get(body, NULL, NULL, &bz, NULL, NULL, &bd);
 
    ephysics_world_lock_take(body->world);
-   _ephysics_body_geometry_set(body, obj_x, obj_y, - rate / 2,
-                               obj_w, obj_h, rate, rate);
+   _ephysics_body_geometry_set(body, obj_x, obj_y, bz, obj_w, obj_h, bd, rate);
    ephysics_world_lock_release(body->world);
    evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_RESIZE,
                                   _ephysics_body_evas_obj_resize_cb, body);

Log:
ephysics: support multiple evas objects associated to
   body
  
  
  

Author:       bdilly
Date:         2012-11-09 10:52:42 -0800 (Fri, 09 Nov 2012)
New Revision: 79041
Trac:         http://trac.enlightenment.org/e/changeset/79041

Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-11-09 18:52:35 UTC (rev 79040)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-09 18:52:42 UTC (rev 79041)
@@ -1842,6 +1842,66 @@
 } EPhysics_Body_Cloth_Anchor_Side;
 
 /**
+ * @enum _EPhysics_Body_Box_Face
+ * @typedef EPhysics_Body_Box_Face
+ *
+ * Define in wich box's face the evas object should be set.
+ *
+ * @see ephysics_body_box_face_evas_object_set()
+ *
+ * @ingroup EPhysics_Body
+ */
+typedef enum _EPhysics_Body_Box_Face
+{
+  EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT,
+  EPHYSICS_BODY_BOX_FACE_MIDDLE_BACK,
+  EPHYSICS_BODY_BOX_FACE_FRONT,
+  EPHYSICS_BODY_BOX_FACE_BACK,
+  EPHYSICS_BODY_BOX_FACE_LEFT,
+  EPHYSICS_BODY_BOX_FACE_RIGHT,
+  EPHYSICS_BODY_BOX_FACE_TOP,
+  EPHYSICS_BODY_BOX_FACE_BOTTOM,
+  EPHYSICS_BODY_BOX_FACE_LAST,
+} EPhysics_Body_Box_Face;
+
+/**
+ * @enum _EPhysics_Body_Cylinder_Face
+ * @typedef EPhysics_Body_Cylinder_Face
+ *
+ * Define in wich cylinder's face the evas object should be set.
+ *
+ * @see ephysics_body_cylinder_face_evas_object_set()
+ *
+ * @ingroup EPhysics_Body
+ */
+typedef enum _EPhysics_Body_Cylinder_Face
+{
+  EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT,
+  EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_BACK,
+  EPHYSICS_BODY_CYLINDER_FACE_FRONT,
+  EPHYSICS_BODY_CYLINDER_FACE_BACK,
+  EPHYSICS_BODY_CYLINDER_FACE_CURVED,
+  EPHYSICS_BODY_CYLINDER_FACE_LAST,
+} EPhysics_Body_Cylinder_Face;
+
+/**
+ * @enum _EPhysics_Body_Cloth_Face
+ * @typedef EPhysics_Body_Cloth_Face
+ *
+ * Define in wich cloth's face the evas object should be set.
+ *
+ * @see ephysics_body_cloth_face_evas_object_set()
+ *
+ * @ingroup EPhysics_Body
+ */
+typedef enum _EPhysics_Body_Cloth_Face
+{
+  EPHYSICS_BODY_CLOTH_FACE_FRONT,
+  EPHYSICS_BODY_CLOTH_FACE_BACK,
+  EPHYSICS_BODY_CLOTH_FACE_LAST,
+} EPhysics_Body_Cloth_Face;
+
+/**
  * @typedef EPhysics_Body_Collision
  *
  * Body collision wraps collision informations.
@@ -2084,6 +2144,8 @@
  * @return a new body or @c NULL, on errors.
  *
  * @see ephysics_body_del().
+ * @see ephysics_body_evas_object_set().
+ * @see ephysics_body_cylinder_face_evas_object_set().
  *
  * @ingroup EPhysics_Body
  */
@@ -2113,6 +2175,8 @@
  * @return a new body or @c NULL, on errors.
  *
  * @see ephysics_body_del().
+ * @see ephysics_body_evas_object_set().
+ * @see ephysics_body_cylinder_face_evas_object_set().
  * @see ephysics_world_simulation_set().
  *
  * @ingroup EPhysics_Body
@@ -2134,6 +2198,7 @@
  *
  * @see ephysics_body_del().
  * @see ephysics_body_evas_object_set().
+ * @see ephysics_body_box_face_evas_object_set().
  *
  * @ingroup EPhysics_Body
  */
@@ -2159,6 +2224,7 @@
  *
  * @see ephysics_body_del().
  * @see ephysics_body_evas_object_set().
+ * @see ephysics_body_box_face_evas_object_set().
  * @see ephysics_world_simulation_set().
  *
  * @ingroup EPhysics_Body
@@ -2188,6 +2254,7 @@
  *
  * @see ephysics_body_del().
  * @see ephysics_body_evas_object_set().
+ * @see ephysics_body_cloth_face_evas_object_set().
  * @see ephysics_world_simulation_set().
  * @see ephysics_body_cloth_anchor_add().
  * @see ephysics_body_cloth_anchor_full_add().
@@ -2429,6 +2496,12 @@
  * updates of associated evas objects, or complement updates, like changing
  * evas objects properties under certain conditions of position or rotation.
  *
+ * If it's required to associate evas object to specific faces of the body,
+ * the following functions could be used, depending on the body's shape:
+ * @li @ref ephysics_body_box_face_evas_object_set();
+ * @li @ref ephysics_body_cylinder_face_evas_object_set();
+ * @li @ref ephysics_body_cloth_face_evas_object_set().
+ *
  * @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
@@ -2475,6 +2548,185 @@
 
 /**
  * @brief
+ * Set an evas object to a physics box body face.
+ *
+ * It will create a direct association between a specific face of the physics
+ * body and an evas object.
+ * With that EPhysics will be able to update evas object
+ * position and rotation automatically.
+ *
+ * If it's required to associate only one evas object to this body, a more
+ * generic function @see ephysics_body_evas_object_set() can be used.
+ *
+ * @param body The body to associate to an evas object.
+ * @param face The specific face of @p body where the evas object will be
+ * placed.
+ * @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
+ * to match evas object position taking world rate on consideration.
+ *
+ * @see ephysics_body_box_face_evas_object_unset().
+ * @see ephysics_body_box_face_evas_object_get().
+ * @see ephysics_body_box_add().
+ * @see ephysics_body_soft_box_add().
+ * @see ephysics_body_evas_object_set().
+ * @see ephysics_world_rate_set().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_box_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Box_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos);
+
+/**
+ * @brief
+ * Get the evas object associated to a physics box body face.
+ *
+ * @param body The body to get an evas object from.
+ * @param face The specific face of @p body where the evas object was placed.
+ * @return The associated evas object, or @c NULL if no object is associated
+ * or on error.
+ *
+ * @see ephysics_body_box_face_evas_object_set() for more details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Evas_Object *ephysics_body_box_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Box_Face face);
+
+/**
+ * @brief
+ * Unset the evas object associated to a physics box body face.
+ *
+ * @param body The body to unset an evas object from.
+ * @param face The specific face of @p body where the evas object was placed.
+ * @return The associated evas object, or @c NULL if no object is associated
+ * or on error.
+ *
+ * @see ephysics_body_box_face_evas_object_set() for more details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Evas_Object *ephysics_body_box_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Box_Face face);
+
+/**
+ * @brief
+ * Set an evas object to a physics cylinder body face.
+ *
+ * It will create a direct association between a specific face of the physics
+ * body and an evas object.
+ * With that EPhysics will be able to update evas object
+ * position and rotation automatically.
+ *
+ * If it's required to associate only one evas object to this body, a more
+ * generic function @see ephysics_body_evas_object_set() can be used.
+ *
+ * @param body The body to associate to an evas object.
+ * @param face The specific face of @p body where the evas object will be
+ * placed.
+ * @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
+ * to match evas object position taking world rate on consideration.
+ *
+ * @see ephysics_body_cylinder_face_evas_object_unset().
+ * @see ephysics_body_cylinder_face_evas_object_get().
+ * @see ephysics_body_circle_add().
+ * @see ephysics_body_soft_circle_add().
+ * @see ephysics_body_evas_object_set().
+ * @see ephysics_world_rate_set().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_cylinder_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Cylinder_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos);
+
+/**
+ * @brief
+ * Get the evas object associated to a physics cylinder body face.
+ *
+ * @param body The body to get an evas object from.
+ * @param face The specific face of @p body where the evas object was placed.
+ * @return The associated evas object, or @c NULL if no object is associated
+ * or on error.
+ *
+ * @see ephysics_body_cylinder_face_evas_object_set() for more details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Evas_Object *ephysics_body_cylinder_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Cylinder_Face face);
+
+/**
+ * @brief
+ * Unset the evas object associated to a physics cylinder body face.
+ *
+ * @param body The body to unset an evas object from.
+ * @param face The specific face of @p body where the evas object was placed.
+ * @return The associated evas object, or @c NULL if no object is associated
+ * or on error.
+ *
+ * @see ephysics_body_cylinder_face_evas_object_set() for more details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Evas_Object *ephysics_body_cylinder_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Cylinder_Face face);
+
+/**
+ * @brief
+ * Set an evas object to a physics cloth body face.
+ *
+ * It will create a direct association between a specific face of the physics
+ * body and an evas object.
+ * With that EPhysics will be able to update evas object
+ * position and rotation automatically.
+ *
+ * If it's required to associate only one evas object to this body, a more
+ * generic function @see ephysics_body_evas_object_set() can be used.
+ *
+ * @param body The body to associate to an evas object.
+ * @param face The specific face of @p body where the evas object will be
+ * placed.
+ * @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
+ * to match evas object position taking world rate on consideration.
+ *
+ * @see ephysics_body_cloth_face_evas_object_unset().
+ * @see ephysics_body_cloth_face_evas_object_get().
+ * @see ephysics_body_cloth_add().
+ * @see ephysics_body_evas_object_set().
+ * @see ephysics_world_rate_set().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_cloth_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Cloth_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos);
+
+/**
+ * @brief
+ * Get the evas object associated to a physics cloth body face.
+ *
+ * @param body The body to get an evas object from.
+ * @param face The specific face of @p body where the evas object was placed.
+ * @return The associated evas object, or @c NULL if no object is associated
+ * or on error.
+ *
+ * @see ephysics_body_cloth_face_evas_object_set() for more details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Evas_Object *ephysics_body_cloth_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Cloth_Face face);
+
+/**
+ * @brief
+ * Unset the evas object associated to a physics cloth body face.
+ *
+ * @param body The body to unset an evas object from.
+ * @param face The specific face of @p body where the evas object was placed.
+ * @return The associated evas object, or @c NULL if no object is associated
+ * or on error.
+ *
+ * @see ephysics_body_cloth_face_evas_object_set() for more details.
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Evas_Object *ephysics_body_cloth_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Cloth_Face face);
+
+/**
+ * @brief
  * Set physics body size.
  *
  * By default circles have diameter equal to 1 meter * rate, boxes have

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:35 UTC (rev 79040)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:42 UTC (rev 79041)
@@ -17,9 +17,13 @@
 extern "C" {
 #endif
 
+#define SHAPE_BOX "Box"
+#define SHAPE_CYLINDER "CylinderZ"
+
 typedef struct _EPhysics_Body_Callback EPhysics_Body_Callback;
 typedef struct _EPhysics_Body_Evas_Stacking EPhysics_Body_Evas_Stacking;
 typedef struct _EPhysics_Body_Soft_Body_Slice EPhysics_Body_Soft_Body_Slice;
+typedef struct _EPhysics_Body_Face_Obj EPhysics_Body_Face_Obj;
 
 struct _EPhysics_Body_Callback {
      EINA_INLIST;
@@ -52,6 +56,11 @@
      float stacking;
 };
 
+struct _EPhysics_Body_Face_Obj {
+    int face;
+    Evas_Object *obj;
+};
+
 static void
 _ephysics_body_soft_body_slices_apply(EPhysics_Body *body)
 {
@@ -1057,6 +1066,23 @@
 }
 
 static void
+_ephysics_cloth_face_objs_update(EPhysics_Body *body __UNUSED__)
+{
+
+}
+
+static void
+_ephysics_cylinder_face_objs_update(EPhysics_Body *body __UNUSED__)
+{
+
+}
+
+static void
+_ephysics_box_face_objs_update(EPhysics_Body *body)
+{
+}
+
+static void
 _ephysics_body_evas_object_default_update(EPhysics_Body *body)
 {
    int x, y, z, w, h, wx, wy, wh, cx, cy;
@@ -1066,6 +1092,19 @@
    Evas_Map *map;
    double rate;
 
+   if (body->face_objs)
+     {
+        if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+          _ephysics_cloth_face_objs_update(body);
+        else if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+          {
+             if (!(strcmp(body->collision_shape->getName(), SHAPE_CYLINDER)))
+               _ephysics_cylinder_face_objs_update(body);
+             else if (!(strcmp(body->collision_shape->getName(), SHAPE_BOX)))
+               _ephysics_box_face_objs_update(body);
+          }
+     }
+
    if (!body->evas_obj)
      return;
 
@@ -3375,6 +3414,614 @@
    return body->clockwise;
 }
 
+static void
+_ephysics_body_face_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   EPhysics_Body *body = (EPhysics_Body *) data;
+   EPhysics_Body_Face_Obj *face_obj;
+   Eina_List *l;
+   void *ldata;
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->obj == obj)
+          {
+             body->face_objs = eina_list_remove(body->face_objs, face_obj);
+             free(face_obj);
+             return;
+          }
+     }
+}
+
+static void
+_ephysics_body_face_obj_unset(Evas_Object *obj, Evas_Object_Event_Cb resize_func)
+{
+   evas_object_map_enable_set(obj, EINA_FALSE);
+   evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
+                                  _ephysics_body_face_obj_del_cb);
+   evas_object_event_callback_del(obj, EVAS_CALLBACK_RESIZE, resize_func);
+}
+
+static void
+_ephysics_body_face_evas_object_add(EPhysics_Body *body, int face, Evas_Object *evas_obj, Evas_Object_Event_Cb resize_func)
+{
+   EPhysics_Body_Face_Obj *face_obj;
+   Eina_List *l;
+   void *ldata;
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->face == face)
+          {
+             _ephysics_body_face_obj_unset(face_obj->obj, resize_func);
+             face_obj->obj = evas_obj;
+             return;
+          }
+     }
+
+   face_obj = (EPhysics_Body_Face_Obj *)calloc(1,
+                                               sizeof(EPhysics_Body_Face_Obj));
+   if (!face_obj)
+     {
+        ERR("Failed to create face object");
+        return;
+     }
+
+   face_obj->face = face;
+   face_obj->obj = evas_obj;
+   body->face_objs = eina_list_append(body->face_objs, face_obj);
+}
+
+static void
+_ephysics_body_box_face_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   EPhysics_Body_Box_Face face = EPHYSICS_BODY_BOX_FACE_LAST;
+   EPhysics_Body *body = (EPhysics_Body *) data;
+   EPhysics_Body_Face_Obj *face_obj;
+   int w, h, bw, bh, bd;
+   Eina_List *l;
+   void *ldata;
+
+   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->obj == obj)
+          {
+             face = (EPhysics_Body_Box_Face) face_obj->face;
+             break;
+          }
+     }
+
+   switch(face)
+     {
+      case EPHYSICS_BODY_BOX_FACE_FRONT:
+      case EPHYSICS_BODY_BOX_FACE_BACK:
+      case EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT:
+      case EPHYSICS_BODY_BOX_FACE_MIDDLE_BACK:
+         if ((w == body->size.w) && (h == body->size.h))
+           return;
+         bw = w;
+         bh = h;
+         bd = body->size.d;
+         break;
+      case EPHYSICS_BODY_BOX_FACE_RIGHT:
+      case EPHYSICS_BODY_BOX_FACE_LEFT:
+         if ((w == body->size.d) && (h == body->size.h))
+           return;
+         bw = body->size.w;
+         bh = h;
+         bd = w;
+      case EPHYSICS_BODY_BOX_FACE_TOP:
+      case EPHYSICS_BODY_BOX_FACE_BOTTOM:
+         if ((w == body->size.w) && (h == body->size.d))
+           return;
+         bw = w;
+         bh = body->size.h;
+         bd = h;
+      default:
+         return;
+     }
+
+   DBG("Resizing body %p to w=%i, h=%i, d=%i", body, bw, bh, bd);
+   ephysics_world_lock_take(body->world);
+   _ephysics_body_resize(body, bw, bh, bd);
+   ephysics_world_lock_release(body->world);
+}
+
+EAPI void
+ephysics_body_box_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Box_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
+{
+   int obj_x, obj_y, obj_w, obj_h, bx, by, bz, bw, bh, bd;
+   double rate;
+
+   if (!body)
+     {
+        ERR("Can't set evas object to body, the last wasn't provided.");
+        return;
+     }
+
+   if (!evas_obj)
+     {
+        ERR("Can't set evas object to body, the first wasn't provided.");
+        return;
+     }
+
+   if ((strcmp(body->collision_shape->getName(), SHAPE_BOX)))
+     {
+        ERR("Can't set evas object to body, it's not a box.");
+        return;
+     }
+
+   if ((face < 0) || (face >= EPHYSICS_BODY_BOX_FACE_LAST))
+     {
+        ERR("Can't set evas object to body, face is invalid.");
+        return;
+     }
+
+   if (body->soft_body)
+     {
+        ERR("Not implemented for soft bodies yet.");
+        return;
+     }
+
+   _ephysics_body_face_evas_object_add(body, face, evas_obj,
+                                       _ephysics_body_box_face_obj_resize_cb);
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL,
+                                  _ephysics_body_face_obj_del_cb, body);
+
+   if (!use_obj_pos)
+     return;
+
+   rate = ephysics_world_rate_get(body->world);
+   evas_object_geometry_get(evas_obj, &obj_x, &obj_y, &obj_w, &obj_h);
+   ephysics_body_geometry_get(body, &bx, &by, &bz, &bw, &bh, &bd);
+
+   ephysics_world_lock_take(body->world);
+
+   switch(face)
+     {
+      case EPHYSICS_BODY_BOX_FACE_FRONT:
+      case EPHYSICS_BODY_BOX_FACE_BACK:
+      case EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT:
+      case EPHYSICS_BODY_BOX_FACE_MIDDLE_BACK:
+         _ephysics_body_geometry_set(body, obj_x, obj_y, bz,
+                                     obj_w, obj_h, bd, rate);
+         break;
+      case EPHYSICS_BODY_BOX_FACE_RIGHT:
+      case EPHYSICS_BODY_BOX_FACE_LEFT:
+         _ephysics_body_geometry_set(body, bx, by, bz,
+                                     bw, obj_h, obj_w, rate);
+      case EPHYSICS_BODY_BOX_FACE_TOP:
+      case EPHYSICS_BODY_BOX_FACE_BOTTOM:
+         _ephysics_body_geometry_set(body, bx, by, bz,
+                                     obj_w, bh, obj_h, rate);
+      default:
+         break;
+     }
+
+   ephysics_world_lock_release(body->world);
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE,
+                                  _ephysics_body_box_face_obj_resize_cb,
+                                  body);
+}
+
+EAPI Evas_Object *
+ephysics_body_box_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Box_Face face)
+{
+   EPhysics_Body_Face_Obj *face_obj;
+   Eina_List *l;
+   void *ldata;
+
+   if (!body)
+     {
+        ERR("Can't get evas object from body, it wasn't provided.");
+        return NULL;
+     }
+
+   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
+     {
+        ERR("Can't get evas object from body, it's not a box.");
+        return NULL;
+     }
+
+   if ((face < 0) || (face >= EPHYSICS_BODY_BOX_FACE_LAST))
+     {
+        ERR("Can't get evas object from body, face is invalid.");
+        return NULL;
+     }
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->face == face)
+          return face_obj->obj;
+     }
+
+   ERR("Couldn't find an object associated to face %i.", face);
+   return NULL;
+}
+
+EAPI Evas_Object *
+ephysics_body_box_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Box_Face face)
+{
+   EPhysics_Body_Face_Obj *face_obj;
+   Eina_List *l;
+   void *ldata;
+
+   if (!body)
+     {
+        ERR("Can't unset evas object from body, it wasn't provided.");
+        return NULL;
+     }
+
+   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
+     {
+        ERR("Can't unset evas object from body, it's not a box.");
+        return NULL;
+     }
+
+   if ((face < 0) || (face >= EPHYSICS_BODY_BOX_FACE_LAST))
+     {
+        ERR("Can't unset evas object from body, face is invalid.");
+        return NULL;
+     }
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->face == face)
+          {
+             Evas_Object *obj = face_obj->obj;
+             _ephysics_body_face_obj_unset(
+                obj, _ephysics_body_box_face_obj_resize_cb);
+             body->face_objs = eina_list_remove(body->face_objs, face_obj);
+             free(face_obj);
+             return obj;
+          }
+     }
+
+   ERR("Couldn't find an object associated to face %i.", face);
+   return NULL;
+}
+
+static void
+_ephysics_body_cylinder_face_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   EPhysics_Body_Cylinder_Face face = EPHYSICS_BODY_CYLINDER_FACE_LAST;
+   EPhysics_Body *body = (EPhysics_Body *) data;
+   EPhysics_Body_Face_Obj *face_obj;
+   int w, h, bw, bh, bd;
+   Eina_List *l;
+   void *ldata;
+
+   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->obj == obj)
+          {
+             face = (EPhysics_Body_Cylinder_Face) face_obj->face;
+             break;
+          }
+     }
+
+   switch(face)
+     {
+      case EPHYSICS_BODY_CYLINDER_FACE_FRONT:
+      case EPHYSICS_BODY_CYLINDER_FACE_BACK:
+      case EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT:
+      case EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_BACK:
+         if ((w == body->size.w) && (h == body->size.h))
+           return;
+         bw = w;
+         bh = h;
+         bd = body->size.d;
+         break;
+      case EPHYSICS_BODY_CYLINDER_FACE_CURVED:
+         if ((h == body->size.d))
+           return;
+         bw = body->size.w;
+         bh = body->size.h;
+         bd = h;
+      default:
+         return;
+     }
+
+   DBG("Resizing body %p to w=%i, h=%i, d=%i", body, bw, bh, bd);
+   ephysics_world_lock_take(body->world);
+   _ephysics_body_resize(body, bw, bh, bd);
+   ephysics_world_lock_release(body->world);
+}
+
+EAPI void
+ephysics_body_cylinder_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Cylinder_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
+{
+   int obj_x, obj_y, obj_w, obj_h, bx, by, bz, bw, bh, bd;
+   double rate;
+
+   if (!body)
+     {
+        ERR("Can't set evas object to body, the last wasn't provided.");
+        return;
+     }
+
+   if (!evas_obj)
+     {
+        ERR("Can't set evas object to body, the first wasn't provided.");
+        return;
+     }
+
+   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
+     {
+        ERR("Can't set evas object to body, it's not a cylinder.");
+        return;
+     }
+
+   if ((face < 0) || (face >= EPHYSICS_BODY_CYLINDER_FACE_LAST))
+     {
+        ERR("Can't set evas object to body, face is invalid.");
+        return;
+     }
+
+   if (body->soft_body)
+     {
+        ERR("Not implemented for soft bodies yet.");
+        return;
+     }
+
+   _ephysics_body_face_evas_object_add(
+      body, face, evas_obj, _ephysics_body_cylinder_face_obj_resize_cb);
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL,
+                                  _ephysics_body_face_obj_del_cb, body);
+
+   if (!use_obj_pos)
+     return;
+
+   rate = ephysics_world_rate_get(body->world);
+   evas_object_geometry_get(evas_obj, &obj_x, &obj_y, &obj_w, &obj_h);
+   ephysics_body_geometry_get(body, &bx, &by, &bz, &bw, &bh, &bd);
+
+   ephysics_world_lock_take(body->world);
+
+   switch(face)
+     {
+      case EPHYSICS_BODY_CYLINDER_FACE_FRONT:
+      case EPHYSICS_BODY_CYLINDER_FACE_BACK:
+      case EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT:
+      case EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_BACK:
+         _ephysics_body_geometry_set(body, obj_x, obj_y, bz,
+                                     obj_w, obj_h, bd, rate);
+         break;
+      case EPHYSICS_BODY_CYLINDER_FACE_CURVED:
+         _ephysics_body_geometry_set(body, bx, by, bz,
+                                     bw, bh, obj_h, rate);
+      default:
+         break;
+     }
+
+   ephysics_world_lock_release(body->world);
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE,
+                                  _ephysics_body_cylinder_face_obj_resize_cb,
+                                  body);
+}
+
+EAPI Evas_Object *
+ephysics_body_cylinder_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Cylinder_Face face)
+{
+   EPhysics_Body_Face_Obj *face_obj;
+   Eina_List *l;
+   void *ldata;
+
+   if (!body)
+     {
+        ERR("Can't get evas object from body, it wasn't provided.");
+        return NULL;
+     }
+
+   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
+     {
+        ERR("Can't get evas object from body, it's not a cylinder.");
+        return NULL;
+     }
+
+   if ((face < 0) || (face >= EPHYSICS_BODY_CYLINDER_FACE_LAST))
+     {
+        ERR("Can't get evas object from body, face is invalid.");
+        return NULL;
+     }
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->face == face)
+          return face_obj->obj;
+     }
+
+   ERR("Couldn't find an object associated to face %i.", face);
+   return NULL;
+}
+
+EAPI Evas_Object *
+ephysics_body_cylinder_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Cylinder_Face face)
+{
+   EPhysics_Body_Face_Obj *face_obj;
+   Eina_List *l;
+   void *ldata;
+
+   if (!body)
+     {
+        ERR("Can't unset evas object from body, it wasn't provided.");
+        return NULL;
+     }
+
+   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
+     {
+        ERR("Can't unset evas object from body, it's not a cylinder.");
+        return NULL;
+     }
+
+   if ((face < 0) || (face >= EPHYSICS_BODY_CYLINDER_FACE_LAST))
+     {
+        ERR("Can't unset evas object from body, face is invalid.");
+        return NULL;
+     }
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->face == face)
+          {
+             Evas_Object *obj = face_obj->obj;
+             _ephysics_body_face_obj_unset(
+                obj, _ephysics_body_cylinder_face_obj_resize_cb);
+             body->face_objs = eina_list_remove(body->face_objs, face_obj);
+             free(face_obj);
+             return obj;
+          }
+     }
+
+   ERR("Couldn't find an object associated to face %i.", face);
+   return NULL;
+}
+
+EAPI void
+ephysics_body_cloth_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Cloth_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
+{
+   int obj_x, obj_y, obj_w, obj_h, bz, bd;
+   double rate;
+
+   if (!body)
+     {
+        ERR("Can't set evas object to body, the last wasn't provided.");
+        return;
+     }
+
+   if (!evas_obj)
+     {
+        ERR("Can't set evas object to body, the first wasn't provided.");
+        return;
+     }
+
+   if (body->type != EPHYSICS_BODY_TYPE_CLOTH)
+     {
+        ERR("Can't set evas object to body, it's not a cloth.");
+        return;
+     }
+
+   if ((face < 0) || (face >= EPHYSICS_BODY_CLOTH_FACE_LAST))
+     {
+        ERR("Can't set evas object to body, face is invalid.");
+        return;
+     }
+
+   if (body->soft_body)
+     {
+        ERR("Not implemented for soft bodies yet.");
+        return;
+     }
+
+   _ephysics_body_face_evas_object_add(body, face, evas_obj,
+                                       _ephysics_body_evas_obj_resize_cb);
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL,
+                                  _ephysics_body_face_obj_del_cb, body);
+
+   if (!use_obj_pos)
+     return;
+
+   rate = ephysics_world_rate_get(body->world);
+   evas_object_geometry_get(evas_obj, &obj_x, &obj_y, &obj_w, &obj_h);
+
+   ephysics_world_lock_take(body->world);
+   ephysics_body_geometry_get(body, NULL, NULL, &bz, NULL, NULL, &bd);
+   _ephysics_body_geometry_set(body, obj_x, obj_y, bz, obj_w, obj_h, bd, rate);
+   ephysics_world_lock_release(body->world);
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE,
+                                  _ephysics_body_evas_obj_resize_cb,
+                                  body);
+}
+
+EAPI Evas_Object *
+ephysics_body_cloth_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Cloth_Face face)
+{
+   EPhysics_Body_Face_Obj *face_obj;
+   Eina_List *l;
+   void *ldata;
+
+   if (!body)
+     {
+        ERR("Can't get evas object from body, it wasn't provided.");
+        return NULL;
+     }
+
+   if (body->type != EPHYSICS_BODY_TYPE_CLOTH)
+     {
+        ERR("Can't get evas object from body, it's not a cloth.");
+        return NULL;
+     }
+
+   if ((face < 0) || (face >= EPHYSICS_BODY_CLOTH_FACE_LAST))
+     {
+        ERR("Can't get evas object from body, face is invalid.");
+        return NULL;
+     }
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->face == face)
+          return face_obj->obj;
+     }
+
+   ERR("Couldn't find an object associated to face %i.", face);
+   return NULL;
+}
+
+EAPI Evas_Object *
+ephysics_body_cloth_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Cloth_Face face)
+{
+   EPhysics_Body_Face_Obj *face_obj;
+   Eina_List *l;
+   void *ldata;
+
+   if (!body)
+     {
+        ERR("Can't unset evas object from body, it wasn't provided.");
+        return NULL;
+     }
+
+   if (body->type != EPHYSICS_BODY_TYPE_CLOTH)
+     {
+        ERR("Can't unset evas object from body, it's not a cloth.");
+        return NULL;
+     }
+
+   if ((face < 0) || (face >= EPHYSICS_BODY_CLOTH_FACE_LAST))
+     {
+        ERR("Can't unset evas object from body, face is invalid.");
+        return NULL;
+     }
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->face == face)
+          {
+             Evas_Object *obj = face_obj->obj;
+             _ephysics_body_face_obj_unset(
+                obj, _ephysics_body_evas_obj_resize_cb);
+             body->face_objs = eina_list_remove(body->face_objs, face_obj);
+             free(face_obj);
+             return obj;
+          }
+     }
+
+   ERR("Couldn't find an object associated to face %i.", face);
+   return NULL;
+}
+
 #ifdef  __cplusplus
 }
 #endif

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:52:35 UTC (rev 79040)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:52:42 UTC (rev 79041)
@@ -122,6 +122,7 @@
      Eina_List *collision_groups;
      Eina_List *to_delete;
      Eina_List *slices_list;
+     Eina_List *face_objs;
      EPhysics_Body_Material material;
      double mass;
      double density;

Log:
ephysics: use a common API to add faces for all types
   of body
  
  
  

Author:       bdilly
Date:         2012-11-09 10:52:49 -0800 (Fri, 09 Nov 2012)
New Revision: 79042
Trac:         http://trac.enlightenment.org/e/changeset/79042

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-11-09 18:52:42 UTC (rev 79041)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-09 18:52:49 UTC (rev 79042)
@@ -1842,16 +1842,16 @@
 } EPhysics_Body_Cloth_Anchor_Side;
 
 /**
- * @enum _EPhysics_Body_Box_Face
- * @typedef EPhysics_Body_Box_Face
+ * @enum _EPhysics_Body_Face
+ * @typedef EPhysics_Body_Face
  *
- * Define in wich box's face the evas object should be set.
+ * Define in wich body's face the evas object should be set.
  *
- * @see ephysics_body_box_face_evas_object_set()
+ * @see ephysics_body_face_evas_object_set()
  *
  * @ingroup EPhysics_Body
  */
-typedef enum _EPhysics_Body_Box_Face
+typedef enum _EPhysics_Body_Face
 {
   EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT,
   EPHYSICS_BODY_BOX_FACE_MIDDLE_BACK,
@@ -1861,46 +1861,19 @@
   EPHYSICS_BODY_BOX_FACE_RIGHT,
   EPHYSICS_BODY_BOX_FACE_TOP,
   EPHYSICS_BODY_BOX_FACE_BOTTOM,
-  EPHYSICS_BODY_BOX_FACE_LAST,
-} EPhysics_Body_Box_Face;
 
-/**
- * @enum _EPhysics_Body_Cylinder_Face
- * @typedef EPhysics_Body_Cylinder_Face
- *
- * Define in wich cylinder's face the evas object should be set.
- *
- * @see ephysics_body_cylinder_face_evas_object_set()
- *
- * @ingroup EPhysics_Body
- */
-typedef enum _EPhysics_Body_Cylinder_Face
-{
   EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT,
   EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_BACK,
   EPHYSICS_BODY_CYLINDER_FACE_FRONT,
   EPHYSICS_BODY_CYLINDER_FACE_BACK,
   EPHYSICS_BODY_CYLINDER_FACE_CURVED,
-  EPHYSICS_BODY_CYLINDER_FACE_LAST,
-} EPhysics_Body_Cylinder_Face;
 
-/**
- * @enum _EPhysics_Body_Cloth_Face
- * @typedef EPhysics_Body_Cloth_Face
- *
- * Define in wich cloth's face the evas object should be set.
- *
- * @see ephysics_body_cloth_face_evas_object_set()
- *
- * @ingroup EPhysics_Body
- */
-typedef enum _EPhysics_Body_Cloth_Face
-{
   EPHYSICS_BODY_CLOTH_FACE_FRONT,
   EPHYSICS_BODY_CLOTH_FACE_BACK,
-  EPHYSICS_BODY_CLOTH_FACE_LAST,
-} EPhysics_Body_Cloth_Face;
 
+  EPHYSICS_BODY_FACE_LAST,
+} EPhysics_Body_Face;
+
 /**
  * @typedef EPhysics_Body_Collision
  *
@@ -2145,7 +2118,7 @@
  *
  * @see ephysics_body_del().
  * @see ephysics_body_evas_object_set().
- * @see ephysics_body_cylinder_face_evas_object_set().
+ * @see ephysics_body_face_evas_object_set().
  *
  * @ingroup EPhysics_Body
  */
@@ -2176,7 +2149,7 @@
  *
  * @see ephysics_body_del().
  * @see ephysics_body_evas_object_set().
- * @see ephysics_body_cylinder_face_evas_object_set().
+ * @see ephysics_body_face_evas_object_set().
  * @see ephysics_world_simulation_set().
  *
  * @ingroup EPhysics_Body
@@ -2198,7 +2171,7 @@
  *
  * @see ephysics_body_del().
  * @see ephysics_body_evas_object_set().
- * @see ephysics_body_box_face_evas_object_set().
+ * @see ephysics_body_face_evas_object_set().
  *
  * @ingroup EPhysics_Body
  */
@@ -2224,7 +2197,7 @@
  *
  * @see ephysics_body_del().
  * @see ephysics_body_evas_object_set().
- * @see ephysics_body_box_face_evas_object_set().
+ * @see ephysics_body_face_evas_object_set().
  * @see ephysics_world_simulation_set().
  *
  * @ingroup EPhysics_Body
@@ -2254,7 +2227,7 @@
  *
  * @see ephysics_body_del().
  * @see ephysics_body_evas_object_set().
- * @see ephysics_body_cloth_face_evas_object_set().
+ * @see ephysics_body_face_evas_object_set().
  * @see ephysics_world_simulation_set().
  * @see ephysics_body_cloth_anchor_add().
  * @see ephysics_body_cloth_anchor_full_add().
@@ -2497,10 +2470,7 @@
  * evas objects properties under certain conditions of position or rotation.
  *
  * If it's required to associate evas object to specific faces of the body,
- * the following functions could be used, depending on the body's shape:
- * @li @ref ephysics_body_box_face_evas_object_set();
- * @li @ref ephysics_body_cylinder_face_evas_object_set();
- * @li @ref ephysics_body_cloth_face_evas_object_set().
+ * function @ref ephysics_body_face_evas_object_set() could be used.
  *
  * @param body The body to associate to an evas object.
  * @param evas_obj The evas object that will be associated to this @p body.
@@ -2548,7 +2518,7 @@
 
 /**
  * @brief
- * Set an evas object to a physics box body face.
+ * Set an evas object to a physics body face.
  *
  * It will create a direct association between a specific face of the physics
  * body and an evas object.
@@ -2565,168 +2535,47 @@
  * @param use_obj_pos If @c EINA_TRUE it will set the physics body position
  * to match evas object position taking world rate on consideration.
  *
- * @see ephysics_body_box_face_evas_object_unset().
- * @see ephysics_body_box_face_evas_object_get().
- * @see ephysics_body_box_add().
- * @see ephysics_body_soft_box_add().
+ * @see ephysics_body_face_evas_object_unset().
+ * @see ephysics_body_face_evas_object_get().
  * @see ephysics_body_evas_object_set().
  * @see ephysics_world_rate_set().
  *
  * @ingroup EPhysics_Body
  */
-EAPI void ephysics_body_box_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Box_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos);
+EAPI void ephysics_body_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos);
 
 /**
  * @brief
- * Get the evas object associated to a physics box body face.
+ * Get the evas object associated to a physics body face.
  *
  * @param body The body to get an evas object from.
  * @param face The specific face of @p body where the evas object was placed.
  * @return The associated evas object, or @c NULL if no object is associated
  * or on error.
  *
- * @see ephysics_body_box_face_evas_object_set() for more details.
+ * @see ephysics_body_face_evas_object_set() for more details.
  *
  * @ingroup EPhysics_Body
  */
-EAPI Evas_Object *ephysics_body_box_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Box_Face face);
+EAPI Evas_Object *ephysics_body_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Face face);
 
 /**
  * @brief
- * Unset the evas object associated to a physics box body face.
+ * Unset the evas object associated to a physics body face.
  *
  * @param body The body to unset an evas object from.
  * @param face The specific face of @p body where the evas object was placed.
  * @return The associated evas object, or @c NULL if no object is associated
  * or on error.
  *
- * @see ephysics_body_box_face_evas_object_set() for more details.
+ * @see ephysics_body_face_evas_object_set() for more details.
  *
  * @ingroup EPhysics_Body
  */
-EAPI Evas_Object *ephysics_body_box_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Box_Face face);
+EAPI Evas_Object *ephysics_body_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Face face);
 
 /**
  * @brief
- * Set an evas object to a physics cylinder body face.
- *
- * It will create a direct association between a specific face of the physics
- * body and an evas object.
- * With that EPhysics will be able to update evas object
- * position and rotation automatically.
- *
- * If it's required to associate only one evas object to this body, a more
- * generic function @see ephysics_body_evas_object_set() can be used.
- *
- * @param body The body to associate to an evas object.
- * @param face The specific face of @p body where the evas object will be
- * placed.
- * @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
- * to match evas object position taking world rate on consideration.
- *
- * @see ephysics_body_cylinder_face_evas_object_unset().
- * @see ephysics_body_cylinder_face_evas_object_get().
- * @see ephysics_body_circle_add().
- * @see ephysics_body_soft_circle_add().
- * @see ephysics_body_evas_object_set().
- * @see ephysics_world_rate_set().
- *
- * @ingroup EPhysics_Body
- */
-EAPI void ephysics_body_cylinder_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Cylinder_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos);
-
-/**
- * @brief
- * Get the evas object associated to a physics cylinder body face.
- *
- * @param body The body to get an evas object from.
- * @param face The specific face of @p body where the evas object was placed.
- * @return The associated evas object, or @c NULL if no object is associated
- * or on error.
- *
- * @see ephysics_body_cylinder_face_evas_object_set() for more details.
- *
- * @ingroup EPhysics_Body
- */
-EAPI Evas_Object *ephysics_body_cylinder_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Cylinder_Face face);
-
-/**
- * @brief
- * Unset the evas object associated to a physics cylinder body face.
- *
- * @param body The body to unset an evas object from.
- * @param face The specific face of @p body where the evas object was placed.
- * @return The associated evas object, or @c NULL if no object is associated
- * or on error.
- *
- * @see ephysics_body_cylinder_face_evas_object_set() for more details.
- *
- * @ingroup EPhysics_Body
- */
-EAPI Evas_Object *ephysics_body_cylinder_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Cylinder_Face face);
-
-/**
- * @brief
- * Set an evas object to a physics cloth body face.
- *
- * It will create a direct association between a specific face of the physics
- * body and an evas object.
- * With that EPhysics will be able to update evas object
- * position and rotation automatically.
- *
- * If it's required to associate only one evas object to this body, a more
- * generic function @see ephysics_body_evas_object_set() can be used.
- *
- * @param body The body to associate to an evas object.
- * @param face The specific face of @p body where the evas object will be
- * placed.
- * @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
- * to match evas object position taking world rate on consideration.
- *
- * @see ephysics_body_cloth_face_evas_object_unset().
- * @see ephysics_body_cloth_face_evas_object_get().
- * @see ephysics_body_cloth_add().
- * @see ephysics_body_evas_object_set().
- * @see ephysics_world_rate_set().
- *
- * @ingroup EPhysics_Body
- */
-EAPI void ephysics_body_cloth_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Cloth_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos);
-
-/**
- * @brief
- * Get the evas object associated to a physics cloth body face.
- *
- * @param body The body to get an evas object from.
- * @param face The specific face of @p body where the evas object was placed.
- * @return The associated evas object, or @c NULL if no object is associated
- * or on error.
- *
- * @see ephysics_body_cloth_face_evas_object_set() for more details.
- *
- * @ingroup EPhysics_Body
- */
-EAPI Evas_Object *ephysics_body_cloth_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Cloth_Face face);
-
-/**
- * @brief
- * Unset the evas object associated to a physics cloth body face.
- *
- * @param body The body to unset an evas object from.
- * @param face The specific face of @p body where the evas object was placed.
- * @return The associated evas object, or @c NULL if no object is associated
- * or on error.
- *
- * @see ephysics_body_cloth_face_evas_object_set() for more details.
- *
- * @ingroup EPhysics_Body
- */
-EAPI Evas_Object *ephysics_body_cloth_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Cloth_Face face);
-
-/**
- * @brief
  * Set physics body size.
  *
  * By default circles have diameter equal to 1 meter * rate, boxes have

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:42 UTC (rev 79041)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:49 UTC (rev 79042)
@@ -57,7 +57,7 @@
 };
 
 struct _EPhysics_Body_Face_Obj {
-    int face;
+    EPhysics_Body_Face face;
     Evas_Object *obj;
 };
 
@@ -3444,7 +3444,7 @@
 }
 
 static void
-_ephysics_body_face_evas_object_add(EPhysics_Body *body, int face, Evas_Object *evas_obj, Evas_Object_Event_Cb resize_func)
+_ephysics_body_face_evas_object_add(EPhysics_Body *body, EPhysics_Body_Face face, Evas_Object *evas_obj, Evas_Object_Event_Cb resize_func)
 {
    EPhysics_Body_Face_Obj *face_obj;
    Eina_List *l;
@@ -3477,7 +3477,7 @@
 static void
 _ephysics_body_box_face_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
-   EPhysics_Body_Box_Face face = EPHYSICS_BODY_BOX_FACE_LAST;
+   EPhysics_Body_Face face = EPHYSICS_BODY_FACE_LAST;
    EPhysics_Body *body = (EPhysics_Body *) data;
    EPhysics_Body_Face_Obj *face_obj;
    int w, h, bw, bh, bd;
@@ -3490,7 +3490,7 @@
         face_obj = (EPhysics_Body_Face_Obj *)ldata;
         if (face_obj->obj == obj)
           {
-             face = (EPhysics_Body_Box_Face) face_obj->face;
+             face = face_obj->face;
              break;
           }
      }
@@ -3531,32 +3531,15 @@
    ephysics_world_lock_release(body->world);
 }
 
-EAPI void
-ephysics_body_box_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Box_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
+static void
+_ephysics_body_box_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
 {
    int obj_x, obj_y, obj_w, obj_h, bx, by, bz, bw, bh, bd;
    double rate;
 
-   if (!body)
+   if ((face < EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT) ||
+       (face > EPHYSICS_BODY_BOX_FACE_BOTTOM))
      {
-        ERR("Can't set evas object to body, the last wasn't provided.");
-        return;
-     }
-
-   if (!evas_obj)
-     {
-        ERR("Can't set evas object to body, the first wasn't provided.");
-        return;
-     }
-
-   if ((strcmp(body->collision_shape->getName(), SHAPE_BOX)))
-     {
-        ERR("Can't set evas object to body, it's not a box.");
-        return;
-     }
-
-   if ((face < 0) || (face >= EPHYSICS_BODY_BOX_FACE_LAST))
-     {
         ERR("Can't set evas object to body, face is invalid.");
         return;
      }
@@ -3608,27 +3591,16 @@
                                   body);
 }
 
-EAPI Evas_Object *
-ephysics_body_box_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Box_Face face)
+static Evas_Object *
+_ephysics_body_box_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Face face)
 {
    EPhysics_Body_Face_Obj *face_obj;
    Eina_List *l;
    void *ldata;
 
-   if (!body)
+   if ((face < EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT) ||
+       (face > EPHYSICS_BODY_BOX_FACE_BOTTOM))
      {
-        ERR("Can't get evas object from body, it wasn't provided.");
-        return NULL;
-     }
-
-   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
-     {
-        ERR("Can't get evas object from body, it's not a box.");
-        return NULL;
-     }
-
-   if ((face < 0) || (face >= EPHYSICS_BODY_BOX_FACE_LAST))
-     {
         ERR("Can't get evas object from body, face is invalid.");
         return NULL;
      }
@@ -3644,27 +3616,16 @@
    return NULL;
 }
 
-EAPI Evas_Object *
-ephysics_body_box_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Box_Face face)
+static Evas_Object *
+_ephysics_body_box_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Face face)
 {
    EPhysics_Body_Face_Obj *face_obj;
    Eina_List *l;
    void *ldata;
 
-   if (!body)
+   if ((face < EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT) ||
+       (face > EPHYSICS_BODY_BOX_FACE_BOTTOM))
      {
-        ERR("Can't unset evas object from body, it wasn't provided.");
-        return NULL;
-     }
-
-   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
-     {
-        ERR("Can't unset evas object from body, it's not a box.");
-        return NULL;
-     }
-
-   if ((face < 0) || (face >= EPHYSICS_BODY_BOX_FACE_LAST))
-     {
         ERR("Can't unset evas object from body, face is invalid.");
         return NULL;
      }
@@ -3690,7 +3651,7 @@
 static void
 _ephysics_body_cylinder_face_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
-   EPhysics_Body_Cylinder_Face face = EPHYSICS_BODY_CYLINDER_FACE_LAST;
+   EPhysics_Body_Face face = EPHYSICS_BODY_FACE_LAST;
    EPhysics_Body *body = (EPhysics_Body *) data;
    EPhysics_Body_Face_Obj *face_obj;
    int w, h, bw, bh, bd;
@@ -3703,7 +3664,7 @@
         face_obj = (EPhysics_Body_Face_Obj *)ldata;
         if (face_obj->obj == obj)
           {
-             face = (EPhysics_Body_Cylinder_Face) face_obj->face;
+             face = face_obj->face;
              break;
           }
      }
@@ -3736,32 +3697,15 @@
    ephysics_world_lock_release(body->world);
 }
 
-EAPI void
-ephysics_body_cylinder_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Cylinder_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
+static void
+_ephysics_body_cylinder_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
 {
    int obj_x, obj_y, obj_w, obj_h, bx, by, bz, bw, bh, bd;
    double rate;
 
-   if (!body)
+   if ((face < EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT) ||
+       (face > EPHYSICS_BODY_CYLINDER_FACE_CURVED))
      {
-        ERR("Can't set evas object to body, the last wasn't provided.");
-        return;
-     }
-
-   if (!evas_obj)
-     {
-        ERR("Can't set evas object to body, the first wasn't provided.");
-        return;
-     }
-
-   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
-     {
-        ERR("Can't set evas object to body, it's not a cylinder.");
-        return;
-     }
-
-   if ((face < 0) || (face >= EPHYSICS_BODY_CYLINDER_FACE_LAST))
-     {
         ERR("Can't set evas object to body, face is invalid.");
         return;
      }
@@ -3808,27 +3752,16 @@
                                   body);
 }
 
-EAPI Evas_Object *
-ephysics_body_cylinder_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Cylinder_Face face)
+static Evas_Object *
+_ephysics_body_cylinder_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Face face)
 {
    EPhysics_Body_Face_Obj *face_obj;
    Eina_List *l;
    void *ldata;
 
-   if (!body)
+   if ((face < EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT) ||
+       (face > EPHYSICS_BODY_CYLINDER_FACE_CURVED))
      {
-        ERR("Can't get evas object from body, it wasn't provided.");
-        return NULL;
-     }
-
-   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
-     {
-        ERR("Can't get evas object from body, it's not a cylinder.");
-        return NULL;
-     }
-
-   if ((face < 0) || (face >= EPHYSICS_BODY_CYLINDER_FACE_LAST))
-     {
         ERR("Can't get evas object from body, face is invalid.");
         return NULL;
      }
@@ -3844,27 +3777,16 @@
    return NULL;
 }
 
-EAPI Evas_Object *
-ephysics_body_cylinder_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Cylinder_Face face)
+static Evas_Object *
+_ephysics_body_cylinder_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Face face)
 {
    EPhysics_Body_Face_Obj *face_obj;
    Eina_List *l;
    void *ldata;
 
-   if (!body)
+   if ((face < EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT) ||
+       (face > EPHYSICS_BODY_CYLINDER_FACE_CURVED))
      {
-        ERR("Can't unset evas object from body, it wasn't provided.");
-        return NULL;
-     }
-
-   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
-     {
-        ERR("Can't unset evas object from body, it's not a cylinder.");
-        return NULL;
-     }
-
-   if ((face < 0) || (face >= EPHYSICS_BODY_CYLINDER_FACE_LAST))
-     {
         ERR("Can't unset evas object from body, face is invalid.");
         return NULL;
      }
@@ -3887,42 +3809,19 @@
    return NULL;
 }
 
-EAPI void
-ephysics_body_cloth_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Cloth_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
+static void
+_ephysics_body_cloth_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
 {
    int obj_x, obj_y, obj_w, obj_h, bz, bd;
    double rate;
 
-   if (!body)
+   if ((face < EPHYSICS_BODY_CLOTH_FACE_FRONT) ||
+       (face > EPHYSICS_BODY_CLOTH_FACE_BACK))
      {
-        ERR("Can't set evas object to body, the last wasn't provided.");
-        return;
-     }
-
-   if (!evas_obj)
-     {
-        ERR("Can't set evas object to body, the first wasn't provided.");
-        return;
-     }
-
-   if (body->type != EPHYSICS_BODY_TYPE_CLOTH)
-     {
-        ERR("Can't set evas object to body, it's not a cloth.");
-        return;
-     }
-
-   if ((face < 0) || (face >= EPHYSICS_BODY_CLOTH_FACE_LAST))
-     {
         ERR("Can't set evas object to body, face is invalid.");
         return;
      }
 
-   if (body->soft_body)
-     {
-        ERR("Not implemented for soft bodies yet.");
-        return;
-     }
-
    _ephysics_body_face_evas_object_add(body, face, evas_obj,
                                        _ephysics_body_evas_obj_resize_cb);
    evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL,
@@ -3943,27 +3842,16 @@
                                   body);
 }
 
-EAPI Evas_Object *
-ephysics_body_cloth_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Cloth_Face face)
+static Evas_Object *
+_ephysics_body_cloth_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Face face)
 {
    EPhysics_Body_Face_Obj *face_obj;
    Eina_List *l;
    void *ldata;
 
-   if (!body)
+   if ((face < EPHYSICS_BODY_CLOTH_FACE_FRONT) ||
+       (face > EPHYSICS_BODY_CLOTH_FACE_BACK))
      {
-        ERR("Can't get evas object from body, it wasn't provided.");
-        return NULL;
-     }
-
-   if (body->type != EPHYSICS_BODY_TYPE_CLOTH)
-     {
-        ERR("Can't get evas object from body, it's not a cloth.");
-        return NULL;
-     }
-
-   if ((face < 0) || (face >= EPHYSICS_BODY_CLOTH_FACE_LAST))
-     {
         ERR("Can't get evas object from body, face is invalid.");
         return NULL;
      }
@@ -3979,27 +3867,16 @@
    return NULL;
 }
 
-EAPI Evas_Object *
-ephysics_body_cloth_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Cloth_Face face)
+static Evas_Object *
+_ephysics_body_cloth_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Face face)
 {
    EPhysics_Body_Face_Obj *face_obj;
    Eina_List *l;
    void *ldata;
 
-   if (!body)
+   if ((face < EPHYSICS_BODY_CLOTH_FACE_FRONT) ||
+       (face > EPHYSICS_BODY_CLOTH_FACE_BACK))
      {
-        ERR("Can't unset evas object from body, it wasn't provided.");
-        return NULL;
-     }
-
-   if (body->type != EPHYSICS_BODY_TYPE_CLOTH)
-     {
-        ERR("Can't unset evas object from body, it's not a cloth.");
-        return NULL;
-     }
-
-   if ((face < 0) || (face >= EPHYSICS_BODY_CLOTH_FACE_LAST))
-     {
         ERR("Can't unset evas object from body, face is invalid.");
         return NULL;
      }
@@ -4022,6 +3899,74 @@
    return NULL;
 }
 
+EAPI void
+ephysics_body_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
+{
+   if (!body)
+     {
+        ERR("Can't set evas object to body, the last wasn't provided.");
+        return;
+     }
+
+   if (!evas_obj)
+     {
+        ERR("Can't set evas object to body, the first wasn't provided.");
+        return;
+     }
+
+   if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+     return _ephysics_body_cloth_face_evas_object_set(body, face, evas_obj,
+                                                      use_obj_pos);
+   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
+     return _ephysics_body_cylinder_face_evas_object_set(body, face, evas_obj,
+                                                         use_obj_pos);
+   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
+     return _ephysics_body_box_face_evas_object_set(body, face, evas_obj,
+                                                    use_obj_pos);
+
+   ERR("Can't handle body %p type.", body);
+}
+
+EAPI Evas_Object *
+ephysics_body_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Face face)
+{
+   if (!body)
+     {
+        ERR("Can't get evas object from body, it wasn't provided.");
+        return NULL;
+     }
+
+   if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+     return _ephysics_body_cloth_face_evas_object_get(body, face);
+   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
+     return _ephysics_body_cylinder_face_evas_object_get(body, face);
+   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
+     return _ephysics_body_box_face_evas_object_get(body, face);
+
+   ERR("Can't handle body %p type.", body);
+   return NULL;
+}
+
+EAPI Evas_Object *
+ephysics_body_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Face face)
+{
+   if (!body)
+     {
+        ERR("Can't unset evas object from body, it wasn't provided.");
+        return NULL;
+     }
+
+   if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+     return _ephysics_body_cloth_face_evas_object_unset(body, face);
+   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
+     return _ephysics_body_cylinder_face_evas_object_unset(body, face);
+   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
+     return _ephysics_body_box_face_evas_object_unset(body, face);
+
+   ERR("Can't handle body %p type.", body);
+   return NULL;
+}
+
 #ifdef  __cplusplus
 }
 #endif

Log:
ephysics: fix outdates docs regarding light
  
  
  

Author:       bdilly
Date:         2012-11-09 10:52:55 -0800 (Fri, 09 Nov 2012)
New Revision: 79043
Trac:         http://trac.enlightenment.org/e/changeset/79043

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-11-09 18:52:49 UTC (rev 79042)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-09 18:52:55 UTC (rev 79043)
@@ -3840,11 +3840,9 @@
  * is set to be applied over all the bodies, @p body will be displayed
  * with light over it.
  *
- * Also, if no light is set on the world with @ref ephysics_world_light_set(),
- * nothing will happens.
- *
  * @see ephysics_body_light_get().
- * @see ephysics_world_light_set() for more details regarding lighting.
+ * @see ephysics_world_point_light_position_set() for more details
+ * regarding lighting.
  *
  * @ingroup EPhysics_Body
  */

Log:
ephysics: use integer on body struct to store shape
  
  Instead of comparing strings to return of bullet collision shapes
  
  

Author:       bdilly
Date:         2012-11-09 10:53:04 -0800 (Fri, 09 Nov 2012)
New Revision: 79044
Trac:         http://trac.enlightenment.org/e/changeset/79044

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:52:55 UTC (rev 79043)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:53:04 UTC (rev 79044)
@@ -17,9 +17,6 @@
 extern "C" {
 #endif
 
-#define SHAPE_BOX "Box"
-#define SHAPE_CYLINDER "CylinderZ"
-
 typedef struct _EPhysics_Body_Callback EPhysics_Body_Callback;
 typedef struct _EPhysics_Body_Evas_Stacking EPhysics_Body_Evas_Stacking;
 typedef struct _EPhysics_Body_Soft_Body_Slice EPhysics_Body_Soft_Body_Slice;
@@ -1098,9 +1095,9 @@
           _ephysics_cloth_face_objs_update(body);
         else if (body->type == EPHYSICS_BODY_TYPE_RIGID)
           {
-             if (!(strcmp(body->collision_shape->getName(), SHAPE_CYLINDER)))
+             if (body->shape == EPHYSICS_BODY_SHAPE_CYLINDER)
                _ephysics_cylinder_face_objs_update(body);
-             else if (!(strcmp(body->collision_shape->getName(), SHAPE_BOX)))
+             else if (body->shape == EPHYSICS_BODY_SHAPE_BOX)
                _ephysics_box_face_objs_update(body);
           }
      }
@@ -1922,6 +1919,7 @@
    if (!body)
      goto no_body;
 
+   body->shape = EPHYSICS_BODY_SHAPE_CYLINDER;
    body->slices = 19;
    body->points_deform = (int *)malloc(body->slices * sizeof(int));
    if (!body->points_deform)
@@ -1977,6 +1975,7 @@
    ephysics_world_lock_take(world);
    body = _ephysics_body_rigid_body_add(world, collision_shape, "circle", 0.5,
                                         0.5, 0.5);
+   body->shape = EPHYSICS_BODY_SHAPE_CYLINDER;
    ephysics_world_lock_release(world);
    return body;
 }
@@ -2020,6 +2019,7 @@
    if (!body)
      goto no_body;
 
+   body->shape = EPHYSICS_BODY_SHAPE_BOX;
    body->slices = 16;
    body->points_deform = (int *)malloc(body->slices * sizeof(int));
    if (!body->points_deform)
@@ -2070,6 +2070,7 @@
    ephysics_world_lock_take(world);
    body = _ephysics_body_rigid_body_add(world, collision_shape, "box", 0.5,
                                         0.5, 0.5);
+   body->shape = EPHYSICS_BODY_SHAPE_BOX;
    ephysics_world_lock_release(world);
    return body;
 }
@@ -2194,6 +2195,7 @@
                                         "generic", (cm_x - min_x) / range_x,
                                         1 - (cm_y - min_y) / range_y,
                                         (cm_z - min_z) / range_z);
+   body->shape = EPHYSICS_BODY_SHAPE_CUSTOM;
    ephysics_world_lock_release(world);
    return body;
 }
@@ -3917,10 +3919,10 @@
    if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
      return _ephysics_body_cloth_face_evas_object_set(body, face, evas_obj,
                                                       use_obj_pos);
-   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
+   if (body->shape == EPHYSICS_BODY_SHAPE_CYLINDER)
      return _ephysics_body_cylinder_face_evas_object_set(body, face, evas_obj,
                                                          use_obj_pos);
-   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
+   if (body->shape == EPHYSICS_BODY_SHAPE_BOX)
      return _ephysics_body_box_face_evas_object_set(body, face, evas_obj,
                                                     use_obj_pos);
 
@@ -3938,9 +3940,9 @@
 
    if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
      return _ephysics_body_cloth_face_evas_object_get(body, face);
-   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
+   if (body->shape == EPHYSICS_BODY_SHAPE_CYLINDER)
      return _ephysics_body_cylinder_face_evas_object_get(body, face);
-   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
+   if (body->shape == EPHYSICS_BODY_SHAPE_BOX)
      return _ephysics_body_box_face_evas_object_get(body, face);
 
    ERR("Can't handle body %p type.", body);
@@ -3958,9 +3960,9 @@
 
    if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
      return _ephysics_body_cloth_face_evas_object_unset(body, face);
-   if (strcmp(body->collision_shape->getName(), SHAPE_CYLINDER))
+   if (body->shape == EPHYSICS_BODY_SHAPE_CYLINDER)
      return _ephysics_body_cylinder_face_evas_object_unset(body, face);
-   if (strcmp(body->collision_shape->getName(), SHAPE_BOX))
+   if (body->shape == EPHYSICS_BODY_SHAPE_BOX)
      return _ephysics_body_box_face_evas_object_unset(body, face);
 
    ERR("Can't handle body %p type.", body);

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:52:55 UTC (rev 79043)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:53:04 UTC (rev 79044)
@@ -55,6 +55,14 @@
 typedef struct _EPhysics_Dragging_Data EPhysics_Dragging_Data;
 typedef struct _EPhysics_Body_Soft_Body_Data EPhysics_Body_Soft_Body_Data;
 
+typedef enum _EPhysics_Body_Shape
+{
+  EPHYSICS_BODY_SHAPE_BOX,
+  EPHYSICS_BODY_SHAPE_CUSTOM,
+  EPHYSICS_BODY_SHAPE_CYLINDER,
+  EPHYSICS_BODY_SHAPE_LAST,
+} EPhysics_Body_Shape;
+
 typedef enum _EPhysics_World_Boundary
 {
    EPHYSICS_WORLD_BOUNDARY_TOP,
@@ -131,6 +139,7 @@
      int slices;
      int *points_deform;
      EPhysics_Body_Type type;
+     EPhysics_Body_Shape shape;
      int cloth_columns;
      int cloth_rows;
      int material_index;

Log:
ephysics: implement update of box faces objects
  
  
  

Author:       bdilly
Date:         2012-11-09 10:53:11 -0800 (Fri, 09 Nov 2012)
New Revision: 79045
Trac:         http://trac.enlightenment.org/e/changeset/79045

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:53:04 UTC (rev 79044)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:53:11 UTC (rev 79045)
@@ -1063,6 +1063,53 @@
 }
 
 static void
+_ephysics_body_evas_obj_map_apply(EPhysics_Body *body, Evas_Map *map, Evas_Object *obj, Eina_Bool bfc, Eina_Bool update_cw)
+{
+   EPhysics_Camera *camera = ephysics_world_camera_get(body->world);
+
+   if (ephysics_camera_perspective_enabled_get(camera))
+     {
+        int px, py, z0, foc;
+        ephysics_camera_perspective_get(camera, &px, &py, &z0, &foc);
+        evas_map_util_3d_perspective(map, px, py, z0, foc);
+     }
+
+   if (bfc)
+     {
+        if (evas_map_util_clockwise_get(map))
+          {
+             if (update_cw)
+               body->clockwise = EINA_TRUE;
+             evas_object_show(obj);
+          }
+        else
+          {
+             if (update_cw)
+               body->clockwise = EINA_FALSE;
+             evas_map_free(map);
+             evas_object_hide(obj);
+             return;
+          }
+     }
+
+   if ((body->light_apply) ||
+       (ephysics_world_light_all_bodies_get(body->world)))
+     {
+        int lr, lg, lb, ar, ag, ab;
+        Evas_Coord lx, ly, lz;
+
+        ephysics_world_point_light_position_get(body->world, &lx, &ly, &lz);
+        ephysics_world_point_light_color_get(body->world, &lr, &lg, &lb);
+        ephysics_world_ambient_light_color_get(body->world, &ar, &ag, &ab);
+        evas_map_util_3d_lighting(map, lx, ly, lz, lr, lg, lb, ar, ag, ab);
+     }
+
+   evas_object_map_set(obj, map);
+   evas_object_map_enable_set(obj, EINA_TRUE);
+   evas_map_free(map);
+}
+
+static void
 _ephysics_cloth_face_objs_update(EPhysics_Body *body __UNUSED__)
 {
 
@@ -1077,6 +1124,121 @@
 static void
 _ephysics_box_face_objs_update(EPhysics_Body *body)
 {
+   EPhysics_Body_Face_Obj *face_obj;
+   int i, x, y, z, wx, wy, wh, cx, cy;
+   EPhysics_Camera *camera;
+   Evas_Coord v[8][3];
+   btQuaternion quat;
+   btTransform trans;
+   btBoxShape *shape;
+   Evas_Map *map;
+   Eina_List *l;
+   double rate;
+   void *ldata;
+
+   ephysics_world_render_geometry_get(body->world, &wx, &wy, NULL,
+                                      NULL, &wh, NULL);
+   camera = ephysics_world_camera_get(body->world);
+   ephysics_camera_position_get(camera, &cx, &cy);
+   cx -= wx;
+   cy -= wy;
+
+   rate = ephysics_world_rate_get(body->world);
+   trans = _ephysics_body_transform_get(body);
+
+   x = (int) (trans.getOrigin().getX() * rate) - cx;
+   y = wh + wy - (int) (trans.getOrigin().getY() * rate) - cy;
+   z = (int) (trans.getOrigin().getZ() * rate);
+
+   shape = (btBoxShape *) body->collision_shape;
+   for (i = 0; i < 8; i++)
+     {
+        btVector3 vertice;
+        shape->getVertex(i, vertice);
+        v[i][0] = vertice.getX() * rate + x;
+        v[i][1] = - vertice.getY() * rate + y;
+        v[i][2] = vertice.getZ() * rate + z;
+     }
+
+   quat = trans.getRotation();
+   quat.normalize();
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        Evas_Object *obj;
+        Evas_Coord w, h;
+
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        obj = face_obj->obj;
+        evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+
+        map = evas_map_new(4);
+        evas_map_point_image_uv_set(map, 0, 0, 0);
+        evas_map_point_image_uv_set(map, 1, w, 0);
+        evas_map_point_image_uv_set(map, 2, w, h);
+        evas_map_point_image_uv_set(map, 3, 0, h);
+
+        switch(face_obj->face)
+          {
+           case EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT:
+              evas_map_point_coord_set(map, 0, v[5][0], v[5][1], z);
+              evas_map_point_coord_set(map, 1, v[4][0], v[4][1], z);
+              evas_map_point_coord_set(map, 2, v[6][0], v[6][1], z);
+              evas_map_point_coord_set(map, 3, v[7][0], v[7][1], z);
+              break;
+           case EPHYSICS_BODY_BOX_FACE_MIDDLE_BACK:
+              evas_map_point_coord_set(map, 0, v[0][0], v[0][1], z);
+              evas_map_point_coord_set(map, 1, v[1][0], v[1][1], z);
+              evas_map_point_coord_set(map, 2, v[3][0], v[3][1], z);
+              evas_map_point_coord_set(map, 3, v[2][0], v[2][1], z);
+              break;
+           case EPHYSICS_BODY_BOX_FACE_FRONT:
+              evas_map_point_coord_set(map, 0, v[5][0], v[5][1], v[5][2]);
+              evas_map_point_coord_set(map, 1, v[4][0], v[4][1], v[4][2]);
+              evas_map_point_coord_set(map, 2, v[6][0], v[6][1], v[6][2]);
+              evas_map_point_coord_set(map, 3, v[7][0], v[7][1], v[7][2]);
+              break;
+           case EPHYSICS_BODY_BOX_FACE_BACK:
+              evas_map_point_coord_set(map, 0, v[0][0], v[0][1], v[0][2]);
+              evas_map_point_coord_set(map, 1, v[1][0], v[1][1], v[1][2]);
+              evas_map_point_coord_set(map, 2, v[3][0], v[3][1], v[3][2]);
+              evas_map_point_coord_set(map, 3, v[2][0], v[2][1], v[2][2]);
+              break;
+           case EPHYSICS_BODY_BOX_FACE_RIGHT:
+              evas_map_point_coord_set(map, 0, v[4][0], v[4][1], v[4][2]);
+              evas_map_point_coord_set(map, 1, v[0][0], v[0][1], v[0][2]);
+              evas_map_point_coord_set(map, 2, v[2][0], v[2][1], v[2][2]);
+              evas_map_point_coord_set(map, 3, v[6][0], v[6][1], v[6][2]);
+              break;
+           case EPHYSICS_BODY_BOX_FACE_LEFT:
+              evas_map_point_coord_set(map, 0, v[1][0], v[1][1], v[1][2]);
+              evas_map_point_coord_set(map, 1, v[5][0], v[5][1], v[5][2]);
+              evas_map_point_coord_set(map, 2, v[7][0], v[7][1], v[7][2]);
+              evas_map_point_coord_set(map, 3, v[3][0], v[3][1], v[3][2]);
+              break;
+           case EPHYSICS_BODY_BOX_FACE_TOP:
+              evas_map_point_coord_set(map, 0, v[1][0], v[1][1], v[1][2]);
+              evas_map_point_coord_set(map, 1, v[0][0], v[0][1], v[0][2]);
+              evas_map_point_coord_set(map, 2, v[4][0], v[4][1], v[4][2]);
+              evas_map_point_coord_set(map, 3, v[5][0], v[5][1], v[5][2]);
+              break;
+           case EPHYSICS_BODY_BOX_FACE_BOTTOM:
+              evas_map_point_coord_set(map, 0, v[7][0], v[7][1], v[7][2]);
+              evas_map_point_coord_set(map, 1, v[6][0], v[6][1], v[6][2]);
+              evas_map_point_coord_set(map, 2, v[2][0], v[2][1], v[2][2]);
+              evas_map_point_coord_set(map, 3, v[3][0], v[3][1], v[3][2]);
+              break;
+           default:
+              WRN("Face %i not updated", face_obj->face);
+              evas_map_free(map);
+              continue;
+          }
+
+        evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(),
+                                  x, y, z);
+        _ephysics_body_evas_obj_map_apply(body, map, obj, EINA_TRUE,
+                                          EINA_FALSE);
+     }
 }
 
 static void
@@ -1141,45 +1303,8 @@
    quat.normalize();
    evas_map_util_quat_rotate(map, quat.x(), quat.y(), quat.z(), -quat.w(),
                              x + (w * body->cm.x), y + (h * body->cm.y), z);
-
-   if (ephysics_camera_perspective_enabled_get(camera))
-     {
-        int px, py, z0, foc;
-        ephysics_camera_perspective_get(camera, &px, &py, &z0, &foc);
-        evas_map_util_3d_perspective(map, px, py, z0, foc);
-     }
-
-   if (body->back_face_culling)
-     {
-        if (evas_map_util_clockwise_get(map))
-          {
-             body->clockwise = EINA_TRUE;
-             evas_object_show(body->evas_obj);
-          }
-        else
-          {
-             body->clockwise = EINA_FALSE;
-             evas_map_free(map);
-             evas_object_hide(body->evas_obj);
-             return;
-          }
-     }
-
-   if ((body->light_apply) ||
-       (ephysics_world_light_all_bodies_get(body->world)))
-     {
-        int lr, lg, lb, ar, ag, ab;
-        Evas_Coord lx, ly, lz;
-
-        ephysics_world_point_light_position_get(body->world, &lx, &ly, &lz);
-        ephysics_world_point_light_color_get(body->world, &lr, &lg, &lb);
-        ephysics_world_ambient_light_color_get(body->world, &ar, &ag, &ab);
-        evas_map_util_3d_lighting(map, lx, ly, lz, lr, lg, lb, ar, ag, ab);
-     }
-
-   evas_object_map_set(body->evas_obj, map);
-   evas_object_map_enable_set(body->evas_obj, EINA_TRUE);
-   evas_map_free(map);
+   _ephysics_body_evas_obj_map_apply(body, map, body->evas_obj,
+                                     body->back_face_culling, EINA_TRUE);
 }
 
 static void

Log:
ephysics: fix evas object rotation based on body
  
  Inverts y component.
  
  

Author:       bdilly
Date:         2012-11-09 10:53:38 -0800 (Fri, 09 Nov 2012)
New Revision: 79048
Trac:         http://trac.enlightenment.org/e/changeset/79048

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:53:26 UTC (rev 79047)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:53:38 UTC (rev 79048)
@@ -1244,7 +1244,7 @@
 static void
 _ephysics_body_evas_object_default_update(EPhysics_Body *body)
 {
-   int x, y, z, w, h, wx, wy, wh, cx, cy;
+   int bx, by, x, y, z, w, h, wx, wy, wh, cx, cy;
    EPhysics_Camera *camera;
    btTransform trans;
    btQuaternion quat;
@@ -1277,8 +1277,10 @@
 
    evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h);
    rate = ephysics_world_rate_get(body->world);
-   x = (int) (trans.getOrigin().getX() * rate) - w * body->cm.x - cx;
-   y = wh + wy - (int) (trans.getOrigin().getY() * rate) - h * body->cm.y - cy;
+   bx = (int) (trans.getOrigin().getX() * rate) - cx;
+   by = wh + wy - (int) (trans.getOrigin().getY() * rate) - cy;
+   x = bx - w * body->cm.x;
+   y = by - h * body->cm.y;
    z = (int) (trans.getOrigin().getZ() * rate);
 
    evas_object_move(body->evas_obj, x, y);
@@ -1301,8 +1303,9 @@
 
    quat = trans.getRotation();
    quat.normalize();
-   evas_map_util_quat_rotate(map, quat.x(), quat.y(), quat.z(), -quat.w(),
-                             x + (w * body->cm.x), y + (h * body->cm.y), z);
+   evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(),
+                             bx, by, z);
+
    _ephysics_body_evas_obj_map_apply(body, map, body->evas_obj,
                                      body->back_face_culling, EINA_TRUE);
 }

Log:
ephysics: implement update of cylinder faces
  
  
  

Author:       bdilly
Date:         2012-11-09 10:57:51 -0800 (Fri, 09 Nov 2012)
New Revision: 79049
Trac:         http://trac.enlightenment.org/e/changeset/79049

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:53:38 UTC (rev 79048)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:57:51 UTC (rev 79049)
@@ -1116,9 +1116,86 @@
 }
 
 static void
-_ephysics_cylinder_face_objs_update(EPhysics_Body *body __UNUSED__)
+_ephysics_cylinder_face_objs_update(EPhysics_Body *body)
 {
+   int bx, by, x, y, z, wx, wy, wh, cx, cy;
+   EPhysics_Body_Face_Obj *face_obj;
+   EPhysics_Camera *camera;
+   btQuaternion quat;
+   btTransform trans;
+   Evas_Map *map;
+   Eina_List *l;
+   double rate;
+   void *ldata;
 
+   ephysics_world_render_geometry_get(body->world, &wx, &wy, NULL,
+                                      NULL, &wh, NULL);
+   camera = ephysics_world_camera_get(body->world);
+   ephysics_camera_position_get(camera, &cx, &cy);
+   cx -= wx;
+   cy -= wy;
+
+   rate = ephysics_world_rate_get(body->world);
+   trans = _ephysics_body_transform_get(body);
+
+   bx = (int) (trans.getOrigin().getX() * rate) - cx;
+   by = wh + wy - (int) (trans.getOrigin().getY() * rate) - cy;
+   x = bx - body->size.w / 2;
+   y = by - body->size.h / 2;
+   z = (int) (trans.getOrigin().getZ() * rate);
+
+   quat = trans.getRotation();
+   quat.normalize();
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        Evas_Object *obj;
+        Evas_Coord w, h;
+
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        obj = face_obj->obj;
+
+        evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+        evas_object_move(obj, x, y);
+        if ((!w) || (!h))
+          {
+             DBG("Evas object with no geometry: %p, w=%i h=%i", obj, w, h);
+             continue;
+          }
+
+        map = evas_map_new(4);
+
+        switch(face_obj->face)
+          {
+           case EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT:
+              evas_map_util_points_populate_from_object_full(map, obj, z);
+              break;
+           case EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_BACK:
+              evas_map_util_points_populate_from_object_full(map, obj, z + 1);
+              evas_map_util_3d_rotate(map, 0, 180, 0, bx, by, z + 1);
+              break;
+           case EPHYSICS_BODY_CYLINDER_FACE_FRONT:
+              evas_map_util_points_populate_from_object_full(
+                 map, obj, z - body->size.d / 2);
+              break;
+           case EPHYSICS_BODY_CYLINDER_FACE_BACK:
+              evas_map_util_points_populate_from_object_full(
+                 map, obj, z + body->size.d / 2);
+              evas_map_util_3d_rotate(map, 0, 180, 0, bx, by,
+                                      z + body->size.d / 2);
+              break;
+           default:
+              WRN("Face %i not updated", face_obj->face);
+              evas_map_free(map);
+              continue;
+          }
+
+        evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(),
+                                  bx, by, z);
+
+        _ephysics_body_evas_obj_map_apply(body, map, obj, EINA_TRUE,
+                                          EINA_FALSE);
+     }
 }
 
 static void

Log:
EPhysics: get rid of soft_data
  
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-09 10:58:38 -0800 (Fri, 09 Nov 2012)
New Revision: 79055
Trac:         http://trac.enlightenment.org/e/changeset/79055

Modified:
  trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:58:32 UTC (rev 79054)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:58:38 UTC (rev 79055)
@@ -53,7 +53,6 @@
 typedef struct _EPhysics_Body_Size EPhysics_Body_Size;
 typedef struct _EPhysics_Point EPhysics_Point;
 typedef struct _EPhysics_Dragging_Data EPhysics_Dragging_Data;
-typedef struct _EPhysics_Body_Soft_Body_Data EPhysics_Body_Soft_Body_Data;
 
 typedef enum _EPhysics_Body_Shape
 {
@@ -144,7 +143,6 @@
      int cloth_rows;
      int material_index;
      int collision_cb;
-     EPhysics_Body_Soft_Body_Data *soft_data;
      EPhysics_Dragging_Data dragging_data;
 
      Eina_Bool active:1;

Log:
EPhysics: fix soft body geometry set
  
  Issue found on ephysics_sandbox. The scale was been applied considering
  the rigid body behaviour. This patch applies a reverse scale then scale
  again.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-09 10:58:43 -0800 (Fri, 09 Nov 2012)
New Revision: 79056
Trac:         http://trac.enlightenment.org/e/changeset/79056

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:58:38 UTC (rev 79055)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:58:43 UTC (rev 79056)
@@ -427,7 +427,7 @@
    btTransform origin;
    btTransform dest;
 
-   if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+   if (body->type != EPHYSICS_BODY_TYPE_RIGID)
      {
         origin = _ephysics_body_transform_get(body);
         dest.setIdentity();
@@ -887,20 +887,29 @@
 _ephysics_body_resize(EPhysics_Body *body, Evas_Coord w, Evas_Coord h, Evas_Coord d)
 {
    double rate, sx, sy, sz;
+   btVector3 body_scale;
 
    rate = ephysics_world_rate_get(body->world);
    sx = w / rate;
    sy = h / rate;
    sz = d / rate;
 
-   if (body->soft_body)
+   body_scale = btVector3(sx, sy, sz);
+   if (body->type == EPHYSICS_BODY_TYPE_SOFT)
      {
-        body->soft_body->scale(btVector3(sx, sy, sz));
+        body->soft_body->scale(btVector3(1, 1, 1) / body->scale);
+        body->soft_body->scale(body_scale);
         _ephysics_body_soft_body_constraints_rebuild(body);
      }
+   else if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+     {
+        body->soft_body->scale(btVector3(1, 1, 1) / body->scale);
+        body->soft_body->scale(body_scale);
+        _ephysics_body_cloth_constraints_rebuild(body);
+     }
    else
      {
-        body->collision_shape->setLocalScaling(btVector3(sx, sy, sz));
+        body->collision_shape->setLocalScaling(body_scale);
 
         if(!body->rigid_body->isStaticObject())
           _ephysics_body_mass_set(body, ephysics_body_mass_get(body));
@@ -909,7 +918,7 @@
    body->size.w = w;
    body->size.h = h;
    body->size.d = d;
-   body->scale = btVector3(sx, sy, sz);
+   body->scale = body_scale;
 
    ephysics_body_activate(body, EINA_TRUE);
 
@@ -974,14 +983,15 @@
 
    if (body->type == EPHYSICS_BODY_TYPE_SOFT)
      {
+        body->soft_body->scale(btVector3(1, 1, 1) / body->scale);
         body->soft_body->scale(body_scale);
-        body->soft_body->getCollisionShape()->setLocalScaling(body_scale);
         body->rigid_body->proceedToTransform(trans);
-        body->soft_body->transform(trans);
+        _ephysics_body_transform_set(body, trans);
         _ephysics_body_soft_body_constraints_rebuild(body);
      }
    else if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
      {
+        body->soft_body->scale(btVector3(1, 1, 1) / body->scale);
         body->soft_body->scale(body_scale);
         _ephysics_body_transform_set(body, trans);
         _ephysics_body_cloth_constraints_rebuild(body);

Log:
EPhysics: do not wait to disassociate a boundary
  
  If a user has asked for a boundary deletion do not wait until body_del
  callback to clean it up to avoid returning a body marked for deletion
  case the user decided to add it again.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-09 10:58:51 -0800 (Fri, 09 Nov 2012)
New Revision: 79057
Trac:         http://trac.enlightenment.org/e/changeset/79057

Modified:
  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_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:58:43 UTC (rev 79056)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-09 18:58:51 UTC (rev 79057)
@@ -2467,6 +2467,7 @@
    if (!body)
      return NULL;
 
+   body->boundary = EINA_TRUE;
    ephysics_body_mass_set(body, 0);
    ephysics_world_boundary_set(world, boundary, body);
    ephysics_body_geometry_set(body, x, y, z, w, h, d);

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:58:43 UTC (rev 79056)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-09 18:58:51 UTC (rev 79057)
@@ -150,6 +150,7 @@
      Eina_Bool light_apply:1;
      Eina_Bool back_face_culling:1;
      Eina_Bool clockwise:1;
+     Eina_Bool boundary:1;
 };
 
 extern int _ephysics_log_dom;

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-11-09 18:58:43 UTC (rev 79056)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-11-09 18:58:51 UTC (rev 79057)
@@ -316,11 +316,29 @@
    ephysics_orphan_body_del(body);
 }
 
+static void
+_ephysics_world_boundary_del(EPhysics_World *world, EPhysics_Body *body)
+{
+   int i;
+
+   for (i = 0; i < EPHYSICS_WORLD_BOUNDARY_LAST; i++)
+     {
+        if (world->boundaries[i] == body)
+          {
+             world->boundaries[i] = NULL;
+             return;
+          }
+     }
+}
+
 Eina_Bool
 ephysics_world_body_del(EPhysics_World *world, EPhysics_Body *body)
 {
    EPhysics_Body *bd;
 
+   if (body->boundary)
+     _ephysics_world_boundary_del(world, body);
+
    if (world->pending_ticks)
      {
         world->to_delete = eina_list_append(world->to_delete, body);
@@ -448,22 +466,6 @@
    return EINA_TRUE;
 }
 
-static void
-_ephysics_world_boundary_del_cb(void *data, EPhysics_Body *body, void *event_info __UNUSED__)
-{
-   EPhysics_World *world = (EPhysics_World *) data;
-   int i;
-
-   for (i = 0; i < EPHYSICS_WORLD_BOUNDARY_LAST; i++)
-     {
-        if (world->boundaries[i] == body)
-          {
-             world->boundaries[i] = NULL;
-             return;
-          }
-     }
-}
-
 Eina_Bool
 ephysics_world_body_add(EPhysics_World *world, EPhysics_Body *body)
 {
@@ -554,8 +556,6 @@
 ephysics_world_boundary_set(EPhysics_World *world, EPhysics_World_Boundary boundary, EPhysics_Body *body)
 {
    world->boundaries[boundary] = body;
-   ephysics_body_event_callback_add(body, EPHYSICS_CALLBACK_BODY_DEL,
-                                    _ephysics_world_boundary_del_cb, world);
 }
 
 EPhysics_Body *

Log:
ephysics: fix docs regarding torque axis.
  
  
  

Author:       bdilly
Date:         2012-11-13 14:17:54 -0800 (Tue, 13 Nov 2012)
New Revision: 79249
Trac:         http://trac.enlightenment.org/e/changeset/79249

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-11-13 21:57:49 UTC (rev 79248)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-13 22:17:54 UTC (rev 79249)
@@ -3286,7 +3286,7 @@
  * @brief
  * Apply a torque impulse over a body.
  *
- * An impulse will be applied over the body to make it rotate around Z axis.
+ * An impulse will be applied over the body to make it rotate.
  * Impulse is the product of the force over the time this force is applied.
  * In ephysics case, it would be the time of a tick, so it behaves just
  * summing current angular velocity to the result of a calculation involving
@@ -3311,8 +3311,7 @@
  * @brief
  * Apply an impulse over a body.
  *
- * An impulse will be applied over the body to make it move and rotate around
- * Z axis.
+ * An impulse will be applied over the body to make it move and rotate.
  *
  * Impulse is the product of the force over the time this force is applied.
  * It can be applied in the center of the body, avoiding rotating it,
@@ -3321,7 +3320,7 @@
  * or can be used to lead to both behaviors with
  * @ref ephysics_body_impulse_apply().
  *
- * It will result in a central impulse with impulse (@p x, @p y) and a
+ * It will result in a central impulse with impulse (@p x, @p y, @p z) and a
  * torque impulse that will be calculated as a cross product on impulse
  * and relative position.
  *

Log:
ephysics: fix body rotation set / get
  
  There was a inversion on setter and getter wasn't calculating
  euler angles correctly.
  
  

Author:       bdilly
Date:         2012-11-13 14:18:03 -0800 (Tue, 13 Nov 2012)
New Revision: 79250
Trac:         http://trac.enlightenment.org/e/changeset/79250

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-13 22:17:54 UTC (rev 79249)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-13 22:18:03 UTC (rev 79250)
@@ -3269,6 +3269,7 @@
 EAPI void
 ephysics_body_rotation_get(const EPhysics_Body *body, double *rot_x, double *rot_y, double *rot_z)
 {
+   btScalar yaw, pitch, roll;
    btTransform trans;
 
    if (!body)
@@ -3279,12 +3280,10 @@
 
    trans = _ephysics_body_transform_get(body);
 
-   if (rot_x) *rot_x = - trans.getRotation().getAngle() * RAD_TO_DEG *
-     trans.getRotation().getAxis().getX();
-   if (rot_y) *rot_y = - trans.getRotation().getAngle() * RAD_TO_DEG *
-     trans.getRotation().getAxis().getY();
-   if (rot_z) *rot_z = - trans.getRotation().getAngle() * RAD_TO_DEG *
-     trans.getRotation().getAxis().getZ();
+   trans.getBasis().getEulerYPR(yaw, pitch, roll);
+   if (rot_x) *rot_x = -roll * RAD_TO_DEG;
+   if (rot_y) *rot_y = -pitch * RAD_TO_DEG;
+   if (rot_z) *rot_z = -yaw * RAD_TO_DEG;
 }
 
 EAPI void
@@ -3302,7 +3301,7 @@
    ephysics_world_lock_take(body->world);
    ephysics_body_activate(body, EINA_TRUE);
 
-   quat.setEuler(-rot_x / RAD_TO_DEG, -rot_y / RAD_TO_DEG, -rot_z / RAD_TO_DEG);
+   quat.setEuler(-rot_y / RAD_TO_DEG, -rot_x / RAD_TO_DEG, -rot_z / RAD_TO_DEG);
 
    if (body->soft_body)
      body->soft_body->rotate(quat);

Log:
ephysics: add quaternion group to main doc page
  
  I forgot that.
  
  

Author:       bdilly
Date:         2012-11-14 12:01:01 -0800 (Wed, 14 Nov 2012)
New Revision: 79297
Trac:         http://trac.enlightenment.org/e/changeset/79297

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-11-14 16:34:33 UTC (rev 79296)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-14 20:01:01 UTC (rev 79297)
@@ -22,6 +22,7 @@
  * @li @ref EPhysics_Body
  * @li @ref EPhysics_Camera
  * @li @ref EPhysics_Constraint
+ * @li @ref EPhysics_Quaternion
  * @li @ref EPhysics_Shape
  *
  * Please see the @ref authors page for contact details.

Log:
EPhysics: move just a single node of a triangle
  
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:43:19 -0800 (Fri, 23 Nov 2012)
New Revision: 79590
Trac:         http://trac.enlightenment.org/e/changeset/79590

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:28:02 UTC (rev 79589)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:43:19 UTC (rev 79590)
@@ -819,11 +819,8 @@
    body->dragging_data.dragging = EINA_TRUE;
 
    face = body->soft_body->m_faces[triangle];
-   for (int i = 0; i < 3; i++)
-     {
-        node = face.m_n[i];
-        body->dragging_data.mass[i] = node->m_im;
-     }
+   node = face.m_n[0];
+   body->dragging_data.mass = node->m_im;
 }
 
 static void
@@ -850,8 +847,7 @@
           {
              valid_nodes++;
              inverse_mass = 1 / (mass / valid_nodes);
-             for (int i = 0; i < 3; i++)
-               body->dragging_data.mass[i] = inverse_mass;
+             body->dragging_data.mass = inverse_mass;
           }
 
         for (int i = 0; i < body->soft_body->m_nodes.size(); i++)
@@ -1651,13 +1647,10 @@
 
    ephysics_world_lock_take(body->world);
    face = body->soft_body->m_faces[body->dragging_data.triangle];
-   for (int i = 0; i < 3; i++)
-     {
-        node = face.m_n[i];
-        node->m_im = body->dragging_data.mass[i];
-        body->dragging_data.mass[i] = 0;
-     }
+   node = face.m_n[0];
+   node->m_im = body->dragging_data.mass;
 
+   body->dragging_data.mass = 0;
    body->dragging_data.dragging = EINA_FALSE;
    body->dragging_data.triangle = 0;
    ephysics_world_lock_release(body->world);
@@ -1994,19 +1987,16 @@
    btSoftBody::Node *node;
 
    face = body->soft_body->m_faces[body->dragging_data.triangle];
-   for (int i = 0; i < 3; i++)
-     {
-        node = face.m_n[i];
-        node->m_v *= 0;
-        node->m_im *= 0;
-     }
+   node = face.m_n[0];
+   node->m_v *= 0;
+   node->m_im *= 0;
 }
 
 EAPI void
 ephysics_body_soft_body_triangle_move(EPhysics_Body *body, int idx, Evas_Coord x, Evas_Coord y, Evas_Coord z)
 {
    btScalar xx, yy, zz;
-   Evas_Coord wh;
+   Evas_Coord wh, wy;
    double rate;
    btVector3 new_pos;
    btTransform diff;
@@ -2027,34 +2017,29 @@
      }
 
    rate = ephysics_world_rate_get(body->world);
-   ephysics_world_render_geometry_get(body->world, NULL, NULL, NULL, NULL, &wh,
+   ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
                                       NULL);
 
    xx = x / rate;
-   yy = (wh -  y) / rate;
+   yy = ((wh + wy) -  y) / rate;
    zz = z / rate;
 
    new_pos = btVector3(xx, yy, zz);
    ephysics_world_lock_take(body->world);
 
    face = body->soft_body->m_faces[idx];
-   for (int i = 0; i < 3; i++)
-     {
-        node = face.m_n[i];
-        diff.setIdentity();
-        diff.setOrigin(new_pos - node->m_x);
-        _ephysics_body_soft_body_single_face_transform(body->soft_body, idx, i,
-                                                       diff);
 
-        if (!i) continue;
+   node = face.m_n[0];
+   diff.setIdentity();
+   diff.setOrigin(new_pos - node->m_x);
+   _ephysics_body_soft_body_single_face_transform(body->soft_body, idx, 0, diff);
 
-        diff.setOrigin(diff.getOrigin() * 0.1);
-        for (int m = 0; m < body->soft_body->m_faces.size(); m++)
-          {
-             if (m == idx) continue;
-             _ephysics_body_soft_body_single_face_transform(body->soft_body, m,
-                                                            i, diff);
-          }
+   diff.setOrigin(diff.getOrigin() * 0.1);
+   for (int m = 0; m < body->soft_body->m_faces.size(); m++)
+     {
+        if (m == idx) continue;
+        _ephysics_body_soft_body_single_face_transform(body->soft_body, m, 0,
+                                                       diff);
      }
 
    body->soft_body->updateClusters();

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:28:02 UTC (rev 79589)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:43:19 UTC (rev 79590)
@@ -98,7 +98,7 @@
 
 struct _EPhysics_Dragging_Data {
      int triangle;
-     double mass[3];
+     double mass;
      Eina_Bool dragging:1;
 };

Log:
EPhysics: generate bending constraints just once
  
  Unlikely the cluster generate bullet will not rebuild the bending
  constraints every call, so we must prevent creating duplicated
  constraints.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:43:25 -0800 (Fri, 23 Nov 2012)
New Revision: 79591
Trac:         http://trac.enlightenment.org/e/changeset/79591

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:43:19 UTC (rev 79590)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:43:25 UTC (rev 79591)
@@ -776,8 +776,12 @@
           }
      }
    soft_body->generateClusters(0);
-   soft_body->generateBendingConstraints(2, soft_body->m_materials[
-                                                          body->material_index]);
+   if (!body->bending_constraints)
+     {
+        soft_body->generateBendingConstraints(2, soft_body->
+                                              m_materials[body->material_index]);
+        body->bending_constraints = EINA_TRUE;
+     }
 }
 
 static void
@@ -798,8 +802,12 @@
      }
 
    soft_body->generateClusters(0);
-   soft_body->generateBendingConstraints(10, soft_body->m_materials[
-                                                          body->material_index]);
+   if (!body->bending_constraints)
+     {
+        soft_body->generateBendingConstraints(10, soft_body->
+                                              m_materials[body->material_index]);
+        body->bending_constraints = EINA_TRUE;
+     }
 }
 
 inline static double

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:43:19 UTC (rev 79590)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:43:25 UTC (rev 79591)
@@ -151,6 +151,7 @@
      Eina_Bool back_face_culling:1;
      Eina_Bool clockwise:1;
      Eina_Bool boundary:1;
+     Eina_Bool bending_constraints:1;
 };
 
 extern int _ephysics_log_dom;

Log:
EPhysics: add soft body bending constraints API
  
  This patch introduces the API ephysics_body_soft_body_bending_constraints_add
  used define how deformeable a soft body is supposed to be.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:43:32 -0800 (Fri, 23 Nov 2012)
New Revision: 79592
Trac:         http://trac.enlightenment.org/e/changeset/79592

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-11-23 21:43:25 UTC (rev 79591)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-23 21:43:32 UTC (rev 79592)
@@ -2425,6 +2425,28 @@
 
 /**
  * @brief
+ * Add new bending constraints to some @p body.
+ *
+ * Bending constraints define how a soft body is to be deformeable. In fact a
+ * bending constraints represents a link between a soft body mesh triangle and
+ * other. The hardness property is used to define the bending constraint of
+ * those new links.
+ *
+ * By default EPhysics create a new soft body or cloth with a single bending
+ * constraint.
+ *
+ * @param body The body to add bending constraints to.
+ * @param number The number of bending constraints to be added, it must be
+ * greater than 0.
+ *
+ * @see ephysics_body_soft_body_hardness_set().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_soft_body_bending_constraints_add(EPhysics_Body *body, int number);
+
+/**
+ * @brief
  * Create a new circle physics body.
  *
  * Its collision shape will be a circle of diameter 1. To change it's size

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:43:25 UTC (rev 79591)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:43:32 UTC (rev 79592)
@@ -749,6 +749,16 @@
      }
 }
 
+void
+ephysics_body_soft_body_bending_constraints_generate(EPhysics_Body *body)
+{
+   btSoftBody *soft_body = body->soft_body;
+
+   for (; body->bending_constraints; body->bending_constraints--)
+     soft_body->generateBendingConstraints(2, soft_body->m_materials
+                                           [body->material_index]);
+}
+
 static void
 _ephysics_body_cloth_constraints_rebuild(EPhysics_Body *body)
 {
@@ -776,12 +786,7 @@
           }
      }
    soft_body->generateClusters(0);
-   if (!body->bending_constraints)
-     {
-        soft_body->generateBendingConstraints(2, soft_body->
-                                              m_materials[body->material_index]);
-        body->bending_constraints = EINA_TRUE;
-     }
+   ephysics_body_soft_body_bending_constraints_generate(body);
 }
 
 static void
@@ -802,12 +807,7 @@
      }
 
    soft_body->generateClusters(0);
-   if (!body->bending_constraints)
-     {
-        soft_body->generateBendingConstraints(10, soft_body->
-                                              m_materials[body->material_index]);
-        body->bending_constraints = EINA_TRUE;
-     }
+   ephysics_body_soft_body_bending_constraints_generate(body);
 }
 
 inline static double
@@ -1685,6 +1685,7 @@
 static void
 _ephysics_body_soft_body_default_config(EPhysics_Body *body, btSoftBody *soft_body)
 {
+   body->bending_constraints = 1;
    body->soft_body = soft_body;
    body->soft_body->getCollisionShape()->setMargin(btScalar(0.02));
    body->soft_body->setUserPointer(body);
@@ -1892,6 +1893,26 @@
    return body->soft_body->m_cfg.piterations;
 }
 
+EAPI void
+ephysics_body_soft_body_bending_constraints_add(EPhysics_Body *body, int number)
+{
+   if (!body)
+     {
+        ERR("Could add new bending constraint, body is null.");
+        return;
+     }
+
+   if (number <= 0)
+     {
+        ERR("Could not add new bending constraints, number must be greater"
+            " than 0");
+        return;
+     }
+
+   body->bending_constraints += number;
+   DBG("Added new bending constraints to body: %p", body);
+}
+
 EAPI EPhysics_Body *
 ephysics_body_cloth_add(EPhysics_World *world, unsigned short rows, unsigned short columns)
 {

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:43:25 UTC (rev 79591)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:43:32 UTC (rev 79592)
@@ -151,7 +151,7 @@
      Eina_Bool back_face_culling:1;
      Eina_Bool clockwise:1;
      Eina_Bool boundary:1;
-     Eina_Bool bending_constraints:1;
+     int bending_constraints;
 };
 
 extern int _ephysics_log_dom;
@@ -189,6 +189,7 @@
 void ephysics_body_activate(const EPhysics_Body *body, Eina_Bool activate);
 void ephysics_body_evas_objects_restack(EPhysics_World *world);
 void ephysics_body_soft_body_dragging_apply(EPhysics_Body *body);
+void ephysics_body_soft_body_bending_constraints_generate(EPhysics_Body *body);
 
 /* Camera */
 EPhysics_Camera *ephysics_camera_add(EPhysics_World *world);

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-11-23 21:43:25 UTC (rev 79591)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-11-23 21:43:32 UTC (rev 79592)
@@ -590,6 +590,9 @@
              ephysics_body_forces_apply(body);
              if (body->dragging_data.dragging)
                ephysics_body_soft_body_dragging_apply(body);
+
+             if (body->bending_constraints)
+               ephysics_body_soft_body_bending_constraints_generate(body);
           }
 
         time_now = ecore_time_get();

Log:
EPhysics: add soft body triangle impulse API
  
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:43:49 -0800 (Fri, 23 Nov 2012)
New Revision: 79594
Trac:         http://trac.enlightenment.org/e/changeset/79594

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-11-23 21:43:44 UTC (rev 79593)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-23 21:43:49 UTC (rev 79594)
@@ -2370,6 +2370,33 @@
 
 /**
  * @brief
+ * Apply an impulse on a given soft body triangle.
+ *
+ * The impulse is equal to the change of momentum of the body.
+ * Impulse is the product of the force over the time this force is applied. In
+ * ephysics case, it would be the time of a tick, so it behaves just summing
+ * current linear velocity to impulse per mass(per triangle mass).
+ *
+ * When a impulse is applied over a body, it will have its velocity changed. This
+ * impulse will be applied on body's specified triangle @p idx, so it won't
+ * imply in rotating the body.
+ *
+ * @note Impulse is measured in kg * p / s.
+ *
+ * @param body The body to apply impulse to.
+ * @param idx The soft body triangle index.
+ * @param x The axis @p x component of impulse.
+ * @param y The axis @p y component of impulse
+ * @param z The axis @p z component of impulse
+ *
+ * @see ephysics_body_soft_body_triangle_index_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_soft_body_triangle_impulse_apply(EPhysics_Body * body, int idx, double x, double y, double z);
+
+/**
+ * @brief
  * Set the soft body number of position iterations.
  *
  * Both soft body and cloth can have its number of position iterations changed.

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:43:44 UTC (rev 79593)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:43:49 UTC (rev 79594)
@@ -2078,6 +2078,41 @@
    ephysics_world_lock_release(body->world);
 }
 
+EAPI void
+ephysics_body_soft_body_triangle_impulse_apply(EPhysics_Body * body, int idx, double x, double y, double z)
+{
+   btSoftBody::Face face;
+   btSoftBody::Node *node;
+   double rate;
+   btVector3 impulse;
+
+   if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+     {
+        ERR("Can't apply impulse, operation not permited to rigid bodies.");
+        return;
+     }
+
+   if (idx < 0 || idx >= body->soft_body->m_faces.size())
+     {
+        ERR("Could not apply impulse, provided body triangle index ranges from"
+            " 0 to %d", body->soft_body->m_faces.size());
+        return;
+     }
+
+   rate = ephysics_world_rate_get(body->world);
+   impulse = btVector3(x / rate, y / rate, z / rate);
+
+   ephysics_world_lock_take(body->world);
+
+   face = body->soft_body->m_faces[idx];
+   node = face.m_n[0];
+   node->m_f += impulse * node->m_im;
+
+   ephysics_world_lock_release(body->world);
+   DBG("Impulse applied to soft body node(%d): %lf, %lf, %lf", idx, impulse.x(),
+       impulse.y(), impulse.z());
+}
+
 EAPI int
 ephysics_body_soft_body_triangle_index_get(EPhysics_Body *body, Evas_Coord x, Evas_Coord y)
 {

Log:
EPhysics: reset soft body's slices layer
  
  If a evas object has its layer reset so we must apply the change its
  slices evas objects.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:49:44 -0800 (Fri, 23 Nov 2012)
New Revision: 79595
Trac:         http://trac.enlightenment.org/e/changeset/79595

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:43:49 UTC (rev 79594)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:49:44 UTC (rev 79595)
@@ -1038,6 +1038,23 @@
    ephysics_world_lock_release(body->world);
 }
 
+ static void
+_ephysics_body_soft_body_evas_restack_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   EPhysics_Body *body = (EPhysics_Body *)data;
+   Eina_List *l;
+   void *ldata;
+   EPhysics_Body_Soft_Body_Slice *slice;
+   short layer = evas_object_layer_get(obj);
+
+   EINA_LIST_FOREACH(body->slices_list, l, ldata)
+     {
+        slice = (EPhysics_Body_Soft_Body_Slice *)ldata;
+        evas_object_layer_set(slice->evas_obj, layer);
+     }
+   DBG("Body's slices layer reset to: %d", layer);
+}
+
 static void
 _ephysics_body_del(EPhysics_Body *body)
 {
@@ -1050,6 +1067,10 @@
                                        _ephysics_body_evas_obj_del_cb);
         evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
                                        _ephysics_body_evas_obj_resize_cb);
+
+        if (body->slices_list)
+          evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESTACK,
+                                       _ephysics_body_soft_body_evas_restack_cb);
      }
 
    while (body->callbacks)
@@ -2652,7 +2673,12 @@
         evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
                                        _ephysics_body_evas_obj_resize_cb);
         if (body->slices_list)
-          _ephysics_body_soft_body_slices_clean(body);
+          {
+             evas_object_event_callback_del(body->evas_obj,
+                                       EVAS_CALLBACK_RESTACK,
+                                       _ephysics_body_soft_body_evas_restack_cb);
+             _ephysics_body_soft_body_slices_clean(body);
+          }
      }
 
    body->evas_obj = evas_obj;
@@ -2660,7 +2686,11 @@
                                   _ephysics_body_evas_obj_del_cb, body);
 
    if (body->soft_body)
-     _ephysics_body_soft_body_slices_init(body);
+     {
+        evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_RESTACK,
+                                 _ephysics_body_soft_body_evas_restack_cb, body);
+        _ephysics_body_soft_body_slices_init(body);
+     }
 
    if (!use_obj_pos)
      return;
@@ -2700,7 +2730,12 @@
      }
 
    if (body->slices_list)
-     _ephysics_body_soft_body_slices_clean(body);
+     {
+        evas_object_event_callback_del(body->evas_obj,
+                                       EVAS_CALLBACK_RESTACK,
+                                       _ephysics_body_soft_body_evas_restack_cb);
+        _ephysics_body_soft_body_slices_clean(body);
+     }
 
    return obj;
 }

Log:
EPhysics: soft body slicing refactory
  
  Prepare to use the same infra structure of slicing for soft body multi-face
  deformation implementation.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:49:51 -0800 (Fri, 23 Nov 2012)
New Revision: 79596
Trac:         http://trac.enlightenment.org/e/changeset/79596

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:49:44 UTC (rev 79595)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:49:51 UTC (rev 79596)
@@ -60,7 +60,7 @@
 };
 
 static void
-_ephysics_body_soft_body_slices_apply(EPhysics_Body *body)
+_ephysics_body_soft_body_slices_apply(EPhysics_Body *body, Eina_List *slices)
 {
    double rate;
    void *list_data;
@@ -98,7 +98,7 @@
         perspective = EINA_TRUE;
      }
 
-   EINA_LIST_FOREACH(body->slices_list, l, list_data)
+   EINA_LIST_FOREACH(slices, l, list_data)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *)list_data;
 
@@ -206,7 +206,7 @@
 }
 
 static void
-_ephysics_body_soft_body_slices_init(EPhysics_Body *body)
+_ephysics_body_soft_body_slices_init(EPhysics_Body *body, Eina_List *slices)
 {
    EPhysics_Body_Soft_Body_Slice *slice = NULL;
    btVector3 p0, p1, p2;
@@ -218,7 +218,7 @@
    evas = evas_object_evas_get(body->evas_obj);
    evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h);
 
-   EINA_LIST_FOREACH(body->slices_list, l, slice_data)
+   EINA_LIST_FOREACH(slices, l, slice_data)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *) slice_data;
         slice->evas_obj = evas_object_image_filled_add(evas);
@@ -234,17 +234,17 @@
    if (slice)
      evas_object_image_source_visible_set(slice->evas_obj, EINA_FALSE);
 
-   _ephysics_body_soft_body_slices_apply(body);
+   _ephysics_body_soft_body_slices_apply(body, slices);
 }
 
 static void
-_ephysics_body_soft_body_slices_clean(EPhysics_Body *body)
+_ephysics_body_soft_body_slices_clean(Eina_List *slices)
 {
    EPhysics_Body_Soft_Body_Slice *slice;
    void *slice_data;
    Eina_List *l;
 
-   EINA_LIST_FOREACH(body->slices_list, l, slice_data)
+   EINA_LIST_FOREACH(slices, l, slice_data)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
         evas_object_del(slice->evas_obj);
@@ -731,7 +731,7 @@
 _ephysics_body_evas_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    EPhysics_Body *body = (EPhysics_Body *) data;
-   _ephysics_body_soft_body_slices_clean(body);
+   _ephysics_body_soft_body_slices_clean(body->slices_list);
    body->evas_obj = NULL;
    DBG("Evas object deleted. Updating body: %p", body);
 }
@@ -1407,7 +1407,7 @@
 
    if (body->type != EPHYSICS_BODY_TYPE_RIGID)
      {
-        _ephysics_body_soft_body_slices_apply(body);
+        _ephysics_body_soft_body_slices_apply(body, body->slices_list);
         return;
      }
 
@@ -1854,23 +1854,29 @@
    body->soft_body->m_anchors.resize(0);
 }
 
-static Eina_Bool
-_ephysics_body_slices_add(EPhysics_Body *body, double delta, double max)
+static Eina_List *
+_ephysics_body_slices_add(EPhysics_Body *body, int slices_cnt, int *points, double delta, double max)
 {
+   Eina_List *slices = NULL;
    EPhysics_Body_Soft_Body_Slice *slice;
    btSoftBody::tFaceArray faces;
+   void *ldata;
 
-   for (int i = 0; i < body->slices; i++)
+   for (int i = 0; i < slices_cnt; i++)
      {
         faces = body->soft_body->m_faces;
 
         slice = _ephysics_body_soft_body_slice_new(body, delta, max,
-                                                   body->points_deform[i]);
-        if (!slice) return EINA_FALSE;
+                                                   points[i]);
+        if (!slice) goto no_slices;
 
-        body->slices_list = eina_list_append(body->slices_list, slice);
+        slices = eina_list_append(slices, slice);
      }
-   return EINA_TRUE;
+   return slices;
+
+ no_slices:
+   _ephysics_body_soft_body_slices_clean(slices);
+   return NULL;
 }
 
 EAPI void
@@ -1988,7 +1994,10 @@
    for (int i = 0; i < body->slices; i++)
      body->points_deform[i] = i;
 
-   if (!_ephysics_body_slices_add(body, -1, 1))
+   body->slices_list = _ephysics_body_slices_add(body, body->slices,
+                                            body->points_deform, -1, 1);
+
+   if (!body->slices_list)
      {
         ERR("Couldn't create slices.");
         goto no_slices;
@@ -2217,7 +2226,10 @@
    for (int i = 0; i < body->slices; i++)
      body->points_deform[i] = points[i];
 
-   if (!_ephysics_body_slices_add(body, 0.55, 1.1))
+   body->slices_list = _ephysics_body_slices_add(body, body->slices,
+                                                 body->points_deform, 0.55, 1.1);
+
+   if (!body->slices_list)
      {
         ERR("Couldn't create slices.");
         goto no_slices;
@@ -2317,7 +2329,10 @@
    for (int i = 0; i < body->slices; i++)
      body->points_deform[i] = points[i];
 
-   if (!_ephysics_body_slices_add(body, 0.55, 1.1))
+   body->slices_list = _ephysics_body_slices_add(body, body->slices,
+                                                 body->points_deform, 0.55, 1.1);
+
+   if (!body->slices_list)
      {
         ERR("Couldn't create slices.");
         goto no_slices;
@@ -2677,7 +2692,7 @@
              evas_object_event_callback_del(body->evas_obj,
                                        EVAS_CALLBACK_RESTACK,
                                        _ephysics_body_soft_body_evas_restack_cb);
-             _ephysics_body_soft_body_slices_clean(body);
+             _ephysics_body_soft_body_slices_clean(body->slices_list);
           }
      }
 
@@ -2689,7 +2704,7 @@
      {
         evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_RESTACK,
                                  _ephysics_body_soft_body_evas_restack_cb, body);
-        _ephysics_body_soft_body_slices_init(body);
+        _ephysics_body_soft_body_slices_init(body, body->slices_list);
      }
 
    if (!use_obj_pos)
@@ -2734,7 +2749,7 @@
         evas_object_event_callback_del(body->evas_obj,
                                        EVAS_CALLBACK_RESTACK,
                                        _ephysics_body_soft_body_evas_restack_cb);
-        _ephysics_body_soft_body_slices_clean(body);
+        _ephysics_body_soft_body_slices_clean(body->slices_list);
      }
 
    return obj;

Log:
EPhysics: soft body slice per face
  
  This changes how initial points of deformations are mapped, now we
  must support multiple faces so different points of deformation for
  each.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:49:57 -0800 (Fri, 23 Nov 2012)
New Revision: 79597
Trac:         http://trac.enlightenment.org/e/changeset/79597

Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-11-23 21:49:51 UTC (rev 79596)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-23 21:49:57 UTC (rev 79597)
@@ -2195,6 +2195,24 @@
   EPHYSICS_BODY_CLOTH_FACE_FRONT,
   EPHYSICS_BODY_CLOTH_FACE_BACK,
 
+  EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_FRONT,
+  EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_BACK,
+
+  EPHYSICS_BODY_SOFT_BOX_FACE_MIDDLE_FRONT,
+  EPHYSICS_BODY_SOFT_BOX_FACE_MIDDLE_BACK,
+  EPHYSICS_BODY_SOFT_BOX_FACE_FRONT,
+  EPHYSICS_BODY_SOFT_BOX_FACE_BACK,
+  EPHYSICS_BODY_SOFT_BOX_FACE_LEFT,
+  EPHYSICS_BODY_SOFT_BOX_FACE_RIGHT,
+  EPHYSICS_BODY_SOFT_BOX_FACE_TOP,
+  EPHYSICS_BODY_SOFT_BOX_FACE_BOTTOM,
+
+  EPHYSICS_BODY_SOFT_CIRCLE_FACE_MIDDLE_FRONT,
+  EPHYSICS_BODY_SOFT_CIRCLE_FACE_MIDDLE_BACK,
+  EPHYSICS_BODY_SOFT_CIRCLE_FACE_FRONT,
+  EPHYSICS_BODY_SOFT_CIRCLE_FACE_BACK,
+  EPHYSICS_BODY_SOFT_CIRCLE_FACE_CURVED,
+
   EPHYSICS_BODY_FACE_LAST,
 } EPhysics_Body_Face;
 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:49:51 UTC (rev 79596)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:49:57 UTC (rev 79597)
@@ -319,6 +319,23 @@
    return stacking;
 }
 
+static Eina_List *
+_ephysics_body_soft_body_slices_get(EPhysics_Body *body)
+{
+   Eina_List *l, *slices_list, *slices = NULL;
+   void *ldata, *slice_data;
+   EPhysics_Body_Face_Slice *face_slice;
+
+   EINA_LIST_FOREACH(body->faces_slices, l, ldata)
+     {
+        face_slice = (EPhysics_Body_Face_Slice *)ldata;
+        EINA_LIST_FOREACH(face_slice->slices, slices_list, slice_data)
+             slices = eina_list_append(slices, slice_data);
+     }
+
+   return slices;
+}
+
 void
 ephysics_body_evas_objects_restack(EPhysics_World *world)
 {
@@ -369,9 +386,10 @@
              continue;
           }
 
-        if (!body->slices_list) continue;
+        slices = _ephysics_body_soft_body_slices_get(body);
+        if (!slices) continue;
 
-        EINA_LIST_FOREACH(body->slices_list, slices, slice_data)
+        EINA_LIST_FREE(slices, slice_data)
           {
              previously_added = EINA_FALSE;
              slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
@@ -731,7 +749,10 @@
 _ephysics_body_evas_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    EPhysics_Body *body = (EPhysics_Body *) data;
-   _ephysics_body_soft_body_slices_clean(body->slices_list);
+
+   if (body->default_face)
+     _ephysics_body_soft_body_slices_clean(body->default_face->slices);
+
    body->evas_obj = NULL;
    DBG("Evas object deleted. Updating body: %p", body);
 }
@@ -1042,12 +1063,13 @@
 _ephysics_body_soft_body_evas_restack_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    EPhysics_Body *body = (EPhysics_Body *)data;
-   Eina_List *l;
+   Eina_List *slices;
    void *ldata;
    EPhysics_Body_Soft_Body_Slice *slice;
    short layer = evas_object_layer_get(obj);
 
-   EINA_LIST_FOREACH(body->slices_list, l, ldata)
+   slices = _ephysics_body_soft_body_slices_get(body);
+   EINA_LIST_FREE(slices, ldata)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *)ldata;
         evas_object_layer_set(slice->evas_obj, layer);
@@ -1056,10 +1078,35 @@
 }
 
 static void
+_ephysics_body_face_slice_del(EPhysics_Body_Face_Slice *face_slice)
+{
+   _ephysics_body_soft_body_slices_clean(face_slice->slices);
+   free(face_slice->points_deform);
+   free(face_slice);
+}
+
+static EPhysics_Body_Face_Slice *
+_ephysics_body_face_slice_add(EPhysics_Body *body, EPhysics_Body_Face face)
+{
+   EPhysics_Body_Face_Slice *face_slice;
+
+   face_slice = (EPhysics_Body_Face_Slice *)calloc(1,
+                                               sizeof(EPhysics_Body_Face_Slice));
+   if (!face_slice)
+     return NULL;
+
+   face_slice->face = face;
+   body->faces_slices = eina_list_append(body->faces_slices, face_slice);
+   return face_slice;
+   DBG("New face slice added to body %p", body);
+}
+
+static void
 _ephysics_body_del(EPhysics_Body *body)
 {
    EPhysics_Body_Callback *cb;
    void *group;
+   void *face_slice;
 
    if (body->evas_obj)
      {
@@ -1068,7 +1115,7 @@
         evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
                                        _ephysics_body_evas_obj_resize_cb);
 
-        if (body->slices_list)
+        if (body->faces_slices)
           evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESTACK,
                                        _ephysics_body_soft_body_evas_restack_cb);
      }
@@ -1084,7 +1131,8 @@
    EINA_LIST_FREE(body->collision_groups, group)
       eina_stringshare_del((Eina_Stringshare *)group);
 
-   free(body->points_deform);
+   EINA_LIST_FREE(body->faces_slices, face_slice)
+     _ephysics_body_face_slice_del((EPhysics_Body_Face_Slice *)face_slice);
 
    if (body->rigid_body)
      {
@@ -1363,6 +1411,8 @@
    btQuaternion quat;
    Evas_Map *map;
    double rate;
+   Eina_List *l;
+   void *ldata;
 
    if (body->face_objs)
      {
@@ -1407,7 +1457,9 @@
 
    if (body->type != EPHYSICS_BODY_TYPE_RIGID)
      {
-        _ephysics_body_soft_body_slices_apply(body, body->slices_list);
+        EINA_LIST_FOREACH(body->faces_slices, l, ldata)
+          _ephysics_body_soft_body_slices_apply(body,
+                                    ((EPhysics_Body_Face_Slice *)ldata)->slices);
         return;
      }
 
@@ -1860,7 +1912,6 @@
    Eina_List *slices = NULL;
    EPhysics_Body_Soft_Body_Slice *slice;
    btSoftBody::tFaceArray faces;
-   void *ldata;
 
    for (int i = 0; i < slices_cnt; i++)
      {
@@ -1944,6 +1995,7 @@
 ephysics_body_cloth_add(EPhysics_World *world, unsigned short rows, unsigned short columns)
 {
    EPhysics_Body *body;
+   EPhysics_Body_Face_Slice *face_slice;
    btSoftBodyWorldInfo *world_info;
    btSoftBody *soft_body;
    const int body_rows = (!rows) ? 15 : rows;
@@ -1983,26 +2035,37 @@
    _ephysics_body_soft_body_default_config(body, soft_body);
    _ephysics_body_cloth_constraints_rebuild(body);
 
-   body->slices = soft_body->m_faces.size();
-   body->points_deform = (int *)malloc(body->slices * sizeof(int));
-   if (!body->points_deform)
+   face_slice = _ephysics_body_face_slice_add(body,
+                                              EPHYSICS_BODY_CLOTH_FACE_FRONT);
+   if (!face_slice)
      {
+        ERR("Could not allocate face slice data structure.");
+        goto no_face_slice;
+     }
+
+   face_slice->slices_cnt = soft_body->m_faces.size();
+   face_slice->points_deform = (int *)malloc(face_slice->slices_cnt *
+                                             sizeof(int));
+   if (!face_slice->points_deform)
+     {
         ERR("Couldn't create points of deformation.");
         goto no_deform;
      }
 
-   for (int i = 0; i < body->slices; i++)
-     body->points_deform[i] = i;
+   for (int i = 0; i < face_slice->slices_cnt; i++)
+     face_slice->points_deform[i] = i;
 
-   body->slices_list = _ephysics_body_slices_add(body, body->slices,
-                                            body->points_deform, -1, 1);
-
-   if (!body->slices_list)
+   face_slice->slices = _ephysics_body_slices_add(body, face_slice->slices_cnt,
+                                                  face_slice->points_deform, -1,
+                                                  1);
+   if (!face_slice->slices)
      {
         ERR("Couldn't create slices.");
         goto no_slices;
      }
 
+   body->default_face = face_slice;
+
    body->cloth_columns = body_columns;
    body->cloth_rows = body_rows;
    body->type = EPHYSICS_BODY_TYPE_CLOTH;
@@ -2012,8 +2075,9 @@
    return body;
 
 no_slices:
-   free(body->points_deform);
 no_deform:
+   _ephysics_body_face_slice_del(face_slice);
+ no_face_slice:
    free(body);
 no_body:
    delete soft_body;
@@ -2179,6 +2243,7 @@
 ephysics_body_soft_circle_add(EPhysics_World *world)
 {
    EPhysics_Body *body;
+   EPhysics_Body_Face_Slice *face_slice;
    btCollisionShape *shape;
    btSoftBodyWorldInfo *world_info;
    btSoftBody *soft_body;
@@ -2215,32 +2280,45 @@
      goto no_body;
 
    body->shape = EPHYSICS_BODY_SHAPE_CYLINDER;
-   body->slices = 19;
-   body->points_deform = (int *)malloc(body->slices * sizeof(int));
-   if (!body->points_deform)
+
+   face_slice = _ephysics_body_face_slice_add(body,
+                                           EPHYSICS_BODY_SOFT_CIRCLE_FACE_FRONT);
+   if (!face_slice)
      {
+        ERR("Could not allocate face slice data structure.");
+        goto no_face_slice;
+     }
+
+   face_slice->slices_cnt = 19;
+   face_slice->points_deform = (int *)malloc(face_slice->slices_cnt *
+                                             sizeof(int));
+   if (!face_slice->points_deform)
+     {
         ERR("Couldn't create points of deformation.");
         goto no_deform;
      }
 
-   for (int i = 0; i < body->slices; i++)
-     body->points_deform[i] = points[i];
+   for (int i = 0; i < face_slice->slices_cnt; i++)
+     face_slice->points_deform[i] = points[i];
 
-   body->slices_list = _ephysics_body_slices_add(body, body->slices,
-                                                 body->points_deform, 0.55, 1.1);
-
-   if (!body->slices_list)
+   face_slice->slices = _ephysics_body_slices_add(body, face_slice->slices_cnt,
+                                                 face_slice->points_deform, 0.55,
+                                                  1.1);
+   if (!face_slice->slices)
      {
         ERR("Couldn't create slices.");
         goto no_slices;
      }
 
+   body->default_face = face_slice;
+
    ephysics_world_lock_release(world);
    return body;
 
 no_slices:
-   free(body->points_deform);
 no_deform:
+   _ephysics_body_face_slice_del(face_slice);
+no_face_slice:
    ephysics_world_body_del(world, body);
 no_body:
    delete soft_body;
@@ -2282,6 +2360,7 @@
 ephysics_body_soft_box_add(EPhysics_World *world)
 {
    EPhysics_Body *body;
+   EPhysics_Body_Face_Slice *face_slice;
    btCollisionShape *shape;
    btSoftBodyWorldInfo *world_info;
    btSoftBody *soft_body;
@@ -2318,31 +2397,44 @@
      goto no_body;
 
    body->shape = EPHYSICS_BODY_SHAPE_BOX;
-   body->slices = 16;
-   body->points_deform = (int *)malloc(body->slices * sizeof(int));
-   if (!body->points_deform)
+
+   face_slice = _ephysics_body_face_slice_add(body,
+                                              EPHYSICS_BODY_SOFT_BOX_FACE_FRONT);
+   if (!face_slice)
      {
+        ERR("Could not allocate face slice data structure.");
+        goto no_face_slice;
+     }
+
+   face_slice->slices_cnt = 16;
+   face_slice->points_deform = (int *)malloc(face_slice->slices_cnt *
+                                             sizeof(int));
+   if (!face_slice->points_deform)
+     {
         ERR("Couldn't create points of deformation.");
         goto no_deform;
      }
 
-   for (int i = 0; i < body->slices; i++)
-     body->points_deform[i] = points[i];
+   for (int i = 0; i < face_slice->slices_cnt; i++)
+     face_slice->points_deform[i] = points[i];
 
-   body->slices_list = _ephysics_body_slices_add(body, body->slices,
-                                                 body->points_deform, 0.55, 1.1);
-
-   if (!body->slices_list)
+   face_slice->slices = _ephysics_body_slices_add(body, face_slice->slices_cnt,
+                                                 face_slice->points_deform, 0.55,
+                                                  1.1);
+   if (!face_slice->slices)
      {
         ERR("Couldn't create slices.");
         goto no_slices;
      }
 
+   body->default_face = face_slice;
+
    ephysics_world_lock_release(world);
    return body;
 
 no_slices:
-   free(body->points_deform);
+no_face_slice:
+   _ephysics_body_face_slice_del(face_slice);
 no_deform:
    ephysics_world_body_del(world, body);
 no_body:
@@ -2687,12 +2779,12 @@
                                        _ephysics_body_evas_obj_del_cb);
         evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
                                        _ephysics_body_evas_obj_resize_cb);
-        if (body->slices_list)
+        if (body->default_face)
           {
              evas_object_event_callback_del(body->evas_obj,
                                        EVAS_CALLBACK_RESTACK,
                                        _ephysics_body_soft_body_evas_restack_cb);
-             _ephysics_body_soft_body_slices_clean(body->slices_list);
+             _ephysics_body_soft_body_slices_clean(body->default_face->slices);
           }
      }
 
@@ -2704,7 +2796,7 @@
      {
         evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_RESTACK,
                                  _ephysics_body_soft_body_evas_restack_cb, body);
-        _ephysics_body_soft_body_slices_init(body, body->slices_list);
+        _ephysics_body_soft_body_slices_init(body, body->default_face->slices);
      }
 
    if (!use_obj_pos)
@@ -2744,12 +2836,12 @@
         evas_object_map_enable_set(obj, EINA_FALSE);
      }
 
-   if (body->slices_list)
+   if (body->default_face)
      {
         evas_object_event_callback_del(body->evas_obj,
                                        EVAS_CALLBACK_RESTACK,
                                        _ephysics_body_soft_body_evas_restack_cb);
-        _ephysics_body_soft_body_slices_clean(body->slices_list);
+        _ephysics_body_soft_body_slices_clean(body->default_face->slices);
      }
 
    return obj;

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:49:51 UTC (rev 79596)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:49:57 UTC (rev 79597)
@@ -51,6 +51,7 @@
 typedef struct _EPhysics_Force EPhysics_Force;
 typedef struct _EPhysics_Body_Center_Mass EPhysics_Body_Center_Mass;
 typedef struct _EPhysics_Body_Size EPhysics_Body_Size;
+typedef struct _EPhysics_Body_Face_Slice EPhysics_Body_Face_Slice;
 typedef struct _EPhysics_Point EPhysics_Point;
 typedef struct _EPhysics_Dragging_Data EPhysics_Dragging_Data;
 
@@ -114,6 +115,13 @@
      Evas_Coord d;
 };
 
+struct _EPhysics_Body_Face_Slice {
+     EPhysics_Body_Face face;
+     int slices_cnt;
+     int *points_deform;
+     Eina_List *slices;
+};
+
 struct _EPhysics_Body {
      EINA_INLIST;
      btCollisionShape *collision_shape;
@@ -128,15 +136,14 @@
      Eina_Inlist *callbacks;
      Eina_List *collision_groups;
      Eina_List *to_delete;
-     Eina_List *slices_list;
      Eina_List *face_objs;
      EPhysics_Body_Material material;
      double mass;
      double density;
      EPhysics_Force force;
      EPhysics_Body_Center_Mass cm;
-     int slices;
-     int *points_deform;
+     Eina_List *faces_slices;
+     EPhysics_Body_Face_Slice *default_face;
      EPhysics_Body_Type type;
      EPhysics_Body_Shape shape;
      int cloth_columns;

Log:
EPhysics: slice_init doesn't know about
   body->evas_object anymore
  
  So we can use the same functions to initialize the slices in case of
  face slicing.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:50:02 -0800 (Fri, 23 Nov 2012)
New Revision: 79598
Trac:         http://trac.enlightenment.org/e/changeset/79598

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:49:57 UTC (rev 79597)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:50:02 UTC (rev 79598)
@@ -206,7 +206,7 @@
 }
 
 static void
-_ephysics_body_soft_body_slices_init(EPhysics_Body *body, Eina_List *slices)
+_ephysics_body_soft_body_slices_init(EPhysics_Body *body, Evas_Object *obj, Eina_List *slices)
 {
    EPhysics_Body_Soft_Body_Slice *slice = NULL;
    btVector3 p0, p1, p2;
@@ -215,16 +215,16 @@
    Eina_List *l;
    Evas *evas;
 
-   evas = evas_object_evas_get(body->evas_obj);
-   evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h);
+   evas = evas_object_evas_get(obj);
+   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
 
    EINA_LIST_FOREACH(slices, l, slice_data)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *) slice_data;
         slice->evas_obj = evas_object_image_filled_add(evas);
         evas_object_layer_set(slice->evas_obj,
-                              evas_object_layer_get(body->evas_obj));
-        evas_object_image_source_set(slice->evas_obj, body->evas_obj);
+                              evas_object_layer_get(obj));
+        evas_object_image_source_set(slice->evas_obj, obj);
         evas_object_image_source_events_set(slice->evas_obj, EINA_TRUE);
         evas_object_resize(slice->evas_obj, w, h);
         evas_object_show(slice->evas_obj);
@@ -2796,7 +2796,8 @@
      {
         evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_RESTACK,
                                  _ephysics_body_soft_body_evas_restack_cb, body);
-        _ephysics_body_soft_body_slices_init(body, body->default_face->slices);
+        _ephysics_body_soft_body_slices_init(body, body->evas_obj,
+                                             body->default_face->slices);
      }
 
    if (!use_obj_pos)

Log:
EPhysics: fix random memory leaks
  
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:51:03 -0800 (Fri, 23 Nov 2012)
New Revision: 79599
Trac:         http://trac.enlightenment.org/e/changeset/79599

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:50:02 UTC (rev 79598)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:51:03 UTC (rev 79599)
@@ -238,6 +238,20 @@
 }
 
 static void
+_ephysics_body_soft_body_slices_free(Eina_List *slices)
+{
+   EPhysics_Body_Soft_Body_Slice *slice;
+   void *slice_data;
+
+   EINA_LIST_FREE(slices, slice_data)
+     {
+        slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
+        evas_object_del(slice->evas_obj);
+        free(slice);
+     }
+}
+
+static void
 _ephysics_body_soft_body_slices_clean(Eina_List *slices)
 {
    EPhysics_Body_Soft_Body_Slice *slice;
@@ -349,7 +363,6 @@
    Eina_Hash *hash;
    Eina_Iterator *it;
    int layer;
-   Eina_Bool previously_added;
 
    bodies = ephysics_world_bodies_get(world);
 
@@ -358,11 +371,10 @@
 
    hash = eina_hash_int32_new(_ephysics_body_evas_objects_restack_free);
 
-   EINA_LIST_FOREACH(bodies, l, data)
+   EINA_LIST_FREE(bodies, data)
      {
         body = (EPhysics_Body *)data;
         if (body->deleted) continue;
-        previously_added = EINA_FALSE;
 
         if (body->type == EPHYSICS_BODY_TYPE_RIGID)
           {
@@ -374,15 +386,9 @@
 
              layer = evas_object_layer_get(stacking->evas);
              stack_list = (Eina_List *)eina_hash_find(hash, &layer);
-
-             if (stack_list)
-               previously_added = EINA_TRUE;
-
              stack_list = eina_list_append(stack_list, stacking);
+             eina_hash_set(hash, &layer, stack_list);
 
-             if (!previously_added)
-               eina_hash_add(hash, &layer, stack_list);
-
              continue;
           }
 
@@ -391,7 +397,6 @@
 
         EINA_LIST_FREE(slices, slice_data)
           {
-             previously_added = EINA_FALSE;
              slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
 
              stacking = _ephysics_body_evas_stacking_new(slice->evas_obj,
@@ -400,14 +405,8 @@
 
              layer = evas_object_layer_get(stacking->evas);
              stack_list = (Eina_List *)eina_hash_find(hash, &layer);
-
-             if (stack_list)
-               previously_added = EINA_TRUE;
-
              stack_list = eina_list_append(stack_list, stacking);
-
-             if (!previously_added)
-               eina_hash_add(hash, &layer, stack_list);
+             eina_hash_set(hash, &layer, stack_list);
           }
      }
 
@@ -1080,7 +1079,7 @@
 static void
 _ephysics_body_face_slice_del(EPhysics_Body_Face_Slice *face_slice)
 {
-   _ephysics_body_soft_body_slices_clean(face_slice->slices);
+   _ephysics_body_soft_body_slices_free(face_slice->slices);
    free(face_slice->points_deform);
    free(face_slice);
 }

Log:
EPhysics: add soft ellipsoid and multi face
   implementation
  
  This patch introduces the ellipsoid soft body and its multi face
  implementation.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:51:38 -0800 (Fri, 23 Nov 2012)
New Revision: 79603
Trac:         http://trac.enlightenment.org/e/changeset/79603

Modified:
  trunk/ephysics/src/lib/EPhysics.h trunk/ephysics/src/lib/ephysics_body.cpp trunk/ephysics/src/lib/ephysics_private.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-11-23 21:51:32 UTC (rev 79602)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-23 21:51:38 UTC (rev 79603)
@@ -2388,6 +2388,28 @@
 
 /**
  * @brief
+ * Add a soft ellipsoid.
+ *
+ * Add a new soft 3d ellipsoid to the simulation. The @p granularity defines how
+ * many triangles are to be added.
+ *
+ * @note if no @p granularity is informed(i.e @p granularity = 0) the soft body
+ * will be created with a triangle mesh of 100.
+ *
+ * @param world The world the new soft ellipsoid is to be added.
+ * @param granularity How many triangles the soft body triangle mesh must have.
+ * @return a new body or @c NULL on errors.
+ *
+ * @see ephysics_body_del().
+ * @see ephysics_body_evas_object_set().
+ * @see ephysics_body_face_evas_object_set().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI EPhysics_Body *ephysics_body_soft_ellipsoid_add(EPhysics_World *world, int granularity);
+
+/**
+ * @brief
  * Apply an impulse on a given soft body triangle.
  *
  * The impulse is equal to the change of momentum of the body.

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:51:32 UTC (rev 79602)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:51:38 UTC (rev 79603)
@@ -60,7 +60,7 @@
 };
 
 static void
-_ephysics_body_soft_body_slices_apply(EPhysics_Body *body, Eina_List *slices)
+_ephysics_body_soft_body_slices_apply(EPhysics_Body *body, Evas_Object *evas_obj, Eina_List *slices)
 {
    double rate;
    void *list_data;
@@ -81,7 +81,7 @@
    rate = ephysics_world_rate_get(body->world);
    ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
                                       NULL);
-   evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h);
+   evas_object_geometry_get(evas_obj, NULL, NULL, &w, &h);
 
    if ((body->light_apply) ||
        (ephysics_world_light_all_bodies_get(body->world)))
@@ -234,7 +234,7 @@
    if (slice)
      evas_object_image_source_visible_set(slice->evas_obj, EINA_FALSE);
 
-   _ephysics_body_soft_body_slices_apply(body, slices);
+   _ephysics_body_soft_body_slices_apply(body, obj, slices);
 }
 
 static void
@@ -1096,16 +1096,55 @@
 
    face_slice->face = face;
    body->faces_slices = eina_list_append(body->faces_slices, face_slice);
+   face_slice->body = body;
    return face_slice;
    DBG("New face slice added to body %p", body);
 }
 
+static EPhysics_Body_Face_Slice *
+_ephysics_body_face_slice_get(EPhysics_Body *body, EPhysics_Body_Face face)
+{
+   Eina_List *l;
+   void *ldata;
+   EPhysics_Body_Face_Slice *face_slice = NULL;
+
+   EINA_LIST_FOREACH(body->faces_slices, l, ldata)
+     {
+        if (((EPhysics_Body_Face_Slice *)ldata)->face == face)
+          {
+             face_slice = (EPhysics_Body_Face_Slice *)ldata;
+             break;
+          }
+     }
+
+   return face_slice;
+}
+
+static EPhysics_Body_Face_Obj *
+_ephysics_body_face_evas_object_get(EPhysics_Body *body, EPhysics_Body_Face face)
+{
+   Eina_List *l;
+   void *ldata;
+   EPhysics_Body_Face_Obj *face_obj;
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        face_obj = (EPhysics_Body_Face_Obj *)ldata;
+        if (face_obj->face == face)
+          return face_obj;
+     }
+
+   DBG("Could not find requested face");
+   return NULL;
+}
+
 static void
 _ephysics_body_del(EPhysics_Body *body)
 {
    EPhysics_Body_Callback *cb;
+   void *ldata;
    void *group;
-   void *face_slice;
+   EPhysics_Body_Face_Slice *face_slice;
 
    if (body->evas_obj)
      {
@@ -1130,8 +1169,13 @@
    EINA_LIST_FREE(body->collision_groups, group)
       eina_stringshare_del((Eina_Stringshare *)group);
 
-   EINA_LIST_FREE(body->faces_slices, face_slice)
-     _ephysics_body_face_slice_del((EPhysics_Body_Face_Slice *)face_slice);
+   EINA_LIST_FREE(body->faces_slices, ldata)
+     {
+        face_slice = (EPhysics_Body_Face_Slice *)ldata;
+        if (_ephysics_body_face_evas_object_get(body, face_slice->face))
+          ephysics_body_face_evas_object_unset(body, face_slice->face);
+        _ephysics_body_face_slice_del(face_slice);
+     }
 
    if (body->rigid_body)
      {
@@ -1402,7 +1446,7 @@
 }
 
 static void
-_ephysics_body_evas_object_default_update(EPhysics_Body *body)
+_ephysics_body_evas_object_update(EPhysics_Body *body, Evas_Object *evas_obj)
 {
    int bx, by, x, y, z, w, h, wx, wy, wh, cx, cy;
    EPhysics_Camera *camera;
@@ -1410,25 +1454,7 @@
    btQuaternion quat;
    Evas_Map *map;
    double rate;
-   Eina_List *l;
-   void *ldata;
 
-   if (body->face_objs)
-     {
-        if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
-          _ephysics_cloth_face_objs_update(body);
-        else if (body->type == EPHYSICS_BODY_TYPE_RIGID)
-          {
-             if (body->shape == EPHYSICS_BODY_SHAPE_CYLINDER)
-               _ephysics_cylinder_face_objs_update(body);
-             else if (body->shape == EPHYSICS_BODY_SHAPE_BOX)
-               _ephysics_box_face_objs_update(body);
-          }
-     }
-
-   if (!body->evas_obj)
-     return;
-
    trans = _ephysics_body_transform_get(body);
    ephysics_world_render_geometry_get(body->world, &wx, &wy, NULL,
                                       NULL, &wh, NULL);
@@ -1437,7 +1463,7 @@
    cx -= wx;
    cy -= wy;
 
-   evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h);
+   evas_object_geometry_get(evas_obj, NULL, NULL, &w, &h);
    rate = ephysics_world_rate_get(body->world);
    bx = (int) (trans.getOrigin().getX() * rate) - cx;
    by = wh + wy - (int) (trans.getOrigin().getY() * rate) - cy;
@@ -1445,20 +1471,18 @@
    y = by - h * body->cm.y;
    z = (int) (trans.getOrigin().getZ() * rate);
 
-   evas_object_move(body->evas_obj, x, y);
+   evas_object_move(evas_obj, x, y);
 
    if ((!w) || (!h))
      {
-        DBG("Evas object with no geometry: %p, w=%i h=%i", body->evas_obj,
-            w, h);
+        DBG("Evas object with no geometry: %p, w=%i h=%i", evas_obj, w, h);
         return;
      }
 
    if (body->type != EPHYSICS_BODY_TYPE_RIGID)
      {
-        EINA_LIST_FOREACH(body->faces_slices, l, ldata)
-          _ephysics_body_soft_body_slices_apply(body,
-                                    ((EPhysics_Body_Face_Slice *)ldata)->slices);
+        _ephysics_body_soft_body_slices_apply(body, body->evas_obj,
+                                              body->default_face->slices);
         return;
      }
 
@@ -1470,11 +1494,54 @@
    evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(),
                              bx, by, z);
 
-   _ephysics_body_evas_obj_map_apply(body, map, body->evas_obj,
+   _ephysics_body_evas_obj_map_apply(body, map, evas_obj,
                                      body->back_face_culling, EINA_TRUE);
 }
 
 static void
+_ephysics_body_soft_body_update(EPhysics_Body *body)
+{
+   Eina_List *l;
+   void *ldata;
+   EPhysics_Body_Face_Slice *face_slice;
+   EPhysics_Body_Face_Obj *face_obj;
+
+   EINA_LIST_FOREACH(body->faces_slices, l, ldata)
+     {
+        face_slice = (EPhysics_Body_Face_Slice *)ldata;
+        face_obj = _ephysics_body_face_evas_object_get(body,
+                                                       face_slice->face);
+        if (!face_obj) continue;
+        _ephysics_body_soft_body_slices_apply(body, face_obj->obj,
+                                              face_slice->slices);
+     }
+}
+
+static void
+_ephysics_body_evas_object_default_update(EPhysics_Body *body)
+{
+   if (body->face_objs)
+     {
+        if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
+          _ephysics_cloth_face_objs_update(body);
+        else if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+          {
+             if (body->shape == EPHYSICS_BODY_SHAPE_CYLINDER)
+               _ephysics_cylinder_face_objs_update(body);
+             else if (body->shape == EPHYSICS_BODY_SHAPE_BOX)
+               _ephysics_box_face_objs_update(body);
+          }
+        else if (body->type == EPHYSICS_BODY_TYPE_SOFT)
+          _ephysics_body_soft_body_update(body);
+     }
+
+   if (!body->evas_obj)
+     return;
+
+   _ephysics_body_evas_object_update(body, body->evas_obj);
+}
+
+static void
 _ephysics_body_outside_render_area_check(EPhysics_Body *body)
 {
    int wx, wy, wz, ww, wh, wd, bx, by, bz, bw, bh, bd;
@@ -2238,7 +2305,158 @@
    return index;
 }
 
+static EPhysics_Body_Face_Slice *
+_ephysics_body_soft_ellipsoid_face_slices_add(EPhysics_Body *body, EPhysics_Body_Face face, btVector3 center)
+{
+   btSoftBody::Face *bt_face;
+   btSoftBody::Node *node;
+   int out;
+   btScalar depth_limit;
+   Eina_List *face_list = NULL;
+   void *data;
+   int *idx, i = 0;
+   EPhysics_Body_Face_Slice *face_slice;
+
+   depth_limit = center.z();
+
+   for (int m = 0; m < body->soft_body->m_faces.size(); m++)
+     {
+        out = 0;
+        bt_face = &body->soft_body->m_faces[m];
+        for (int n = 0; n < 3; n++)
+          {
+             node = bt_face->m_n[n];
+             if ((face == EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_FRONT &&
+                  node->m_x.z() > depth_limit) ||
+                 (face == EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_BACK &&
+                  node->m_x.z() < depth_limit))
+               out++;
+          }
+
+        if (out < 2)
+          {
+             idx = (int *)malloc(sizeof(int));
+             if (!idx)
+               goto no_deform;
+             *idx = m;
+             face_list = eina_list_append(face_list, idx);
+          }
+     }
+
+   face_slice = _ephysics_body_face_slice_add(body, face);
+   if (!face_slice)
+     {
+        ERR("Could not allocate face slice data structure.");
+        goto no_deform;
+     }
+
+   face_slice->slices_cnt = eina_list_count(face_list);
+   face_slice->points_deform = (int *)malloc(face_slice->slices_cnt *
+                                             sizeof(int));
+   if (!face_slice->points_deform)
+        goto no_points_deform;
+
+   EINA_LIST_FREE(face_list, data)
+     {
+        face_slice->points_deform[i] = *((int *)data);
+        i++;
+     }
+
+   face_slice->slices = _ephysics_body_slices_add(body, face_slice->slices_cnt,
+                                             face_slice->points_deform, -0.5, 1);
+   if (!face_slice->slices)
+     {
+        ERR("Couldn't create slices.");
+        goto no_points_deform;
+     }
+   return face_slice;
+
+no_points_deform:
+   _ephysics_body_face_slice_del(face_slice);
+no_deform:
+   EINA_LIST_FREE(face_list, data)
+     free(data);
+   return NULL;
+}
+
 EAPI EPhysics_Body *
+ephysics_body_soft_ellipsoid_add(EPhysics_World *world, int granularity)
+{
+   EPhysics_Body *body;
+   EPhysics_Body_Face_Slice *front_face, *back_face;
+   btCollisionShape *shape;
+   btSoftBodyWorldInfo *world_info;
+   btSoftBody *soft_body;
+   btVector3 center, radius;
+   int body_granularity = (!granularity) ? 100 : granularity;
+
+
+   if (!world)
+     {
+        ERR("Can't add circle, world is null.");
+        return NULL;
+     }
+
+   ephysics_world_lock_take(world);
+   shape = new btCylinderShapeZ(btVector3(0.25, 0.25, 0.25));
+
+   if (!shape)
+     {
+        ERR("Couldn't create a new cylinder shape.");
+        goto no_collision_shape;
+     }
+
+   world_info = ephysics_world_info_get(world);
+   center = btVector3(1, 1, 1);
+   radius = btVector3(0.5, 0.5, 0.5);
+   soft_body = btSoftBodyHelpers::CreateEllipsoid(*world_info, center, radius,
+                                                  body_granularity);
+
+   if (!soft_body)
+     {
+        ERR("Couldn't create a new soft body.");
+        goto no_soft_body;
+     }
+
+   body = _ephysics_body_soft_body_add(world, shape, soft_body);
+   if (!body)
+     goto no_body;
+
+   front_face = _ephysics_body_soft_ellipsoid_face_slices_add(body,
+                             EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_FRONT, center);
+   if (!front_face)
+     {
+        ERR("Could not create points of deformation mapping for front face.");
+        goto no_front_face;
+     }
+   body->default_face = front_face;
+
+   back_face = _ephysics_body_soft_ellipsoid_face_slices_add(body,
+                              EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_BACK, center);
+   if (!back_face)
+     {
+        ERR("Could not create points of deformation mapping for back face.");
+        goto no_back_face;
+     }
+
+   body->shape = EPHYSICS_BODY_SHAPE_ELLIPSOID;
+   ephysics_world_lock_release(world);
+   return body;
+
+no_back_face:
+   _ephysics_body_face_slice_del(front_face);
+no_front_face:
+   ephysics_world_body_del(world, body);
+no_body:
+   delete soft_body;
+no_soft_body:
+   delete shape;
+no_collision_shape:
+   ephysics_world_lock_release(world);
+   return NULL;
+}
+
+EAPI EPhysics_Body *
 ephysics_body_soft_circle_add(EPhysics_World *world)
 {
    EPhysics_Body *body;
@@ -3848,6 +4066,14 @@
 }
 
 static void
+_ephysics_body_face_evas_object_del(EPhysics_Body *body, EPhysics_Body_Face_Obj *face_obj, Evas_Object_Event_Cb resize_func)
+{
+   _ephysics_body_face_obj_unset(face_obj->obj, resize_func);
+   body->face_objs = eina_list_remove(body->face_objs, face_obj);
+   free(face_obj);
+}
+
+static void
 _ephysics_body_face_evas_object_add(EPhysics_Body *body, EPhysics_Body_Face face, Evas_Object *evas_obj, Evas_Object_Event_Cb resize_func)
 {
    EPhysics_Body_Face_Obj *face_obj;
@@ -4303,6 +4529,172 @@
    return NULL;
 }
 
+static void
+_ephysics_body_ellipsoid_face_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   EPhysics_Body *body = (EPhysics_Body *) data;
+   Evas_Coord bd, w, h;
+
+   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+   ephysics_body_geometry_get(body, NULL, NULL, NULL, NULL, NULL, &bd);
+   ephysics_world_lock_take(body->world);
+   ephysics_body_resize(body, w, h, bd);
+   ephysics_world_lock_release(body->world);
+}
+
+static void
+_ephysics_body_ellipsoid_face_evas_object_del_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Eina_List *l;
+   void *ldata;
+   EPhysics_Body_Face_Obj *face_obj = NULL;
+   EPhysics_Body_Face_Slice *face_slice = (EPhysics_Body_Face_Slice *)data;
+   EPhysics_Body *body = face_slice->body;
+
+   EINA_LIST_FOREACH(body->face_objs, l, ldata)
+     {
+        if (((EPhysics_Body_Face_Obj *)ldata)->face == face_slice->face)
+          {
+             face_obj = (EPhysics_Body_Face_Obj *)ldata;
+             break;
+          }
+     }
+
+   _ephysics_body_face_evas_object_del(body, face_obj,
+                                    _ephysics_body_ellipsoid_face_obj_resize_cb);
+   _ephysics_body_soft_body_slices_clean(face_slice->slices);
+   DBG("Ellipsoid's face cleaned up.");
+}
+
+static void
+_ephysics_body_ellipsoid_face_evas_object_clean(EPhysics_Body *body, EPhysics_Body_Face_Obj *face_obj, Eina_List *slices)
+{
+   evas_object_map_enable_set(face_obj->obj, EINA_FALSE);
+   evas_object_event_callback_del(face_obj->obj, EVAS_CALLBACK_DEL,
+                               _ephysics_body_ellipsoid_face_evas_object_del_cb);
+   evas_object_event_callback_del(face_obj->obj, EVAS_CALLBACK_RESIZE,
+                                  _ephysics_body_evas_obj_resize_cb);
+   evas_object_event_callback_del(face_obj->obj, EVAS_CALLBACK_RESTACK,
+                                  _ephysics_body_soft_body_evas_restack_cb);
+   _ephysics_body_soft_body_slices_clean(slices);
+
+   _ephysics_body_face_evas_object_del(body, face_obj,
+                                    _ephysics_body_ellipsoid_face_obj_resize_cb);
+}
+
+static void
+_ephysics_body_ellipsoid_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
+{
+   int obj_x, obj_y, obj_w, obj_h, bz, bd;
+   double rate;
+   EPhysics_Body_Face_Slice *face_slice = NULL;
+   EPhysics_Body_Face_Obj *face_obj;
+
+   if ((face < EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_FRONT) ||
+       (face > EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_BACK))
+     {
+        ERR("Can't set evas object to body, face is invalid.");
+        return;
+     }
+
+   if (!body)
+     {
+        ERR("Can't set evas object to body, the last wasn't provided.");
+        return;
+     }
+
+   if (!evas_obj)
+     {
+        ERR("Can't set evas object to body, the first wasn't provided.");
+        return;
+     }
+
+   face_slice = _ephysics_body_face_slice_get(body, face);
+   if (!face_slice)
+     {
+        ERR("Could not find pre initialized face slice for the wanted face.");
+        return;
+     }
+
+   face_obj = _ephysics_body_face_evas_object_get(body, face);
+
+   if (face_obj)
+        _ephysics_body_ellipsoid_face_evas_object_clean(body, face_obj,
+                                                        face_slice->slices);
+
+   _ephysics_body_face_evas_object_add(body, face, evas_obj,
+                                    _ephysics_body_ellipsoid_face_obj_resize_cb);
+
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL,
+                   _ephysics_body_ellipsoid_face_evas_object_del_cb, face_slice);
+
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESTACK,
+                                  _ephysics_body_soft_body_evas_restack_cb,
+                                  body);
+
+   _ephysics_body_soft_body_slices_init(body, evas_obj, face_slice->slices);
+
+   if (!use_obj_pos)
+     return;
+
+   rate = ephysics_world_rate_get(body->world);
+   evas_object_geometry_get(evas_obj, &obj_x, &obj_y, &obj_w, &obj_h);
+   ephysics_body_geometry_get(body, NULL, NULL, &bz, NULL, NULL, &bd);
+
+   ephysics_world_lock_take(body->world);
+   _ephysics_body_geometry_set(body, obj_x, obj_y, bz, obj_w, obj_h, bd, rate);
+   ephysics_world_lock_release(body->world);
+   evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE,
+                                  _ephysics_body_evas_obj_resize_cb, body);
+   DBG("Ellipsoid face evas object set.");
+}
+
+static Evas_Object *
+_ephysics_body_ellipsoid_face_evas_object_get(const EPhysics_Body *body, EPhysics_Body_Face face)
+{
+   EPhysics_Body_Face_Obj *face_obj = NULL;
+
+   if ((face < EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_FRONT) ||
+       (face > EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_BACK))
+     {
+        ERR("Can't get evas object from body, face is invalid.");
+        return NULL;
+     }
+
+   face_obj = _ephysics_body_face_evas_object_get((EPhysics_Body *)body, face);
+   if (face_obj) return face_obj->obj;
+
+   ERR("Couldn't find an object associated to face %i.", face);
+   return NULL;
+}
+
+static Evas_Object *
+_ephysics_body_ellipsoid_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Face face)
+{
+   EPhysics_Body_Face_Slice *face_slice;
+   EPhysics_Body_Face_Obj *face_obj = NULL;
+   Evas_Object *obj;
+
+   if ((face < EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_FRONT) ||
+       (face > EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_BACK))
+     {
+        ERR("Can't unset evas object from body, face is invalid.");
+        return NULL;
+     }
+
+   face_obj = _ephysics_body_face_evas_object_get(body, face);
+
+   if (!face_obj) return NULL;
+
+   obj = face_obj->obj;
+   face_slice = _ephysics_body_face_slice_get(body, face);
+   _ephysics_body_ellipsoid_face_evas_object_clean(body, face_obj,
+                                                   face_slice->slices);
+
+   DBG("EPhysics Body face unset.");
+   return obj;
+}
+
 EAPI void
 ephysics_body_face_evas_object_set(EPhysics_Body *body, EPhysics_Body_Face face, Evas_Object *evas_obj, Eina_Bool use_obj_pos)
 {
@@ -4327,6 +4719,9 @@
    if (body->shape == EPHYSICS_BODY_SHAPE_BOX)
      return _ephysics_body_box_face_evas_object_set(body, face, evas_obj,
                                                     use_obj_pos);
+   if (body->shape == EPHYSICS_BODY_SHAPE_ELLIPSOID)
+     return _ephysics_body_ellipsoid_face_evas_object_set(body, face, evas_obj,
+                                                    use_obj_pos);
 
    ERR("Can't handle body %p type.", body);
 }
@@ -4346,6 +4741,8 @@
      return _ephysics_body_cylinder_face_evas_object_get(body, face);
    if (body->shape == EPHYSICS_BODY_SHAPE_BOX)
      return _ephysics_body_box_face_evas_object_get(body, face);
+   if (body->shape == EPHYSICS_BODY_SHAPE_ELLIPSOID)
+     return _ephysics_body_ellipsoid_face_evas_object_get(body, face);
 
    ERR("Can't handle body %p type.", body);
    return NULL;
@@ -4366,6 +4763,8 @@
      return _ephysics_body_cylinder_face_evas_object_unset(body, face);
    if (body->shape == EPHYSICS_BODY_SHAPE_BOX)
      return _ephysics_body_box_face_evas_object_unset(body, face);
+   if (body->shape == EPHYSICS_BODY_SHAPE_ELLIPSOID)
+     return _ephysics_body_ellipsoid_face_evas_object_unset(body, face);
 
    ERR("Can't handle body %p type.", body);
    return NULL;

Modified: trunk/ephysics/src/lib/ephysics_private.h
===================================================================
--- trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:51:32 UTC (rev 79602)
+++ trunk/ephysics/src/lib/ephysics_private.h	2012-11-23 21:51:38 UTC (rev 79603)
@@ -60,6 +60,7 @@
   EPHYSICS_BODY_SHAPE_BOX,
   EPHYSICS_BODY_SHAPE_CUSTOM,
   EPHYSICS_BODY_SHAPE_CYLINDER,
+  EPHYSICS_BODY_SHAPE_ELLIPSOID,
   EPHYSICS_BODY_SHAPE_LAST,
 } EPhysics_Body_Shape;
 
@@ -116,6 +117,7 @@
 };
 
 struct _EPhysics_Body_Face_Slice {
+     EPhysics_Body *body;
      EPhysics_Body_Face face;
      int slices_cnt;
      int *points_deform;

Log:
EPhysics: add api to get the slice index based on its
   evas object
  
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:51:44 -0800 (Fri, 23 Nov 2012)
New Revision: 79604
Trac:         http://trac.enlightenment.org/e/changeset/79604

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-11-23 21:51:38 UTC (rev 79603)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-23 21:51:44 UTC (rev 79604)
@@ -2388,6 +2388,24 @@
 
 /**
  * @brief
+ * Get the slice index of a soft body based on its slice`s Evas Object.
+ *
+ * Registering a mouse event callback on an associated evas object one can get
+ * the clicked slice evas object. With that pointer the user can get the slice
+ * index based on its related evas object.
+ *
+ * @param body The body to get the slice index from.
+ * @param slice The slice evas object.
+ * @return The slice index on success, -1 otherwise.
+ *
+ * @see ephysics_body_soft_body_triangle_index_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI int ephysics_body_soft_body_slice_index_get(EPhysics_Body *body, Evas_Object *slice);
+
+/**
+ * @brief
  * Add a soft ellipsoid.
  *
  * Add a new soft 3d ellipsoid to the simulation. The @p granularity defines how

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:51:38 UTC (rev 79603)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:51:44 UTC (rev 79604)
@@ -205,6 +205,54 @@
    return slice;
 }
 
+static Eina_List *
+_ephysics_body_soft_body_slices_get(EPhysics_Body *body)
+{
+   Eina_List *l, *slices_list, *slices = NULL;
+   void *ldata, *slice_data;
+   EPhysics_Body_Face_Slice *face_slice;
+
+   EINA_LIST_FOREACH(body->faces_slices, l, ldata)
+     {
+        face_slice = (EPhysics_Body_Face_Slice *)ldata;
+        EINA_LIST_FOREACH(face_slice->slices, slices_list, slice_data)
+             slices = eina_list_append(slices, slice_data);
+     }
+
+   return slices;
+}
+
+EAPI int
+ephysics_body_soft_body_slice_index_get(EPhysics_Body *body, Evas_Object *slice)
+{
+   Eina_List *slices;
+   void *ldata;
+   EPhysics_Body_Soft_Body_Slice *slice_data;
+
+   if (!body)
+     {
+        ERR("Can't get soft body slice index, body is null.");
+        return -1;
+     }
+
+   if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+     {
+        ERR("Can't get soft body slice index, operation not allowed for rigid"
+            " bodies.");
+        return -1;
+     }
+
+   slices = _ephysics_body_soft_body_slices_get(body);
+   EINA_LIST_FREE(slices, ldata)
+     {
+        slice_data = (EPhysics_Body_Soft_Body_Slice *)ldata;
+        if (slice_data->evas_obj == slice)
+          return slice_data->index;
+     }
+
+   return -1;
+}
+
 static void
 _ephysics_body_soft_body_slices_init(EPhysics_Body *body, Evas_Object *obj, Eina_List *slices)
 {
@@ -333,23 +381,6 @@
    return stacking;
 }
 
-static Eina_List *
-_ephysics_body_soft_body_slices_get(EPhysics_Body *body)
-{
-   Eina_List *l, *slices_list, *slices = NULL;
-   void *ldata, *slice_data;
-   EPhysics_Body_Face_Slice *face_slice;
-
-   EINA_LIST_FOREACH(body->faces_slices, l, ldata)
-     {
-        face_slice = (EPhysics_Body_Face_Slice *)ldata;
-        EINA_LIST_FOREACH(face_slice->slices, slices_list, slice_data)
-             slices = eina_list_append(slices, slice_data);
-     }
-
-   return slices;
-}
-
 void
 ephysics_body_evas_objects_restack(EPhysics_World *world)
 {

Log:
EPhysics: avoid slices double deletion
  
  This patch avoids slices double deletion case ecore evas deletes the
  slices evas objects before ephysics has actually shutdown and/or simulation
  thread hasn't been canceled.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:51:53 -0800 (Fri, 23 Nov 2012)
New Revision: 79605
Trac:         http://trac.enlightenment.org/e/changeset/79605

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:51:44 UTC (rev 79604)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:51:53 UTC (rev 79605)
@@ -254,6 +254,15 @@
 }
 
 static void
+_ephysics_body_soft_body_slice_del_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   EPhysics_Body_Soft_Body_Slice *slice = (EPhysics_Body_Soft_Body_Slice *)data;
+   slice->evas_obj = NULL;
+   evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
+                                  _ephysics_body_soft_body_slice_del_cb);
+}
+
+static void
 _ephysics_body_soft_body_slices_init(EPhysics_Body *body, Evas_Object *obj, Eina_List *slices)
 {
    EPhysics_Body_Soft_Body_Slice *slice = NULL;
@@ -277,6 +286,9 @@
         evas_object_resize(slice->evas_obj, w, h);
         evas_object_show(slice->evas_obj);
         evas_object_image_smooth_scale_set(slice->evas_obj, EINA_TRUE);
+        evas_object_event_callback_add(slice->evas_obj, EVAS_CALLBACK_DEL,
+                                       _ephysics_body_soft_body_slice_del_cb,
+                                       slice);
      }
 
    if (slice)
@@ -294,7 +306,8 @@
    EINA_LIST_FREE(slices, slice_data)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
-        evas_object_del(slice->evas_obj);
+        if (slice->evas_obj)
+          evas_object_del(slice->evas_obj);
         free(slice);
      }
 }
@@ -309,8 +322,8 @@
    EINA_LIST_FOREACH(slices, l, slice_data)
      {
         slice = (EPhysics_Body_Soft_Body_Slice *)slice_data;
-        evas_object_del(slice->evas_obj);
-        slice->evas_obj = NULL;
+        if (slice->evas_obj)
+          evas_object_del(slice->evas_obj);
      }
 }

Log:
EPhysics: fix soft body resize
  
  When resizing a soft body move the anchored rigid body to the
  center of it.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:52:02 -0800 (Fri, 23 Nov 2012)
New Revision: 79606
Trac:         http://trac.enlightenment.org/e/changeset/79606

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:51:53 UTC (rev 79605)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:52:02 UTC (rev 79606)
@@ -956,7 +956,9 @@
 _ephysics_body_resize(EPhysics_Body *body, Evas_Coord w, Evas_Coord h, Evas_Coord d)
 {
    double rate, sx, sy, sz;
-   btVector3 body_scale;
+   btVector3 body_scale, center;
+   btScalar radius;
+   btTransform trans;
 
    rate = ephysics_world_rate_get(body->world);
    sx = w / rate;
@@ -968,6 +970,12 @@
      {
         body->soft_body->scale(btVector3(1, 1, 1) / body->scale);
         body->soft_body->scale(body_scale);
+
+        body->soft_body->getCollisionShape()->getBoundingSphere(center, radius);
+        trans.setIdentity();
+        trans.setOrigin(center);
+        body->rigid_body->proceedToTransform(trans);
+
         _ephysics_body_soft_body_constraints_rebuild(body);
      }
    else if (body->type == EPHYSICS_BODY_TYPE_CLOTH)

Log:
EPhysics: soft body operations on triangles list
  
  This patch introduces API to get a list of triangles inside an
  area and another to apply impulse - also - in a list of triangles.
  
  
  Patch by: Leandro Dorileo <dorileo@...>
  
  

Author:       bdilly
Date:         2012-11-23 13:52:08 -0800 (Fri, 23 Nov 2012)
New Revision: 79607
Trac:         http://trac.enlightenment.org/e/changeset/79607

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-11-23 21:52:02 UTC (rev 79606)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-23 21:52:08 UTC (rev 79607)
@@ -2428,6 +2428,35 @@
 
 /**
  * @brief
+ * Get a list of triangles indexes inside an area.
+ *
+ * Get a list of triangles indexes given an area defined by @p x, @p y, @p z, @p
+ * w, @p h and @p d, the z axis components are represented by @p x and @p d
+ * where all triangles between @p z and @p d are considered, that's triangles
+ * with their z component greater than @p z and smaller than @p d.
+ *
+ * @note EPhysics will not free the returned list, remember to do so.
+ *
+ * @param body The body to get triangles indexes from.
+ * @param x The x component.
+ * @param y The y component.
+ * @param z The z component.
+ * @param w The w component.
+ * @param h The h component.
+ * @param d The d component.
+ *
+ * @return NULL on errors or no triangles found, a list of triangles indexes
+ * otherwhise.
+ *
+ * @see ephysics_body_soft_body_triangle_index_get().
+ * @see ephysics_body_soft_body_slice_index_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI Eina_List *ephysics_body_soft_body_triangles_inside_get(const EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Evas_Coord z, Evas_Coord w, Evas_Coord h, Evas_Coord d);
+
+/**
+ * @brief
  * Apply an impulse on a given soft body triangle.
  *
  * The impulse is equal to the change of momentum of the body.
@@ -2455,6 +2484,27 @@
 
 /**
  * @brief
+ * Apply impulse in a list of triangles.
+ *
+ * Apply impulse in a list of triangles all at once considering the same impulse
+ * values on @p x, @p y and @p z.
+ *
+ * @param body The body to apply impulse.
+ * @param triangles A list of triangles indexes.
+ * @param x The axis @p x component of impulse.
+ * @param y The axis @p y component of impulse.
+ * @param z The axis @p z component of impulse.
+ *
+ * @see ephysics_body_soft_body_triangle_impulse_apply() to see about impulse
+ * applying on soft bodies.
+ * @see ephysics_body_soft_body_triangles_inside_get().
+ *
+ * @ingroup EPhysics_Body
+ */
+EAPI void ephysics_body_soft_body_triangle_list_impulse_apply(EPhysics_Body *body, Eina_List *triangles, double x, double y, double z);
+
+/**
+ * @brief
  * Set the soft body number of position iterations.
  *
  * Both soft body and cloth can have its number of position iterations changed.

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:52:02 UTC (rev 79606)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-23 21:52:08 UTC (rev 79607)
@@ -2290,14 +2290,90 @@
    ephysics_world_lock_release(body->world);
 }
 
-EAPI void
-ephysics_body_soft_body_triangle_impulse_apply(EPhysics_Body * body, int idx, double x, double y, double z)
+EAPI Eina_List *
+ephysics_body_soft_body_triangles_inside_get(const EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Evas_Coord z, Evas_Coord w, Evas_Coord h, Evas_Coord d)
 {
+   Eina_List *face_list = NULL;
+   btSoftBody::Face *bt_face;
+   btSoftBody::Node *node;
+   int out, *idx;
+   btScalar nx, ny, nz, xx, yy, zz, dd, ww, hh;
+   Evas_Coord wy, wh;
+   double rate;
+
+   if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+     {
+        ERR("Can't get triangle indexes, operation not permited to rigid"
+            " bodies.");
+        return NULL;
+     }
+
+   ephysics_world_lock_take(body->world);
+   rate = ephysics_world_rate_get(body->world);
+   ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
+                                      NULL);
+   xx = x / rate;
+   yy = ((wh + wy) -  y) / rate;
+   zz = z / rate;
+   dd = d / rate;
+   ww = w / rate;
+   hh = h / rate;
+
+   for (int m = 0; m < body->soft_body->m_faces.size(); m++)
+     {
+        out = 0;
+        bt_face = &body->soft_body->m_faces[m];
+        for (int n = 0; n < 3; n++)
+          {
+             node = bt_face->m_n[n];
+             nx = node->m_x.x();
+             ny = node->m_x.y();
+             nz = node->m_x.z();
+
+             if ((nz > zz || nz < dd) || (nx < xx || nx > xx + ww) ||
+                 (ny > yy || ny < ny - hh))
+               out++;
+          }
+
+        if (!out)
+          {
+             idx = (int *)malloc(sizeof(int));
+             *idx = m;
+             face_list = eina_list_append(face_list, idx);
+          }
+     }
+
+   ephysics_world_lock_release(body->world);
+
+   return face_list;
+}
+
+static void
+_ephysics_body_soft_body_triangle_impulse_apply(EPhysics_Body *body, int idx, double x, double y, double z)
+{
    btSoftBody::Face face;
    btSoftBody::Node *node;
    double rate;
    btVector3 impulse;
 
+   rate = ephysics_world_rate_get(body->world);
+   impulse = btVector3(x / rate, y / rate, z / rate);
+
+   face = body->soft_body->m_faces[idx];
+   for (int i = 0; i < 3; i++)
+     {
+        node = face.m_n[i];
+        node->m_v += impulse * node->m_im;
+     }
+
+   DBG("Impulse applied to soft body node(%d): %lf, %lf, %lf", idx, impulse.x(),
+       impulse.y(), impulse.z());
+}
+
+EAPI void
+ephysics_body_soft_body_triangle_impulse_apply(EPhysics_Body * body, int idx, double x, double y, double z)
+{
+
    if (body->type == EPHYSICS_BODY_TYPE_RIGID)
      {
         ERR("Can't apply impulse, operation not permited to rigid bodies.");
@@ -2311,18 +2387,40 @@
         return;
      }
 
-   rate = ephysics_world_rate_get(body->world);
-   impulse = btVector3(x / rate, y / rate, z / rate);
+   ephysics_world_lock_take(body->world);
+   _ephysics_body_soft_body_triangle_impulse_apply(body, idx, x, y, z);
+   ephysics_world_lock_release(body->world);
+}
 
+EAPI void
+ephysics_body_soft_body_triangle_list_impulse_apply(EPhysics_Body *body, Eina_List *triangles, double x, double y, double z)
+{
+   Eina_List *l;
+   void *ldata;
+   int idx, faces_cnt;
+
+   if (body->type == EPHYSICS_BODY_TYPE_RIGID)
+     {
+        ERR("Can't apply impulse, operation not permited to rigid bodies.");
+        return;
+     }
+
+   faces_cnt = body->soft_body->m_faces.size();
    ephysics_world_lock_take(body->world);
+   EINA_LIST_FOREACH(triangles, l, ldata)
+     {
+        idx = *(int *)ldata;
+        if (idx < 0 || idx >= faces_cnt)
+          {
+             INF("Could not apply impulse to triangle %d, provided body"
+                 " triangle index ranges from 0 to %d", idx, faces_cnt);
+             continue;
+          }
 
-   face = body->soft_body->m_faces[idx];
-   node = face.m_n[0];
-   node->m_f += impulse * node->m_im;
-
+        _ephysics_body_soft_body_triangle_impulse_apply(body, idx, x, y, z);
+        DBG("Applied impulse on body %p, triangle: %d", body, idx);
+     }
    ephysics_world_lock_release(body->world);
-   DBG("Impulse applied to soft body node(%d): %lf, %lf, %lf", idx, impulse.x(),
-       impulse.y(), impulse.z());
 }
 
 EAPI int

Log:
ephysics: random doc fixes
  
  
  

Author:       bdilly
Date:         2012-11-28 04:55:53 -0800 (Wed, 28 Nov 2012)
New Revision: 79781
Trac:         http://trac.enlightenment.org/e/changeset/79781

Modified:
  trunk/ephysics/src/lib/EPhysics.h 

Modified: trunk/ephysics/src/lib/EPhysics.h
===================================================================
--- trunk/ephysics/src/lib/EPhysics.h	2012-11-28 12:54:23 UTC (rev 79780)
+++ trunk/ephysics/src/lib/EPhysics.h	2012-11-28 12:55:53 UTC (rev 79781)
@@ -2302,8 +2302,8 @@
  *
  * The hardness percentage will define how the soft body is supposed to deform,
  * its default is set to 100%. The soft body mass will also interfere on soft
- * body deformation, so bare in mind that the bodies mass must also be changed to
- * have different deformation results.
+ * body deformation, so bare in mind that the bodies mass must also be changed
+ * to have different deformation results.
  *
  * Valid values vary from 0 to 100.
  *
@@ -2340,8 +2340,8 @@
  * ephysics_body_soft_body_dragging_unset().
  *
  * @note Freezing a specific trimesh face means no forces are applied to it, no
- * gravity enforced, that's @p triangle will have no mass untill it dragging gets
- * unset.
+ * gravity enforced, that's @p triangle will have no mass untill it dragging
+ * gets unset.
  *
  * @param body The body of interest.
  * @param triangle The triangle to freeze.
@@ -2721,7 +2721,7 @@
  * @brief
  * Anchors a cloth with a rigid body.
  *
- * All the informed @p side of @p body1 will be anchored to @p body1 wherever
+ * All the informed @p side of @p body1 will be anchored to @p body2 wherever
  * it's in time of anchoring. That is, all the nodes in the informed "edge".
  *
  * An anchor assumes the @p body1 positions, if it's 20px far from @p body2 then
@@ -3774,7 +3774,7 @@
  * torque impulse and body's inertia.
  *
  * @param body The physics body that will receive the impulse.
- * @param pitch Impulse to rotate body around Z axis (rotate on y - z plane).
+ * @param pitch Impulse to rotate body around X axis (rotate on y - z plane).
  * Negative values will impulse body on counter clockwise rotation.
  * @param yaw Impulse to rotate body around Y axis (rotate on x - z plane).
  * Negative values will impulse body on counter clockwise rotation.
@@ -4020,7 +4020,6 @@
  *
  * A torque will be applied over the @p body to change the angular acceleration
  * of this body. It will leads to a change on angular velocity over time.
- * And the body will rotate around Z axis considering this angular velocity.
  *
  * @param body The physics body that will receive the torque.
  * @param torque_x Torque to change angular acceleration of the body around X

Log:
ephysics: don't allow a body to be scaled to 0 in any
   axis
  
  In this case it will be considered inactive and things
  won't work as expected.
  
  

Author:       bdilly
Date:         2012-11-28 13:47:30 -0800 (Wed, 28 Nov 2012)
New Revision: 79789
Trac:         http://trac.enlightenment.org/e/changeset/79789

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-28 19:32:20 UTC (rev 79788)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-28 21:47:30 UTC (rev 79789)
@@ -1050,9 +1050,9 @@
    mx = (x + w * body->cm.x) / rate;
    my = (height - (y + h * body->cm.y)) / rate;
    mz = (z + d * body->cm.z) / rate;
-   sx = w / rate;
-   sy = h / rate;
-   sz = d / rate;
+   sx = (w <= 0) ? 1 : w / rate;
+   sy = (h <= 0) ? 1 : h / rate;
+   sz = (d <= 0) ? 1 : d / rate;
 
    trans = _ephysics_body_transform_get(body);
    trans.setOrigin(btVector3(mx, my, mz));

Log:
ephysics: add improve dbg msgs
  
  To help me debuging it while I'm working on Edje.
  
  

Author:       bdilly
Date:         2012-11-28 13:47:47 -0800 (Wed, 28 Nov 2012)
New Revision: 79790
Trac:         http://trac.enlightenment.org/e/changeset/79790

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-11-28 21:47:30 UTC (rev 79789)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-28 21:47:47 UTC (rev 79790)
@@ -3236,6 +3236,9 @@
         return;
      }
 
+   INF("Body: %p geometry set to x=%i y=%i z=%i w=%i h=%i d=%i.",
+       body, x, y, z, w, h, d);
+
    if ((w <= 0) || (h <= 0) || (d <= 0))
      {
         ERR("Width, height and depth must to be a non-null, positive value.");

Modified: trunk/ephysics/src/lib/ephysics_world.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_world.cpp	2012-11-28 21:47:30 UTC (rev 79789)
+++ trunk/ephysics/src/lib/ephysics_world.cpp	2012-11-28 21:47:47 UTC (rev 79790)
@@ -1240,6 +1240,9 @@
    world->geometry.h = h;
    world->geometry.d = d;
 
+   INF("World %p render geometry set: x=%i y=%i z=%i w=%i h=%i d=%i",
+       world, x, y, z, w, h, d);
+
    ephysics_camera_perspective_set(world->camera, x + w / 2, y + h / 2,
                                    z + d / 2, 10 * (z + d));

Log:
ephysics: don't try to set bad body geometry when adding
   boundaries
  
  If render geometry is not set yet, it will try to set a bad geometry
  for the boundary boxes.
  In this case, let these bodies with default size and only resize them
  when render geometry is set.
  
  

Author:       bdilly
Date:         2012-11-28 13:47:58 -0800 (Wed, 28 Nov 2012)
New Revision: 79791
Trac:         http://trac.enlightenment.org/e/changeset/79791

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-28 21:47:47 UTC (rev 79790)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-11-28 21:47:58 UTC (rev 79791)
@@ -3015,8 +3015,12 @@
    body->boundary = EINA_TRUE;
    ephysics_body_mass_set(body, 0);
    ephysics_world_boundary_set(world, boundary, body);
-   ephysics_body_geometry_set(body, x, y, z, w, h, d);
 
+   if ((w <= 0) || (h <= 0) || (d <= 0))
+     INF("Boundary added with default geometry. Render geometry not set yet");
+   else
+     ephysics_body_geometry_set(body, x, y, z, w, h, d);
+
    return body;
 }

Log:
ephysics: fix debug msgs at some functions
  
  Broken in r77467
  
  

Author:       bdilly
Date:         2012-12-03 11:47:18 -0800 (Mon, 03 Dec 2012)
New Revision: 80098
Trac:         http://trac.enlightenment.org/e/changeset/80098

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-12-03 19:36:16 UTC (rev 80097)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-12-03 19:47:18 UTC (rev 80098)
@@ -3605,6 +3605,7 @@
 static void
 _ephysics_body_restitution_set(EPhysics_Body *body, double restitution)
 {
+   DBG("Body %p restitution set to %lf", body, restitution);
    if (body->type == EPHYSICS_BODY_TYPE_RIGID)
      {
         body->rigid_body->setRestitution(btScalar(restitution));
@@ -3612,7 +3613,6 @@
      }
 
    body->soft_body->setRestitution(btScalar(restitution));
-   DBG("Body %p restitution set to %lf", body, restitution);
 }
 
 EAPI void
@@ -3648,6 +3648,7 @@
 static void
 _ephysics_body_friction_set(EPhysics_Body *body, double friction)
 {
+   DBG("Body %p friction set to %lf", body, friction);
    if (body->type == EPHYSICS_BODY_TYPE_RIGID)
      {
         body->rigid_body->setFriction(btScalar(friction));
@@ -3655,7 +3656,6 @@
      }
 
    body->soft_body->setFriction(btScalar(friction));
-   DBG("Body %p friction set to %lf", body, friction);
 }
 
 EAPI void

Log:
ephysics: handle evas object visibitily on default update
  
  
  

Author:       bdilly
Date:         2012-12-10 13:58:06 -0800 (Mon, 10 Dec 2012)
New Revision: 80624
Trac:         http://trac.enlightenment.org/e/changeset/80624

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-12-10 21:52:39 UTC (rev 80623)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-12-10 21:58:06 UTC (rev 80624)
@@ -1311,6 +1311,8 @@
              return;
           }
      }
+   else
+       evas_object_show(obj);
 
    if ((body->light_apply) ||
        (ephysics_world_light_all_bodies_get(body->world)))
@@ -1574,6 +1576,8 @@
 
    if (body->type != EPHYSICS_BODY_TYPE_RIGID)
      {
+        if (!body->back_face_culling)
+          evas_object_show(body->evas_obj);
         _ephysics_body_soft_body_slices_apply(body, body->evas_obj,
                                               body->default_face->slices);
         return;
@@ -1626,6 +1630,11 @@
           }
         else if (body->type == EPHYSICS_BODY_TYPE_SOFT)
           _ephysics_body_soft_body_update(body);
+
+        if (body->evas_obj)
+            evas_object_hide(body->evas_obj);
+
+        return;
      }
 
    if (!body->evas_obj)

Log:
ephysics: warn if try to use functions not implemented
   by clothes
  
  
  

Author:       bdilly
Date:         2012-12-11 12:48:24 -0800 (Tue, 11 Dec 2012)
New Revision: 80713
Trac:         http://trac.enlightenment.org/e/changeset/80713

Modified:
  trunk/ephysics/src/lib/ephysics_body.cpp 

Modified: trunk/ephysics/src/lib/ephysics_body.cpp
===================================================================
--- trunk/ephysics/src/lib/ephysics_body.cpp	2012-12-11 19:52:24 UTC (rev 80712)
+++ trunk/ephysics/src/lib/ephysics_body.cpp	2012-12-11 20:48:24 UTC (rev 80713)
@@ -17,6 +17,15 @@
 extern "C" {
 #endif
 
+#define BODY_CLOTH_CHECK() \
+   do { \
+     if (body->type == EPHYSICS_BODY_TYPE_CLOTH) \
+       { \
+          WRN("Not supported for cloth"); \
+          return; \
+       } \
+   } while(0);
+
 typedef struct _EPhysics_Body_Callback EPhysics_Body_Callback;
 typedef struct _EPhysics_Body_Evas_Stacking EPhysics_Body_Evas_Stacking;
 typedef struct _EPhysics_Body_Soft_Body_Slice EPhysics_Body_Soft_Body_Slice;
@@ -3552,11 +3561,7 @@
         return;
      }
 
-   if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
-     {
-        ERR("Can't set angular velocity, not implemented for cloth.");
-        return;
-     }
+   BODY_CLOTH_CHECK();
 
    ephysics_world_lock_take(body->world);
    ephysics_body_activate(body, EINA_TRUE);
@@ -3577,11 +3582,7 @@
         return;
      }
 
-   if (body->type == EPHYSICS_BODY_TYPE_CLOTH)
-     {
-        ERR("Can't get angular velocity, not implemented for cloth.");
-        return;
-     }
+   BODY_CLOTH_CHECK();
 
    if (x) *x = -body->rigid_body->getAngularVelocity().getX() * RAD_TO_DEG;
    if (y) *y = -body->rigid_body->getAngularVelocity().getY() * RAD_TO_DEG;
@@ -3597,6 +3598,8 @@
         return;
      }
 
+   BODY_CLOTH_CHECK();
+
    ephysics_world_lock_take(body->world);
    _ephysics_body_sleeping_threshold_set(body, linear_threshold,
                                          angular_threshold,
@@ -3615,6 +3618,8 @@
         return;
      }
 
+   BODY_CLOTH_CHECK();
+
    rate = ephysics_world_rate_get(body->world);
    if (linear_threshold)
      *linear_threshold = body->rigid_body->getLinearSleepingThreshold() * rate;
@@ -3661,6 +3666,8 @@
         return;
      }
 
+   BODY_CLOTH_CHECK();
+
    ephysics_world_lock_take(body->world);
    body->rigid_body->setDamping(btScalar(linear_damping),
                                 btScalar(angular_damping));
@@ -3676,6 +3683,8 @@
         return;
      }
 
+   BODY_CLOTH_CHECK();
+
    if (linear_damping) *linear_damping = body->rigid_body->getLinearDamping();
    if (angular_damping) *angular_damping =
      body->rigid_body->getAngularDamping();
@@ -3953,6 +3962,8 @@
         return;
      }
 
+   BODY_CLOTH_CHECK();
+
    ephysics_world_lock_take(body->world);
    body->rigid_body->setLinearFactor(btVector3(!!enable_x, !!enable_y,
                                                !!enable_z));
@@ -3968,6 +3979,8 @@
         return;
      }
 
+   BODY_CLOTH_CHECK();
+
    if (enable_x) *enable_x = !!body->rigid_body->getLinearFactor().x();
    if (enable_y) *enable_y = !!body->rigid_body->getLinearFactor().y();
    if (enable_z) *enable_z = !!body->rigid_body->getLinearFactor().z();
@@ -3997,6 +4010,8 @@
         return;
      }
 
+   BODY_CLOTH_CHECK();
+
    ephysics_world_lock_take(body->world);
    body->rigid_body->setAngularFactor(btVector3(!!enable_x, !!enable_y,
                                                 !!enable_z));
@@ -4012,6 +4027,8 @@
         return;
      }
 
+   BODY_CLOTH_CHECK();
+
    if (enable_x) *enable_x = !!body->rigid_body->getAngularFactor().x();
    if (enable_y) *enable_y = !!body->rigid_body->getAngularFactor().y();
    if (enable_z) *enable_z = !!body->rigid_body->getAngularFactor().z();