From 0e6c3690bc6ac75521ba954def4e4367de364edd Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sat, 24 May 2014 03:16:41 +1000 Subject: Pretend to login, and some commenting out so it all compiles. Fix it up later. --- src/extantz/build.lua | 2 +- src/extantz/extantz.c | 6 ++++++ src/extantz/extantz.h | 1 + src/extantz/scenri.h | 2 ++ src/love/love.c | 1 + src/love/love.h | 19 ++++++++++++++----- 6 files changed, 25 insertions(+), 6 deletions(-) (limited to 'src') 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 dir = workingDir end -CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua' +CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua -I../love' LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' libs = libs .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua -lwinFang -lRunnr' 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); int logDom = -1; // Our logging domain. globals ourGlobals; static Eina_Strbuf *serverStream; +static char *myKey = "12345678-1234-4321-abcd-0123456789ab"; +//static char *myName = "onefang rejected"; @@ -20,6 +22,10 @@ static Eina_Bool _add(void *data, int type, Ecore_Con_Event_Server_Add *ev) PI("Connected to love server."); ourGlobals->server = ev->server; + + // Pretend we logged in. + strcpy(ourGlobals->uuid, myKey); + if (ourGlobals->LSLGuiMess) ourGlobals->LSLGuiMess->server = ourGlobals->server; if (ourGlobals->purkle) ourGlobals->purkle->server = ourGlobals->server; 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 GuiLua *LSLGuiMess; Ecore_Con_Server *server; + char uuid[42]; } globals; 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 @@ #ifndef _SCENRI_H_ #define _SCENRI_H_ +#include "love.h" + typedef struct _cameraMove { 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. #include "LumbrJack.h" #include "Runnr.h" #include "SledjHamr.h" +#include "love.h" #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 @@ +#ifndef _LOVE_H_ +#define _LOVE_H_ + + + /* What do we need as an internal world object format? @@ -73,6 +78,8 @@ love needs calling card */ +#include + typedef struct _material { int face; @@ -87,8 +94,8 @@ typedef struct _mesh { char fileName[PATH_MAX]; //type - Evas_Vec3 pos; - Evas_Vec4 rot; +// Evas_Vec3 pos; +// Evas_Vec4 rot; Eina_Inarray materials; // Material Eina_Inarray parts; // Mesh } Mesh; @@ -100,7 +107,7 @@ typedef struct _stuffs union { Mesh *mesh; - script *script; +// script *script; void *other; } details; } Stuffs; @@ -115,8 +122,8 @@ typedef struct _loveStuffs typedef struct _extantzStuffs { Stuffs stuffs; - Evas_3D_Mesh *mesh; - Evas_3D_Node *mesh_node; +// Evas_3D_Mesh *mesh; +// Evas_3D_Node *mesh_node; Eina_Inarray *materials; // Evas_3D_Material Eina_Inarray *textures; // Evas_3D_Texture } ExtantzStuffs; @@ -161,3 +168,5 @@ Extantz client starts up changes that bit and stores on disk send update nails commands to everyone/thing watching */ + +#endif -- cgit v1.1