Przeglądaj źródła

Removed "_mesh" suffix in scene format for non-procedural geometries. Bumped up scene format version to 3.1. Updated Blender exporter and examples.

See discussion here: https://github.com/alteredq/three.js/commit/718625cdb9b523f97f5923c0cdf543edda9a7bf1
alteredq 13 lat temu
rodzic
commit
a7bd3f5c2e

+ 3 - 3
build/three.min.js

@@ -182,7 +182,7 @@ m}}var g=a.faces,q=a.vertices,m=a.normals,l=a.colors,j=0;if(a.uvs)for(f=0;f<a.uv
 g[o++];t.materialIndex=s}var x=d.faces.length;if(f)for(f=0;f<j;f++){var B=a.uvs[f],s=g[o++],C=B[s*2],s=B[s*2+1];d.faceUvs[f][x]=new THREE.UV(C,s)}if(u)for(f=0;f<j;f++){for(var B=a.uvs[f],u=[],z=0;z<A;z++){s=g[o++];C=B[s*2];s=B[s*2+1];u[z]=new THREE.UV(C,s)}d.faceVertexUvs[f][x]=u}if(v){v=g[o++]*3;s=new THREE.Vector3;s.x=m[v++];s.y=m[v++];s.z=m[v];t.normal=s}if(q)for(f=0;f<A;f++){v=g[o++]*3;s=new THREE.Vector3;s.x=m[v++];s.y=m[v++];s.z=m[v];t.vertexNormals.push(s)}if(r){q=g[o++];t.color=new THREE.Color(l[q])}if(n)for(f=
 0;f<A;f++){q=g[o++];t.vertexColors.push(new THREE.Color(l[q]))}d.faces.push(t)}if(a.skinWeights){f=0;for(g=a.skinWeights.length;f<g;f=f+2)d.skinWeights.push(new THREE.Vector4(a.skinWeights[f],a.skinWeights[f+1],0,0))}if(a.skinIndices){f=0;for(g=a.skinIndices.length;f<g;f=f+2){m=0;d.skinIndices.push(new THREE.Vector4(a.skinIndices[f],a.skinIndices[f+1],m,0))}}d.bones=a.bones;d.animation=a.animation;if(a.morphTargets){f=0;for(g=a.morphTargets.length;f<g;f++){d.morphTargets[f]={};d.morphTargets[f].name=
 a.morphTargets[f].name;d.morphTargets[f].vertices=[];m=d.morphTargets[f].vertices;l=a.morphTargets[f].vertices;s=0;for(j=l.length;s<j;s=s+3){n=new THREE.Vector3;n.x=l[s]*e;n.y=l[s+1]*e;n.z=l[s+2]*e;m.push(n)}}}if(a.morphColors){f=0;for(g=a.morphColors.length;f<g;f++){d.morphColors[f]={};d.morphColors[f].name=a.morphColors[f].name;d.morphColors[f].colors=[];e=d.morphColors[f].colors;l=a.morphColors[f].colors;m=0;for(j=l.length;m<j;m=m+3){o=new THREE.Color(16755200);o.setRGB(l[m],l[m+1],l[m+2]);e.push(o)}}}d.computeCentroids();
