Merge pull request #427 from KhronosGroup/instance-skin

Merge instanceSkin into node

specification/schema/examples/nodes.json

@@ -40,23 +40,13 @@
         },
         "skin_node_id": {
             "children": [],
-            "instanceSkin": {
-                "meshes": [
-                    "skin_mesh_id"
-                ],
-                "skeletons": [
-                    "joint id in skin"
-                ],
-                "skin": "skin_id",
-	            "extensions" : {
-	               "extension_name" : {
-	                  "extension specific" : "value"
-	               }
-	            },
-                "extras" : {
-                    "Application specific" : "The extra object can contain any properties."
-                }     
-            },
+            "meshes": [
+                "skin_mesh_id"
+            ],
+            "skeletons": [
+                "joint id in skin"
+            ],
+            "skin": "skin_id",
             "matrix": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ],
             "name": "user-defined name of skin node"
         },

specification/schema/node.schema.json

@@ -7,7 +7,7 @@
     "properties" : {
         "camera" : {
             "extends" : { "$ref" : "glTFid.schema.json" },
-            "description" : "The id (JSON property name) of the camera referenced by this node.  A node will have either the camera, light, meshes, or instanceSkin property defined."
+            "description" : "The id (JSON property name) of the camera referenced by this node.  A node will have either the camera, light, meshes, or skeletons/skin/meshes property defined."
         },
         "children" : {
             "type" : "array",
@@ -18,17 +18,25 @@
             "uniqueItems" : true,
             "default" : []
         },
-        "instanceSkin" : {
-            "extends" : { "$ref" : "nodeInstanceSkin.schema.json" },
-            "description" : "An instance of a skin."
+        "skeletons" : {
+            "type" : "array",
+            "description" : "The id (JSON property name) of skeleton nodes.  Each node defines a subtree, which has a jointName of the corresponding element in the referenced skin.joints.",
+            "items" : {
+                "$ref" : "glTFid.schema.json"
+            },
+            "uniqueItems" : true
+        },
+        "skin" : {
+            "extends" : { "$ref" : "glTFid.schema.json" },
+            "description" : "The id (JSON property name) of the skin referenced by this node."
         },
         "jointName" : {
             "extends" : { "$ref" : "glTFid.schema.json" },
-            "description" : "Name used when this node is a joint in a skin.  When this node is a skin, instanceSkin will also be defined."
+            "description" : "Name used when this node is a joint in a skin.  When this node is a skin, skeletons/skin/meshes will also be defined."
         },
         "light" : {
             "extends" : { "$ref" : "glTFid.schema.json" },
-            "description" : "The id (JSON property name) of the light referenced by this node.  A node will have either the camera, light, meshes, or instanceSkin property defined."
+            "description" : "The id (JSON property name) of the light referenced by this node.  A node will have either the camera, light, meshes, or skeletons/skin/meshes property defined."
         },
         "matrix" : {
             "type" : "array",
@@ -42,7 +50,7 @@
         },
         "meshes" : {
             "type" : "array",
-            "description" : "The ids (JSON property name) of the meshes in this node.  Multiple meshes are allowed so each can share the same transform matrix.  A node will have either the camera, light, meshes, or instanceSkin property defined.",
+            "description" : "The ids (JSON property name) of the meshes in this node.  Multiple meshes are allowed so each can share the same transform matrix.  A node will have either the camera, light, meshes, or skeletons/skin/meshes property defined.",
             "items" : {
                 "$ref" : "glTFid.schema.json"
             },
@@ -79,5 +87,11 @@
             "default" : [ 0.0, 0.0, 0.0 ]
         }
     },
+    "dependencies" : {
+        "skeletons" : "skin",
+        "skeletons" : "meshes",
+        "skin" : "skeletons",
+        "skin" : "meshes"
+    },
     "additionalProperties" : false
 }