From 0198766fedad70b7baa46a48af7e238754351ebd Mon Sep 17 00:00:00 2001 From: Mikael Emtinger Date: Thu, 14 Apr 2011 16:23:21 +0200 Subject: [PATCH] Added .name and .getChildByName( "objectName", doRecurse ) to Object3D. Added so scene-loader fills in .name property. --- build/Three.js | 20 ++++++++++---------- src/core/Object3D.js | 34 ++++++++++++++++++++++++++++++++++ src/extras/io/SceneLoader.js | 1 + 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/build/Three.js b/build/Three.js index d7a13f28..3b4538c2 100755 --- a/build/Three.js +++ b/build/Three.js @@ -41,11 +41,11 @@ THREE.Matrix4.makeInvert3x3=function(b){var d=b.m33,c=d.m,f=b.n33*b.n22-b.n32*b. THREE.Matrix4.makeFrustum=function(b,d,c,f,g,h){var j;j=new THREE.Matrix4;j.n11=2*g/(d-b);j.n12=0;j.n13=(d+b)/(d-b);j.n14=0;j.n21=0;j.n22=2*g/(f-c);j.n23=(f+c)/(f-c);j.n24=0;j.n31=0;j.n32=0;j.n33=-(h+g)/(h-g);j.n34=-2*h*g/(h-g);j.n41=0;j.n42=0;j.n43=-1;j.n44=0;return j};THREE.Matrix4.makePerspective=function(b,d,c,f){var g;b=c*Math.tan(b*Math.PI/360);g=-b;return THREE.Matrix4.makeFrustum(g*d,b*d,g,b,c,f)}; THREE.Matrix4.makeOrtho=function(b,d,c,f,g,h){var j,k,m,o;j=new THREE.Matrix4;k=d-b;m=c-f;o=h-g;j.n11=2/k;j.n12=0;j.n13=0;j.n14=-((d+b)/k);j.n21=0;j.n22=2/m;j.n23=0;j.n24=-((c+f)/m);j.n31=0;j.n32=0;j.n33=-2/o;j.n34=-((h+g)/o);j.n41=0;j.n42=0;j.n43=0;j.n44=1;return j};THREE.Matrix4.__v1=new THREE.Vector3;THREE.Matrix4.__v2=new THREE.Vector3;THREE.Matrix4.__v3=new THREE.Vector3; THREE.Object3D=function(){this.parent=undefined;this.children=[];this.up=new THREE.Vector3(0,1,0);this.position=new THREE.Vector3;this.rotation=new THREE.Vector3;this.scale=new THREE.Vector3(1,1,1);this.rotationAutoUpdate=!0;this.matrix=new THREE.Matrix4;this.matrixWorld=new THREE.Matrix4;this.matrixRotationWorld=new THREE.Matrix4;this.matrixAutoUpdate=!0;this.matrixWorldNeedsUpdate=!0;this.quaternion=new THREE.Quaternion;this.useQuaternion=!1;this.boundRadius=0;this.boundRadiusScale=1;this.visible= -!0;this._vector=new THREE.Vector3}; -THREE.Object3D.prototype={translate:function(b,d){this.matrix.rotateAxis(d);this.position.addSelf(d.multiplyScalar(b))},translateX:function(b){this.translate(b,this._vector.set(1,0,0))},translateY:function(b){this.translate(b,this._vector.set(0,1,0))},translateZ:function(b){this.translate(b,this._vector.set(0,0,1))},lookAt:function(b){this.matrix.lookAt(b,this.position,this.up);this.rotationAutoUpdate&&this.rotation.setRotationFromMatrix(this.matrix)},addChild:function(b){if(this.children.indexOf(b)===-1){b.parent!== -undefined&&b.parent.removeChild(b);b.parent=this;this.children.push(b);for(var d=this;d instanceof THREE.Scene===!1&&d!==undefined;)d=d.parent;d!==undefined&&d.addChildRecurse(b)}},removeChild:function(b){var d=this.children.indexOf(b);if(d!==-1){b.parent=undefined;this.children.splice(d,1)}},updateMatrix:function(){this.matrix.setPosition(this.position);this.useQuaternion?this.matrix.setRotationFromQuaternion(this.quaternion):this.matrix.setRotationFromEuler(this.rotation);if(this.scale.x!==1||this.scale.y!== -1||this.scale.z!==1){this.matrix.scale(this.scale);this.boundRadiusScale=Math.max(this.scale.x,Math.max(this.scale.y,this.scale.z))}this.matrixWorldNeedsUpdate=!0},update:function(b,d,c){this.matrixAutoUpdate&&this.updateMatrix();if(this.matrixWorldNeedsUpdate||d){b?this.matrixWorld.multiply(b,this.matrix):this.matrixWorld.copy(this.matrix);this.matrixRotationWorld.extractRotation(this.matrixWorld,this.scale);this.matrixWorldNeedsUpdate=!1;d=!0}b=0;for(var f=this.children.length;b1&&(pa=[new THREE.MeshFaceMaterial]);object=new THREE.Mesh(O,pa);object.position.set(B[0],B[1],B[2]);if(q){object.quaternion.set(q[0],q[1],q[2],q[3]);object.useQuaternion=!0}else object.rotation.set(r[0],r[1],r[2]);object.scale.set(s[0],s[1],s[2]);object.visible=W.visible;ka.scene.addObject(object);ka.objects[u]=object;if(W.meshCollider){var wa=THREE.CollisionUtils.MeshColliderWBox(object);THREE.Collisions.colliders.push(wa)}}}}function o(wa){return function(ca){ka.geometries[wa]=ca;m(); -e-=1;p()}}function p(){f({total_models:Da,total_textures:Aa,loaded_models:Da-e,loaded_textures:Aa-oa},ka);e==0&&oa==0&&c(ka)}var t,z,u,A,E,H,J,W,B,U,N,O,ua,la,pa,ga,ha,e,oa,Da,Aa,ka;ga=j.data;j=new THREE.BinaryLoader;ha=new THREE.JSONLoader;oa=e=0;ka={scene:new THREE.Scene,geometries:{},materials:{},textures:{},objects:{},cameras:{},lights:{},fogs:{}};if(ga.transform){var fa=ga.transform.position;U=ga.transform.rotation;var va=ga.transform.scale;fa&&ka.scene.position.set(fa[0],fa[1],fa[2]);U&&ka.scene.rotation.set(U[0], -U[1],U[2]);va&&ka.scene.scale.set(va[0],va[1],va[2]);(fa||U||va)&&ka.scene.updateMatrix()}fa=function(){oa-=1;p()};for(E in ga.cameras){U=ga.cameras[E];if(U.type=="perspective")ua=new THREE.Camera(U.fov,U.aspect,U.near,U.far);else if(U.type=="ortho"){ua=new THREE.Camera;ua.projectionMatrix=THREE.Matrix4.makeOrtho(U.left,U.right,U.top,U.bottom,U.near,U.far)}B=U.position;U=U.target;ua.position.set(B[0],B[1],B[2]);ua.target.position.set(U[0],U[1],U[2]);ka.cameras[E]=ua}for(A in ga.lights){E=ga.lights[A]; -ua=E.color!==undefined?E.color:16777215;U=E.intensity!==undefined?E.intensity:1;if(E.type=="directional"){B=E.direction;light=new THREE.DirectionalLight(ua,U);light.position.set(B[0],B[1],B[2]);light.position.normalize()}else if(E.type=="point"){B=E.position;light=new THREE.PointLight(ua,U);light.position.set(B[0],B[1],B[2])}ka.scene.addLight(light);ka.lights[A]=light}for(H in ga.fogs){A=ga.fogs[H];if(A.type=="linear")la=new THREE.Fog(0,A.near,A.far);else A.type=="exp2"&&(la=new THREE.FogExp2(0,A.density)); -U=A.color;la.color.setRGB(U[0],U[1],U[2]);ka.fogs[H]=la}if(ka.cameras&&ga.defaults.camera)ka.currentCamera=ka.cameras[ga.defaults.camera];if(ka.fogs&&ga.defaults.fog)ka.scene.fog=ka.fogs[ga.defaults.fog];U=ga.defaults.bgcolor;ka.bgColor=new THREE.Color;ka.bgColor.setRGB(U[0],U[1],U[2]);ka.bgColorAlpha=ga.defaults.bgalpha;for(t in ga.geometries){H=ga.geometries[t];if(H.type=="bin_mesh"||H.type=="ascii_mesh")e+=1}Da=e;for(t in ga.geometries){H=ga.geometries[t];if(H.type=="cube"){O=new THREE.Cube(H.width, +pa.length>1&&(pa=[new THREE.MeshFaceMaterial]);object=new THREE.Mesh(O,pa);object.name=u;object.position.set(B[0],B[1],B[2]);if(q){object.quaternion.set(q[0],q[1],q[2],q[3]);object.useQuaternion=!0}else object.rotation.set(r[0],r[1],r[2]);object.scale.set(s[0],s[1],s[2]);object.visible=W.visible;ka.scene.addObject(object);ka.objects[u]=object;if(W.meshCollider){var wa=THREE.CollisionUtils.MeshColliderWBox(object);THREE.Collisions.colliders.push(wa)}}}}function o(wa){return function(ca){ka.geometries[wa]= +ca;m();e-=1;p()}}function p(){f({total_models:Da,total_textures:Aa,loaded_models:Da-e,loaded_textures:Aa-oa},ka);e==0&&oa==0&&c(ka)}var t,z,u,A,E,H,J,W,B,U,N,O,ua,la,pa,ga,ha,e,oa,Da,Aa,ka;ga=j.data;j=new THREE.BinaryLoader;ha=new THREE.JSONLoader;oa=e=0;ka={scene:new THREE.Scene,geometries:{},materials:{},textures:{},objects:{},cameras:{},lights:{},fogs:{}};if(ga.transform){var fa=ga.transform.position;U=ga.transform.rotation;var va=ga.transform.scale;fa&&ka.scene.position.set(fa[0],fa[1],fa[2]); +U&&ka.scene.rotation.set(U[0],U[1],U[2]);va&&ka.scene.scale.set(va[0],va[1],va[2]);(fa||U||va)&&ka.scene.updateMatrix()}fa=function(){oa-=1;p()};for(E in ga.cameras){U=ga.cameras[E];if(U.type=="perspective")ua=new THREE.Camera(U.fov,U.aspect,U.near,U.far);else if(U.type=="ortho"){ua=new THREE.Camera;ua.projectionMatrix=THREE.Matrix4.makeOrtho(U.left,U.right,U.top,U.bottom,U.near,U.far)}B=U.position;U=U.target;ua.position.set(B[0],B[1],B[2]);ua.target.position.set(U[0],U[1],U[2]);ka.cameras[E]=ua}for(A in ga.lights){E= +ga.lights[A];ua=E.color!==undefined?E.color:16777215;U=E.intensity!==undefined?E.intensity:1;if(E.type=="directional"){B=E.direction;light=new THREE.DirectionalLight(ua,U);light.position.set(B[0],B[1],B[2]);light.position.normalize()}else if(E.type=="point"){B=E.position;light=new THREE.PointLight(ua,U);light.position.set(B[0],B[1],B[2])}ka.scene.addLight(light);ka.lights[A]=light}for(H in ga.fogs){A=ga.fogs[H];if(A.type=="linear")la=new THREE.Fog(0,A.near,A.far);else A.type=="exp2"&&(la=new THREE.FogExp2(0, +A.density));U=A.color;la.color.setRGB(U[0],U[1],U[2]);ka.fogs[H]=la}if(ka.cameras&&ga.defaults.camera)ka.currentCamera=ka.cameras[ga.defaults.camera];if(ka.fogs&&ga.defaults.fog)ka.scene.fog=ka.fogs[ga.defaults.fog];U=ga.defaults.bgcolor;ka.bgColor=new THREE.Color;ka.bgColor.setRGB(U[0],U[1],U[2]);ka.bgColorAlpha=ga.defaults.bgalpha;for(t in ga.geometries){H=ga.geometries[t];if(H.type=="bin_mesh"||H.type=="ascii_mesh")e+=1}Da=e;for(t in ga.geometries){H=ga.geometries[t];if(H.type=="cube"){O=new THREE.Cube(H.width, H.height,H.depth,H.segmentsWidth,H.segmentsHeight,H.segmentsDepth,null,H.flipped,H.sides);ka.geometries[t]=O}else if(H.type=="plane"){O=new THREE.Plane(H.width,H.height,H.segmentsWidth,H.segmentsHeight);ka.geometries[t]=O}else if(H.type=="sphere"){O=new THREE.Sphere(H.radius,H.segmentsWidth,H.segmentsHeight);ka.geometries[t]=O}else if(H.type=="cylinder"){O=new THREE.Cylinder(H.numSegs,H.topRad,H.botRad,H.height,H.topOffset,H.botOffset);ka.geometries[t]=O}else if(H.type=="torus"){O=new THREE.Torus(H.radius, H.tube,H.segmentsR,H.segmentsT);ka.geometries[t]=O}else if(H.type=="icosahedron"){O=new THREE.Icosahedron(H.subdivisions);ka.geometries[t]=O}else if(H.type=="bin_mesh")j.load({model:k(H.url,ga.urlBaseType),callback:o(t)});else H.type=="ascii_mesh"&&ha.load({model:k(H.url,ga.urlBaseType),callback:o(t)})}for(J in ga.textures){t=ga.textures[J];oa+=t.url instanceof Array?t.url.length:1}Aa=oa;for(J in ga.textures){t=ga.textures[J];if(t.mapping!=undefined&&THREE[t.mapping]!=undefined)t.mapping=new THREE[t.mapping]; if(t.url instanceof Array){H=[];for(var sa=0;sa