summaryrefslogtreecommitdiff
path: root/legacy/ephysics/src/lib/EPhysics.h
diff options
context:
space:
mode:
authorLeandro Dorileo <dorileo@profusion.mobi>2012-12-11 21:11:19 +0000
committerLeandro Dorileo <dorileo@profusion.mobi>2012-12-11 21:11:19 +0000
commit547ade5f6cfd11da1317fb4a8739234bd337bbf3 (patch)
treef3d52bf188f1a0e37c9ec4442b6a035ab68aa44f /legacy/ephysics/src/lib/EPhysics.h
parent2ccf6d2a119fc3c31851114aa19bef3f42e6e8cf (diff)
EPhysics: soft_circle and soft_ellipsoid renaming
For sake of consistency moving soft_circle to soft_cylinder and soft_ellipsoid becomes soft_sphere. Their face identification were moved as well. The faces identifications were also unified. SVN revision: 80720
Diffstat (limited to '')
-rw-r--r--legacy/ephysics/src/lib/EPhysics.h53
1 files changed, 20 insertions, 33 deletions
diff --git a/legacy/ephysics/src/lib/EPhysics.h b/legacy/ephysics/src/lib/EPhysics.h
index 888e4be004..e7fc6a8f04 100644
--- a/legacy/ephysics/src/lib/EPhysics.h
+++ b/legacy/ephysics/src/lib/EPhysics.h
@@ -621,7 +621,7 @@ EAPI Eina_Bool ephysics_shape_save(const EPhysics_Shape *shape, const char *file
621 * @li @ref ephysics_body_cylinder_add() 621 * @li @ref ephysics_body_cylinder_add()
622 * @li @ref ephysics_body_box_add() 622 * @li @ref ephysics_body_box_add()
623 * @li @ref ephysics_body_shape_add() 623 * @li @ref ephysics_body_shape_add()
624 * @li @ref ephysics_body_soft_circle_add() 624 * @li @ref ephysics_body_soft_cylinder_add()
625 * @li @ref ephysics_body_soft_box_add() 625 * @li @ref ephysics_body_soft_box_add()
626 * 626 *
627 * and it can be deleted with @ref ephysics_body_del(). 627 * and it can be deleted with @ref ephysics_body_del().
@@ -1959,7 +1959,7 @@ EAPI Eina_Bool ephysics_world_stack_enable_get(const EPhysics_World *world);
1959 * Also they can be soft bodies, that won't act as rigid bodies. They will 1959 * Also they can be soft bodies, that won't act as rigid bodies. They will
1960 * deform its shape under certain circunstances, like under collisions. 1960 * deform its shape under certain circunstances, like under collisions.
1961 * Soft bodies can be created with: 1961 * Soft bodies can be created with:
1962 * @li @ref ephysics_body_soft_circle_add(); 1962 * @li @ref ephysics_body_soft_cylinder_add();
1963 * @li @ref ephysics_body_soft_box_add(); 1963 * @li @ref ephysics_body_soft_box_add();
1964 * 1964 *
1965 * They can collide and have customizable properties, like: 1965 * They can collide and have customizable properties, like:
@@ -2173,6 +2173,8 @@ typedef enum _EPhysics_Body_Cloth_Anchor_Side
2173 * Define in wich body's face the evas object should be set. 2173 * Define in wich body's face the evas object should be set.
2174 * 2174 *
2175 * @see ephysics_body_face_evas_object_set() 2175 * @see ephysics_body_face_evas_object_set()
2176 * @see ephysics_body_face_evas_object_unset()
2177 * @see ephysics_body_face_evas_object_get()
2176 * 2178 *
2177 * @ingroup EPhysics_Body 2179 * @ingroup EPhysics_Body
2178 */ 2180 */
@@ -2187,32 +2189,17 @@ typedef enum _EPhysics_Body_Face
2187 EPHYSICS_BODY_BOX_FACE_TOP, 2189 EPHYSICS_BODY_BOX_FACE_TOP,
2188 EPHYSICS_BODY_BOX_FACE_BOTTOM, 2190 EPHYSICS_BODY_BOX_FACE_BOTTOM,
2189 2191
2192 EPHYSICS_BODY_CLOTH_FACE_FRONT,
2193 EPHYSICS_BODY_CLOTH_FACE_BACK,
2194
2190 EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT, 2195 EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT,
2191 EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_BACK, 2196 EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_BACK,
2192 EPHYSICS_BODY_CYLINDER_FACE_FRONT, 2197 EPHYSICS_BODY_CYLINDER_FACE_FRONT,
2193 EPHYSICS_BODY_CYLINDER_FACE_BACK, 2198 EPHYSICS_BODY_CYLINDER_FACE_BACK,
2194 EPHYSICS_BODY_CYLINDER_FACE_CURVED, 2199 EPHYSICS_BODY_CYLINDER_FACE_CURVED,
2195 2200
2196 EPHYSICS_BODY_CLOTH_FACE_FRONT, 2201 EPHYSICS_BODY_SPHERE_FACE_FRONT,
2197 EPHYSICS_BODY_CLOTH_FACE_BACK, 2202 EPHYSICS_BODY_SPHERE_FACE_BACK,
2198
2199 EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_FRONT,
2200 EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_BACK,
2201
2202 EPHYSICS_BODY_SOFT_BOX_FACE_MIDDLE_FRONT,
2203 EPHYSICS_BODY_SOFT_BOX_FACE_MIDDLE_BACK,
2204 EPHYSICS_BODY_SOFT_BOX_FACE_FRONT,
2205 EPHYSICS_BODY_SOFT_BOX_FACE_BACK,
2206 EPHYSICS_BODY_SOFT_BOX_FACE_LEFT,
2207 EPHYSICS_BODY_SOFT_BOX_FACE_RIGHT,
2208 EPHYSICS_BODY_SOFT_BOX_FACE_TOP,
2209 EPHYSICS_BODY_SOFT_BOX_FACE_BOTTOM,
2210
2211 EPHYSICS_BODY_SOFT_CIRCLE_FACE_MIDDLE_FRONT,
2212 EPHYSICS_BODY_SOFT_CIRCLE_FACE_MIDDLE_BACK,
2213 EPHYSICS_BODY_SOFT_CIRCLE_FACE_FRONT,
2214 EPHYSICS_BODY_SOFT_CIRCLE_FACE_BACK,
2215 EPHYSICS_BODY_SOFT_CIRCLE_FACE_CURVED,
2216 2203
2217 EPHYSICS_BODY_FACE_LAST, 2204 EPHYSICS_BODY_FACE_LAST,
2218} EPhysics_Body_Face; 2205} EPhysics_Body_Face;
@@ -2494,15 +2481,15 @@ EAPI int ephysics_body_soft_body_slice_index_get(EPhysics_Body *body, Evas_Objec
2494 2481
2495/** 2482/**
2496 * @brief 2483 * @brief
2497 * Add a soft ellipsoid. 2484 * Add a soft sphere.
2498 * 2485 *
2499 * Add a new soft 3d ellipsoid to the simulation. The @p granularity defines how 2486 * Add a new soft 3d sphere to the simulation. The @p granularity defines how
2500 * many triangles are to be added. 2487 * many triangles are to be added.
2501 * 2488 *
2502 * @note if no @p granularity is informed(i.e @p granularity = 0) the soft body 2489 * @note if no @p granularity is informed(i.e @p granularity = 0) the soft body
2503 * will be created with a triangle mesh of 100. 2490 * will be created with a triangle mesh of 100.
2504 * 2491 *
2505 * @param world The world the new soft ellipsoid is to be added. 2492 * @param world The world the new soft sphere is to be added.
2506 * @param granularity How many triangles the soft body triangle mesh must have. 2493 * @param granularity How many triangles the soft body triangle mesh must have.
2507 * @return a new body or @c NULL on errors. 2494 * @return a new body or @c NULL on errors.
2508 * 2495 *
@@ -2512,7 +2499,7 @@ EAPI int ephysics_body_soft_body_slice_index_get(EPhysics_Body *body, Evas_Objec
2512 * 2499 *
2513 * @ingroup EPhysics_Body 2500 * @ingroup EPhysics_Body
2514 */ 2501 */
2515EAPI EPhysics_Body *ephysics_body_soft_ellipsoid_add(EPhysics_World *world, int granularity); 2502EAPI EPhysics_Body *ephysics_body_soft_sphere_add(EPhysics_World *world, int granularity);
2516 2503
2517/** 2504/**
2518 * @brief 2505 * @brief
@@ -2679,7 +2666,7 @@ EAPI void ephysics_body_soft_body_bending_constraints_add(EPhysics_Body *body, i
2679 * ephysics_body_evas_object_set(), and it will collid as a sphere(even if 2666 * ephysics_body_evas_object_set(), and it will collid as a sphere(even if
2680 * you`ve associated an evas rectangle). 2667 * you`ve associated an evas rectangle).
2681 * 2668 *
2682 * For deformable sphere use @p ephysics_body_soft_ellipsoid_add() instead. 2669 * For deformable sphere use @p ephysics_body_soft_sphere_add() instead.
2683 * 2670 *
2684 * @param world The world this body will belong to. 2671 * @param world The world this body will belong to.
2685 * @return a new body or @c NULL, on errors. 2672 * @return a new body or @c NULL, on errors.
@@ -2704,7 +2691,7 @@ EAPI EPhysics_Body *ephysics_body_sphere_add(EPhysics_World *world);
2704 * and it will collide as a cylinder (even if you have an evas rectangle). 2691 * and it will collide as a cylinder (even if you have an evas rectangle).
2705 * 2692 *
2706 * If a cylinder that could have its shape deformed is required, use 2693 * If a cylinder that could have its shape deformed is required, use
2707 * @ref ephysics_body_soft_circle_add(). 2694 * @ref ephysics_body_soft_cylinder_add().
2708 * 2695 *
2709 * @param world The world this body will belongs to. 2696 * @param world The world this body will belongs to.
2710 * @return a new body or @c NULL, on errors. 2697 * @return a new body or @c NULL, on errors.
@@ -2719,14 +2706,14 @@ EAPI EPhysics_Body *ephysics_body_cylinder_add(EPhysics_World *world);
2719 2706
2720/** 2707/**
2721 * @brief 2708 * @brief
2722 * Create a new deformable circle physics body. 2709 * Create a new deformable cylinder physics body.
2723 * 2710 *
2724 * Its collision shape will be a circle of diameter 1. To change it's size 2711 * Its collision shape will be a cylinder of diameter 1. To change it's size
2725 * @ref ephysics_body_geometry_set() should be used. 2712 * @ref ephysics_body_geometry_set() should be used.
2726 * 2713 *
2727 * Any evas object can be associated to it with 2714 * Any evas object can be associated to it with
2728 * @ref ephysics_body_evas_object_set(), 2715 * @ref ephysics_body_evas_object_set(),
2729 * and it will collide and deform as a circle (even if you have an evas 2716 * and it will collide and deform as a cylinder (even if you have an evas
2730 * rectangle). 2717 * rectangle).
2731 * 2718 *
2732 * Just like rotation, deformation will be applied on associated 2719 * Just like rotation, deformation will be applied on associated
@@ -2747,7 +2734,7 @@ EAPI EPhysics_Body *ephysics_body_cylinder_add(EPhysics_World *world);
2747 * 2734 *
2748 * @ingroup EPhysics_Body 2735 * @ingroup EPhysics_Body
2749 */ 2736 */
2750EAPI EPhysics_Body *ephysics_body_soft_circle_add(EPhysics_World *world); 2737EAPI EPhysics_Body *ephysics_body_soft_cylinder_add(EPhysics_World *world);
2751 2738
2752/** 2739/**
2753 * @brief 2740 * @brief
@@ -3073,7 +3060,7 @@ EAPI EPhysics_World *ephysics_body_world_get(const EPhysics_Body *body);
3073 * @see ephysics_body_box_add(). 3060 * @see ephysics_body_box_add().
3074 * @see ephysics_body_soft_box_add(). 3061 * @see ephysics_body_soft_box_add().
3075 * @see ephysics_body_cylinder_add(). 3062 * @see ephysics_body_cylinder_add().
3076 * @see ephysics_body_soft_circle_add(). 3063 * @see ephysics_body_soft_cylinder_add().
3077 * @see ephysics_body_evas_object_unset(). 3064 * @see ephysics_body_evas_object_unset().
3078 * @see ephysics_world_rate_set(). 3065 * @see ephysics_world_rate_set().
3079 * 3066 *