diff --git a/src/extras/io/JSONLoader.js b/src/extras/io/JSONLoader.js index d177ba51c0e942f27e77f4a82e30b67c6693a0d5..9da169801825070b49fba413e4a410df6e4db814 100644 --- a/src/extras/io/JSONLoader.js +++ b/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; } diff --git a/utils/exporters/max/ThreeJSExporter.ms b/utils/exporters/max/ThreeJSExporter.ms index 6b01f6900bc31af99073dc2e1fe4c1841b0d23cf..db7f9141b2f9788f039401766dc7a034b5fa95fc 100644 --- a/utils/exporters/max/ThreeJSExporter.ms +++ b/utils/exporters/max/ThreeJSExporter.ms @@ -1,6 +1,6 @@ ------------------------------------------------------------------------------------- -- 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 ) )