Преглед изворни кода

#11422 Fixed scene traversal from pivot and lgtm issues

Kai Salmen пре 8 година
родитељ
комит
f4899a51a8

+ 1 - 1
examples/js/loaders/OBJLoader2.js

@@ -628,7 +628,7 @@ THREE.OBJLoader2 = (function () {
 
 		RawObject.prototype.pushSmoothingGroup = function ( activeSmoothingGroup ) {
 			var normalized = parseInt( activeSmoothingGroup );
-			if ( normalized === NaN ) {
+			if ( isNaN( normalized ) ) {
 				normalized = activeSmoothingGroup === "off" ? 0 : 1;
 			}
 			if ( this.activeSmoothingGroup === normalized ) return;

+ 0 - 1
examples/js/loaders/WWOBJLoader2.js

@@ -420,7 +420,6 @@ THREE.OBJLoader2.WWOBJLoader2 = (function () {
 				for ( key in materialDescriptions ) {
 
 					materialDescription = materialDescriptions[ key ];
-					material = this.materials[ materialDescription.name ];
 					material = haveVertexColors ? this.materials[ 'vertexColorMaterial' ] : this.materials[ materialDescription.name ];
 					if ( ! material ) material = this.materials[ 'defaultMaterial' ];
 

+ 2 - 0
examples/webgl_loader_obj2.html

@@ -156,6 +156,7 @@
 
 				OBJLoader2Example.prototype.loadObj = function ( objDef ) {
 					this.scene.add( objDef.pivot );
+					var scope = this;
 
 					var mtlLoader = new THREE.MTLLoader();
 					mtlLoader.setPath( objDef.texturePath );
@@ -164,6 +165,7 @@
 
 						materials.preload();
 
+						scope.pivot.add( objDef.pivot );
 						var objLoader = new THREE.OBJLoader2();
 						objLoader.setSceneGraphBaseNode( objDef.pivot );
 						objLoader.setMaterials( materials.materials );