diff options
Diffstat (limited to '')
-rw-r--r-- | docs/love.txt | 15 | ||||
-rw-r--r-- | media/Test%20sim/earth.lua | 15 | ||||
-rw-r--r-- | media/Test%20sim/index.omg | 35 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed.omg (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0.omg) | 17 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/.MENUITEMS (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.MENUITEMS) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/.POSITIONS (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.POSITIONS) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/.PROPS.example (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.PROPS.example) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/.SEQUENCES.example (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.SEQUENCES.example) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/.readme (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.readme) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/index.omg (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/index.omg) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~ball/index.omg (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~ball/index.omg) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~ball/~ball.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~ball/~ball.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~memory.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~memory.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~menu.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menu.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~menucfg.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menucfg.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~pos.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~pos.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~pose.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~pose.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~poser 1.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 1.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~poser 2.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 2.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~poser 3.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 3.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~poser 4.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 4.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~poser 5.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 5.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~poser.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~props.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~props.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/onefang%27s%20test%20bed/~run.lsl (renamed from media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~run.lsl) | 0 | ||||
-rw-r--r-- | media/Test%20sim/sonic.omg | 14 | ||||
-rw-r--r-- | media/Test%20sim/test/test.lsl (renamed from media/Test%20sim/objects/test.lsl) | 0 | ||||
-rw-r--r-- | src/libraries/love.h | 7 | ||||
-rw-r--r-- | src/love/love.c | 4 |
29 files changed, 89 insertions, 18 deletions
diff --git a/docs/love.txt b/docs/love.txt index f460a71..e21b18b 100644 --- a/docs/love.txt +++ b/docs/love.txt | |||
@@ -174,21 +174,30 @@ Reference counting. | |||
174 | ------------------- | 174 | ------------------- |
175 | 175 | ||
176 | Dunno yet, just realised the need for this, will come up with something | 176 | Dunno yet, just realised the need for this, will come up with something |
177 | soon. | 177 | soon. Will solve this problem when we implement links, wont need it |
178 | until then anyway. | ||
179 | |||
180 | Obviously the count has to be kept with the real asset file, there's a | ||
181 | few ways to go about that. I've been thinking that the .sha1 file might | ||
182 | be a good place to keep other meta data, like perhaps owner and group | ||
183 | info. So one way is to include the reference count there to. Another | ||
184 | option is a separate .ref file with the count inside. A third option, | ||
185 | just tack the count onto the end of a file name. This is likely a bit | ||
186 | quicker than updating a file. | ||
178 | 187 | ||
179 | On disk structure. | 188 | On disk structure. |
180 | ------------------ | 189 | ------------------ |
181 | 190 | ||
182 | "some sim name" -> some%20sim%20name/index.omg | 191 | "some sim name" -> some%20sim%20name/index.omg |
183 | list of stuffs rezzed in the sim | 192 | list of stuffs rezzed in the sim |
184 | stuffs position, orientation, and size | 193 | stuffs position, size, and orientation |
185 | relative file / URL name pointing to the stuffs | 194 | relative file / URL name pointing to the stuffs |
186 | no need for the in world name, those interested in that will likely grab the stuffs.omg file anyway | 195 | no need for the in world name, those interested in that will likely grab the stuffs.omg file anyway |
187 | 196 | ||
188 | "a stuffs" -> a%20stuffs.omg | 197 | "a stuffs" -> a%20stuffs.omg |
189 | in world name, description | 198 | in world name, description |
190 | list of stuffs similar to the sim index.omg, only this is for the various meshes that make up this stuffs. | 199 | list of stuffs similar to the sim index.omg, only this is for the various meshes that make up this stuffs. |
191 | stuffs position, orientation, and size, relative to this stuffs | 200 | stuffs position, size, and orientation, relative to this stuffs |
192 | relative file / URL name pointing to the mesh and textures | 201 | relative file / URL name pointing to the mesh and textures |
193 | extra info for each material | 202 | extra info for each material |
194 | 203 | ||
diff --git a/media/Test%20sim/earth.lua b/media/Test%20sim/earth.lua new file mode 100644 index 0000000..94d2672 --- /dev/null +++ b/media/Test%20sim/earth.lua | |||
@@ -0,0 +1,15 @@ | |||
1 | Stuffs = | ||
2 | { | ||
3 | name = "onefang's left testicle", | ||
4 | description = 'Just a pretend world for testing SledjHamr.', | ||
5 | -- owner = '12345678-1234-4321-abcd-0123456789ab', | ||
6 | details = | ||
7 | { | ||
8 | Mesh = | ||
9 | { | ||
10 | kind = 'sphere', | ||
11 | -- insert prim parameters here | ||
12 | materials = {'EarthDiffuse.png'}, | ||
13 | }, | ||
14 | }, | ||
15 | } | ||
diff --git a/media/Test%20sim/index.omg b/media/Test%20sim/index.omg index afb422a..78148a1 100644 --- a/media/Test%20sim/index.omg +++ b/media/Test%20sim/index.omg | |||
@@ -1,2 +1,33 @@ | |||
1 | <125.432899,128.229706,3500.5> <0.5,5.,5.> <0.,270.,180.> objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/index.omg | 1 | Stuffs = |
2 | 2 | { | |
3 | name = "Test sim", | ||
4 | description = 'onefangs test SledjHamr sim.', | ||
5 | -- owner = '12345678-1234-4321-abcd-0123456789ab', | ||
6 | details = | ||
7 | { | ||
8 | stuffs = | ||
9 | { | ||
10 | Mesh = | ||
11 | { | ||
12 | fileName = 'onefang%27s%20test%20bed.omg', | ||
13 | pos = {0.0, 4.0, 10.0}, | ||
14 | size = {1.0, 1.0, 1.0}, | ||
15 | rot = {1.0, 0.0, 0.0, 0.0}, | ||
16 | }, | ||
17 | Mesh = | ||
18 | { | ||
19 | fileName = 'sonic.omg', | ||
20 | pos = {0.0, 0.0, 0.0}, | ||
21 | size = {1.0, 1.0, 1.0}, | ||
22 | rot = {-0.7071067811865475, 0.0, 0.0, 0.7071067811865475}, | ||
23 | }, | ||
24 | Mesh = | ||
25 | { | ||
26 | fileName = 'earth.omg', | ||
27 | pos = {0.0, 0.0, 0.0}, | ||
28 | size = {1.0, 1.0, 1.0}, | ||
29 | rot = {1.0, 0.0, 0.0, 0.0}, | ||
30 | }, | ||
31 | }, | ||
32 | }, | ||
33 | } | ||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0.omg b/media/Test%20sim/onefang%27s%20test%20bed.omg index 5e2df27..d1dcca0 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0.omg +++ b/media/Test%20sim/onefang%27s%20test%20bed.omg | |||
@@ -1,32 +1,33 @@ | |||
1 | Stuffs = | 1 | Stuffs = |
2 | { | 2 | { |
3 | UUID = '5cb927d5-1304-4f1a-9947-308251ef2df0', | ||
4 | name = "onefang's test bed", | 3 | name = "onefang's test bed", |
5 | description = 'Just a pretend bed with MLP scripts for testing SledjHamr.', | 4 | description = 'Just a pretend bed with MLP scripts for testing SledjHamr.', |
6 | owner = '12345678-1234-4321-abcd-0123456789ab', | 5 | -- owner = '12345678-1234-4321-abcd-0123456789ab', |
7 | details = | 6 | details = |
8 | { | 7 | { |
9 | Mesh = | 8 | Mesh = |
10 | { | 9 | { |
11 | fileName = 'cube.lua', | 10 | kind = 'cube', |
12 | materials = {'normal_lego.png'}, | 11 | materials = {'normal_lego.png'}, |
12 | --[[ | ||
13 | parts = | 13 | parts = |
14 | { | 14 | { |
15 | Mesh = | 15 | Mesh = |
16 | { | 16 | { |
17 | fileName = 'sonic.md2', | 17 | fileName = 'sonic.md2', |
18 | -- pos = {1.23, 4.56, 789.0}, | 18 | pos = {1.23, 4.56, 789.0}, |
19 | -- rot = { , , , ,}, | 19 | rot = { , , , ,}, |
20 | materials = {'sonic.png'}, | 20 | materials = {'sonic.png'}, |
21 | }, | 21 | }, |
22 | Mesh = | 22 | Mesh = |
23 | { | 23 | { |
24 | fileName = 'earth.lua', | 24 | kind = 'earth', |
25 | -- pos = {1.23, 4.56, 789.0}, | 25 | pos = {1.23, 4.56, 789.0}, |
26 | -- rot = { , , , ,}, | 26 | rot = { , , , ,}, |
27 | materials = {'EarthDiffuse.png'}, | 27 | materials = {'EarthDiffuse.png'}, |
28 | }, | 28 | }, |
29 | }, | 29 | }, |
30 | ]] | ||
30 | }, | 31 | }, |
31 | }, | 32 | }, |
32 | } | 33 | } |
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.MENUITEMS b/media/Test%20sim/onefang%27s%20test%20bed/.MENUITEMS index 3ea96ee..3ea96ee 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.MENUITEMS +++ b/media/Test%20sim/onefang%27s%20test%20bed/.MENUITEMS | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.POSITIONS b/media/Test%20sim/onefang%27s%20test%20bed/.POSITIONS index 0d55a63..0d55a63 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.POSITIONS +++ b/media/Test%20sim/onefang%27s%20test%20bed/.POSITIONS | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.PROPS.example b/media/Test%20sim/onefang%27s%20test%20bed/.PROPS.example index e76c9bf..e76c9bf 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.PROPS.example +++ b/media/Test%20sim/onefang%27s%20test%20bed/.PROPS.example | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.SEQUENCES.example b/media/Test%20sim/onefang%27s%20test%20bed/.SEQUENCES.example index fcc1318..fcc1318 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.SEQUENCES.example +++ b/media/Test%20sim/onefang%27s%20test%20bed/.SEQUENCES.example | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.readme b/media/Test%20sim/onefang%27s%20test%20bed/.readme index 182545b..182545b 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/.readme +++ b/media/Test%20sim/onefang%27s%20test%20bed/.readme | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/index.omg b/media/Test%20sim/onefang%27s%20test%20bed/index.omg index a2dcaad..a2dcaad 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/index.omg +++ b/media/Test%20sim/onefang%27s%20test%20bed/index.omg | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~ball/index.omg b/media/Test%20sim/onefang%27s%20test%20bed/~ball/index.omg index ea9d81b..ea9d81b 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~ball/index.omg +++ b/media/Test%20sim/onefang%27s%20test%20bed/~ball/index.omg | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~ball/~ball.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~ball/~ball.lsl index ff5cca3..ff5cca3 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~ball/~ball.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~ball/~ball.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~memory.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~memory.lsl index 17f777d..17f777d 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~memory.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~memory.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menu.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~menu.lsl index e733e96..e733e96 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menu.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~menu.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menucfg.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~menucfg.lsl index 03e1b0f..03e1b0f 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menucfg.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~menucfg.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~pos.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~pos.lsl index 3b93b64..3b93b64 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~pos.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~pos.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~pose.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~pose.lsl index 26ab5ff..26ab5ff 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~pose.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~pose.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 1.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~poser 1.lsl index fc976c4..fc976c4 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 1.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~poser 1.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 2.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~poser 2.lsl index fc976c4..fc976c4 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 2.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~poser 2.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 3.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~poser 3.lsl index fc976c4..fc976c4 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 3.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~poser 3.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 4.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~poser 4.lsl index fc976c4..fc976c4 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 4.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~poser 4.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 5.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~poser 5.lsl index fc976c4..fc976c4 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser 5.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~poser 5.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~poser.lsl index fc976c4..fc976c4 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~poser.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~poser.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~props.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~props.lsl index a731d77..a731d77 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~props.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~props.lsl | |||
diff --git a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~run.lsl b/media/Test%20sim/onefang%27s%20test%20bed/~run.lsl index 2d56983..2d56983 100644 --- a/media/Test%20sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~run.lsl +++ b/media/Test%20sim/onefang%27s%20test%20bed/~run.lsl | |||
diff --git a/media/Test%20sim/sonic.omg b/media/Test%20sim/sonic.omg new file mode 100644 index 0000000..fad5b11 --- /dev/null +++ b/media/Test%20sim/sonic.omg | |||
@@ -0,0 +1,14 @@ | |||
1 | Stuffs = | ||
2 | { | ||
3 | name = "Sonic the bed hog.", | ||
4 | description = 'Just a pretend avatar for testing SledjHamr.', | ||
5 | -- owner = '12345678-1234-4321-abcd-0123456789ab', | ||
6 | details = | ||
7 | { | ||
8 | Mesh = | ||
9 | { | ||
10 | fileName = 'sonic.md2', | ||
11 | materials = {'sonic.png'}, | ||
12 | }, | ||
13 | }, | ||
14 | } | ||
diff --git a/media/Test%20sim/objects/test.lsl b/media/Test%20sim/test/test.lsl index 6e1d915..6e1d915 100644 --- a/media/Test%20sim/objects/test.lsl +++ b/media/Test%20sim/test/test.lsl | |||
diff --git a/src/libraries/love.h b/src/libraries/love.h index f75d5e7..cbd4c80 100644 --- a/src/libraries/love.h +++ b/src/libraries/love.h | |||
@@ -132,9 +132,10 @@ typedef struct _stuffs | |||
132 | //type | 132 | //type |
133 | union | 133 | union |
134 | { | 134 | { |
135 | Mesh *mesh; | 135 | Eina_Inarray stuffs; // Stuffs in the sim |
136 | script *scrip; // Not a typo, C++ is fussy about reusing names like this. | 136 | Mesh *mesh; |
137 | void *other; | 137 | script *scrip; // Not a typo, C++ is fussy about reusing names like this. |
138 | void *other; | ||
138 | } details; | 139 | } details; |
139 | } Stuffs; | 140 | } Stuffs; |
140 | 141 | ||
diff --git a/src/love/love.c b/src/love/love.c index 1a38e2b..dc27d9c 100644 --- a/src/love/love.c +++ b/src/love/love.c | |||
@@ -163,7 +163,7 @@ static Eina_Bool _addLuaSL(void *data, int type, Ecore_Con_Event_Server_Add *ev) | |||
163 | 163 | ||
164 | // Compile and run scripts. | 164 | // Compile and run scripts. |
165 | gettimeofday(&startTime, NULL); | 165 | gettimeofday(&startTime, NULL); |
166 | snprintf(buf, sizeof(buf), "%s/Test sim/objects", prefix_data_get()); | 166 | snprintf(buf, sizeof(buf), "%s/Test%%20sim", prefix_data_get()); |
167 | eina_file_dir_list(buf, EINA_TRUE, dirList_compile, data); | 167 | eina_file_dir_list(buf, EINA_TRUE, dirList_compile, data); |
168 | 168 | ||
169 | return ECORE_CALLBACK_RENEW; | 169 | return ECORE_CALLBACK_RENEW; |
@@ -410,7 +410,7 @@ static Eina_Bool _dataLuaSL(void *data, int type, Ecore_Con_Event_Server_Data *e | |||
410 | temp++; | 410 | temp++; |
411 | temp[0] = '\0'; | 411 | temp[0] = '\0'; |
412 | lineNo = atoi(line); | 412 | lineNo = atoi(line); |
413 | snprintf(key, sizeof(key), "%s/Test sim/objects/onefang%%27s%%20test%%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/%s", prefix_data_get(), notecard); | 413 | snprintf(key, sizeof(key), "%s/Test%%20sim/onefang%%27s%%20test%%20bed/%s", prefix_data_get(), notecard); |
414 | 414 | ||
415 | fd = open(key, O_RDONLY); | 415 | fd = open(key, O_RDONLY); |
416 | if (-1 != fd) | 416 | if (-1 != fd) |