-d.computeFaceNormals();return d}};THREE.SceneLoader=function(){this.onLoadStart=function(){};this.onLoadProgress=function(){};this.onLoadComplete=function(){};this.callbackSync=function(){};this.callbackProgress=function(){};this.geometryHandlerMap={};this.addGeometryHandler("ascii_mesh",THREE.JSONLoader);this.addGeometryHandler("bin_mesh",THREE.BinaryLoader)};THREE.SceneLoader.prototype.constructor=THREE.SceneLoader;
+d.computeFaceNormals();return d}};THREE.SceneLoader=function(){this.onLoadStart=function(){};this.onLoadProgress=function(){};this.onLoadComplete=function(){};this.callbackSync=function(){};this.callbackProgress=function(){};this.geometryHandlerMap={};this.addGeometryHandler("ascii",THREE.JSONLoader);this.addGeometryHandler("binary",THREE.BinaryLoader)};THREE.SceneLoader.prototype.constructor=THREE.SceneLoader;
 THREE.SceneLoader.prototype.load=function(a,b){var c=this,d=new XMLHttpRequest;d.onreadystatechange=function(){if(d.readyState===4)if(d.status===200||d.status===0){var e=JSON.parse(d.responseText);c.parse(e,b,a)}else console.error("THREE.SceneLoader: Couldn't load ["+a+"] ["+d.status+"]")};d.open("GET",a,true);d.send(null)};THREE.SceneLoader.prototype.addGeometryHandler=function(a,b){this.geometryHandlerMap[a]={loaderClass:b}};
 THREE.SceneLoader.prototype.parse=function(a,b,c){function d(a,b){return b=="relativeToHTML"?a:l+"/"+a}function e(a,b){var c;for(m in b)if(G.objects[m]===void 0){s=b[m];if(s.geometry!==void 0){if(F=G.geometries[s.geometry]){c=false;H=G.materials[s.materials[0]];(c=H instanceof THREE.ShaderMaterial)&&F.computeTangents();r=s.position;A=s.rotation;x=s.quaternion;B=s.scale;u=s.matrix;x=0;s.materials.length==0&&(H=new THREE.MeshFaceMaterial);s.materials.length>1&&(H=new THREE.MeshFaceMaterial);c=new THREE.Mesh(F,
 H);c.name=m;if(u){c.matrixAutoUpdate=false;c.matrix.set(u[0],u[1],u[2],u[3],u[4],u[5],u[6],u[7],u[8],u[9],u[10],u[11],u[12],u[13],u[14],u[15])}else{c.position.set(r[0],r[1],r[2]);if(x){c.quaternion.set(x[0],x[1],x[2],x[3]);c.useQuaternion=true}else c.rotation.set(A[0],A[1],A[2]);c.scale.set(B[0],B[1],B[2])}c.visible=s.visible;c.castShadow=s.castShadow;c.receiveShadow=s.receiveShadow;a.add(c);G.objects[m]=c}}else{r=s.position;A=s.rotation;x=s.quaternion;B=s.scale;x=0;c=new THREE.Object3D;c.name=m;
@@ -193,8 +193,8 @@ C.near,C.far));r=C.position;c=C.target;C=C.up;K.position.set(r[0],r[1],r[2]);K.t
 r[2])}else c.type==="ambient"&&(v=new THREE.AmbientLight(q));G.scene.add(v);G.lights[p]=v}for(n in N.fogs){p=N.fogs[n];p.type==="linear"?E=new THREE.Fog(0,p.near,p.far):p.type==="exp2"&&(E=new THREE.FogExp2(0,p.density));C=p.color;E.color.setRGB(C[0],C[1],C[2]);G.fogs[n]=E}if(G.cameras&&N.defaults.camera)G.currentCamera=G.cameras[N.defaults.camera];if(G.fogs&&N.defaults.fog)G.scene.fog=G.fogs[N.defaults.fog];C=N.defaults.bgcolor;G.bgColor=new THREE.Color;G.bgColor.setRGB(C[0],C[1],C[2]);G.bgColorAlpha=
 N.defaults.bgalpha;for(j in N.geometries){n=N.geometries[j];if(n.type in this.geometryHandlerMap){J=J+1;i.onLoadStart()}}R=J;for(j in N.geometries){n=N.geometries[j];if(n.type==="cube"){F=new THREE.CubeGeometry(n.width,n.height,n.depth,n.segmentsWidth,n.segmentsHeight,n.segmentsDepth,null,n.flipped,n.sides);G.geometries[j]=F}else if(n.type==="plane"){F=new THREE.PlaneGeometry(n.width,n.height,n.segmentsWidth,n.segmentsHeight);G.geometries[j]=F}else if(n.type==="sphere"){F=new THREE.SphereGeometry(n.radius,
 n.segmentsWidth,n.segmentsHeight);G.geometries[j]=F}else if(n.type==="cylinder"){F=new THREE.CylinderGeometry(n.topRad,n.botRad,n.height,n.radSegs,n.heightSegs);G.geometries[j]=F}else if(n.type==="torus"){F=new THREE.TorusGeometry(n.radius,n.tube,n.segmentsR,n.segmentsT);G.geometries[j]=F}else if(n.type==="icosahedron"){F=new THREE.IcosahedronGeometry(n.radius,n.subdivisions);G.geometries[j]=F}else if(n.type in this.geometryHandlerMap){E={};for(L in n)L!=="type"&&L!=="url"&&(E[L]=n[L]);this.geometryHandlerMap[n.type].loaderObject.load(d(n.url,
-N.urlBaseType),f(j),E)}else if(n.type==="embedded_mesh"){n=N.embeds[n.id];n.metadata=N.metadata;n&&this.geometryHandlerMap.ascii_mesh.loaderObject.createModel(n,g(j),"")}}for(t in N.textures){j=N.textures[t];if(j.url instanceof Array){I=I+j.url.length;for(L=0;L<j.url.length;L++)i.onLoadStart()}else{I=I+1;i.onLoadStart()}}P=I;for(t in N.textures){j=N.textures[t];if(j.mapping!==void 0&&THREE[j.mapping]!==void 0)j.mapping=new THREE[j.mapping];if(j.url instanceof Array){L=j.url.length;n=[];for(E=0;E<
-L;E++)n[E]=d(j.url[E],N.urlBaseType);L=THREE.ImageUtils.loadTextureCube(n,j.mapping,a(L))}else{L=THREE.ImageUtils.loadTexture(d(j.url,N.urlBaseType),j.mapping,a(1));if(THREE[j.minFilter]!==void 0)L.minFilter=THREE[j.minFilter];if(THREE[j.magFilter]!==void 0)L.magFilter=THREE[j.magFilter];if(j.anisotropy)L.anisotropy=j.anisotropy;if(j.repeat){L.repeat.set(j.repeat[0],j.repeat[1]);if(j.repeat[0]!==1)L.wrapS=THREE.RepeatWrapping;if(j.repeat[1]!==1)L.wrapT=THREE.RepeatWrapping}j.offset&&L.offset.set(j.offset[0],
+N.urlBaseType),f(j),E)}else if(n.type==="embedded"){n=N.embeds[n.id];n.metadata=N.metadata;n&&this.geometryHandlerMap.ascii.loaderObject.createModel(n,g(j),"")}}for(t in N.textures){j=N.textures[t];if(j.url instanceof Array){I=I+j.url.length;for(L=0;L<j.url.length;L++)i.onLoadStart()}else{I=I+1;i.onLoadStart()}}P=I;for(t in N.textures){j=N.textures[t];if(j.mapping!==void 0&&THREE[j.mapping]!==void 0)j.mapping=new THREE[j.mapping];if(j.url instanceof Array){L=j.url.length;n=[];for(E=0;E<L;E++)n[E]=
+d(j.url[E],N.urlBaseType);L=THREE.ImageUtils.loadTextureCube(n,j.mapping,a(L))}else{L=THREE.ImageUtils.loadTexture(d(j.url,N.urlBaseType),j.mapping,a(1));if(THREE[j.minFilter]!==void 0)L.minFilter=THREE[j.minFilter];if(THREE[j.magFilter]!==void 0)L.magFilter=THREE[j.magFilter];if(j.anisotropy)L.anisotropy=j.anisotropy;if(j.repeat){L.repeat.set(j.repeat[0],j.repeat[1]);if(j.repeat[0]!==1)L.wrapS=THREE.RepeatWrapping;if(j.repeat[1]!==1)L.wrapT=THREE.RepeatWrapping}j.offset&&L.offset.set(j.offset[0],
 j.offset[1]);if(j.wrap){n={repeat:THREE.RepeatWrapping,mirror:THREE.MirroredRepeatWrapping};if(n[j.wrap[0]]!==void 0)L.wrapS=n[j.wrap[0]];if(n[j.wrap[1]]!==void 0)L.wrapT=n[j.wrap[1]]}}G.textures[t]=L}for(o in N.materials){u=N.materials[o];for(z in u.parameters)if(z==="envMap"||z==="map"||z==="lightMap"||z==="bumpMap")u.parameters[z]=G.textures[u.parameters[z]];else if(z==="shading")u.parameters[z]=u.parameters[z]=="flat"?THREE.FlatShading:THREE.SmoothShading;else if(z==="blending")u.parameters[z]=
 u.parameters[z]in THREE?THREE[u.parameters[z]]:THREE.NormalBlending;else if(z==="combine")u.parameters[z]=u.parameters[z]=="MixOperation"?THREE.MixOperation:THREE.MultiplyOperation;else if(z==="vertexColors")if(u.parameters[z]=="face")u.parameters[z]=THREE.FaceColors;else{if(u.parameters[z])u.parameters[z]=THREE.VertexColors}else if(z==="wrapRGB"){t=u.parameters[z];u.parameters[z]=new THREE.Vector3(t[0],t[1],t[2])}if(u.parameters.opacity!==void 0&&u.parameters.opacity<1)u.parameters.transparent=true;
 if(u.parameters.normalMap){t=THREE.ShaderUtils.lib.normal;a=THREE.UniformsUtils.clone(t.uniforms);j=u.parameters.color;L=u.parameters.specular;n=u.parameters.ambient;E=u.parameters.shininess;a.tNormal.value=G.textures[u.parameters.normalMap];u.parameters.normalScale&&a.uNormalScale.value.set(u.parameters.normalScale[0],u.parameters.normalScale[1]);if(u.parameters.map){a.tDiffuse.value=u.parameters.map;a.enableDiffuse.value=true}if(u.parameters.envMap){a.tCube.value=u.parameters.envMap;a.enableReflection.value=

+ 20 - 8
examples/obj/blenderscene/scene.Cube.js

@@ -2,15 +2,16 @@
 
     "metadata" :
     {
-        "formatVersion" : 3,
-        "generatedBy"   : "Blender 2.60 Exporter",
+        "formatVersion" : 3.1,
+        "generatedBy"   : "Blender 2.63 Exporter",
         "vertices"      : 8,
         "faces"         : 6,
         "normals"       : 0,
         "colors"        : 0,
-        "uvs"           : 0,
+        "uvs"           : [],
         "materials"     : 1,
-        "morphTargets"  : 0
+        "morphTargets"  : 0,
+        "bones"         : 0
     },
 
     "scale" : 1.000000,
@@ -19,16 +20,20 @@
 	"DbgColor" : 15658734,
 	"DbgIndex" : 0,
 	"DbgName" : "Material",
-	"colorAmbient" : [0.0, 0.0, 0.0],
+	"blending" : "NormalBlending",
+	"colorAmbient" : [0.800000011920929, 0.12723851203918457, 0.15780764818191528],
 	"colorDiffuse" : [0.6400000190734865, 0.10179081114814892, 0.126246120426746],
 	"colorSpecular" : [0.5, 0.5, 0.5],
+	"depthTest" : true,
+	"depthWrite" : true,
 	"shading" : "Lambert",
 	"specularCoef" : 50,
 	"transparency" : 1.0,
+	"transparent" : false,
 	"vertexColors" : false
 	}],
 
-    "vertices": [1.000000,1.000000,-1.000000,1.000000,-1.000000,-1.000000,-1.000000,-1.000000,-1.000000,-1.000000,1.000000,-1.000000,1.000000,1.000000,1.000000,0.999999,-1.000001,1.000000,-1.000000,-1.000000,1.000000,-1.000000,1.000000,1.000000],
+    "vertices": [1,1,-1,1,-1,-1,-1,-1,-1,-1,1,-1,1,1,1,0.999999,-1,1,-1,-1,1,-1,1,1],
 
     "morphTargets": [],
 
@@ -36,10 +41,17 @@
 
     "colors": [],
 
-    "uvs": [[]],
+    "uvs": [],
 
-    "faces": [3,0,1,2,3,0,3,4,7,6,5,0,3,0,4,5,1,0,3,1,5,6,2,0,3,2,6,7,3,0,3,4,0,3,7,0]
+    "faces": [3,0,1,2,3,0,3,4,7,6,5,0,3,0,4,5,1,0,3,1,5,6,2,0,3,2,6,7,3,0,3,4,0,3,7,0],
 
+    "bones" : [],
+
+    "skinIndices" : [],
+
+    "skinWeights" : [],
+
+    "animation" : {}
 
 
 }

