Big include and libraries clean up.

5 files changed, 249 insertions, 9 deletions

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>