diff options
Diffstat (limited to '')
-rwxr-xr-x | src/extantz/build.lua | 2 | ||||
-rw-r--r-- | src/extantz/extantz.c | 6 | ||||
-rw-r--r-- | src/extantz/extantz.h | 1 | ||||
-rw-r--r-- | src/extantz/scenri.h | 2 | ||||
-rw-r--r-- | src/love/love.c | 1 | ||||
-rw-r--r-- | src/love/love.h | 19 |
6 files changed, 25 insertions, 6 deletions
diff --git a/src/extantz/build.lua b/src/extantz/build.lua index 99362d1..618de3f 100755 --- a/src/extantz/build.lua +++ b/src/extantz/build.lua | |||
@@ -13,7 +13,7 @@ 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' | 16 | CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua -I../love' |
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 -lwinFang -lRunnr' |
19 | 19 | ||
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 2ccb97c..e611e4d 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -11,6 +11,8 @@ static void on_pixels(void *data, Evas_Object *obj); | |||
11 | int logDom = -1; // Our logging domain. | 11 | int logDom = -1; // Our logging domain. |
12 | globals ourGlobals; | 12 | globals ourGlobals; |
13 | static Eina_Strbuf *serverStream; | 13 | static Eina_Strbuf *serverStream; |
14 | static char *myKey = "12345678-1234-4321-abcd-0123456789ab"; | ||
15 | //static char *myName = "onefang rejected"; | ||
14 | 16 | ||
15 | 17 | ||
16 | 18 | ||
@@ -20,6 +22,10 @@ static Eina_Bool _add(void *data, int type, Ecore_Con_Event_Server_Add *ev) | |||
20 | 22 | ||
21 | PI("Connected to love server."); | 23 | PI("Connected to love server."); |
22 | ourGlobals->server = ev->server; | 24 | ourGlobals->server = ev->server; |
25 | |||
26 | // Pretend we logged in. | ||
27 | strcpy(ourGlobals->uuid, myKey); | ||
28 | |||
23 | if (ourGlobals->LSLGuiMess) ourGlobals->LSLGuiMess->server = ourGlobals->server; | 29 | if (ourGlobals->LSLGuiMess) ourGlobals->LSLGuiMess->server = ourGlobals->server; |
24 | if (ourGlobals->purkle) ourGlobals->purkle->server = ourGlobals->server; | 30 | if (ourGlobals->purkle) ourGlobals->purkle->server = ourGlobals->server; |
25 | 31 | ||
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h index ca62bdc..1b49f45 100644 --- a/src/extantz/extantz.h +++ b/src/extantz/extantz.h | |||
@@ -235,6 +235,7 @@ typedef struct _globals | |||
235 | GuiLua *LSLGuiMess; | 235 | GuiLua *LSLGuiMess; |
236 | 236 | ||
237 | Ecore_Con_Server *server; | 237 | Ecore_Con_Server *server; |
238 | char uuid[42]; | ||
238 | 239 | ||
239 | } globals; | 240 | } globals; |
240 | 241 | ||
diff --git a/src/extantz/scenri.h b/src/extantz/scenri.h index 7889d22..93b3f16 100644 --- a/src/extantz/scenri.h +++ b/src/extantz/scenri.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _SCENRI_H_ | 1 | #ifndef _SCENRI_H_ |
2 | #define _SCENRI_H_ | 2 | #define _SCENRI_H_ |
3 | 3 | ||
4 | #include "love.h" | ||
5 | |||
4 | typedef struct _cameraMove | 6 | typedef struct _cameraMove |
5 | { | 7 | { |
6 | float x, y, z; | 8 | float x, y, z; |
diff --git a/src/love/love.c b/src/love/love.c index d194f11..c727207 100644 --- a/src/love/love.c +++ b/src/love/love.c | |||
@@ -19,6 +19,7 @@ Dedicated to my girl Boots, coz she means the world to me. | |||
19 | #include "LumbrJack.h" | 19 | #include "LumbrJack.h" |
20 | #include "Runnr.h" | 20 | #include "Runnr.h" |
21 | #include "SledjHamr.h" | 21 | #include "SledjHamr.h" |
22 | #include "love.h" | ||
22 | 23 | ||
23 | 24 | ||
24 | #define WIDTH (512) | 25 | #define WIDTH (512) |
diff --git a/src/love/love.h b/src/love/love.h index 223f43d..925ad0e 100644 --- a/src/love/love.h +++ b/src/love/love.h | |||
@@ -1,3 +1,8 @@ | |||
1 | #ifndef _LOVE_H_ | ||
2 | #define _LOVE_H_ | ||
3 | |||
4 | |||
5 | |||
1 | /* | 6 | /* |
2 | 7 | ||
3 | What do we need as an internal world object format? | 8 | What do we need as an internal world object format? |
@@ -73,6 +78,8 @@ love needs | |||
73 | calling card | 78 | calling card |
74 | */ | 79 | */ |
75 | 80 | ||
81 | #include <Eina.h> | ||
82 | |||
76 | typedef struct _material | 83 | typedef struct _material |
77 | { | 84 | { |
78 | int face; | 85 | int face; |
@@ -87,8 +94,8 @@ typedef struct _mesh | |||
87 | { | 94 | { |
88 | char fileName[PATH_MAX]; | 95 | char fileName[PATH_MAX]; |
89 | //type | 96 | //type |
90 | Evas_Vec3 pos; | 97 | // Evas_Vec3 pos; |
91 | Evas_Vec4 rot; | 98 | // Evas_Vec4 rot; |
92 | Eina_Inarray materials; // Material | 99 | Eina_Inarray materials; // Material |
93 | Eina_Inarray parts; // Mesh | 100 | Eina_Inarray parts; // Mesh |
94 | } Mesh; | 101 | } Mesh; |
@@ -100,7 +107,7 @@ typedef struct _stuffs | |||
100 | union | 107 | union |
101 | { | 108 | { |
102 | Mesh *mesh; | 109 | Mesh *mesh; |
103 | script *script; | 110 | // script *script; |
104 | void *other; | 111 | void *other; |
105 | } details; | 112 | } details; |
106 | } Stuffs; | 113 | } Stuffs; |
@@ -115,8 +122,8 @@ typedef struct _loveStuffs | |||
115 | typedef struct _extantzStuffs | 122 | typedef struct _extantzStuffs |
116 | { | 123 | { |
117 | Stuffs stuffs; | 124 | Stuffs stuffs; |
118 | Evas_3D_Mesh *mesh; | 125 | // Evas_3D_Mesh *mesh; |
119 | Evas_3D_Node *mesh_node; | 126 | // Evas_3D_Node *mesh_node; |
120 | Eina_Inarray *materials; // Evas_3D_Material | 127 | Eina_Inarray *materials; // Evas_3D_Material |
121 | Eina_Inarray *textures; // Evas_3D_Texture | 128 | Eina_Inarray *textures; // Evas_3D_Texture |
122 | } ExtantzStuffs; | 129 | } ExtantzStuffs; |
@@ -161,3 +168,5 @@ Extantz client starts up | |||
161 | changes that bit and stores on disk | 168 | changes that bit and stores on disk |
162 | send update nails commands to everyone/thing watching | 169 | send update nails commands to everyone/thing watching |
163 | */ | 170 | */ |
171 | |||
172 | #endif | ||