Skip to content

Commit

Permalink
Merge pull request #1 from Fallstream/Fallstream-patch-1
Browse files Browse the repository at this point in the history
Update ColladaLoader.js
  • Loading branch information
Fallstream authored Apr 4, 2017
2 parents 6776a15 + 486b519 commit 44f413a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion examples/js/loaders/ColladaLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,7 @@ THREE.ColladaLoader = function () {
var transform = transforms[ i ];

// kinda ghetto joint detection
var m1 = new THREE.Matrix4();
if ( transform.sid && transform.sid.indexOf( 'joint' + jointIndex ) !== -1 ) {

// apply actual joint value here
Expand All @@ -937,7 +938,6 @@ THREE.ColladaLoader = function () {

} else {

var m1 = new THREE.Matrix4();

switch ( transform.type ) {

Expand Down Expand Up @@ -988,6 +988,7 @@ THREE.ColladaLoader = function () {

threejsNode.matrix.set.apply( threejsNode.matrix, elementsRowMajor );
threejsNode.matrix.decompose( threejsNode.position, threejsNode.quaternion, threejsNode.scale );
jointMap[jointIndex].position=value;
}

} else {
Expand Down

0 comments on commit 44f413a

Please sign in to comment.