diff options
author | David Walter Seikel | 2014-05-28 15:53:17 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-28 15:53:17 +1000 |
commit | 635934fc038d034a1ae632a91609413a4181f106 (patch) | |
tree | 4e9fd19a576d5f0f73e817d9baaa98a1e6cbbed3 /src/libraries | |
parent | The UUID faking code is common enough to stick it in a macro. (diff) | |
download | SledjHamr-635934fc038d034a1ae632a91609413a4181f106.zip SledjHamr-635934fc038d034a1ae632a91609413a4181f106.tar.gz SledjHamr-635934fc038d034a1ae632a91609413a4181f106.tar.bz2 SledjHamr-635934fc038d034a1ae632a91609413a4181f106.tar.xz |
Some more in world object structure stuff and fixes.
Diffstat (limited to 'src/libraries')
-rw-r--r-- | src/libraries/love.h | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/libraries/love.h b/src/libraries/love.h index cf23f3c..c7f243f 100644 --- a/src/libraries/love.h +++ b/src/libraries/love.h | |||
@@ -107,11 +107,23 @@ typedef struct _vec2 | |||
107 | } vec2; | 107 | } vec2; |
108 | 108 | ||
109 | 109 | ||
110 | typedef enum | ||
111 | { | ||
112 | TT_NORMAL = -1 | ||
113 | } TextureType; | ||
114 | |||
115 | typedef enum | ||
116 | { | ||
117 | MT_CUBE, | ||
118 | MT_SPHERE | ||
119 | } MeshType; | ||
120 | |||
121 | |||
110 | typedef struct _material | 122 | typedef struct _material |
111 | { | 123 | { |
112 | int face; | 124 | int face; |
113 | //type? | 125 | TextureType type; |
114 | char texture[PATH_MAX]; | 126 | char texture[PATH_MAX]; |
115 | //colour | 127 | //colour |
116 | //alpha | 128 | //alpha |
117 | //other stuff | 129 | //other stuff |
@@ -120,16 +132,16 @@ typedef struct _material | |||
120 | typedef struct _mesh | 132 | typedef struct _mesh |
121 | { | 133 | { |
122 | char fileName[PATH_MAX]; | 134 | char fileName[PATH_MAX]; |
123 | //type | 135 | MeshType type; |
124 | vec3 pos; | 136 | vec3 pos; |
125 | vec4 rot; | 137 | vec4 rot; |
126 | Eina_Inarray materials; // Material | 138 | Eina_Inarray *materials; // Material |
127 | Eina_Inarray parts; // Mesh | 139 | Eina_Inarray *parts; // Mesh |
128 | } Mesh; | 140 | } Mesh; |
129 | 141 | ||
130 | typedef struct _stuffs | 142 | typedef struct _stuffs |
131 | { | 143 | { |
132 | char UUID[32], *name, *description, owner[32]; | 144 | char UUID[45], *name, *description, owner[45]; |
133 | //type | 145 | //type |
134 | union | 146 | union |
135 | { | 147 | { |
@@ -144,7 +156,7 @@ typedef struct _stuffs | |||
144 | typedef struct _loveStuffs | 156 | typedef struct _loveStuffs |
145 | { | 157 | { |
146 | Stuffs stuffs; | 158 | Stuffs stuffs; |
147 | Eina_Inarray contents; // Stuffs | 159 | Eina_Inarray *contents; // Stuffs |
148 | } LoveStuffs; | 160 | } LoveStuffs; |
149 | 161 | ||
150 | 162 | ||