summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/Makefile_EPhysics.am47
-rw-r--r--src/examples/Makefile.am4
-rw-r--r--src/examples/ephysics/Makefile.am87
-rw-r--r--src/examples/ephysics/ephysics_logo.c (renamed from legacy/ephysics/src/examples/ephysics_logo.c)0
-rw-r--r--src/examples/ephysics/ephysics_test.h (renamed from legacy/ephysics/src/examples/ephysics_test.h)0
-rw-r--r--src/examples/ephysics/test.c (renamed from legacy/ephysics/src/examples/test.c)0
-rw-r--r--src/examples/ephysics/test_bouncing_ball.c (renamed from legacy/ephysics/src/examples/test_bouncing_ball.c)0
-rw-r--r--src/examples/ephysics/test_bouncing_text.c (renamed from legacy/ephysics/src/examples/test_bouncing_text.c)0
-rw-r--r--src/examples/ephysics/test_camera.c (renamed from legacy/ephysics/src/examples/test_camera.c)0
-rw-r--r--src/examples/ephysics/test_camera_track.c (renamed from legacy/ephysics/src/examples/test_camera_track.c)0
-rw-r--r--src/examples/ephysics/test_colliding_balls.c (renamed from legacy/ephysics/src/examples/test_colliding_balls.c)0
-rw-r--r--src/examples/ephysics/test_collision_detection.c (renamed from legacy/ephysics/src/examples/test_collision_detection.c)0
-rw-r--r--src/examples/ephysics/test_collision_filter.c (renamed from legacy/ephysics/src/examples/test_collision_filter.c)0
-rw-r--r--src/examples/ephysics/test_constraint.c (renamed from legacy/ephysics/src/examples/test_constraint.c)0
-rw-r--r--src/examples/ephysics/test_delete.c (renamed from legacy/ephysics/src/examples/test_delete.c)0
-rw-r--r--src/examples/ephysics/test_forces.c (renamed from legacy/ephysics/src/examples/test_forces.c)0
-rw-r--r--src/examples/ephysics/test_growing_balls.c (renamed from legacy/ephysics/src/examples/test_growing_balls.c)0
-rw-r--r--src/examples/ephysics/test_no_gravity.c (renamed from legacy/ephysics/src/examples/test_no_gravity.c)0
-rw-r--r--src/examples/ephysics/test_rotating_forever.c (renamed from legacy/ephysics/src/examples/test_rotating_forever.c)0
-rw-r--r--src/examples/ephysics/test_shapes.c (renamed from legacy/ephysics/src/examples/test_shapes.c)0
-rw-r--r--src/examples/ephysics/test_sleeping_threshold.c (renamed from legacy/ephysics/src/examples/test_sleeping_threshold.c)0
-rw-r--r--src/examples/ephysics/test_slider.c (renamed from legacy/ephysics/src/examples/test_slider.c)0
-rw-r--r--src/examples/ephysics/test_velocity.c (renamed from legacy/ephysics/src/examples/test_velocity.c)0
-rw-r--r--src/lib/ephysics/EPhysics.h (renamed from legacy/ephysics/src/lib/EPhysics.h)61
-rw-r--r--src/lib/ephysics/ephysics_body.cpp (renamed from legacy/ephysics/src/lib/ephysics_body.cpp)22
-rw-r--r--src/lib/ephysics/ephysics_body_materials.h (renamed from legacy/ephysics/src/lib/ephysics_body_materials.h)0
-rw-r--r--src/lib/ephysics/ephysics_camera.cpp (renamed from legacy/ephysics/src/lib/ephysics_camera.cpp)2
-rw-r--r--src/lib/ephysics/ephysics_constraints.cpp (renamed from legacy/ephysics/src/lib/ephysics_constraints.cpp)0
-rw-r--r--src/lib/ephysics/ephysics_main.cpp (renamed from legacy/ephysics/src/lib/ephysics_main.cpp)0
-rw-r--r--src/lib/ephysics/ephysics_private.h (renamed from legacy/ephysics/src/lib/ephysics_private.h)0
-rw-r--r--src/lib/ephysics/ephysics_quaternion.cpp (renamed from legacy/ephysics/src/lib/ephysics_quaternion.cpp)0
-rw-r--r--src/lib/ephysics/ephysics_shape.cpp (renamed from legacy/ephysics/src/lib/ephysics_shape.cpp)4
-rw-r--r--src/lib/ephysics/ephysics_trimesh.h (renamed from legacy/ephysics/src/lib/ephysics_trimesh.h)0
-rw-r--r--src/lib/ephysics/ephysics_world.cpp (renamed from legacy/ephysics/src/lib/ephysics_world.cpp)6
35 files changed, 200 insertions, 37 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d4b5afd88..e409af2ce4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,6 +64,9 @@ include Makefile_Efreet.am
64if HAVE_EEZE 64if HAVE_EEZE
65include Makefile_Eeze.am 65include Makefile_Eeze.am
66endif 66endif
67if HAVE_EPHYSICS
68include Makefile_EPhysics.am
69endif
67 70
68.PHONY: benchmark examples 71.PHONY: benchmark examples
69 72
@@ -99,6 +102,7 @@ clean-local:
99 rm -rf lib/edbus/*.gcno 102 rm -rf lib/edbus/*.gcno
100 rm -rf lib/efreet/*.gcno 103 rm -rf lib/efreet/*.gcno
101 rm -rf lib/eeze/*.gcno 104 rm -rf lib/eeze/*.gcno
105 rm -rf lib/ephysics/*.gcno
102 rm -rf modules/eina/mp/pass_through/*.gcno 106 rm -rf modules/eina/mp/pass_through/*.gcno
103 rm -rf modules/eina/mp/one_big/*.gcno 107 rm -rf modules/eina/mp/one_big/*.gcno
104 rm -rf modules/eina/mp/chained_pool/*.gcno 108 rm -rf modules/eina/mp/chained_pool/*.gcno
diff --git a/src/Makefile_EPhysics.am b/src/Makefile_EPhysics.am
new file mode 100644
index 0000000000..d5704d8c8e
--- /dev/null
+++ b/src/Makefile_EPhysics.am
@@ -0,0 +1,47 @@
1
2### Library
3
4lib_LTLIBRARIES += \
5lib/ephysics/libephysics.la
6
7installed_ephysicsmainheadersdir = $(includedir)/ephysics-@VMAJ@
8dist_installed_ephysicsmainheaders_DATA = \
9lib/ephysics/EPhysics.h
10
11lib_ephysics_libephysics_la_SOURCES = \
12lib/ephysics/ephysics_private.h \
13lib/ephysics/ephysics_trimesh.h \
14lib/ephysics/ephysics_body_materials.h \
15lib/ephysics/ephysics_body.cpp \
16lib/ephysics/ephysics_camera.cpp \
17lib/ephysics/ephysics_constraints.cpp \
18lib/ephysics/ephysics_main.cpp \
19lib/ephysics/ephysics_quaternion.cpp \
20lib/ephysics/ephysics_shape.cpp \
21lib/ephysics/ephysics_world.cpp
22
23lib_ephysics_libephysics_la_CPPFLAGS = \
24-I$(top_srcdir)/src/lib/eina \
25-I$(top_builddir)/src/lib/eina \
26-I$(top_srcdir)/src/lib/eo \
27-I$(top_builddir)/src/lib/eo \
28-I$(top_srcdir)/src/lib/ecore \
29-I$(top_builddir)/src/lib/ecore \
30-I$(top_srcdir)/src/lib/evas \
31-I$(top_builddir)/src/lib/evas \
32-I$(top_srcdir)/src/lib/ephysics \
33-I$(top_builddir)/src/lib/ephysics \
34@EFL_COV_CFLAGS@ \
35@EPHYSICS_CFLAGS@ \
36-DEFL_EPHYSICS_BUILD
37
38lib_ephysics_libephysics_la_LIBADD = \
39lib/eina/libeina.la \
40lib/eo/libeo.la \
41lib/ecore/libecore.la \
42lib/evas/libevas.la \
43@EFL_COV_LIBS@ \
44@EPHYSICS_LIBS@
45
46lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
47
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 8d5c8aa05c..28e04223e8 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina eo eet evas ecore eio edbus 3SUBDIRS = eina eo eet evas ecore eio edbus ephysics
4 4
5examples: 5examples:
6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples 6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
@@ -10,6 +10,7 @@ examples:
10 @$(MAKE) $(AM_MAKEFLAGS) -C ecore examples 10 @$(MAKE) $(AM_MAKEFLAGS) -C ecore examples
11 @$(MAKE) $(AM_MAKEFLAGS) -C eio examples 11 @$(MAKE) $(AM_MAKEFLAGS) -C eio examples
12 @$(MAKE) $(AM_MAKEFLAGS) -C edbus examples 12 @$(MAKE) $(AM_MAKEFLAGS) -C edbus examples
13 @$(MAKE) $(AM_MAKEFLAGS) -C ephysics examples
13 14
14install-examples: 15install-examples:
15 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples 16 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
@@ -19,3 +20,4 @@ install-examples:
19 @$(MAKE) $(AM_MAKEFLAGS) -C ecore install-examples 20 @$(MAKE) $(AM_MAKEFLAGS) -C ecore install-examples
20 @$(MAKE) $(AM_MAKEFLAGS) -C eio install-examples 21 @$(MAKE) $(AM_MAKEFLAGS) -C eio install-examples
21 @$(MAKE) $(AM_MAKEFLAGS) -C edbus install-examples 22 @$(MAKE) $(AM_MAKEFLAGS) -C edbus install-examples
23 @$(MAKE) $(AM_MAKEFLAGS) -C ephysics install-examples
diff --git a/src/examples/ephysics/Makefile.am b/src/examples/ephysics/Makefile.am
new file mode 100644
index 0000000000..00f856003d
--- /dev/null
+++ b/src/examples/ephysics/Makefile.am
@@ -0,0 +1,87 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3AM_CPPFLAGS = \
4-I. \
5-I$(top_srcdir)/src/lib/eina \
6-I$(top_builddir)/src/lib/eina \
7-I$(top_srcdir)/src/lib/eo \
8-I$(top_builddir)/src/lib/eo \
9-I$(top_srcdir)/src/lib/ecore \
10-I$(top_builddir)/src/lib/ecore \
11-I$(top_srcdir)/src/lib/evas \
12-I$(top_builddir)/src/lib/evas \
13-I$(top_srcdir)/src/lib/ecore_evas \
14-I$(top_builddir)/src/lib/ecore_evas \
15-I$(top_srcdir)/src/lib/ephysics \
16-I$(top_builddir)/src/lib/ephysics
17
18LDADD = \
19$(top_builddir)/src/lib/eina/libeina.la \
20$(top_builddir)/src/lib/eo/libeo.la \
21$(top_builddir)/src/lib/ecore/libecore.la \
22$(top_builddir)/src/lib/evas/libevas.la \
23$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
24$(top_builddir)/src/lib/ephysics/libephysics.la \
25@EPHYSICS_LDFLAGS@
26
27SRCS = \
28ephysics_logo.c \
29ephysics_test.h \
30test_bouncing_ball.c \
31test_bouncing_text.c \
32test.c \
33test_camera.c \
34test_camera_track.c \
35test_colliding_balls.c \
36test_collision_detection.c \
37test_collision_filter.c \
38test_constraint.c \
39test_delete.c \
40test_forces.c \
41test_growing_balls.c \
42test_no_gravity.c \
43test_rotating_forever.c \
44test_shapes.c \
45test_sleeping_threshold.c \
46test_slider.c \
47test_velocity.c
48
49EXTRA_PROGRAMS =
50
51# NOTE: neither ephysics_test or ephysics_logo won't be built as they needs Elementary
52# TODO: convert these to bare ecore_evas, at least a reduced set to have compile-able examples
53
54ephysics_test_SOURCES = \
55ephysics_test.h \
56test_bouncing_ball.c \
57test_bouncing_text.c \
58test.c \
59test_camera.c \
60test_camera_track.c \
61test_colliding_balls.c \
62test_collision_detection.c \
63test_collision_filter.c \
64test_constraint.c \
65test_delete.c \
66test_forces.c \
67test_growing_balls.c \
68test_no_gravity.c \
69test_rotating_forever.c \
70test_shapes.c \
71test_sleeping_threshold.c \
72test_slider.c \
73test_velocity.c
74
75examples: $(EXTRA_PROGRAMS)
76
77clean-local:
78 rm -f $(EXTRA_PROGRAMS)
79
80install-examples:
81 mkdir -p $(datadir)/ephysics/examples
82 $(install_sh_DATA) -c $(SRCS) $(datadir)/ephysics/examples
83
84uninstall-local:
85 for f in $(SRCS) ; do \
86 rm -f $(datadir)/ephysics/examples/$$f ; \
87 done
diff --git a/legacy/ephysics/src/examples/ephysics_logo.c b/src/examples/ephysics/ephysics_logo.c
index 2d055662f8..2d055662f8 100644
--- a/legacy/ephysics/src/examples/ephysics_logo.c
+++ b/src/examples/ephysics/ephysics_logo.c
diff --git a/legacy/ephysics/src/examples/ephysics_test.h b/src/examples/ephysics/ephysics_test.h
index 56db5957b1..56db5957b1 100644
--- a/legacy/ephysics/src/examples/ephysics_test.h
+++ b/src/examples/ephysics/ephysics_test.h
diff --git a/legacy/ephysics/src/examples/test.c b/src/examples/ephysics/test.c
index 88cbb5ebc9..88cbb5ebc9 100644
--- a/legacy/ephysics/src/examples/test.c
+++ b/src/examples/ephysics/test.c
diff --git a/legacy/ephysics/src/examples/test_bouncing_ball.c b/src/examples/ephysics/test_bouncing_ball.c
index 00736b09c8..00736b09c8 100644
--- a/legacy/ephysics/src/examples/test_bouncing_ball.c
+++ b/src/examples/ephysics/test_bouncing_ball.c
diff --git a/legacy/ephysics/src/examples/test_bouncing_text.c b/src/examples/ephysics/test_bouncing_text.c
index c2d7d09c3e..c2d7d09c3e 100644
--- a/legacy/ephysics/src/examples/test_bouncing_text.c
+++ b/src/examples/ephysics/test_bouncing_text.c
diff --git a/legacy/ephysics/src/examples/test_camera.c b/src/examples/ephysics/test_camera.c
index 8dc1dcc74a..8dc1dcc74a 100644
--- a/legacy/ephysics/src/examples/test_camera.c
+++ b/src/examples/ephysics/test_camera.c
diff --git a/legacy/ephysics/src/examples/test_camera_track.c b/src/examples/ephysics/test_camera_track.c
index 443ec3f994..443ec3f994 100644
--- a/legacy/ephysics/src/examples/test_camera_track.c
+++ b/src/examples/ephysics/test_camera_track.c
diff --git a/legacy/ephysics/src/examples/test_colliding_balls.c b/src/examples/ephysics/test_colliding_balls.c
index 6de20f3569..6de20f3569 100644
--- a/legacy/ephysics/src/examples/test_colliding_balls.c
+++ b/src/examples/ephysics/test_colliding_balls.c
diff --git a/legacy/ephysics/src/examples/test_collision_detection.c b/src/examples/ephysics/test_collision_detection.c
index 5e89163de0..5e89163de0 100644
--- a/legacy/ephysics/src/examples/test_collision_detection.c
+++ b/src/examples/ephysics/test_collision_detection.c
diff --git a/legacy/ephysics/src/examples/test_collision_filter.c b/src/examples/ephysics/test_collision_filter.c
index b224ff22c6..b224ff22c6 100644
--- a/legacy/ephysics/src/examples/test_collision_filter.c
+++ b/src/examples/ephysics/test_collision_filter.c
diff --git a/legacy/ephysics/src/examples/test_constraint.c b/src/examples/ephysics/test_constraint.c
index 988ed7b415..988ed7b415 100644
--- a/legacy/ephysics/src/examples/test_constraint.c
+++ b/src/examples/ephysics/test_constraint.c
diff --git a/legacy/ephysics/src/examples/test_delete.c b/src/examples/ephysics/test_delete.c
index a9d3fc4008..a9d3fc4008 100644
--- a/legacy/ephysics/src/examples/test_delete.c
+++ b/src/examples/ephysics/test_delete.c
diff --git a/legacy/ephysics/src/examples/test_forces.c b/src/examples/ephysics/test_forces.c
index 44870cc729..44870cc729 100644
--- a/legacy/ephysics/src/examples/test_forces.c
+++ b/src/examples/ephysics/test_forces.c
diff --git a/legacy/ephysics/src/examples/test_growing_balls.c b/src/examples/ephysics/test_growing_balls.c
index f92de5f149..f92de5f149 100644
--- a/legacy/ephysics/src/examples/test_growing_balls.c
+++ b/src/examples/ephysics/test_growing_balls.c
diff --git a/legacy/ephysics/src/examples/test_no_gravity.c b/src/examples/ephysics/test_no_gravity.c
index 0052bd2082..0052bd2082 100644
--- a/legacy/ephysics/src/examples/test_no_gravity.c
+++ b/src/examples/ephysics/test_no_gravity.c
diff --git a/legacy/ephysics/src/examples/test_rotating_forever.c b/src/examples/ephysics/test_rotating_forever.c
index f0445887bd..f0445887bd 100644
--- a/legacy/ephysics/src/examples/test_rotating_forever.c
+++ b/src/examples/ephysics/test_rotating_forever.c
diff --git a/legacy/ephysics/src/examples/test_shapes.c b/src/examples/ephysics/test_shapes.c
index 8b01222211..8b01222211 100644
--- a/legacy/ephysics/src/examples/test_shapes.c
+++ b/src/examples/ephysics/test_shapes.c
diff --git a/legacy/ephysics/src/examples/test_sleeping_threshold.c b/src/examples/ephysics/test_sleeping_threshold.c
index e6b2d513ed..e6b2d513ed 100644
--- a/legacy/ephysics/src/examples/test_sleeping_threshold.c
+++ b/src/examples/ephysics/test_sleeping_threshold.c
diff --git a/legacy/ephysics/src/examples/test_slider.c b/src/examples/ephysics/test_slider.c
index f17ca01d7f..f17ca01d7f 100644
--- a/legacy/ephysics/src/examples/test_slider.c
+++ b/src/examples/ephysics/test_slider.c
diff --git a/legacy/ephysics/src/examples/test_velocity.c b/src/examples/ephysics/test_velocity.c
index 785767bff1..785767bff1 100644
--- a/legacy/ephysics/src/examples/test_velocity.c
+++ b/src/examples/ephysics/test_velocity.c
diff --git a/legacy/ephysics/src/lib/EPhysics.h b/src/lib/ephysics/EPhysics.h
index e7fc6a8f04..90ea09f046 100644
--- a/legacy/ephysics/src/lib/EPhysics.h
+++ b/src/lib/ephysics/EPhysics.h
@@ -2,12 +2,18 @@
2#define EPHYSICS_H 2#define EPHYSICS_H
3 3
4/** 4/**
5 * @mainpage EPhysics Library Documentation 5 * @page ephysics_main EPhysics
6 * 6 *
7 * @version 0.1.0 7 * @date 2012 (created)
8 * @date 2012
9 * 8 *
10 * @section intro What is EPhysics ? 9 * @section toc Table of Contents
10 *
11 * @li @ref ephysics_main_intro
12 * @li @ref ephysics_main_compiling
13 * @li @ref ephysics_main_next_steps
14 * @li @ref ephysics_main_intro_example
15 *
16 * @section ephysics_main_intro Introduction
11 * 17 *
12 * EPhysics is a library that makes it easy to use Ecore, Evas and Bullet 18 * EPhysics is a library that makes it easy to use Ecore, Evas and Bullet
13 * Physics together. It's a kind of wrapper, a glue, between these libraries. 19 * Physics together. It's a kind of wrapper, a glue, between these libraries.
@@ -16,7 +22,33 @@
16 * @image html diagram_ephysics.png 22 * @image html diagram_ephysics.png
17 * @image latex diagram_ephysics.eps 23 * @image latex diagram_ephysics.eps
18 * 24 *
19 * For a better reference, check the following groups: 25 * @section ephysics_main_compiling How to compile
26 *
27 * Ephysics is a library your application links to. The procedure for this is
28 * very simple. You simply have to compile your application with the
29 * appropriate compiler flags that the @c pkg-config script outputs. For
30 * example:
31 *
32 * Compiling C or C++ files into object files:
33 *
34 * @verbatim
35 gcc -c -o main.o main.c `pkg-config --cflags ephysics`
36 @endverbatim
37 *
38 * Linking object files into a binary executable:
39 *
40 * @verbatim
41 gcc -o my_application main.o `pkg-config --libs ephysics`
42 @endverbatim
43 *
44 * See @ref pkgconfig
45 *
46 * @section ephysics_main_next_steps Next Steps
47 *
48 * After you understood what EPhysics is and installed it in your system
49 * you should proceed understanding the programming interface.
50 *
51 * Recommended reading:
20 * @li @ref EPhysics 52 * @li @ref EPhysics
21 * @li @ref EPhysics_World 53 * @li @ref EPhysics_World
22 * @li @ref EPhysics_Body 54 * @li @ref EPhysics_Body
@@ -25,20 +57,11 @@
25 * @li @ref EPhysics_Quaternion 57 * @li @ref EPhysics_Quaternion
26 * @li @ref EPhysics_Shape 58 * @li @ref EPhysics_Shape
27 * 59 *
28 * Please see the @ref authors page for contact details. 60 * @section ephysics_main_intro_example Introductory Example
29 */
30
31/**
32 *
33 * @page authors Authors
34 *
35 * @author Bruno Dilly <bdilly@@profusion.mobi>
36 * @author Leandro Dorileo <dorileo@@profusion.mobi>
37 * @author Ricardo de Almeida Gonzaga <ricardo@@profusion.mobi>
38 * 61 *
39 * Please contact <enlightenment-devel@lists.sourceforge.net> to get in 62 * @include test_bouncing_ball.c
40 * contact with the developers and maintainers.
41 * 63 *
64 * More examples can be found at @ref ephysics_examples.
42 */ 65 */
43 66
44#include <Evas.h> 67#include <Evas.h>
@@ -82,8 +105,8 @@ extern "C" {
82 */ 105 */
83 106
84/** 107/**
85 * @brief How to initialize EPhysics. 108 * @brief Physics simulation integration and visual effects.
86 * @defgroup EPhysics Top Level API available to add physics effects. 109 * @defgroup EPhysics EPhysics
87 * 110 *
88 * @{ 111 * @{
89 * 112 *
diff --git a/legacy/ephysics/src/lib/ephysics_body.cpp b/src/lib/ephysics/ephysics_body.cpp
index 98d8fce79d..eddfbfbee9 100644
--- a/legacy/ephysics/src/lib/ephysics_body.cpp
+++ b/src/lib/ephysics/ephysics_body.cpp
@@ -333,7 +333,7 @@ ephysics_body_soft_body_slice_index_get(EPhysics_Body *body, Evas_Object *slice)
333} 333}
334 334
335static void 335static void
336_ephysics_body_soft_body_slice_del_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) 336_ephysics_body_soft_body_slice_del_cb(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
337{ 337{
338 EPhysics_Body_Soft_Body_Slice *slice = (EPhysics_Body_Soft_Body_Slice *)data; 338 EPhysics_Body_Soft_Body_Slice *slice = (EPhysics_Body_Soft_Body_Slice *)data;
339 slice->evas_obj = NULL; 339 slice->evas_obj = NULL;
@@ -882,7 +882,7 @@ err_body:
882} 882}
883 883
884static void 884static void
885_ephysics_body_evas_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 885_ephysics_body_evas_obj_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
886{ 886{
887 EPhysics_Body *body = (EPhysics_Body *) data; 887 EPhysics_Body *body = (EPhysics_Body *) data;
888 888
@@ -1197,7 +1197,7 @@ _ephysics_body_move(EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Evas_Coord
1197} 1197}
1198 1198
1199static void 1199static void
1200_ephysics_body_evas_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) 1200_ephysics_body_evas_obj_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
1201{ 1201{
1202 EPhysics_Body *body = (EPhysics_Body *) data; 1202 EPhysics_Body *body = (EPhysics_Body *) data;
1203 int w, h; 1203 int w, h;
@@ -1222,7 +1222,7 @@ _ephysics_body_evas_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *o
1222} 1222}
1223 1223
1224 static void 1224 static void
1225_ephysics_body_soft_body_evas_restack_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) 1225_ephysics_body_soft_body_evas_restack_cb(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
1226{ 1226{
1227 EPhysics_Body *body = (EPhysics_Body *)data; 1227 EPhysics_Body *body = (EPhysics_Body *)data;
1228 Eina_List *slices; 1228 Eina_List *slices;
@@ -1404,7 +1404,7 @@ _ephysics_body_evas_obj_map_apply(EPhysics_Body *body, Evas_Map *map, Evas_Objec
1404} 1404}
1405 1405
1406static void 1406static void
1407_ephysics_cloth_face_objs_update(EPhysics_Body *body __UNUSED__) 1407_ephysics_cloth_face_objs_update(EPhysics_Body *body EINA_UNUSED)
1408{ 1408{
1409 1409
1410} 1410}
@@ -4506,7 +4506,7 @@ ephysics_body_clockwise_get(const EPhysics_Body *body)
4506} 4506}
4507 4507
4508static void 4508static void
4509_ephysics_body_face_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) 4509_ephysics_body_face_obj_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
4510{ 4510{
4511 EPhysics_Body *body = (EPhysics_Body *) data; 4511 EPhysics_Body *body = (EPhysics_Body *) data;
4512 EPhysics_Body_Face_Obj *face_obj; 4512 EPhysics_Body_Face_Obj *face_obj;
@@ -4574,7 +4574,7 @@ _ephysics_body_face_evas_object_add(EPhysics_Body *body, EPhysics_Body_Face face
4574} 4574}
4575 4575
4576static void 4576static void
4577_ephysics_body_box_face_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) 4577_ephysics_body_box_face_obj_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
4578{ 4578{
4579 EPhysics_Body_Face face = EPHYSICS_BODY_FACE_LAST; 4579 EPhysics_Body_Face face = EPHYSICS_BODY_FACE_LAST;
4580 EPhysics_Body *body = (EPhysics_Body *) data; 4580 EPhysics_Body *body = (EPhysics_Body *) data;
@@ -4748,7 +4748,7 @@ _ephysics_body_box_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_Fac
4748} 4748}
4749 4749
4750static void 4750static void
4751_ephysics_body_cylinder_face_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) 4751_ephysics_body_cylinder_face_obj_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
4752{ 4752{
4753 EPhysics_Body_Face face = EPHYSICS_BODY_FACE_LAST; 4753 EPhysics_Body_Face face = EPHYSICS_BODY_FACE_LAST;
4754 EPhysics_Body *body = (EPhysics_Body *) data; 4754 EPhysics_Body *body = (EPhysics_Body *) data;
@@ -4909,7 +4909,7 @@ _ephysics_body_cylinder_face_evas_object_unset(EPhysics_Body *body, EPhysics_Bod
4909} 4909}
4910 4910
4911static void 4911static void
4912_ephysics_body_soft_body_face_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) 4912_ephysics_body_soft_body_face_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
4913{ 4913{
4914 int w, h; 4914 int w, h;
4915 EPhysics_Body_Face_Obj *face; 4915 EPhysics_Body_Face_Obj *face;
@@ -5031,7 +5031,7 @@ _ephysics_body_cloth_face_evas_object_unset(EPhysics_Body *body, EPhysics_Body_F
5031} 5031}
5032 5032
5033static void 5033static void
5034_ephysics_body_soft_sphere_face_obj_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) 5034_ephysics_body_soft_sphere_face_obj_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
5035{ 5035{
5036 EPhysics_Body *body = (EPhysics_Body *) data; 5036 EPhysics_Body *body = (EPhysics_Body *) data;
5037 Evas_Coord bd, w, h; 5037 Evas_Coord bd, w, h;
@@ -5044,7 +5044,7 @@ _ephysics_body_soft_sphere_face_obj_resize_cb(void *data, Evas *e __UNUSED__, Ev
5044} 5044}
5045 5045
5046static void 5046static void
5047_ephysics_body_soft_sphere_face_evas_object_del_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 5047_ephysics_body_soft_sphere_face_evas_object_del_cb(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
5048{ 5048{
5049 Eina_List *l; 5049 Eina_List *l;
5050 void *ldata; 5050 void *ldata;
diff --git a/legacy/ephysics/src/lib/ephysics_body_materials.h b/src/lib/ephysics/ephysics_body_materials.h
index 40b6ee8280..40b6ee8280 100644
--- a/legacy/ephysics/src/lib/ephysics_body_materials.h
+++ b/src/lib/ephysics/ephysics_body_materials.h
diff --git a/legacy/ephysics/src/lib/ephysics_camera.cpp b/src/lib/ephysics/ephysics_camera.cpp
index e1d95664ff..9ca2052f92 100644
--- a/legacy/ephysics/src/lib/ephysics_camera.cpp
+++ b/src/lib/ephysics/ephysics_camera.cpp
@@ -27,7 +27,7 @@ struct _EPhysics_Camera {
27}; 27};
28 28
29static void 29static void
30_ephysics_camera_target_del_cb(void *data, EPhysics_Body *body, void *event_info __UNUSED__) 30_ephysics_camera_target_del_cb(void *data, EPhysics_Body *body, void *event_info EINA_UNUSED)
31{ 31{
32 EPhysics_Camera *camera = (EPhysics_Camera *) data; 32 EPhysics_Camera *camera = (EPhysics_Camera *) data;
33 33
diff --git a/legacy/ephysics/src/lib/ephysics_constraints.cpp b/src/lib/ephysics/ephysics_constraints.cpp
index 5e36fcbf36..5e36fcbf36 100644
--- a/legacy/ephysics/src/lib/ephysics_constraints.cpp
+++ b/src/lib/ephysics/ephysics_constraints.cpp
diff --git a/legacy/ephysics/src/lib/ephysics_main.cpp b/src/lib/ephysics/ephysics_main.cpp
index e486f89ad1..e486f89ad1 100644
--- a/legacy/ephysics/src/lib/ephysics_main.cpp
+++ b/src/lib/ephysics/ephysics_main.cpp
diff --git a/legacy/ephysics/src/lib/ephysics_private.h b/src/lib/ephysics/ephysics_private.h
index 1f888ca88d..1f888ca88d 100644
--- a/legacy/ephysics/src/lib/ephysics_private.h
+++ b/src/lib/ephysics/ephysics_private.h
diff --git a/legacy/ephysics/src/lib/ephysics_quaternion.cpp b/src/lib/ephysics/ephysics_quaternion.cpp
index 899204d563..899204d563 100644
--- a/legacy/ephysics/src/lib/ephysics_quaternion.cpp
+++ b/src/lib/ephysics/ephysics_quaternion.cpp
diff --git a/legacy/ephysics/src/lib/ephysics_shape.cpp b/src/lib/ephysics/ephysics_shape.cpp
index 6aba343ed6..e2fa6d25a6 100644
--- a/legacy/ephysics/src/lib/ephysics_shape.cpp
+++ b/src/lib/ephysics/ephysics_shape.cpp
@@ -95,7 +95,7 @@ ephysics_shape_point_add(EPhysics_Shape *shape, double x, double y, double z)
95 95
96/* TODO: load points from file */ 96/* TODO: load points from file */
97EAPI EPhysics_Shape * 97EAPI EPhysics_Shape *
98ephysics_shape_load(const char *filename __UNUSED__) 98ephysics_shape_load(const char *filename EINA_UNUSED)
99{ 99{
100 EPhysics_Shape *shape; 100 EPhysics_Shape *shape;
101 101
@@ -108,7 +108,7 @@ ephysics_shape_load(const char *filename __UNUSED__)
108 108
109/* TODO: save points to file */ 109/* TODO: save points to file */
110EAPI Eina_Bool 110EAPI Eina_Bool
111ephysics_shape_save(const EPhysics_Shape *shape __UNUSED__, const char *filename __UNUSED__) 111ephysics_shape_save(const EPhysics_Shape *shape EINA_UNUSED, const char *filename EINA_UNUSED)
112{ 112{
113 return EINA_TRUE; 113 return EINA_TRUE;
114} 114}
diff --git a/legacy/ephysics/src/lib/ephysics_trimesh.h b/src/lib/ephysics/ephysics_trimesh.h
index 975cb1cb11..975cb1cb11 100644
--- a/legacy/ephysics/src/lib/ephysics_trimesh.h
+++ b/src/lib/ephysics/ephysics_trimesh.h
diff --git a/legacy/ephysics/src/lib/ephysics_world.cpp b/src/lib/ephysics/ephysics_world.cpp
index 198e47cf77..b75bb953e7 100644
--- a/legacy/ephysics/src/lib/ephysics_world.cpp
+++ b/src/lib/ephysics/ephysics_world.cpp
@@ -301,7 +301,7 @@ _ephysics_world_tick_dispatch(EPhysics_World *world)
301} 301}
302 302
303static void 303static void
304_ephysics_world_tick_cb(btDynamicsWorld *dynamics_world, btScalar timeStep __UNUSED__) 304_ephysics_world_tick_cb(btDynamicsWorld *dynamics_world, btScalar timeStep EINA_UNUSED)
305{ 305{
306 EPhysics_World *world; 306 EPhysics_World *world;
307 world = (EPhysics_World *) dynamics_world->getWorldUserInfo(); 307 world = (EPhysics_World *) dynamics_world->getWorldUserInfo();
@@ -413,7 +413,7 @@ _ephysics_world_free(EPhysics_World *world)
413} 413}
414 414
415static Eina_Bool 415static Eina_Bool
416_simulate_worlds(void *data __UNUSED__) 416_simulate_worlds(void *data EINA_UNUSED)
417{ 417{
418 EPhysics_World *world; 418 EPhysics_World *world;
419 void *wrld; 419 void *wrld;
@@ -635,7 +635,7 @@ _th_simulate(void *data, Ecore_Thread *th)
635} 635}
636 636
637static void 637static void
638_th_msg_cb(void *data, Ecore_Thread *th __UNUSED__, void *msg_data) 638_th_msg_cb(void *data, Ecore_Thread *th EINA_UNUSED, void *msg_data)
639{ 639{
640 EPhysics_World *world = (EPhysics_World *) data; 640 EPhysics_World *world = (EPhysics_World *) data;
641 Simulation_Msg *msg = (Simulation_Msg *) msg_data; 641 Simulation_Msg *msg = (Simulation_Msg *) msg_data;