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.
 -------------------
 
 Dunno yet, just realised the need for this, will come up with something
-soon.
+soon.  Will solve this problem when we implement links, wont need it
+until then anyway.
+
+Obviously the count has to be kept with the real asset file, there's a
+few ways to go about that.  I've been thinking that the .sha1 file might
+be a good place to keep other meta data, like perhaps owner and group
+info.  So one way is to include the reference count there to.  Another
+option is a separate .ref file with the count inside.  A third option,
+just tack the count onto the end of a file name.  This is likely a bit
+quicker than updating a file.
 
 On disk structure.
 ------------------
 
 "some sim name" -> some%20sim%20name/index.omg
   list of stuffs rezzed in the sim
-    stuffs position, orientation, and size
+    stuffs position, size, and orientation
     relative file / URL name pointing to the stuffs
     no need for the in world name, those interested in that will likely grab the stuffs.omg file anyway
 
   "a stuffs" -> a%20stuffs.omg
     in world name, description
       list of stuffs similar to the sim index.omg, only this is for the various meshes that make up this stuffs.
-        stuffs position, orientation, and size, relative to this stuffs
+        stuffs position, size, and orientation, relative to this stuffs
         relative file / URL name pointing to the mesh and textures
         extra info for each material
 
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 @@
+Stuffs =
+{
+  name = "onefang's left testicle",
+  description = 'Just a pretend world for testing SledjHamr.',
+--  owner = '12345678-1234-4321-abcd-0123456789ab',
+  details = 
+  {
+    Mesh = 
+    {
+      kind = 'sphere',
+-- insert prim parameters here
+      materials = {'EarthDiffuse.png'},
+    },
+  },
+}
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 @@
-<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
-
+Stuffs =
+{
+  name = "Test sim",
+  description = 'onefangs test SledjHamr sim.',
+--  owner = '12345678-1234-4321-abcd-0123456789ab',
+  details = 
+  {
+    stuffs = 
+    {
+      Mesh = 
+      {
+        fileName = 'onefang%27s%20test%20bed.omg',
+        pos = {0.0, 4.0, 10.0},
+        size = {1.0, 1.0, 1.0},
+        rot = {1.0, 0.0, 0.0, 0.0},
+      },
+      Mesh = 
+      {
+        fileName = 'sonic.omg',
+        pos = {0.0, 0.0, 0.0},
+        size = {1.0, 1.0, 1.0},
+        rot = {-0.7071067811865475, 0.0, 0.0, 0.7071067811865475},
+      },
+      Mesh = 
+      {
+        fileName = 'earth.omg',
+        pos = {0.0, 0.0, 0.0},
+        size = {1.0, 1.0, 1.0},
+        rot = {1.0, 0.0, 0.0, 0.0},
+      },
+    },
+  },
+}
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 @@
 Stuffs =
 {
-  UUID = '5cb927d5-1304-4f1a-9947-308251ef2df0',
   name = "onefang's test bed",
   description = 'Just a pretend bed with MLP scripts for testing SledjHamr.',
-  owner = '12345678-1234-4321-abcd-0123456789ab',
+--  owner = '12345678-1234-4321-abcd-0123456789ab',
   details = 
   {
     Mesh = 
     {
-      fileName = 'cube.lua',
+      kind = 'cube',
       materials = {'normal_lego.png'},
+--[[
       parts = 
       {
         Mesh = 
         {
           fileName = 'sonic.md2',
---          pos = {1.23, 4.56, 789.0},
---          rot = { , , , ,},
+          pos = {1.23, 4.56, 789.0},
+          rot = { , , , ,},
           materials = {'sonic.png'},
         },
         Mesh = 
         {
-          fileName = 'earth.lua',
---          pos = {1.23, 4.56, 789.0},
---          rot = { , , , ,},
+          kind = 'earth',
+          pos = {1.23, 4.56, 789.0},
+          rot = { , , , ,},
           materials = {'EarthDiffuse.png'},
         },
       },
+]]
     },
   },
 }
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 @@
+Stuffs =
+{
+  name = "Sonic the bed hog.",
+  description = 'Just a pretend avatar for testing SledjHamr.',
+--  owner = '12345678-1234-4321-abcd-0123456789ab',
+  details = 
+  {
+    Mesh = 
+    {
+      fileName = 'sonic.md2',
+      materials = {'sonic.png'},
+    },
+  },
+}
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
   //type
   union
   {
-    Mesh        *mesh;
-    script      *scrip; // Not a typo, C++ is fussy about reusing names like this.
-    void        *other;
+    Eina_Inarray        stuffs;         // Stuffs in the sim
+    Mesh                *mesh;
+    script              *scrip; // Not a typo, C++ is fussy about reusing names like this.
+    void                *other;
   } details;
 } Stuffs;
 
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)
 
   // Compile and run scripts.
   gettimeofday(&startTime, NULL);
-  snprintf(buf, sizeof(buf), "%s/Test sim/objects", prefix_data_get());
+  snprintf(buf, sizeof(buf), "%s/Test%%20sim", prefix_data_get());
   eina_file_dir_list(buf, EINA_TRUE, dirList_compile, data);
 
   return ECORE_CALLBACK_RENEW;
@@ -410,7 +410,7 @@ static Eina_Bool _dataLuaSL(void *data, int type, Ecore_Con_Event_Server_Data *e
                         temp++;
                     temp[0] = '\0';
                     lineNo = atoi(line);
-                    snprintf(key, sizeof(key), "%s/Test sim/objects/onefang%%27s%%20test%%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/%s", prefix_data_get(), notecard);
+                    snprintf(key, sizeof(key), "%s/Test%%20sim/onefang%%27s%%20test%%20bed/%s", prefix_data_get(), notecard);
 
                     fd = open(key, O_RDONLY);
                     if (-1 != fd)