Fixed class hierarchy for BinaryLoader and UTF8Loader.

Also tried to clean whitespace for ColladaLoader. This thing is so massive.
quentinxxz · Sep 2, 2011 · 22e8423 · 22e8423
1 parent e459fc9
commit 22e8423
Show file tree

Hide file tree

Showing 8 changed files with 2,956 additions and 1,816 deletions.
diff --git a/build/Three.js b/build/Three.js
diff --git a/build/custom/ThreeExtras.js b/build/custom/ThreeExtras.js
diff --git a/src/extras/loaders/BinaryLoader.js b/src/extras/loaders/BinaryLoader.js
diff --git a/src/extras/loaders/ColladaLoader.js b/src/extras/loaders/ColladaLoader.js
diff --git a/src/extras/loaders/JSONLoader.js b/src/extras/loaders/JSONLoader.js
@@ -405,4 +405,4 @@ THREE.JSONLoader.prototype.createModel = function ( json, callback, texture_path
 
 	callback( geometry );
 
-}
+};
diff --git a/src/extras/loaders/Loader.js b/src/extras/loaders/Loader.js
@@ -55,27 +55,27 @@ THREE.Loader.prototype = {
 
 	},
 
-	extractUrlbase: function( url ) {
+	extractUrlbase: function ( url ) {
 
 		var chunks = url.split( "/" );
 		chunks.pop();
 		return chunks.join( "/" );
 
 	},
 
-	init_materials: function( scope, materials, texture_path ) {
+	init_materials: function ( scope, materials, texture_path ) {
 
 		scope.materials = [];
 
-		for ( var i = 0; i < materials.length; ++i ) {
+		for ( var i = 0; i < materials.length; ++ i ) {
 
 			scope.materials[ i ] = [ THREE.Loader.prototype.createMaterial( materials[ i ], texture_path ) ];
 
 		}
 
 	},
 
-	hasNormals: function( scope ) {
+	hasNormals: function ( scope ) {
 
 		var m, i, il = scope.materials.length;
 
@@ -136,7 +136,7 @@ THREE.Loader.prototype = {
 
 		}
 
-		function create_texture( where, name, sourceFile, repeat, offset, wrap ) {
+		function create_texture ( where, name, sourceFile, repeat, offset, wrap ) {
 
 			var texture = document.createElement( 'canvas' );
 
@@ -174,7 +174,7 @@ THREE.Loader.prototype = {
 
 		}
 
-		function rgb2hex( rgb ) {
+		function rgb2hex ( rgb ) {
 
 			return ( rgb[ 0 ] * 255 << 16 ) + ( rgb[ 1 ] * 255 << 8 ) + rgb[ 2 ] * 255;
 
@@ -367,7 +367,7 @@ THREE.Loader.prototype = {
 		return material;
 
 	},
-	
+
 	constructor : THREE.Loader
 
 };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -405,4 +405,4 @@ THREE.JSONLoader.prototype.createModel = function ( json, callback, texture_path

		callback( geometry );

		}
		};