Selaa lähdekoodia

webgl_loader_scene: clean up

Mugen87 8 vuotta sitten
vanhempi
commit
96d0d0e1bf
1 muutettua tiedostoa jossa 14 lisäystä ja 22 poistoa
  1. 14 22
      examples/webgl_loader_scene.html

+ 14 - 22
examples/webgl_loader_scene.html

@@ -93,9 +93,6 @@
 
 		<script src="../build/three.js"></script>
 		<script src="js/MorphAnimMesh.js"></script>
-		<script src="js/loaders/collada/Animation.js"></script>
-		<script src="js/loaders/collada/AnimationHandler.js"></script>
-		<script src="js/loaders/collada/KeyFrameAnimation.js"></script>
 
 		<script src="js/loaders/DDSLoader.js"></script>
 
@@ -122,7 +119,7 @@
 			var SCREEN_WIDTH = window.innerWidth;
 			var SCREEN_HEIGHT = window.innerHeight;
 
-			var container,stats;
+			var container, stats;
 
 			var camera, scene, loaded;
 			var renderer;
@@ -186,7 +183,7 @@
 					if ( total )
 						bar = Math.floor( bar * loaded / total );
 
-					$( "bar" ).style.width = bar + "px";
+					$( 'bar' ).style.width = bar + 'px';
 
 				};
 
@@ -194,8 +191,8 @@
 
 					loaded = result;
 
-					$( "message" ).style.display = "none";
-					$( "progressbar" ).style.display = "none";
+					$( 'message' ).style.display = 'none';
+					$( 'progressbar' ).style.display = 'none';
 
 					result.scene.traverse( function ( object ) {
 
@@ -221,7 +218,7 @@
 
 					//
 
-					$( "progress" ).style.display = "none";
+					$( 'progress' ).style.display = 'none';
 
 					camera = loaded.currentCamera;
 					camera.aspect = window.innerWidth / window.innerHeight;
@@ -231,24 +228,24 @@
 
 				};
 
-				$( "progress" ).style.display = "block";
+				$( 'progress' ).style.display = 'block';
 
 				THREE.Loader.Handlers.add( /\.dds$/i, new THREE.DDSLoader() );
 
 				var loader = new THREE.SceneLoader();
 
-				loader.addGeometryHandler( "binary", THREE.BinaryLoader );
-				loader.addGeometryHandler( "ctm", THREE.CTMLoader );
-				loader.addGeometryHandler( "vtk", THREE.VTKLoader );
-				loader.addGeometryHandler( "stl", THREE.STLLoader );
+				loader.addGeometryHandler( 'binary', THREE.BinaryLoader );
+				loader.addGeometryHandler( 'ctm', THREE.CTMLoader );
+				loader.addGeometryHandler( 'vtk', THREE.VTKLoader );
+				loader.addGeometryHandler( 'stl', THREE.STLLoader );
 
-				loader.addHierarchyHandler( "obj", THREE.OBJLoader );
-				loader.addHierarchyHandler( "dae", THREE.ColladaLoader );
-				loader.addHierarchyHandler( "utf8", THREE.UTF8Loader );
+				loader.addHierarchyHandler( 'obj', THREE.OBJLoader );
+				loader.addHierarchyHandler( 'dae', THREE.ColladaLoader );
+				loader.addHierarchyHandler( 'utf8', THREE.UTF8Loader );
 
 				loader.callbackProgress = callbackProgress;
 
-				loader.load( "scenes/test_scene.js", callbackFinished );
+				loader.load( 'scenes/test_scene.js', callbackFinished );
 
 				//
 
@@ -344,10 +341,6 @@
 
 				camera.lookAt( scene.position );
 
-				// update skinning
-
-				THREE.AnimationHandler.update( delta * 0.75 );
-
 				for ( var i = 0; i < rotatingObjects.length; i ++ ) {
 
 					var object = rotatingObjects[ i ];
@@ -357,7 +350,6 @@
 
 				}
 
-				
 				for ( var i = 0; i < mixers.length; i ++ ) {
 
 					mixers[ i ].update( delta );