From f0cce6bd0e7bfafcaf91df0dccd16f43cba1ea4b Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 1 Jun 2014 18:42:37 +1000
Subject: Get the from disk sim loading to work.

Still an odd problem with sonic that doesn't make sense.
---
 media/Test%20sim/earth.omg                    |  9 +++++++--
 media/Test%20sim/index.omg                    |  8 ++++----
 media/Test%20sim/onefang%27s%20test%20bed.omg | 23 +++++++++++++++++------
 media/Test%20sim/sonic.omg                    | 10 ++++++++--
 4 files changed, 36 insertions(+), 14 deletions(-)

(limited to 'media')

diff --git a/media/Test%20sim/earth.omg b/media/Test%20sim/earth.omg
index 94d2672..88b8430 100644
--- a/media/Test%20sim/earth.omg
+++ b/media/Test%20sim/earth.omg
@@ -2,14 +2,19 @@ Stuffs =
 {
   name = "onefang's left testicle",
   description = 'Just a pretend world for testing SledjHamr.',
---  owner = '12345678-1234-4321-abcd-0123456789ab',
+  fake = 2,
+  uuid  = '12345678-1234-4321-abcd-012345sphere',
+  owner = '12345678-1234-4321-abcd-0123456789ab',
   details = 
   {
     Mesh = 
     {
       kind = 'sphere',
 -- insert prim parameters here
-      materials = {'EarthDiffuse.png'},
+      materials =
+      {
+        [0] = {kind = 'face', texture = 'EarthDiffuse.png'},
+      },
     },
   },
 }
diff --git a/media/Test%20sim/index.omg b/media/Test%20sim/index.omg
index 78148a1..c9d3b71 100644
--- a/media/Test%20sim/index.omg
+++ b/media/Test%20sim/index.omg
@@ -2,26 +2,26 @@ Stuffs =
 {
   name = "Test sim",
   description = 'onefangs test SledjHamr sim.',
---  owner = '12345678-1234-4321-abcd-0123456789ab',
+  owner = '12345678-1234-4321-abcd-0123456789ab',
   details = 
   {
     stuffs = 
     {
-      Mesh = 
+      ['onefang%27s%20test%20bed'] = 
       {
         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 = 
+      ['sonic'] = 
       {
         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 = 
+      ['earth'] = 
       {
         fileName = 'earth.omg',
         pos = {0.0, 0.0, 0.0},
diff --git a/media/Test%20sim/onefang%27s%20test%20bed.omg b/media/Test%20sim/onefang%27s%20test%20bed.omg
index d1dcca0..1e86837 100644
--- a/media/Test%20sim/onefang%27s%20test%20bed.omg
+++ b/media/Test%20sim/onefang%27s%20test%20bed.omg
@@ -2,29 +2,40 @@ Stuffs =
 {
   name = "onefang's test bed",
   description = 'Just a pretend bed with MLP scripts for testing SledjHamr.',
---  owner = '12345678-1234-4321-abcd-0123456789ab',
+  fake = 1,
+  uuid  = '12345678-1234-4321-abcd-01234567cube',
+  owner = '12345678-1234-4321-abcd-0123456789ab',
   details = 
   {
     Mesh = 
     {
       kind = 'cube',
-      materials = {'normal_lego.png'},
+      materials =
+      {
+        [0] = {kind = 'normal', texture = 'normal_lego.png'},
+      },
 --[[
       parts = 
       {
-        Mesh = 
+        ['sonic'] = 
         {
           fileName = 'sonic.md2',
           pos = {1.23, 4.56, 789.0},
           rot = { , , , ,},
-          materials = {'sonic.png'},
+          materials =
+          {
+            [0] = {kind = 'face', texture = 'sonic.png'},
+          },
         },
-        Mesh = 
+        ['earth'] = 
         {
           kind = 'earth',
           pos = {1.23, 4.56, 789.0},
           rot = { , , , ,},
-          materials = {'EarthDiffuse.png'},
+          materials =
+          {
+            [0] = {kind = 'face', texture = 'EarthDiffuse.png'},
+          },
         },
       },
 ]]
diff --git a/media/Test%20sim/sonic.omg b/media/Test%20sim/sonic.omg
index fad5b11..1b33e4f 100644
--- a/media/Test%20sim/sonic.omg
+++ b/media/Test%20sim/sonic.omg
@@ -2,13 +2,19 @@ Stuffs =
 {
   name = "Sonic the bed hog.",
   description = 'Just a pretend avatar for testing SledjHamr.',
---  owner = '12345678-1234-4321-abcd-0123456789ab',
+  fake = 3,
+  uuid  = '12345678-1234-4321-abcd-0123456sonic',
+  owner = '12345678-1234-4321-abcd-0123456789ab',
   details = 
   {
     Mesh = 
     {
       fileName = 'sonic.md2',
-      materials = {'sonic.png'},
+      kind = 'mesh',
+      materials =
+      {
+        [0] = {kind = 'face', texture = 'sonic.png'},
+      },
     },
   },
 }
-- 
cgit v1.1