extras/io > extras/loaders

extras/collada/dae.js > extras/loaders/ColladaLoader.js

removed LoaderOld.js

examples/webgl_collada.html

@@ -21,7 +21,7 @@
 		<script type="text/javascript" src="js/Detector.js"></script>
 		<script type="text/javascript" src="js/RequestAnimationFrame.js"></script>
 		<script type="text/javascript" src="js/Stats.js"></script>
-		<script type="text/javascript" src="../src/extras/collada/dae.js"></script>
+		<script type="text/javascript" src="../src/extras/loaders/ColladaLoader.js"></script>
 
 		<script type="text/javascript">
 
@@ -33,9 +33,8 @@
 			var particleLight, pointLight;
 			var dae, skin;
 
-			DAE.load( './models/monster.dae', colladaReady );
-
-			function colladaReady( collada ) {
+			var loader = new ColladaLoader();
+			loader.load( './models/monster.dae', function colladaReady( collada ) {
 
 				dae = collada.scene;
 				skin = collada.skins[ 0 ];
@@ -47,7 +46,7 @@
 				init();
 				animate();
 
-			}
+			} );
 
 			function init() {
 

src/extras/collada/dae.js → src/extras/loaders/ColladaLoader.js

@@ -2,7 +2,7 @@
  * @author Tim Knip / http://www.floorplanner.com/ / tim at floorplanner.com
  */
 
-var DAE = (function() {
+var ColladaLoader = function() {
 	var COLLADA = null;
 	var scene = null;
 	var daeScene;
@@ -20,7 +20,7 @@ var DAE = (function() {
 	var morphs;
 	var skins;
 	var preferredShading = THREE.SmoothShading;
-	
+
 	function load(url, readyCallback) {
 		if (document.implementation && document.implementation.createDocument) {
 			var namespaceURL = "http://www.collada.org/2005/11/COLLADASchema";
@@ -40,7 +40,7 @@ var DAE = (function() {
 			req.onreadystatechange = function() {
 				if(req.readyState == 4) {
 					if(req.status == 0 || req.status == 200) {
-						
+
 						readyCallbackFunc = readyCallback;
 						parse(req.responseXML, undefined, url);
 					}
@@ -2027,4 +2027,4 @@ var DAE = (function() {
 		applySkin: applySkin,
 		geometries : geometries
 	};
-})();
+};

utils/build.py

@@ -108,11 +108,11 @@ EXTRAS_FILES = [
 'extras/geometries/TextGeometry.js',
 'extras/geometries/TorusGeometry.js',
 'extras/geometries/TorusKnotGeometry.js',
-'extras/io/Loader.js',
-'extras/io/JSONLoader.js',
-'extras/io/BinaryLoader.js',
-'extras/io/SceneLoader.js',
-'extras/io/UTF8Loader.js',
+'extras/loaders/Loader.js',
+'extras/loaders/JSONLoader.js',
+'extras/loaders/BinaryLoader.js',
+'extras/loaders/SceneLoader.js',
+'extras/loaders/UTF8Loader.js',
 'extras/objects/MarchingCubes.js',
 'extras/objects/Trident.js',
 'extras/physics/Collisions.js',