Merge remote branch 'alteredq/master'

src/extras/io/JSONLoader.js

@@ -73,7 +73,7 @@ THREE.JSONLoader.prototype = {
 
 				};
 				
-				var i, j, 
+				var i, j, fi,
 				
 				offset, zLength,
 
@@ -130,6 +130,7 @@ THREE.JSONLoader.prototype = {
 
 					type = faces[ offset ++ ];
 
+					
 					isQuad          	= isBitSet( type, 0 );
 					hasMaterial         = isBitSet( type, 1 );
 					hasFaceUv           = isBitSet( type, 2 );
@@ -207,7 +208,10 @@ THREE.JSONLoader.prototype = {
 
 							}
 
-							scope.faceVertexUvs[ i ].push( uvs );
+							// to get face <=> uv index correspondence
+							
+							fi = scope.faces.length;
+							scope.faceVertexUvs[ i ][ fi ] = uvs;
 
 						}
 

utils/exporters/max/ThreeJSExporter.ms

 -------------------------------------------------------------------------------------
 -- ThreeJSExporter.ms
--- Exports geometry from 3ds max to Three.js models in ASCII JSON format
+-- Exports geometry from 3ds max to Three.js models in ASCII JSON format v2
 -- By alteredq / http://alteredqualia.com
 -------------------------------------------------------------------------------------
 
@@ -40,7 +40,7 @@ rollout ThreeJSExporter "ThreeJSExporter"
 	-- User interface
 
 
-	group "ThreeJSExporter  v0.4"
+	group "ThreeJSExporter  v0.5"
 	(
 
 		label msg "Exports selected meshes in Three.js ascii JSON format" align:#left
@@ -819,7 +819,7 @@ rollout ThreeJSExporter "ThreeJSExporter"
 			-- unknown or undefined material
 			
 			append whereto false
-			append wheretoColors hasVColors
+			append wheretoColors false
 
 		)
 
@@ -884,7 +884,7 @@ rollout ThreeJSExporter "ThreeJSExporter"
 
 		-- Not geometry ... could be a camera, light, etc.
 		
-		return #( false, node.name, 0 )
+		return #( false, node.name, 0, false, false )
 
 	)