collada-dae-parser - npm Package Compare versions

Comparing version 0.13.1 to 0.14.0

package.json

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

src/library_controllers/parse-library-controllers.js

@@ -8,3 +8,7 @@ var mat4Multiply = require('gl-mat4/multiply')
   var controller = library_controllers[0].controller
+  var armatureName
   if (controller) {
+    // Get the name of the armature that this model is a child of
+    armatureName = controller[0].$.name
+
     // Number of vertexes that need weights
@@ -74,4 +78,5 @@ // var numVertices = controller[0].skin[0].vertex_weights[0].$.count
     jointNamePositionIndex: jointNamePositionIndex,
-    vertexJointWeights: parsedVertexJointWeights
+    vertexJointWeights: parsedVertexJointWeights,
+    armatureName: armatureName
   }
 }

src/parse-collada.js

@@ -69,2 +69,5 @@ var xmlparser = require('xml-parser')
   parsedObject.vertexPositions = parsedLibraryGeometries.vertexPositions
+  if (controllerData.armatureName) {
+    parsedObject.armatureName = controllerData.armatureName
+  }
   if (jointParents) {
@@ -71,0 +74,0 @@ parsedObject.jointParents = jointParents

test/expected/animated-letter-f.js

@@ -6,2 +6,3 @@ // A 3d letter f
 module.exports = {
+  armatureName: 'Armature',
   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 ] },
@@ -8,0 +9,0 @@ jointNamePositionIndex: { Bone: 0, Bone_001: 1 },

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

@@ -7,2 +7,3 @@ // Letter F animated with a parent -> child -> child
 module.exports = {
+  armatureName: 'Armature',
   keyframes: { 0: [ [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ] ], '1.666667': [ [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ], [ 0.707107, 0, 0.707107, 0, 0, 1, 0, 0, -0.707107, 0, 0.707107, 0, 1.171346, 0, 0.485187, 1 ], [ 0.707107, 0, 0.707107, 0, 0, 1, 0, 0, -0.707107, 0, 0.707107, 0, 1.171346, 0, 0.485187, 1 ] ], '3.333333': [ [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ], [ 0.707107, 0, 0.707107, 0, 0, 1, 0, 0, -0.707107, 0, 0.707107, 0, 1.171346, 0, 0.485187, 1 ], [ -0.707107, 0, 0.707107, 0, 0, 1, 0, 0, -0.707107, 0, -0.707107, 0, 6.21493, 0, 2.827879, 1 ] ], 5: [ [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ] ] },
@@ -9,0 +10,0 @@ vertexJointWeights: [ { 0: 0.8415314, 1: 0.1584686 }, { 0: 0.8437713, 1: 0.1562287 }, { 0: 0.9476546, 1: 0.05234539 }, { 0: 0.946487, 1: 0.05351299 }, { 0: 0.1121221, 1: 0.8878778 }, { 0: 0.1128941, 1: 0.8433575, 2: 0.04374837 }, { 0: 0.8497215, 1: 0.1502784 }, { 0: 0.8475226, 1: 0.1524773 }, { 0: 0.4134382, 1: 0.5865618 }, { 0: 0.3438115, 1: 0.6561885 }, { 0: 0.4709932, 1: 0.5290068 }, { 0: 0.4592075, 1: 0.5407926 }, { 0: 0.4794089, 1: 0.5205911 }, { 0: 0.4869785, 1: 0.5130215 }, { 0: 0.433289, 1: 0.566711 }, { 0: 0.3834543, 1: 0.6165456 }, { 0: 0.5163786, 1: 0.4836215 }, { 0: 0.08351624, 1: 0.9164837 }, { 0: 0.5159874, 1: 0.4840126 }, { 0: 0.08578228, 1: 0.9142178 }, { 0: 0.4012839, 1: 0.5987161 }, { 0: 0.3799905, 1: 0.6200094 }, { 0: 0.3870865, 1: 0.6129134 }, { 0: 0.4056271, 1: 0.5943729 }, { 1: 0.7715917, 2: 0.2284083 }, { 1: 0.1755544, 2: 0.8244456 }, { 1: 0.891659, 2: 0.108341 }, { 1: 0.8336093, 2: 0.1663907 }, { 1: 0.1755515, 2: 0.8244485 }, { 1: 0.0901066, 2: 0.9098934 }, { 1: 0.5328469, 2: 0.4671531 }, { 1: 0.5148224, 2: 0.4851776 }, { 1: 0.200401, 2: 0.7995991 }, { 1: 0.06429231, 2: 0.9357076 }, { 1: 0.08411085, 2: 0.9158891 }, { 1: 0.03239625, 2: 0.9676038 } ],

test/expected/two-skinned-cube.js

@@ -8,2 +8,3 @@ // Two cubes, each with their own joint (no parent child relationship)
 module.exports = {
+  armatureName: 'Armature',
   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 ] },
@@ -10,0 +11,0 @@ jointNamePositionIndex: { Bone: 0, Bone_001: 1 },

No alert changes

Improved metrics

Total package byte prevSize

4624054

increased by0.01%

Lines of code

1544

increased by0.65%

No dependency changes