Переглянути джерело

Moved BinaryLoader to /examples/js/loaders.

Mr.doob 12 роки тому
батько
коміт
32dc35c0f7

+ 1 - 0
editor/index.html

@@ -70,6 +70,7 @@
 
 		<script src="../build/three.min.js"></script>
 		<script src="../examples/js/controls/TrackballControls.js"></script>
+		<script src="../examples/js/loaders/BinaryLoader.js"></script>
 		<script src="../examples/js/loaders/ColladaLoader.js"></script>
 		<script src="../examples/js/loaders/OBJLoader.js"></script>
 		<script src="../examples/js/loaders/STLLoader.js"></script>

+ 0 - 0
src/loaders/BinaryLoader.js → examples/js/loaders/BinaryLoader.js


+ 3 - 0
examples/webgl_geometry_large_mesh.html

@@ -46,6 +46,9 @@
 		<pre id="log"></pre>
 
 		<script src="../build/three.min.js"></script>
+
+		<script src="js/loaders/BinaryLoader.js"></script>
+
 		<script src="js/libs/stats.min.js"></script>
 
 		<script>

+ 3 - 2
examples/webgl_lights_deferred_arealights.html

@@ -46,8 +46,7 @@
 
 		<script src="../build/three.min.js"></script>
 
-		<script src="js/Detector.js"></script>
-		<script src="js/libs/stats.min.js"></script>
+		<script src="js/loaders/BinaryLoader.js"></script>
 
 		<script src="js/renderers/WebGLDeferredRenderer.js"></script>
 		<script src="js/ShaderDeferred.js"></script>
@@ -62,6 +61,8 @@
 		<script src="js/postprocessing/MaskPass.js"></script>
 		<script src="js/postprocessing/BloomPass.js"></script>
 
+		<script src="js/Detector.js"></script>
+		<script src="js/libs/stats.min.js"></script>
 
 		<script>
 

+ 4 - 6
examples/webgl_lights_deferred_pointlights.html

@@ -47,8 +47,8 @@
 
 		<script src="../build/three.min.js"></script>
 
-		<script src="js/Detector.js"></script>
-		<script src="js/libs/stats.min.js"></script>
+		<script src="js/loaders/BinaryLoader.js"></script>
+		<!-- <script src="js/loaders/UTF8Loader.js"></script> -->
 
 		<script src="js/renderers/WebGLDeferredRenderer.js"></script>
 		<script src="js/ShaderDeferred.js"></script>
@@ -61,10 +61,8 @@
 		<script src="js/postprocessing/ShaderPass.js"></script>
 		<script src="js/postprocessing/MaskPass.js"></script>
 
-		<!--
-		<script src="js/loaders/UTF8Loader.js"></script>
-		<script src="js/loaders/MTLLoader.js"></script>
-		-->
+		<script src="js/Detector.js"></script>
+		<script src="js/libs/stats.min.js"></script>
 
 		<script>
 

+ 2 - 0
examples/webgl_lights_pointlights.html

@@ -41,6 +41,8 @@
 
 		<script src="../build/three.min.js"></script>
 
+		<script src="js/loaders/BinaryLoader.js"></script>
+
 		<script src="js/Detector.js"></script>
 
 		<script>

+ 0 - 18
examples/webgl_loader_ctm_materials.html

@@ -178,24 +178,6 @@
 
 				var start = Date.now();
 
-				// classic way via BinaryLoader
-/*
-				loader = new THREE.BinaryLoader( true );
-				document.body.appendChild( loader.statusDomElement );
-
-				var callbackScene   = function( geometry, materials ) {
-
-					createScene( geometry, materials, 0, 0, 0, 30 );
-
-					var end = Date.now();
-
-					console.log( "load time:", end - start, "ms" );
-
-				};
-
-				loader.load( "obj/camaro_bake/camaro_bake.js", callbackScene );
-
-*/
 				// new way via CTMLoader and separate parts
 
 				loaderCTM = new THREE.CTMLoader( true );

+ 0 - 4
examples/webgl_loader_json_objconverter.html

@@ -181,7 +181,6 @@
 				bcanvas.addEventListener("click", toggleCanvas, false);
 				bwebgl.addEventListener("click", toggleWebGL, false);
 
-				//var loader = new THREE.BinaryLoader(),
 				var loader = new THREE.JSONLoader();
 				var callbackMale = function ( geometry, materials ) { createScene( geometry, materials, 90, FLOOR, 50, 105 ) };
 				var callbackFemale = function ( geometry, materials ) { createScene( geometry, materials, -80, FLOOR, 50, 0 ) };
@@ -189,9 +188,6 @@
 				loader.load( "obj/male02/Male02_dds.js", callbackMale );
 				loader.load( "obj/female02/Female02_slim.js", callbackFemale );
 
-				//loader.load( "obj/male02/Male02_bin.js", callbackMale );
-				//loader.load( "obj/female02/Female02_bin.js", callbackFemale );
-
 				//
 
 				window.addEventListener( 'resize', onWindowResize, false );

