Переглянути джерело

Updated SceneLoader2 to use latest JSONLoader API. GeometryExported setting bits as 0 as a place holder to start to get things working. Fixes #3198.

Mr.doob 12 роки тому
батько
коміт
1222072779

+ 10 - 10
examples/js/exporters/GeometryExporter.js

@@ -29,24 +29,24 @@ THREE.GeometryExporter.prototype = {
 			var face = geometry.faces[ i ];
 			var face = geometry.faces[ i ];
 
 
 			var isTriangle = face instanceof THREE.Face3;
 			var isTriangle = face instanceof THREE.Face3;
-			var hasMaterial = face.materialIndex !== undefined;
-			var hasFaceUv = geometry.faceUvs[ 0 ][ i ] !== undefined;
-			var hasFaceVertexUv = geometry.faceVertexUvs[ 0 ][ i ] !== undefined;
+			var hasMaterial = false; // face.materialIndex !== undefined;
+			var hasFaceUv = false; // geometry.faceUvs[ 0 ][ i ] !== undefined;
+			var hasFaceVertexUv = false; // geometry.faceVertexUvs[ 0 ][ i ] !== undefined;
 			var hasFaceNormal = face.normal.length() > 0;
 			var hasFaceNormal = face.normal.length() > 0;
 			var hasFaceVertexNormal = face.vertexNormals[ 0 ] !== undefined;
 			var hasFaceVertexNormal = face.vertexNormals[ 0 ] !== undefined;
-			var hasFaceColor = face.color;
-			var hasFaceVertexColor = face.vertexColors[ 0 ] !== undefined;
+			var hasFaceColor = false; // face.color;
+			var hasFaceVertexColor = false; // face.vertexColors[ 0 ] !== undefined;
 
 
 			var faceType = 0;
 			var faceType = 0;
 
 
 			faceType = setBit( faceType, 0, ! isTriangle );
 			faceType = setBit( faceType, 0, ! isTriangle );
-			// faceType = setBit( faceType, 1, hasMaterial );
-			// faceType = setBit( faceType, 2, hasFaceUv );
-			// faceType = setBit( faceType, 3, hasFaceVertexUv );
+			faceType = setBit( faceType, 1, hasMaterial );
+			faceType = setBit( faceType, 2, hasFaceUv );
+			faceType = setBit( faceType, 3, hasFaceVertexUv );
 			faceType = setBit( faceType, 4, hasFaceNormal );
 			faceType = setBit( faceType, 4, hasFaceNormal );
 			faceType = setBit( faceType, 5, hasFaceVertexNormal );
 			faceType = setBit( faceType, 5, hasFaceVertexNormal );
-			// faceType = setBit( faceType, 6, hasFaceColor );
-			// faceType = setBit( faceType, 7, hasFaceVertexColor );
+			faceType = setBit( faceType, 6, hasFaceColor );
+			faceType = setBit( faceType, 7, hasFaceVertexColor );
 
 
 			faces.push( faceType );
 			faces.push( faceType );
 
 

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

@@ -53,7 +53,7 @@ THREE.SceneLoader2.prototype = {
 
 
 			console.log( json.geometries[ i ] );
 			console.log( json.geometries[ i ] );
 
 
-			geometries.push( loader.createModel( json.geometries[ i ] ) );
+			geometries.push( loader.parse( json.geometries[ i ] ) );
 
 
 		}
 		}