Browse Source

ColladaLoader2: Rotate scene to handle Z_UP by now.

Mr.doob 9 years ago
parent
commit
d5b7d3b2cc
1 changed files with 6 additions and 13 deletions
  1. 6 13
      examples/js/loaders/ColladaLoader2.js

+ 6 - 13
examples/js/loaders/ColladaLoader2.js

@@ -1036,19 +1036,6 @@ THREE.ColladaLoader.prototype = {
 			function pushVector( i ) {
 
 				var index = indices[ i + offset ] * sourceStride;
-
-				/*
-				if ( asset.upAxis === 'Z_UP' ) {
-
-					array.push( sourceArray[ index + 0 ], sourceArray[ index + 2 ], - sourceArray[ index + 1 ] );
-
-				} else {
-
-					array.push( sourceArray[ index + 0 ], sourceArray[ index + 1 ], sourceArray[ index + 2 ] );
-
-				}
-				*/
-
 				array.push( sourceArray[ index + 0 ], sourceArray[ index + 1 ], sourceArray[ index + 2 ] );
 
 			}
@@ -1451,6 +1438,12 @@ THREE.ColladaLoader.prototype = {
 
 		var scene = parseScene( getElementsByTagName( collada, 'scene' )[ 0 ] );
 
+		if ( asset.upAxis === 'Z_UP' ) {
+
+			scene.rotation.x = - Math.PI / 2;
+
+		}
+
 		console.timeEnd( 'ColladaLoader' );
 
 		// console.log( scene );