Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

And more post-release fixes.

Mr.doob 9 years ago
parent
624e4d1f1e
commit
785271e61a
4 changed files with 57 additions and 9 deletions
Split View Show Diff Stats
  1. 12 0
      editor/js/Menubar.File.js
  2. 2 0
      editor/js/libs/app/index.html
  3. 3 8
      examples/js/loaders/ColladaLoader2.js
  4. 40 1
      examples/js/loaders/OBJLoader.js

+ 12 - 0
editor/js/Menubar.File.js
View File 

@@ -248,6 +248,18 @@ Menubar.File = function ( editor ) {
 
 
 		} );
 
 
+		loader.load( '../examples/js/controls/VRControls.js', function ( content ) {
 
+
 
+			zip.file( 'js/VRControls.js', content );
 
+
 
+		} );
 
+
 
+		loader.load( '../examples/js/effects/VREffect.js', function ( content ) {
 
+
 
+			zip.file( 'js/VREffect.js', content );
 
+
 
+		} );
 
+
 
 	} );
 
 	options.add( option );

+ 2 - 0
editor/js/libs/app/index.html
View File 

@@ -30,6 +30,8 @@
 
 	<body ontouchstart="">
 
 		<script src="js/three.min.js"></script>
 
 		<script src="js/app.js"></script>
 
+		<script src="js/VRControls.js"></script>
 
+		<script src="js/VREffect.js"></script>
 
 		<script>
 
 
 			var loader = new THREE.XHRLoader();

+ 3 - 8
examples/js/loaders/ColladaLoader2.js
View File 

@@ -183,12 +183,7 @@ THREE.ColladaLoader.prototype = {
 
 		// image
 
 
 		var imageLoader = new THREE.ImageLoader();
 
-		
-		if ( this.crossOrigin ) {
 
-			
-			imageLoader.crossOrigin = this.crossOrigin;
 
-			
-		}
 
+		imageLoader.setCrossOrigin( this.crossOrigin );
 
 
 		function parseImage( xml ) {
 
 
@@ -606,10 +601,10 @@ THREE.ColladaLoader.prototype = {
 
 						texture.repeat.set( technique.repeatU, technique.repeatV );
 
 
 					} else {
 
-				
+
 
 						texture.wrapS = THREE.RepeatWrapping;
 
 						texture.wrapT = THREE.RepeatWrapping;
 
-					
+
 
 					}
 
 
 					texture.needsUpdate = true;

+ 40 - 1
examples/js/loaders/OBJLoader.js
View File 

@@ -95,6 +95,8 @@ THREE.OBJLoader.prototype = {
 
 
 				}
 
 
+				var previousMaterial = ( this.object && typeof this.object.currentMaterial === 'function' ? this.object.currentMaterial() : undefined );
 
+
 
 				this.object = {
 
 					name : name || '',
 
 					fromDeclaration : ( fromDeclaration !== false ),
 
@@ -111,6 +113,14 @@ THREE.OBJLoader.prototype = {
 
 
 						var previous = this._finalize( false );
 
 
+						// New usemtl declaration overwrites an inherited material, except if faces were declared
 
+						// after the material, then it must be preserved for proper MultiMaterial continuation.
 
+						if ( previous && ( previous.inherited || previous.groupCount <= 0 ) ) {
 
+
 
+							this.materials.splice( previous.index, 1 );
 
+
 
+						}
 
+
 
 						var material = {
 
 							index      : this.materials.length,
 
 							name       : name || '',
 
@@ -118,7 +128,21 @@ THREE.OBJLoader.prototype = {
 
 							smooth     : ( previous !== undefined ? previous.smooth : this.smooth ),
 
 							groupStart : ( previous !== undefined ? previous.groupEnd : 0 ),
 
 							groupEnd   : -1,
 
-							groupCount : -1
 
+							groupCount : -1,
 
+							inherited  : false,
 
+
 
+							clone : function( index ) {
 
+								return {
 
+									index      : ( typeof index === 'number' ? index : this.index ),
 
+									name       : this.name,
 
+									mtllib     : this.mtllib,
 
+									smooth     : this.smooth,
 
+									groupStart : this.groupEnd,
 
+									groupEnd   : -1,
 
+									groupCount : -1,
 
+									inherited  : false
 
+								};
 
+							}
 
 						};
 
 
 						this.materials.push( material );
 
@@ -144,6 +168,7 @@ THREE.OBJLoader.prototype = {
 
 
 							lastMultiMaterial.groupEnd = this.geometry.vertices.length / 3;
 
 							lastMultiMaterial.groupCount = lastMultiMaterial.groupEnd - lastMultiMaterial.groupStart;
 
+							lastMultiMaterial.inherited = false;
 
 
 						}
 
 
@@ -160,6 +185,20 @@ THREE.OBJLoader.prototype = {
 
 					}
 
 				};
 
 
+				// Inherit previous objects material.
 
+				// Spec tells us that a declared material must be set to all objects until a new material is declared.
 
+				// If a usemtl declaration is encountered while this new object is being parsed, it will
 
+				// overwrite the inherited material. Exception being that there was already face declarations
 
+				// to the inherited material, then it will be preserved for proper MultiMaterial continuation.
 
+
 
+				if ( previousMaterial && previousMaterial.name && typeof previousMaterial.clone === "function" ) {
 
+
 
+					var declared = previousMaterial.clone( 0 );
 
+					declared.inherited = true;
 
+					this.object.materials.push( declared );
 
+
 
+				}
 
+
 
 				this.objects.push( this.object );
 
 
 			},