Big include and libraries clean up.

23 files changed, 263 insertions, 60 deletions

diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index 1ffbc0f..3ef6007 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -142,8 +142,8 @@ and ordinary elementary widgets.  Proper introspection can come later.
 */
 
 
+#include "LumbrJack.h"
 #include "GuiLua.h"
-#include "Runnr.h"
 
 
 const char      *glName = "ourGuiLua";
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 216ce8a..d82d244 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -2,7 +2,6 @@
 #define _GUILUA_H_
 
 
-#include "LumbrJack.h"
 #include "Runnr.h"
 #include "winFang.h"
 
diff --git a/src/GuiLua/build.lua b/src/GuiLua/build.lua
index 08446f0..7254eb1 100755
--- a/src/GuiLua/build.lua
+++ b/src/GuiLua/build.lua
@@ -17,7 +17,7 @@ LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
 
 removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'})
 
-runCommand('C modules',         dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
 runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c')
 runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o')
-runCommand('C apps',            dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua -lwinFang ' .. libs)
+runCommand('C apps',            dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
+runCommand('C modules',         dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
diff --git a/src/GuiLua/skang.c b/src/GuiLua/skang.c
index 3aee0e2..f40b136 100644
--- a/src/GuiLua/skang.c
+++ b/src/GuiLua/skang.c
@@ -1,3 +1,4 @@
+#include "LumbrJack.h"
 #include "GuiLua.h"
 
 
diff --git a/src/GuiLua/test_c.c b/src/GuiLua/test_c.c
index f964d65..1cc5c08 100644
--- a/src/GuiLua/test_c.c
+++ b/src/GuiLua/test_c.c
@@ -11,7 +11,6 @@ http://lua-users.org/lists/lua-l/2008-01/msg00671.html
 
 
 #include "LumbrJack.h"
-#include "Runnr.h"
 #include "GuiLua.h"
 
 
diff --git a/src/LuaSL/LuaSL.h b/src/LuaSL/LuaSL.h
index cfee0aa..54e7fa7 100644
--- a/src/LuaSL/LuaSL.h
+++ b/src/LuaSL/LuaSL.h
@@ -5,16 +5,7 @@
 #endif
 
 #include <Eet.h>
-#include <Ecore.h>
-#include <Ecore_Con.h>
 #include <Ecore_File.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <lua.h>
-#include <luajit.h>
-#include <lualib.h>
-#include <lauxlib.h>
 
 typedef struct _gameGlobals gameGlobals;        // Define this here, so LuaSL_threads.h can use it.
 
diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index 61fce8f..5adeabe 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -1,6 +1,5 @@
 
 #include "LuaSL.h"
-#include "Runnr.h"
 #include "SledjHamr.h"
 
 /* TODO - problem de jour
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 @@
 #include "extantz.h"
-#include "scenri.h"
 
 
 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
   dir = workingDir
 end
 
-CFLAGS  = CFLAGS  .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua -I../love'
+CFLAGS  = CFLAGS  .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua'
 LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux'
-libs    = libs    .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua -lwinFang -lRunnr'
+libs    = libs    .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua'
 
 removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'})
 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 @@
 #include "extantz.h"
 
-#include "evas_3d_utils.h"
 
 static inline void evas_euler_to_quaternion(Evas_Vec4 *out, Evas_Vec3 *in)
 {
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 @@
 #include "extantz.h"
-#include <EPhysics.h>
 
 
 #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 @@
 // Initally I'll make it SecondLife like, coz that's what my muscle memory is used to.
 // It will get extended and made generic though.
 
+#include <irrlicht.h>
+#include "extantz.h"
+
 #include "extantzCamera.h"
 #include "IVideoDriver.h"
 #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 @@
 #ifndef __EXTANTZ_CAMERA_H_INCLUDED__
 #define __EXTANTZ_CAMERA_H_INCLUDED__
 
-
 #ifdef __cplusplus
 #include <ISceneNodeAnimator.h>
 #include <vector2d.h>
@@ -13,7 +12,6 @@
 #include <SKeyMap.h>
 #include <irrArray.h>
 #include <ICameraSceneNode.h>
-#include "scenri.h"
 
 using namespace irr;
 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 @@
 #include "extantz.h"
-#include "scenri.h"
 
 static void _on_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void *einfo)
 {
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 @@
 
 #include "love.h"
 
+
 typedef struct _cameraMove
 {
     float       x, y, z;
@@ -11,27 +12,6 @@ typedef struct _cameraMove
     float       JumpSpeed, RotateSpeed, MoveSpeed;
 } cameraMove;
 
-typedef struct _vec4
-{
-    float   x;
-    float   y;
-    float   z;
-    float   w;
-} vec4;
-
-typedef struct _vec3
-{
-    float   x;
-    float   y;
-    float   z;
-} vec3;
-
-typedef struct _vec2
-{
-    float   x;
-    float   y;
-} vec2;
-
 typedef struct _vertex
 {
     vec3    position;
diff --git a/src/libraries/LumbrJack.c b/src/libraries/LumbrJack.c
index 27ca524..9b072b0 100644
--- a/src/libraries/LumbrJack.c
+++ b/src/libraries/LumbrJack.c
@@ -3,8 +3,8 @@
 */
 
 
-#include "LumbrJack.h"
 #include <unistd.h>
+#include "LumbrJack.h"
 
 
 static char dateTime[DATE_TIME_LEN];
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
diff --git a/src/libraries/evas_macros.h b/src/libraries/evas_macros.h
new file mode 100644
index 0000000..ed29dbd
--- /dev/null
+++ b/src/libraries/evas_macros.h
@@ -0,0 +1,217 @@
+#ifndef EVAS_MACROS_H
+#define EVAS_MACROS_H
+
+#undef ABS
+#define ABS(x) (((x) < 0) ? -(x) : (x))
+
+#undef SGN
+#define SGN(x) (((x) < 0) ? -1 : 1)
+
+#undef MIN
+#define MIN(x, y) (((x) < (y)) ? (x) : (y))
+
+#undef MAX
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+
+#define SWAP32(x) (x) = \
+   ((((x) & 0x000000ff ) << 24) | \
+    (((x) & 0x0000ff00 ) << 8)  | \
+    (((x) & 0x00ff0000 ) >> 8)  | \
+    (((x) & 0xff000000 ) >> 24))
+
+#define SWAP16(x) (x) = \
+   ((((x) & 0x00ff ) << 8) | \
+    (((x) & 0xff00 ) >> 8))
+
+#define SPANS_COMMON(x1, w1, x2, w2) \
+(!(( (int)((x2) + (int)(w2)) <= (int)(x1)) || (int)((x2) >= (int)((x1) + (int)(w1)))))
+
+#define RECTS_INTERSECT(x, y, w, h, xx, yy, ww, hh) \
+((SPANS_COMMON((x), (w), (xx), (ww))) && (SPANS_COMMON((y), (h), (yy), (hh))))
+
+#define RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch) \
+{ \
+   if (RECTS_INTERSECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch)) \
+     { \
+        if ((int)_x < (int)(_cx))               \
+          { \
+             if ((int)_w +  ((int)_x - (int)(_cx)) < 0) _w = 0;       \
+             else     _w += ((int)_x - (int)(_cx)); \
+             _x = (_cx); \
+          } \
+        if ((int)(_x + _w) > (int)((_cx) + (_cw)))      \
+          _w = (_cx) + (_cw) - _x; \
+        if ((int)_y < (int)(_cy))  \
+          { \
+             if ((int)_h +  ((int)_y - (int)(_cy)) < 0) _h = 0; \
+             else     _h += ((int)_y - (int)(_cy)); \
+             _y = (_cy); \
+          } \
+        if ((int)(_y + _h) > (int)((_cy) + (_ch)))      \
+          _h = (_cy) + (_ch) - _y; \
+     } \
+   else \
+     { \
+        _w = 0; _h = 0; \
+     } \
+}
+
+
+#define INTERP_VAL(out, in1, in2, in3, in4, interp_x, interp_y)    \
+   {                                                               \
+      int _v, _vv;                                                 \
+                                                                   \
+      _v = (256 - (interp_x)) * (in1);                             \
+      if ((interp_x) > 0) _v += (interp_x) * (in2);                \
+      _v *= (256 - (interp_y));                                    \
+      if ((interp_y) > 0)                                          \
+        {                                                          \
+           _vv = (256 - (interp_x)) * (in3);                       \
+           if ((interp_x) > 0) _vv += (interp_x) * (in4);          \
+           _vv *= (interp_y);                                      \
+           (out) = ((_v + _vv) >> 16);                             \
+        }                                                          \
+      else (out) = (_v >> 16);                                     \
+   }
+
+#define INTERP_2(in1, in2, interp, interp_inv) \
+   ((in1 * interp_inv) + (in2 * interp)) >> 8
+
+
+#define CONVERT_LOOP_START_ROT_0() \
+   src_ptr = src; \
+   for (y = 0; y < h; y++) \
+     { \
+        for (x = 0; x < w; x++) \
+          {
+
+#define CONVERT_LOOP_END_ROT_0() \
+             dst_ptr++; \
+             src_ptr++; \
+          } \
+        src_ptr += src_jump; \
+        dst_ptr += dst_jump; \
+     }
+
+#define CONVERT_LOOP_START_ROT_180() \
+   src_ptr = src + (w - 1) + ((h - 1) * (w + src_jump)); \
+   for (y = 0; y < h; y++) \
+     { \
+        for (x = 0; x < w; x++) \
+          {
+
+#define CONVERT_LOOP_END_ROT_180() \
+             dst_ptr++; \
+             src_ptr--; \
+          } \
+        src_ptr = src + (w - 1) + ((h - y - 2) * (w + src_jump)); \
+        dst_ptr += dst_jump; \
+     }
+
+#define CONVERT_LOOP_START_ROT_270() \
+   src_ptr = src + ((w - 1) * (h + src_jump)); \
+   for (y = 0; y < h; y++) \
+     { \
+        for (x = 0; x < w; x++) \
+          {
+
+#define CONVERT_LOOP_END_ROT_270() \
+             dst_ptr++; \
+             src_ptr -= (h + src_jump); \
+          } \
+        src_ptr = src + ((w - 1) * (h + src_jump)) + (y + 1); \
+        dst_ptr += dst_jump; \
+     }
+
+#define CONVERT_LOOP_START_ROT_90() \
+   src_ptr = src + (h - 1); \
+   for (y = 0; y < h; y++) \
+     { \
+        for (x = 0; x < w; x++) \
+          {
+
+#define CONVERT_LOOP_END_ROT_90() \
+             dst_ptr++; \
+             src_ptr += (h + src_jump); \
+          } \
+        src_ptr = src + (h - 1) - y - 1; \
+        dst_ptr += dst_jump; \
+     }
+
+#define CONVERT_LOOP2_START_ROT_0() \
+   src_ptr = src; \
+   for (y = 0; y < h; y++) \
+     { \
+        for (x = 0; x < w; x++) \
+          {
+
+#define CONVERT_LOOP2_INC_ROT_0() \
+src_ptr++; \
+x++;
+
+#define CONVERT_LOOP2_END_ROT_0() \
+             dst_ptr+=2; \
+             src_ptr++; \
+          } \
+        src_ptr += src_jump; \
+        dst_ptr += dst_jump; \
+     }
+
+#define CONVERT_LOOP2_START_ROT_180() \
+   src_ptr = src + (w - 1) + ((h - 1) * (w + src_jump)); \
+   for (y = 0; y < h; y++) \
+     { \
+        for (x = 0; x < w; x++) \
+          {
+
+#define CONVERT_LOOP2_INC_ROT_180() \
+src_ptr--; \
+x++;
+
+#define CONVERT_LOOP2_END_ROT_180() \
+             dst_ptr+=2; \
+             src_ptr--; \
+          } \
+        src_ptr = src + (w - 1) + ((h - y - 2) * (w + src_jump)); \
+        dst_ptr += dst_jump; \
+     }
+
+#define CONVERT_LOOP2_START_ROT_270() \
+   src_ptr = src + ((w - 1) * (h + src_jump)); \
+   for (y = 0; y < h; y++) \
+     { \
+        for (x = 0; x < w; x++) \
+          {
+
+#define CONVERT_LOOP2_INC_ROT_270() \
+src_ptr -= (h + src_jump); \
+x++;
+
+#define CONVERT_LOOP2_END_ROT_270() \
+             dst_ptr+=2; \
+             src_ptr -= (h + src_jump); \
+          } \
+        src_ptr = src + ((w - 1) * (h + src_jump)) + (y + 1); \
+        dst_ptr += dst_jump; \
+     }
+
+#define CONVERT_LOOP2_START_ROT_90() \
+   src_ptr = src + (h - 1); \
+   for (y = 0; y < h; y++) \
+     { \
+        for (x = 0; x < w; x++) \
+          {
+
+#define CONVERT_LOOP2_INC_ROT_90() \
+src_ptr += (h + src_jump); \
+x++;
+
+#define CONVERT_LOOP2_END_ROT_90() \
+             dst_ptr+=2; \
+             src_ptr += (h + src_jump); \
+          } \
+        src_ptr = src + (h - 1) - y - 1; \
+        dst_ptr += dst_jump; \
+     }
+
+#endif
diff --git a/src/love/love.h b/src/libraries/love.h
index 925ad0e..5964cde 100644
--- a/src/love/love.h
+++ b/src/libraries/love.h
@@ -78,7 +78,33 @@ love needs
     calling card
 */
 
-#include <Eina.h>
+#include "evas_macros.h"
+#include "evas_3d_utils.h"      // TODO - Hopefully I can convince the authors to make this public.
+
+#include "Runnr.h"
+
+
+typedef struct _vec4
+{
+    float   x;
+    float   y;
+    float   z;
+    float   w;
+} vec4;
+
+typedef struct _vec3
+{
+    float   x;
+    float   y;
+    float   z;
+} vec3;
+
+typedef struct _vec2
+{
+    float   x;
+    float   y;
+} vec2;
+
 
 typedef struct _material
 {
@@ -94,8 +120,8 @@ typedef struct _mesh
 {
   char          fileName[PATH_MAX];
   //type
-//  Evas_Vec3   pos;
-//  Evas_Vec4   rot;
+  vec3          pos;
+  vec4          rot;
   Eina_Inarray  materials;      // Material
   Eina_Inarray  parts;          // Mesh
 } Mesh;
@@ -107,7 +133,7 @@ typedef struct _stuffs
   union
   {
     Mesh        *mesh;
-//    script    *script;
+    script      *scrip; // Not a typo, C++ is fussy about reusing names like this.
     void        *other;
   } details;
 } Stuffs;
@@ -123,7 +149,7 @@ typedef struct _extantzStuffs
 {
   Stuffs        stuffs;
 //  Evas_3D_Mesh        *mesh;
-//  Evas_3D_Node        *mesh_node;
+//  Evas_3D_Node        *mesh_node;     // Multiple Evas_3D_Mesh's can be in one Evas_3D_Node
   Eina_Inarray  *materials;     // Evas_3D_Material
   Eina_Inarray  *textures;      // Evas_3D_Texture
 } ExtantzStuffs;
diff --git a/src/libraries/winFang.h b/src/libraries/winFang.h
index 7a84a7e..f2aebfd 100644
--- a/src/libraries/winFang.h
+++ b/src/libraries/winFang.h
@@ -2,9 +2,6 @@
 #define _WINFANG_H_
 
 
-#include <Eo.h>
-#include <Eina.h>
-#include <Evas.h>
 #include <Elementary.h>
 #include <EPhysics.h>
 
diff --git a/src/love/love.c b/src/love/love.c
index c727207..1a38e2b 100644
--- a/src/love/love.c
+++ b/src/love/love.c
@@ -4,9 +4,8 @@ Dedicated to my girl Boots, coz she means the world to me.
 
 */
 
-#include <Eet.h>
-#include <Ecore.h>
-#include <Ecore_Con.h>
+#include "LumbrJack.h"          // Have to include this first, to turn on the Eo and beta API stuff.
+
 #include <Ecore_Evas.h>
 #include <Ecore_File.h>
 #include <Edje.h>
@@ -16,8 +15,6 @@ Dedicated to my girl Boots, coz she means the world to me.
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "LumbrJack.h"
-#include "Runnr.h"
 #include "SledjHamr.h"
 #include "love.h"
 
diff --git a/src/purkle/build.lua b/src/purkle/build.lua
index 32ff522..baa70ae 100755
--- a/src/purkle/build.lua
+++ b/src/purkle/build.lua
@@ -15,7 +15,7 @@ end
 
 CFLAGS  = CFLAGS  .. ' -I../GuiLua'
 LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
-libs    = libs    .. ' -lGuiLua -lwinFang -lRunnr'
+libs    = libs    .. ' -lGuiLua'
 
 removeFiles(dir, {lib_d .. '/purkle.so'})
 
diff --git a/src/purkle/purkle.c b/src/purkle/purkle.c
index ec8997b..0dba5cb 100644
--- a/src/purkle/purkle.c
+++ b/src/purkle/purkle.c
@@ -1,5 +1,5 @@
+#include "LumbrJack.h"
 #include "GuiLua.h"
-#include "Runnr.h"
 #include "SledjHamr.h"