Explorar o código

Fixed ColladaLoader. It was misusing overwrite Object3D.id :(

Mr.doob %!s(int64=11) %!d(string=hai) anos
pai
achega
66c4226d81
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      examples/js/loaders/ColladaLoader.js

+ 3 - 3
examples/js/loaders/ColladaLoader.js

@@ -315,7 +315,7 @@ THREE.ColladaLoader = function () {
 
 	function recurseHierarchy( node ) {
 
-		var n = visualScene.getChildById( node.id, true ),
+		var n = visualScene.getChildById( node.colladaId, true ),
 			newData = null;
 
 		if ( n && n.keys ) {
@@ -838,7 +838,7 @@ THREE.ColladaLoader = function () {
 
 			scene.traverse(function( node ) {
 
-				if ( node.id == parentVisualElementId ) {
+				if ( node.colladaId == parentVisualElementId ) {
 
 					jointMap[ jointIndex ] = {
 						node: node,
@@ -1300,7 +1300,7 @@ THREE.ColladaLoader = function () {
 		}
 
 		obj.name = node.name || node.id || "";
-		obj.id = node.id || "";
+		obj.colladaId = node.id || "";
 		obj.layer = node.layer || "";
 		obj.matrix = node.matrix;
 		obj.matrix.decompose( obj.position, obj.quaternion, obj.scale );