+ 2 - 0
examples/webgl_loader_scene.html

@@ -153,6 +153,7 @@
 		<script src="js/loaders/ctm/ctm.js"></script>
 		<script src="js/loaders/ctm/CTMLoader.js"></script>
 
+		<script src="js/loaders/BinaryLoader.js"></script>
 		<script src="js/loaders/OBJLoader.js"></script>
 		<script src="js/loaders/VTKLoader.js"></script>
 		<script src="js/loaders/STLLoader.js"></script>
@@ -344,6 +345,7 @@
 
 				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 );

+ 2 - 0
examples/webgl_materials_cars.html

@@ -57,6 +57,8 @@
 
 		<script src="../build/three.min.js"></script>
 
+		<script src="js/loaders/BinaryLoader.js"></script>
+
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>
 

+ 1 - 0
examples/webgl_materials_cars_anaglyph.html

@@ -58,6 +58,7 @@
 		<script src="../build/three.min.js"></script>
 
 		<script src="js/effects/AnaglyphEffect.js"></script>
+		<script src="js/loaders/BinaryLoader.js"></script>
 
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>

+ 2 - 0
examples/webgl_materials_cars_camaro.html

@@ -34,6 +34,8 @@
 
 		<script src="../build/three.min.js"></script>
 
+		<script src="js/loaders/BinaryLoader.js"></script>
+
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>
 

+ 1 - 0
examples/webgl_materials_cars_camaro_crosseyed.html

@@ -37,6 +37,7 @@
 		<script src="../build/three.min.js"></script>
 
 		<script src="js/effects/CrosseyedEffect.js"></script>
+		<script src="js/loaders/BinaryLoader.js"></script>
 
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>

+ 1 - 0
examples/webgl_materials_cars_parallaxbarrier.html

@@ -58,6 +58,7 @@
 		<script src="../build/three.min.js"></script>
 
 		<script src="js/effects/ParallaxBarrierEffect.js"></script>
+		<script src="js/loaders/BinaryLoader.js"></script>
 
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>

+ 2 - 0
examples/webgl_materials_cubemap.html

@@ -37,6 +37,8 @@
 
 		<script src="../build/three.min.js"></script>
 
+		<script src="js/loaders/BinaryLoader.js"></script>
+
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>
 

+ 2 - 0
examples/webgl_materials_cubemap_refraction.html

@@ -36,6 +36,8 @@
 
 		<script src="../build/three.min.js"></script>
 
+		<script src="js/loaders/BinaryLoader.js"></script>
+
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>
 

+ 2 - 0
examples/webgl_materials_normalmap.html

@@ -48,6 +48,8 @@
 
 		<script src="../build/three.min.js"></script>
 
+		<script src="js/loaders/BinaryLoader.js"></script>
+
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>
 

+ 2 - 0
examples/webgl_particles_dynamic.html

@@ -42,6 +42,8 @@
 
 		<script src="../build/three.min.js"></script>
 
+		<script src="js/loaders/BinaryLoader.js"></script>
+
 		<script src="js/shaders/ConvolutionShader.js"></script>
 		<script src="js/shaders/CopyShader.js"></script>
 		<script src="js/shaders/FilmShader.js"></script>

+ 0 - 1
src/loaders/SceneLoader.js

@@ -15,7 +15,6 @@ THREE.SceneLoader = function () {
 	this.hierarchyHandlerMap = {};
 
 	this.addGeometryHandler( "ascii", THREE.JSONLoader );
-	this.addGeometryHandler( "binary", THREE.BinaryLoader );
 
 };
 

+ 0 - 1
utils/includes/canvas.json

@@ -31,7 +31,6 @@
 	"../src/lights/DirectionalLight.js",
 	"../src/lights/PointLight.js",
 	"../src/loaders/Loader.js",
-	"../src/loaders/BinaryLoader.js",
 	"../src/loaders/ImageLoader.js",
 	"../src/loaders/JSONLoader.js",
 	"../src/loaders/SceneLoader.js",

+ 0 - 1
utils/includes/common.json

@@ -38,7 +38,6 @@
 	"../src/lights/PointLight.js",
 	"../src/lights/SpotLight.js",
 	"../src/loaders/Loader.js",
-	"../src/loaders/BinaryLoader.js",
 	"../src/loaders/ImageLoader.js",
 	"../src/loaders/JSONLoader.js",
 	"../src/loaders/LoadingMonitor.js",

+ 0 - 1
utils/includes/webgl.json

@@ -36,7 +36,6 @@
 	"../src/lights/PointLight.js",
 	"../src/lights/SpotLight.js",
 	"../src/loaders/Loader.js",
-	"../src/loaders/BinaryLoader.js",
 	"../src/loaders/ImageLoader.js",
 	"../src/loaders/JSONLoader.js",
 	"../src/loaders/SceneLoader.js",