diff options
Diffstat (limited to '')
-rw-r--r-- | src/libraries/love.h (renamed from src/love/love.h) | 36 | ||||
-rw-r--r-- | src/love/love.c | 7 |
2 files changed, 33 insertions, 10 deletions
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 | |||
78 | calling card | 78 | calling card |
79 | */ | 79 | */ |
80 | 80 | ||
81 | #include <Eina.h> | 81 | #include "evas_macros.h" |
82 | #include "evas_3d_utils.h" // TODO - Hopefully I can convince the authors to make this public. | ||
83 | |||
84 | #include "Runnr.h" | ||
85 | |||
86 | |||
87 | typedef struct _vec4 | ||
88 | { | ||
89 | float x; | ||
90 | float y; | ||
91 | float z; | ||
92 | float w; | ||
93 | } vec4; | ||
94 | |||
95 | typedef struct _vec3 | ||
96 | { | ||
97 | float x; | ||
98 | float y; | ||
99 | float z; | ||
100 | } vec3; | ||
101 | |||
102 | typedef struct _vec2 | ||
103 | { | ||
104 | float x; | ||
105 | float y; | ||
106 | } vec2; | ||
107 | |||
82 | 108 | ||
83 | typedef struct _material | 109 | typedef struct _material |
84 | { | 110 | { |
@@ -94,8 +120,8 @@ typedef struct _mesh | |||
94 | { | 120 | { |
95 | char fileName[PATH_MAX]; | 121 | char fileName[PATH_MAX]; |
96 | //type | 122 | //type |
97 | // Evas_Vec3 pos; | 123 | vec3 pos; |
98 | // Evas_Vec4 rot; | 124 | vec4 rot; |
99 | Eina_Inarray materials; // Material | 125 | Eina_Inarray materials; // Material |
100 | Eina_Inarray parts; // Mesh | 126 | Eina_Inarray parts; // Mesh |
101 | } Mesh; | 127 | } Mesh; |
@@ -107,7 +133,7 @@ typedef struct _stuffs | |||
107 | union | 133 | union |
108 | { | 134 | { |
109 | Mesh *mesh; | 135 | Mesh *mesh; |
110 | // script *script; | 136 | script *scrip; // Not a typo, C++ is fussy about reusing names like this. |
111 | void *other; | 137 | void *other; |
112 | } details; | 138 | } details; |
113 | } Stuffs; | 139 | } Stuffs; |
@@ -123,7 +149,7 @@ typedef struct _extantzStuffs | |||
123 | { | 149 | { |
124 | Stuffs stuffs; | 150 | Stuffs stuffs; |
125 | // Evas_3D_Mesh *mesh; | 151 | // Evas_3D_Mesh *mesh; |
126 | // Evas_3D_Node *mesh_node; | 152 | // Evas_3D_Node *mesh_node; // Multiple Evas_3D_Mesh's can be in one Evas_3D_Node |
127 | Eina_Inarray *materials; // Evas_3D_Material | 153 | Eina_Inarray *materials; // Evas_3D_Material |
128 | Eina_Inarray *textures; // Evas_3D_Texture | 154 | Eina_Inarray *textures; // Evas_3D_Texture |
129 | } ExtantzStuffs; | 155 | } ExtantzStuffs; |
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. | |||
4 | 4 | ||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <Eet.h> | 7 | #include "LumbrJack.h" // Have to include this first, to turn on the Eo and beta API stuff. |
8 | #include <Ecore.h> | 8 | |
9 | #include <Ecore_Con.h> | ||
10 | #include <Ecore_Evas.h> | 9 | #include <Ecore_Evas.h> |
11 | #include <Ecore_File.h> | 10 | #include <Ecore_File.h> |
12 | #include <Edje.h> | 11 | #include <Edje.h> |
@@ -16,8 +15,6 @@ Dedicated to my girl Boots, coz she means the world to me. | |||
16 | #include <sys/stat.h> | 15 | #include <sys/stat.h> |
17 | #include <fcntl.h> | 16 | #include <fcntl.h> |
18 | 17 | ||
19 | #include "LumbrJack.h" | ||
20 | #include "Runnr.h" | ||
21 | #include "SledjHamr.h" | 18 | #include "SledjHamr.h" |
22 | #include "love.h" | 19 | #include "love.h" |
23 | 20 | ||