Plik diff jest za duży
+ 10 - 5
examples/obj/blenderscene/scene.Monkey.js


+ 20 - 8
examples/obj/blenderscene/scene.Plane.js

@@ -2,15 +2,16 @@
 
     "metadata" :
     {
-        "formatVersion" : 3,
-        "generatedBy"   : "Blender 2.60 Exporter",
+        "formatVersion" : 3.1,
+        "generatedBy"   : "Blender 2.63 Exporter",
         "vertices"      : 4,
         "faces"         : 1,
         "normals"       : 0,
         "colors"        : 0,
-        "uvs"           : 0,
+        "uvs"           : [],
         "materials"     : 1,
-        "morphTargets"  : 0
+        "morphTargets"  : 0,
+        "bones"         : 0
     },
 
     "scale" : 1.000000,
@@ -19,16 +20,20 @@
 	"DbgColor" : 15658734,
 	"DbgIndex" : 0,
 	"DbgName" : "Material.001",
-	"colorAmbient" : [0.0, 0.0, 0.0],
+	"blending" : "NormalBlending",
+	"colorAmbient" : [0.18078184127807617, 0.800000011920929, 0.3067648708820343],
 	"colorDiffuse" : [0.14462547517754842, 0.6400000190734865, 0.24541190036254967],
 	"colorSpecular" : [0.5, 0.5, 0.5],
