Browse Source

missing LoadingManager in some loaders

Vincent Lark 10 years ago
parent
commit
7c0d5b020c
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/loaders/BufferGeometryLoader.js
  2. 2 2
      src/loaders/MaterialLoader.js

+ 1 - 1
src/loaders/BufferGeometryLoader.js

@@ -16,7 +16,7 @@ THREE.BufferGeometryLoader.prototype = {
 
 
 		var scope = this;
 		var scope = this;
 
 
-		var loader = new THREE.XHRLoader();
+		var loader = new THREE.XHRLoader( scope.manager );
 		loader.setCrossOrigin( this.crossOrigin );
 		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 		loader.load( url, function ( text ) {
 
 

+ 2 - 2
src/loaders/MaterialLoader.js

@@ -16,7 +16,7 @@ THREE.MaterialLoader.prototype = {
 
 
 		var scope = this;
 		var scope = this;
 
 
-		var loader = new THREE.XHRLoader();
+		var loader = new THREE.XHRLoader( scope.manager );
 		loader.setCrossOrigin( this.crossOrigin );
 		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 		loader.load( url, function ( text ) {
 
 
@@ -43,7 +43,7 @@ THREE.MaterialLoader.prototype = {
 		if ( json.shininess !== undefined ) material.shininess = json.shininess;
 		if ( json.shininess !== undefined ) material.shininess = json.shininess;
 		if ( json.uniforms !== undefined ) material.uniforms = json.uniforms;
 		if ( json.uniforms !== undefined ) material.uniforms = json.uniforms;
 		if ( json.vertexShader !== undefined ) material.vertexShader = json.vertexShader;
 		if ( json.vertexShader !== undefined ) material.vertexShader = json.vertexShader;
-		if ( json.fragmentShader !== undefined ) material.fragmentShader = json.fragmentShader;		
+		if ( json.fragmentShader !== undefined ) material.fragmentShader = json.fragmentShader;
 		if ( json.vertexColors !== undefined ) material.vertexColors = json.vertexColors;
 		if ( json.vertexColors !== undefined ) material.vertexColors = json.vertexColors;
 		if ( json.shading !== undefined ) material.shading = json.shading;
 		if ( json.shading !== undefined ) material.shading = json.shading;
 		if ( json.blending !== undefined ) material.blending = json.blending;
 		if ( json.blending !== undefined ) material.blending = json.blending;