diff options
author | David Walter Seikel | 2014-05-24 03:16:41 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-24 03:16:41 +1000 |
commit | 0e6c3690bc6ac75521ba954def4e4367de364edd (patch) | |
tree | 20d4ad4dc4982f95a0a08c9e165af2f27ef685fa /src/love/love.h | |
parent | Ideas about how to deal with in world objects. Includes some entirely untest... (diff) | |
download | SledjHamr-0e6c3690bc6ac75521ba954def4e4367de364edd.zip SledjHamr-0e6c3690bc6ac75521ba954def4e4367de364edd.tar.gz SledjHamr-0e6c3690bc6ac75521ba954def4e4367de364edd.tar.bz2 SledjHamr-0e6c3690bc6ac75521ba954def4e4367de364edd.tar.xz |
Pretend to login, and some commenting out so it all compiles. Fix it up later.
Diffstat (limited to '')
-rw-r--r-- | src/love/love.h | 19 |
1 files changed, 14 insertions, 5 deletions
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 | ||