collada-dae-parser - npm Package Compare versions

Comparing version 0.11.2 to 0.12.0

package.json

 {
   "name": "collada-dae-parser",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "Parse collada .dae 3d animation files into json",
@@ -5,0 +5,0 @@ "main": "src/parse-collada.js",

src/library_animations/parse-skeletal-animations.js

@@ -8,3 +8,3 @@ var mat4Multiply = require('gl-mat4/multiply')
 /**
- * Parse skinned animations from the library_animations section of the collada file.
+ * Parse skinned animations from the libraryAnimations section of the collada file.
  * We only handle skinned animations here, regular location/rotation/scale animations
@@ -18,4 +18,4 @@ * that apply to the entire mesh are handled in parse-loc-rot-scale.js
  */
-function parseLibraryAnimations (library_animations, jointBindPoses, visualSceneData, jointNamePositionIndex) {
-  var animations = library_animations[0].animation
+function parseLibraryAnimations (libraryAnimations, jointInverseBindPoses, visualSceneData, jointNamePositionIndex) {
+  var animations = libraryAnimations[0].animation
   var allKeyframes = {}
@@ -63,3 +63,3 @@ var keyframeJointMatrices = {}
         // Multiply our joint's inverse bind matrix
-        mat4Multiply(jointWorldMatrix, jointBindPoses[animatedJointName], jointWorldMatrix)
+        mat4Multiply(jointWorldMatrix, jointInverseBindPoses[jointNamePositionIndex[animatedJointName]], jointWorldMatrix)
 
@@ -66,0 +66,0 @@ // Turn our row major matrix into a column major matrix. OpenGL uses column major

src/library_controllers/parse-library-controllers.js

@@ -39,4 +39,6 @@ var mat4Multiply = require('gl-mat4/multiply')
 
-    // The matrices that transform each of our joints to their bind pose
-    var jointBindPoses = {}
+    // The matrices that transforms each of our joints from world space to model space.
+    // You typically multiply this with all parent joint bind poses.
+    // We do this in `parse-skeletal-animations.js`
+    var jointInverseBindPoses = {}
 
@@ -62,3 +64,3 @@ var bindPoses = controller[0].skin[0].source[1].float_array[0]._.split(' ').map(Number)
       mat4Multiply(bindPose, bindShapeMatrix, bindPose)
-      jointBindPoses[jointName] = bindPose
+      jointInverseBindPoses[index] = bindPose
       jointNamePositionIndex[jointName] = index
@@ -71,3 +73,3 @@ })
   return {
-    jointBindPoses: jointBindPoses,
+    jointInverseBindPoses: jointInverseBindPoses,
     jointNamePositionIndex: jointNamePositionIndex,
@@ -74,0 +76,0 @@ vertexJointWeights: parsedVertexJointWeights

src/library_visual_scenes/parse-visual-scenes.js

@@ -38,2 +38,5 @@ module.exports = ParseVisualScenes
     accumulator[joint.$.sid] = accumulator[joint.$.sid] || {}
+    // The bind pose of the matrix. We don't make use of this right now, but you would
+    // use it to render a model in bind pose. Right now we only render the model based on
+    // their animated joint positions, so we ignore this bind pose data
     accumulator[joint.$.sid].jointMatrix = joint.matrix[0]._.split(' ').map(Number)
@@ -40,0 +43,0 @@ accumulator[joint.$.sid].parent = parentJointName

src/parse-collada.js

@@ -23,13 +23,14 @@ var xmlparser = require('xml-parser')
 
-  var jointBindPoses
+  var jointInverseBindPoses
   var controllerData
   if (result.COLLADA.library_controllers) {
     controllerData = parseLibraryControllers(result.COLLADA.library_controllers)
-    if (controllerData.vertexJointWeights && Object.keys(controllerData.vertexJointWeights) .length > 0) {
+    if (controllerData.vertexJointWeights && Object.keys(controllerData.vertexJointWeights).length > 0) {
       parsedObject.vertexJointWeights = controllerData.vertexJointWeights
       parsedObject.jointNamePositionIndex = controllerData.jointNamePositionIndex
-      jointBindPoses = controllerData.jointBindPoses
+      parsedObject.jointInverseBindPoses = controllerData.jointInverseBindPoses
+      jointInverseBindPoses = controllerData.jointInverseBindPoses
 
       // The parser only supports deformation bones. Control bones' affects must be baked in before exporting
-      validateNoControlBones(Object.keys(visualSceneData.jointRelationships), Object.keys(jointBindPoses))
+      validateNoControlBones(Object.keys(visualSceneData.jointRelationships), Object.keys(jointInverseBindPoses))
     }
@@ -44,3 +45,3 @@ }
     }
-    var keyframes = parseSkeletalAnimations(result.COLLADA.library_animations, jointBindPoses, visualSceneData, controllerData.jointNamePositionIndex)
+    var keyframes = parseSkeletalAnimations(result.COLLADA.library_animations, jointInverseBindPoses, visualSceneData, controllerData.jointNamePositionIndex)
     if (Object.keys(keyframes).length > 0) {
@@ -47,0 +48,0 @@ parsedObject.keyframes = keyframes

test/expected/animated-letter-f.js

@@ -6,2 +6,3 @@ // A 3d letter f
 module.exports = {
+  jointInverseBindPoses: { 0: [ 0.2406798, 0, 0, 0, 0, 0, 0.2406798, 0, 0, -0.2406798, 0, 0, 0, 0, 0, 1 ], 1: [ 0, -0.2406798, 0, 0, 0.2406798, 0, 0, 0, 0, 0, 0.2406798, -1, 0, 0, 0, 1 ] },
   jointNamePositionIndex: { Bone: 0, Bone_001: 1 },
@@ -8,0 +9,0 @@ keyframes: {

test/expected/parent-child-child-letter-f.js

@@ -13,3 +13,4 @@ // Letter F animated with a parent -> child -> child
   vertexPositions: [ 1, 1, -1, 1, -1, -1, -1, -0.9999998, -1, -0.9999997, 1, -1, 1, 0.9999995, 1, 0.9999994, -1.000001, 1, -1, -0.9999997, 1, -1, 1, 1, 1, 0.9999995, 5, 0.9999994, -1.000001, 5, -1, 1, 5, -1, -0.9999997, 5, -1, -0.9999997, 3.807736, -1, 1, 3.807736, 1, 0.9999995, 3.807736, 0.9999994, -1.000001, 3.807736, -1, 1, 2.403868, 1, 0.9999995, 2.403868, -1, -0.9999997, 2.403868, 0.9999994, -1.000001, 2.403868, 3, 0.9999995, 5, 2.999999, -1.000001, 5, 2.999999, -1.000001, 3.807736, 3, 0.9999995, 3.807736, 3, 0.9999995, 1, 2.999999, -1.000001, 1, 3, 0.9999995, 2.403868, 2.999999, -1.000001, 2.403868, 4, 0.9999995, 1, 3.999999, -1.000001, 1, 4, 0.9999995, 2.403868, 3.999999, -1.000001, 2.403868, 3, 0.9999995, 0, 2.999999, -1.000001, 0, 4, 0.9999995, 0, 3.999999, -1.000001, 0 ],
-  jointNamePositionIndex: { Bone: 0, Bone_001: 1, Bone_002: 2 }
+  jointNamePositionIndex: { Bone: 0, Bone_001: 1, Bone_002: 2 },
+  jointInverseBindPoses: { 0: [ 0.6036704396329501, 0, 0, 0, 0, 0, 0.6036704396329501, 0, 0, -0.6036704396329501, 0, 0, 0, 0, 0, 1 ], 1: [ 0, -0.6036704396329501, 0, 0, 0.6036705396329399, 0, 0, 0, 0, 0, 0.6036704396329501, -1, 0, 0, 0, 1 ], 2: [ 0.6036705396329399, 0, 0, -2.152902, 0, 0, -0.6036704396329501, 1, 0, 0.6036704396329501, 0, 0, 0, 0, 0, 1 ] }
 }

test/expected/two-skinned-cube.js

@@ -8,2 +8,3 @@ // Two cubes, each with their own joint (no parent child relationship)
 module.exports = {
+  jointInverseBindPoses: { 0: [ 1, 0, 0, -2.800068, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], 1: [ 1, 0, 0, 0.01319289, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ] },
   jointNamePositionIndex: { Bone: 0, Bone_001: 1 },
@@ -10,0 +11,0 @@ keyframes: {

No alert changes

Improved metrics

Total package byte prevSize

4623298

0.03%

Lines of code

1508

0.67%

No dependency changes