diff options
author | David Walter Seikel | 2014-05-24 11:42:09 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-24 11:42:09 +1000 |
commit | b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2 (patch) | |
tree | b2016c16ec01ce1ab40decb7533ef6849fa69956 /src/extantz | |
parent | Pretend to login, and some commenting out so it all compiles. Fix it up later. (diff) | |
download | SledjHamr-b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2.zip SledjHamr-b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2.tar.gz SledjHamr-b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2.tar.bz2 SledjHamr-b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2.tar.xz |
Big include and libraries clean up.
Diffstat (limited to '')
-rw-r--r-- | src/extantz/Evas_3D_demo.c | 1 | ||||
-rwxr-xr-x | src/extantz/build.lua | 4 | ||||
-rw-r--r-- | src/extantz/camera.c | 1 | ||||
-rw-r--r-- | src/extantz/ephysics_demo.c | 1 | ||||
-rw-r--r-- | src/extantz/extantzCamera.cpp | 3 | ||||
-rw-r--r-- | src/extantz/extantzCamera.h | 2 | ||||
-rw-r--r-- | src/extantz/scenri.c | 1 | ||||
-rw-r--r-- | src/extantz/scenri.h | 22 | ||||
-rw-r--r-- | src/libraries/evas_3d_utils.h (renamed from src/extantz/evas_3d_utils.h) | 0 |
9 files changed, 6 insertions, 29 deletions
diff --git a/src/extantz/Evas_3D_demo.c b/src/extantz/Evas_3D_demo.c index 6cb673b..371bba7 100644 --- a/src/extantz/Evas_3D_demo.c +++ b/src/extantz/Evas_3D_demo.c | |||
@@ -1,5 +1,4 @@ | |||
1 | #include "extantz.h" | 1 | #include "extantz.h" |
2 | #include "scenri.h" | ||
3 | 2 | ||
4 | 3 | ||
5 | static const float cube_vertices[] = | 4 | static const float cube_vertices[] = |
diff --git a/src/extantz/build.lua b/src/extantz/build.lua index 618de3f..90caca5 100755 --- a/src/extantz/build.lua +++ b/src/extantz/build.lua | |||
@@ -13,9 +13,9 @@ if 'nil' == type(dir) then | |||
13 | dir = workingDir | 13 | dir = workingDir |
14 | end | 14 | end |
15 | 15 | ||
16 | CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua -I../love' | 16 | CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua' |
17 | LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' | 17 | LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' |
18 | libs = libs .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua -lwinFang -lRunnr' | 18 | libs = libs .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua' |
19 | 19 | ||
20 | removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) | 20 | removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) |
21 | removeFiles(dir, {'../../extantz', 'camera.o', 'files.o', 'scenri.o', 'woMan.o'}) | 21 | removeFiles(dir, {'../../extantz', 'camera.o', 'files.o', 'scenri.o', 'woMan.o'}) |
diff --git a/src/extantz/camera.c b/src/extantz/camera.c index b7a79d1..c94b780 100644 --- a/src/extantz/camera.c +++ b/src/extantz/camera.c | |||
@@ -1,6 +1,5 @@ | |||
1 | #include "extantz.h" | 1 | #include "extantz.h" |
2 | 2 | ||
3 | #include "evas_3d_utils.h" | ||
4 | 3 | ||
5 | static inline void evas_euler_to_quaternion(Evas_Vec4 *out, Evas_Vec3 *in) | 4 | static inline void evas_euler_to_quaternion(Evas_Vec4 *out, Evas_Vec3 *in) |
6 | { | 5 | { |
diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c index 89dda99..a86cad2 100644 --- a/src/extantz/ephysics_demo.c +++ b/src/extantz/ephysics_demo.c | |||
@@ -1,5 +1,4 @@ | |||
1 | #include "extantz.h" | 1 | #include "extantz.h" |
2 | #include <EPhysics.h> | ||
3 | 2 | ||
4 | 3 | ||
5 | #define EPHYSICS_TEST_THEME "extantz" | 4 | #define EPHYSICS_TEST_THEME "extantz" |
diff --git a/src/extantz/extantzCamera.cpp b/src/extantz/extantzCamera.cpp index 4d13054..a3145ae 100644 --- a/src/extantz/extantzCamera.cpp +++ b/src/extantz/extantzCamera.cpp | |||
@@ -12,6 +12,9 @@ | |||
12 | // Initally I'll make it SecondLife like, coz that's what my muscle memory is used to. | 12 | // Initally I'll make it SecondLife like, coz that's what my muscle memory is used to. |
13 | // It will get extended and made generic though. | 13 | // It will get extended and made generic though. |
14 | 14 | ||
15 | #include <irrlicht.h> | ||
16 | #include "extantz.h" | ||
17 | |||
15 | #include "extantzCamera.h" | 18 | #include "extantzCamera.h" |
16 | #include "IVideoDriver.h" | 19 | #include "IVideoDriver.h" |
17 | #include "ISceneManager.h" | 20 | #include "ISceneManager.h" |
diff --git a/src/extantz/extantzCamera.h b/src/extantz/extantzCamera.h index 6e9067f..5c98619 100644 --- a/src/extantz/extantzCamera.h +++ b/src/extantz/extantzCamera.h | |||
@@ -5,7 +5,6 @@ | |||
5 | #ifndef __EXTANTZ_CAMERA_H_INCLUDED__ | 5 | #ifndef __EXTANTZ_CAMERA_H_INCLUDED__ |
6 | #define __EXTANTZ_CAMERA_H_INCLUDED__ | 6 | #define __EXTANTZ_CAMERA_H_INCLUDED__ |
7 | 7 | ||
8 | |||
9 | #ifdef __cplusplus | 8 | #ifdef __cplusplus |
10 | #include <ISceneNodeAnimator.h> | 9 | #include <ISceneNodeAnimator.h> |
11 | #include <vector2d.h> | 10 | #include <vector2d.h> |
@@ -13,7 +12,6 @@ | |||
13 | #include <SKeyMap.h> | 12 | #include <SKeyMap.h> |
14 | #include <irrArray.h> | 13 | #include <irrArray.h> |
15 | #include <ICameraSceneNode.h> | 14 | #include <ICameraSceneNode.h> |
16 | #include "scenri.h" | ||
17 | 15 | ||
18 | using namespace irr; | 16 | using namespace irr; |
19 | using namespace scene; | 17 | using namespace scene; |
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c index 0210a48..7395582 100644 --- a/src/extantz/scenri.c +++ b/src/extantz/scenri.c | |||
@@ -1,5 +1,4 @@ | |||
1 | #include "extantz.h" | 1 | #include "extantz.h" |
2 | #include "scenri.h" | ||
3 | 2 | ||
4 | static void _on_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void *einfo) | 3 | static void _on_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void *einfo) |
5 | { | 4 | { |
diff --git a/src/extantz/scenri.h b/src/extantz/scenri.h index 93b3f16..310b615 100644 --- a/src/extantz/scenri.h +++ b/src/extantz/scenri.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include "love.h" | 4 | #include "love.h" |
5 | 5 | ||
6 | |||
6 | typedef struct _cameraMove | 7 | typedef struct _cameraMove |
7 | { | 8 | { |
8 | float x, y, z; | 9 | float x, y, z; |
@@ -11,27 +12,6 @@ typedef struct _cameraMove | |||
11 | float JumpSpeed, RotateSpeed, MoveSpeed; | 12 | float JumpSpeed, RotateSpeed, MoveSpeed; |
12 | } cameraMove; | 13 | } cameraMove; |
13 | 14 | ||
14 | typedef struct _vec4 | ||
15 | { | ||
16 | float x; | ||
17 | float y; | ||
18 | float z; | ||
19 | float w; | ||
20 | } vec4; | ||
21 | |||
22 | typedef struct _vec3 | ||
23 | { | ||
24 | float x; | ||
25 | float y; | ||
26 | float z; | ||
27 | } vec3; | ||
28 | |||
29 | typedef struct _vec2 | ||
30 | { | ||
31 | float x; | ||
32 | float y; | ||
33 | } vec2; | ||
34 | |||
35 | typedef struct _vertex | 15 | typedef struct _vertex |
36 | { | 16 | { |
37 | vec3 position; | 17 | vec3 position; |
diff --git a/src/extantz/evas_3d_utils.h b/src/libraries/evas_3d_utils.h index 8adc322..8adc322 100644 --- a/src/extantz/evas_3d_utils.h +++ b/src/libraries/evas_3d_utils.h | |||