Merge pull request #14 from CrystalPointA4/feature/refactor_crystals

Feature/refactor crystals
2016-06-09 13:05:11 +02:00
parent 6bcd9b1426 3ed5331437
commit 0209c8b4e2
12 changed files with 4790 additions and 58 deletions
@@ -21,14 +21,18 @@
      "pos": [ 20, 5, 10 ],
      "scale": 0.01
  }],
-  "crystals": [
-    {
-      "file": "models/sphere/sphere.obj",
-      "pos": [ 33, 2, 31 ]
-    },
-    {
-      "file": "models/sphere/sphere.obj",
-      "pos": [ 45, 2, 31 ]
-    }
-  ]
+  "crystal": {
+    "full texture": "models/crystal/Crystal.obj",
+    "empty texture": "models/crystal/PickedUpCrystal.obj",
+    "instances": [
+      {
+        "pos": [ 31, 5, 33 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 40, 5, 40 ],
+        "rot": [ 0, 0, 0 ]
+      }
+    ]
+  }
 }