+	"depthTest" : true,
+	"depthWrite" : true,
 	"shading" : "Lambert",
 	"specularCoef" : 50,
 	"transparency" : 1.0,
+	"transparent" : false,
 	"vertexColors" : false
 	}],
 
-    "vertices": [1.000000,1.000000,0.000000,1.000000,-1.000000,0.000000,-1.000000,-1.000000,0.000000,-1.000000,1.000000,0.000000],
+    "vertices": [1,1,0,1,-1,0,-1,-1,0,-1,1,0],
 
     "morphTargets": [],
 
@@ -36,10 +41,17 @@
 
     "colors": [],
 
-    "uvs": [[]],
+    "uvs": [],
 
-    "faces": [3,0,3,2,1,0]
+    "faces": [3,0,3,2,1,0],
 
+    "bones" : [],
+
+    "skinIndices" : [],
+
+    "skinWeights" : [],
+
+    "animation" : {}
 
 
 }

+ 194 - 194
examples/obj/blenderscene/scene.js

@@ -2,9 +2,9 @@
 
 "metadata" :
 {
-    "formatVersion" : 3,
+    "formatVersion" : 3.1,
     "sourceFile"    : "scene.blend",
-    "generatedBy"   : "Blender 2.60 Exporter",
+    "generatedBy"   : "Blender 2.63 Exporter",
     "objects"       : 27,
     "geometries"    : 3,
     "materials"     : 3,
@@ -21,378 +21,378 @@
         "geometry"  : "geo_Cube",
         "groups"    : [  ],
         "materials" : [ "Material" ],
-        "position"  : [ 10.623673, 0.321692, 3.370784 ],
-        "rotation"  : [ 0.005265, 0.056306, 1.566005 ],
-        "quaternion": [ 0.708568, -0.017992, 0.021809, 0.705076 ],
-        "scale"     : [ 8.310000, 0.120000, 4.930000 ],
+        "position"  : [ 10.6237, 0.321692, 3.37078 ],
+        "rotation"  : [ 0.00526525, 0.0563064, 1.566 ],
+        "quaternion": [ 0.708568, -0.0179916, 0.0218086, 0.705076 ],
+        "scale"     : [ 8.31, 0.12, 4.93 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.018" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ 1.702659, -5.860421, 0.680278 ],
-        "rotation"  : [ 1.413516, -0.081377, -3.079004 ],
-        "quaternion": [ 0.050177, -0.010617, -0.649485, -0.758643 ],
+        "position"  : [ 1.70266, -5.86042, 0.680278 ],
+        "rotation"  : [ 1.41352, -0.0813772, -3.079 ],
+        "quaternion": [ 0.0501767, -0.0106173, -0.649485, -0.758643 ],
         "scale"     : [ 0.435837, 0.435837, 0.435837 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.017" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ 0.081295, -5.808783, 0.639505 ],
-        "rotation"  : [ 1.413516, -0.081377, -3.079004 ],
-        "quaternion": [ 0.050177, -0.010617, -0.649485, -0.758643 ],
+        "position"  : [ 0.0812951, -5.80878, 0.639505 ],
+        "rotation"  : [ 1.41352, -0.0813772, -3.079 ],
+        "quaternion": [ 0.0501767, -0.0106173, -0.649485, -0.758643 ],
         "scale"     : [ 0.435837, 0.435837, 0.435837 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.016" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -1.569030, -5.747240, 0.619385 ],
-        "rotation"  : [ 1.413516, -0.081377, -3.079004 ],
-        "quaternion": [ 0.050177, -0.010617, -0.649485, -0.758643 ],
+        "position"  : [ -1.56903, -5.74724, 0.619385 ],
+        "rotation"  : [ 1.41352, -0.0813772, -3.079 ],
+        "quaternion": [ 0.0501767, -0.0106173, -0.649485, -0.758643 ],
         "scale"     : [ 0.435837, 0.435837, 0.435837 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.015" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -3.129120, -5.709269, 0.552267 ],
-        "rotation"  : [ 1.413516, -0.081377, -3.079004 ],
-        "quaternion": [ 0.050177, -0.010617, -0.649485, -0.758643 ],
+        "position"  : [ -3.12912, -5.70927, 0.552267 ],
+        "rotation"  : [ 1.41352, -0.0813772, -3.079 ],
+        "quaternion": [ 0.0501767, -0.0106173, -0.649485, -0.758643 ],
         "scale"     : [ 0.435837, 0.435837, 0.435837 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.014" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -6.386331, -3.004400, 0.382167 ],
-        "rotation"  : [ 1.646237, 0.058425, 1.670594 ],
-        "quaternion": [ 0.471896, 0.477057, 0.556810, 0.489585 ],
+        "position"  : [ -6.38633, -3.0044, 0.382167 ],
+        "rotation"  : [ 1.64624, 0.0584253, 1.67059 ],
+        "quaternion": [ 0.471896, 0.477057, 0.55681, 0.489585 ],
         "scale"     : [ 0.435837, 0.435837, 0.435837 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.013" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -6.499331, -1.593073, 0.471640 ],
-        "rotation"  : [ 1.646237, 0.058425, 1.670594 ],
-        "quaternion": [ 0.471896, 0.477057, 0.556810, 0.489585 ],
+        "position"  : [ -6.49933, -1.59307, 0.47164 ],
+        "rotation"  : [ 1.64624, 0.0584253, 1.67059 ],
+        "quaternion": [ 0.471896, 0.477057, 0.55681, 0.489585 ],
         "scale"     : [ 0.435837, 0.435837, 0.435837 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.012" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -6.629794, -0.234131, 0.533840 ],
-        "rotation"  : [ 1.646237, 0.058425, 1.670594 ],
-        "quaternion": [ 0.471896, 0.477057, 0.556810, 0.489585 ],
+        "position"  : [ -6.62979, -0.234131, 0.53384 ],
+        "rotation"  : [ 1.64624, 0.0584253, 1.67059 ],
+        "quaternion": [ 0.471896, 0.477057, 0.55681, 0.489585 ],
         "scale"     : [ 0.435837, 0.435837, 0.435837 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.011" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -6.713673, 1.008146, 0.629835 ],
-        "rotation"  : [ 1.646237, 0.058425, 1.670594 ],
-        "quaternion": [ 0.471896, 0.477057, 0.556810, 0.489585 ],
+        "position"  : [ -6.71367, 1.00815, 0.629835 ],
+        "rotation"  : [ 1.64624, 0.0584253, 1.67059 ],
+        "quaternion": [ 0.471896, 0.477057, 0.55681, 0.489585 ],
         "scale"     : [ 0.435837, 0.435837, 0.435837 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.010" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -2.010442, -24.343616, 1.387332 ],
-        "rotation"  : [ -1.621122, -2.949867, -0.136972 ],
-        "quaternion": [ 0.016439, -0.116140, -0.679574, -0.724169 ],
-        "scale"     : [ 9.160008, 9.160008, 9.160007 ],
+        "position"  : [ -2.01044, -24.3436, 1.38733 ],
+        "rotation"  : [ -1.62112, -2.94987, -0.136972 ],
+        "quaternion": [ 0.0164388, -0.11614, -0.679574, -0.724169 ],
+        "scale"     : [ 9.16001, 9.16001, 9.16001 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.009" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -4.292194, 7.975398, 1.826282 ],
-        "rotation"  : [ 1.594819, -0.080713, 0.213986 ],
-        "quaternion": [ 0.690920, 0.713888, 0.048328, 0.103242 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ -4.29219, 7.9754, 1.82628 ],
+        "rotation"  : [ 1.59482, -0.0807133, 0.213986 ],
+        "quaternion": [ 0.69092, 0.713888, 0.0483276, 0.103242 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.008" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ 2.151757, 8.065320, 1.891882 ],
-        "rotation"  : [ 1.594819, -0.080713, 0.213986 ],
-        "quaternion": [ 0.690920, 0.713888, 0.048328, 0.103242 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ 2.15176, 8.06532, 1.89188 ],
+        "rotation"  : [ 1.59482, -0.0807133, 0.213986 ],
+        "quaternion": [ 0.69092, 0.713888, 0.0483276, 0.103242 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.007" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -0.712512, 8.097841, 2.115002 ],
-        "rotation"  : [ 1.594819, -0.080713, 0.213986 ],
-        "quaternion": [ 0.690920, 0.713888, 0.048328, 0.103242 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ -0.712512, 8.09784, 2.115 ],
+        "rotation"  : [ 1.59482, -0.0807133, 0.213986 ],
+        "quaternion": [ 0.69092, 0.713888, 0.0483276, 0.103242 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Cube.005" : {
         "geometry"  : "geo_Cube",
         "groups"    : [  ],
         "materials" : [ "Material" ],
-        "position"  : [ -1.000975, 8.755547, 1.319482 ],
-        "rotation"  : [ 0.000000, -0.000000, 0.000000 ],
-        "quaternion": [ 1.000000, 0.000000, 0.000000, 0.000000 ],
-        "scale"     : [ 6.130000, 0.070000, 1.690000 ],
+        "position"  : [ -1.00097, 8.75555, 1.31948 ],
+        "rotation"  : [ 0, -0, 0 ],
+        "quaternion": [ 1, 0, 0, 0 ],
+        "scale"     : [ 6.13, 0.07, 1.69 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Cube.004" : {
         "geometry"  : "geo_Cube",
         "groups"    : [  ],
         "materials" : [ "Material" ],
-        "position"  : [ 2.484517, -7.486932, 2.724846 ],
-        "rotation"  : [ 0.220417, 0.075224, -0.181029 ],
-        "quaternion": [ 0.988791, 0.112836, 0.027288, -0.093898 ],
-        "scale"     : [ 0.350000, 0.890000, 3.309999 ],
+        "position"  : [ 2.48452, -7.48693, 2.72485 ],
+        "rotation"  : [ 0.220417, 0.0752244, -0.181029 ],
+        "quaternion": [ 0.988791, 0.112836, 0.0272876, -0.093898 ],
+        "scale"     : [ 0.35, 0.89, 3.31 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.006" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ 7.724935, 7.123103, 1.694883 ],
-        "rotation"  : [ 1.835590, -0.083161, 2.048913 ],
+        "position"  : [ 7.72494, 7.1231, 1.69488 ],
+        "rotation"  : [ 1.83559, -0.0831609, 2.04891 ],
         "quaternion": [ 0.287189, 0.433893, 0.664936, 0.535835 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.005" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -6.334642, 6.636147, 0.566791 ],
-        "rotation"  : [ 1.327136, 0.032561, -2.147285 ],
+        "position"  : [ -6.33464, 6.63615, 0.566791 ],
+        "rotation"  : [ 1.32714, 0.0325614, -2.14729 ],
         "quaternion": [ 0.366859, 0.304988, -0.535181, -0.697122 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.004" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -5.384042, -6.194087, 0.444915 ],
-        "rotation"  : [ 0.991213, -0.181430, -1.037108 ],
-        "quaternion": [ 0.782246, 0.371851, -0.303947, -0.396780 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ -5.38404, -6.19409, 0.444915 ],
+        "rotation"  : [ 0.991213, -0.18143, -1.03711 ],
+        "quaternion": [ 0.782246, 0.371851, -0.303947, -0.39678 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.003" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ 3.147747, -4.230884, 1.014840 ],
-        "rotation"  : [ -1.422281, 2.834549, 0.213809 ],
-        "quaternion": [ 0.046369, -0.179128, 0.733783, 0.653701 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ 3.14775, -4.23088, 1.01484 ],
+        "rotation"  : [ -1.42228, 2.83455, 0.213809 ],
+        "quaternion": [ 0.0463686, -0.179128, 0.733783, 0.653701 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.002" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -2.668043, -2.153389, 3.008879 ],
-        "rotation"  : [ 1.881970, -0.457870, 2.217052 ],
-        "quaternion": [ 0.091675, 0.470648, 0.644833, 0.595211 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ -2.66804, -2.15339, 3.00888 ],
+        "rotation"  : [ 1.88197, -0.45787, 2.21705 ],
+        "quaternion": [ 0.0916755, 0.470648, 0.644833, 0.595211 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Cube.003" : {
         "geometry"  : "geo_Cube",
         "groups"    : [  ],
         "materials" : [ "Material" ],
-        "position"  : [ -3.031251, -1.943665, 0.702044 ],
-        "rotation"  : [ 1.840852, 1.811250, -0.141131 ],
+        "position"  : [ -3.03125, -1.94366, 0.702044 ],
+        "rotation"  : [ 1.84085, 1.81125, -0.141131 ],
         "quaternion": [ 0.328619, 0.523567, 0.440581, -0.650981 ],
-        "scale"     : [ 1.781142, 0.361142, 0.231142 ],
+        "scale"     : [ 1.78114, 0.361142, 0.231142 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey.001" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ 1.245307, 0.137285, 0.620196 ],
-        "rotation"  : [ 2.339869, 0.286025, 1.394760 ],
-        "quaternion": [ 0.380330, 0.662839, 0.627894, 0.147451 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ 1.24531, 0.137285, 0.620196 ],
+        "rotation"  : [ 2.33987, 0.286025, 1.39476 ],
+        "quaternion": [ 0.38033, 0.662839, 0.627894, 0.147451 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Monkey" : {
         "geometry"  : "geo_Monkey",
         "groups"    : [  ],
         "materials" : [ "Material.002" ],
-        "position"  : [ -0.282500, 4.272932, 1.813606 ],
-        "rotation"  : [ 0.646062, 0.219349, 0.010569 ],
-        "quaternion": [ 0.942751, 0.314982, 0.105460, -0.029764 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ -0.2825, 4.27293, 1.81361 ],
+        "rotation"  : [ 0.646062, 0.219349, 0.0105691 ],
+        "quaternion": [ 0.942751, 0.314982, 0.10546, -0.0297641 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Cube.002" : {
         "geometry"  : "geo_Cube",
         "groups"    : [  ],
         "materials" : [ "Material" ],
-        "position"  : [ 0.042212, 0.199037, 5.536832 ],
-        "rotation"  : [ 0.000000, -0.000000, 0.000000 ],
-        "quaternion": [ 1.000000, 0.000000, 0.000000, 0.000000 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ 0.0422118, 0.199037, 5.53683 ],
+        "rotation"  : [ 0, -0, 0 ],
+        "quaternion": [ 1, 0, 0, 0 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Cube.001" : {
         "geometry"  : "geo_Cube",
         "groups"    : [  ],
         "materials" : [ "Material" ],
-        "position"  : [ -0.395497, 3.944532, 1.009696 ],
-        "rotation"  : [ 0.000000, -0.000000, 0.000000 ],
-        "quaternion": [ 1.000000, 0.000000, 0.000000, 0.000000 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ -0.395497, 3.94453, 1.0097 ],
+        "rotation"  : [ 0, -0, 0 ],
+        "quaternion": [ 1, 0, 0, 0 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Plane" : {
         "geometry"  : "geo_Plane",
         "groups"    : [  ],
         "materials" : [ "Material.001" ],
-        "position"  : [ 0.000000, -0.118260, 0.000000 ],
-        "rotation"  : [ 0.000000, -0.000000, 0.000000 ],
-        "quaternion": [ 1.000000, 0.000000, 0.000000, 0.000000 ],
-        "scale"     : [ 7.922787, 7.922787, 7.922787 ],
+        "position"  : [ 0, -0.11826, 0 ],
+        "rotation"  : [ 0, -0, 0 ],
+        "quaternion": [ 1, 0, 0, 0 ],
+        "scale"     : [ 7.92279, 7.92279, 7.92279 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     },
 
     "Cube" : {
         "geometry"  : "geo_Cube",
         "groups"    : [  ],
         "materials" : [ "Material" ],
-        "position"  : [ 3.651978, -0.000000, 1.071144 ],
-        "rotation"  : [ 0.220417, 0.075224, -0.181029 ],
-        "quaternion": [ 0.988791, 0.112836, 0.027288, -0.093898 ],
-        "scale"     : [ 1.000000, 1.000000, 1.000000 ],
+        "position"  : [ 3.65198, -1.49012e-08, 1.07114 ],
+        "rotation"  : [ 0.220417, 0.0752244, -0.181029 ],
+        "quaternion": [ 0.988791, 0.112836, 0.0272876, -0.093898 ],
+        "scale"     : [ 1, 1, 1 ],
         "visible"       : true,
-        "castsShadow"   : false,
-        "meshCollider"  : false,
-        "trigger"       : "None"
+        "castShadow"    : false,
+        "receiveShadow" : false,
+        "doubleSided"   : false
     }
 },
 
@@ -400,17 +400,17 @@
 "geometries" :
 {
     "geo_Cube" : {
-        "type" : "ascii_mesh",
+        "type" : "ascii",
         "url"  : "scene.Cube.js"
     },
 
     "geo_Monkey" : {
-        "type" : "ascii_mesh",
+        "type" : "ascii",
         "url"  : "scene.Monkey.js"
     },
 
     "geo_Plane" : {
-        "type" : "ascii_mesh",
+        "type" : "ascii",
         "url"  : "scene.Plane.js"
     }
 },
@@ -420,17 +420,17 @@
 {
     "Material" : {
         "type": "MeshLambertMaterial",
-        "parameters": { "color": 10688800, "opacity": 1 }
+        "parameters": { "color": 10688800, "opacity": 1, "blending": "NormalBlending" }
     },
 
     "Material.001" : {
         "type": "MeshLambertMaterial",
-        "parameters": { "color": 2401086, "opacity": 1 }
+        "parameters": { "color": 2401086, "opacity": 1, "blending": "NormalBlending" }
     },
 
     "Material.002" : {
         "type": "MeshLambertMaterial",
-        "parameters": { "color": 10711076, "opacity": 1 }
+        "parameters": { "color": 10711076, "opacity": 1, "blending": "NormalBlending" }
     }
 },
 
@@ -443,8 +443,8 @@
         "aspect": 1.333000,
         "near"  : 1.000000,
         "far"   : 10000.000000,
-        "position": [ 0.000000, 0.000000, 10.000000 ],
-        "target"  : [ 0.000000, 0.000000, 0.000000 ]
+        "position": [ 0, 0, 10 ],
+        "target"  : [ 0, 0, 0 ]
     }
 },
 
@@ -452,8 +452,8 @@
 "lights" :
 {
     "default_light": {
-        "type"		 : "directional",
-        "direction"	 : [ 0.000000, 1.000000, 1.000000 ],
+        "type"    	 : "directional",
+        "direction"	 : [ 0, 1, 1 ],
         "color" 	 : 16777215,
         "intensity"	 : 0.80
     }
@@ -462,14 +462,14 @@
 
 "transform" :
 {
-    "position"  : [ 0.000000, 0.000000, 0.000000 ],
-    "rotation"  : [ -1.570796, 0.000000, 0.000000 ],
-    "scale"     : [ 1.000000, 1.000000, 1.000000 ]
+    "position"  : [ 0, 0, 0 ],
+    "rotation"  : [ -1.5708, 0, 0 ],
+    "scale"     : [ 1, 1, 1 ]
 },
 
 "defaults" :
 {
-    "bgcolor" : [ 0.000000, 0.000000, 0.000000 ],
+    "bgcolor" : [ 0, 0, 0 ],
     "bgalpha" : 1.000000,
     "camera"  : "default_camera"
 }

+ 7 - 7
examples/scenes/test_scene.js

@@ -1,7 +1,7 @@
 {
 
 	"metadata": {
-		"formatVersion": 3,
+		"formatVersion": 3.1,
 		"type" : "scene"
 	},
 
@@ -294,29 +294,29 @@
 		},
 
 		"WaltHead": {
-			"type": "bin_mesh",
+			"type": "binary",
 			"url" : "obj/walt/WaltHead_bin.js"
 		},
 
 		"NinjaLo": {
-			"type": "bin_mesh",
+			"type": "binary",
 			"url" : "obj/ninja/NinjaLo_bin.js"
 		},
 
 		"veyron": {
-			"type": "bin_mesh",
+			"type": "binary",
 			"url" : "obj/veyron/VeyronNoUv_bin.js"
 		},
 
 		"ben": {
-			"type": "ctm_mesh",
+			"type": "ctm",
 			"url" : "models/ctm/ben.ctm",
 			"useWorkers" : true,
 			"useBuffers" : true
 		},
 
 		"hand": {
-			"type": "utf8_mesh",
+			"type": "utf8",
 			"url" : "models/utf8/hand.utf8",
 			"scale"   : 0.815141,
 			"offsetX" : -0.371823,
@@ -325,7 +325,7 @@
 		},
 
 		"colorcube": {
-			"type": "embedded_mesh",
+			"type": "embedded",
 			"id"  : "cube_fvc"
 		}
 

+ 2 - 2
examples/webgl_loader_scene.html

@@ -324,8 +324,8 @@
 
 				var loader = new THREE.SceneLoader();
 
-				loader.addGeometryHandler( "ctm_mesh", THREE.CTMLoader );
-				loader.addGeometryHandler( "utf8_mesh", THREE.UTF8Loader );
+				loader.addGeometryHandler( "ctm", THREE.CTMLoader );
+				loader.addGeometryHandler( "utf8", THREE.UTF8Loader );
 
 				loader.callbackSync = callbackSync;
 				loader.callbackProgress = callbackProgress;

+ 4 - 4
src/loaders/SceneLoader.js

@@ -13,8 +13,8 @@ THREE.SceneLoader = function () {
 
 	this.geometryHandlerMap = {};
 
-	this.addGeometryHandler( "ascii_mesh", THREE.JSONLoader );
-	this.addGeometryHandler( "bin_mesh", THREE.BinaryLoader );
+	this.addGeometryHandler( "ascii", THREE.JSONLoader );
+	this.addGeometryHandler( "binary", THREE.BinaryLoader );
 
 };
 
@@ -571,7 +571,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 			var loader = this.geometryHandlerMap[ g.type ][ "loaderObject" ];
 			loader.load( get_url( g.url, data.urlBaseType ), create_callback( dg ), loaderParameters );
 
-		} else if ( g.type === "embedded_mesh" ) {
+		} else if ( g.type === "embedded" ) {
 
 			var modelJson = data.embeds[ g.id ],
 				texture_path = "";
@@ -582,7 +582,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 			if ( modelJson ) {
 
-				var jsonLoader = this.geometryHandlerMap[ "ascii_mesh" ][ "loaderObject" ];
+				var jsonLoader = this.geometryHandlerMap[ "ascii" ][ "loaderObject" ];
 				jsonLoader.createModel( modelJson, create_callback_embed( dg ), texture_path );
 
 			}

+ 3 - 3
utils/exporters/blender/2.63/scripts/addons/io_mesh_threejs/export_threejs.py

@@ -85,7 +85,7 @@ TEMPLATE_SCENE_ASCII = """\
 
 "metadata" :
 {
-    "formatVersion" : 3,
+    "formatVersion" : 3.1,
     "sourceFile"    : "%(fname)s",
     "generatedBy"   : "Blender 2.63 Exporter",
     "objects"       : %(nobjects)s,
@@ -149,13 +149,13 @@ TEMPLATE_EMPTY = """\
 
 TEMPLATE_GEOMETRY_LINK = """\
     %(geometry_id)s : {
-        "type" : "ascii_mesh",
+        "type" : "ascii",
         "url"  : %(model_file)s
     }"""
 
 TEMPLATE_GEOMETRY_EMBED = """\
     %(geometry_id)s : {
-        "type" : "embedded_mesh",
+        "type" : "embedded",
         "id"  : %(embed_id)s
     }"""
 

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików