diff --git a/build/Three.js b/build/Three.js index 1795ee401eca0198ff0d75f9124ee1e35368865e..fa0df9af7d2ea63ef46a74c3c479b3f21b23b172 100644 --- a/build/Three.js +++ b/build/Three.js @@ -78,7 +78,7 @@ THREE.ParticleBasicMaterial=function(a){this.color=new THREE.Color(16711680);thi this.blending+"
)"}};THREE.ParticleCircleMaterial=function(a){this.color=new THREE.Color(16711680);this.opacity=1;this.blending=THREE.NormalBlending;if(a){a.color!==undefined&&this.color.setHex(a.color);if(a.opacity!==undefined)this.opacity=a.opacity;if(a.blending!==undefined)this.blending=a.blending}this.toString=function(){return"THREE.ParticleCircleMaterial (
color: "+this.color+"
opacity: "+this.opacity+"
blending: "+this.blending+"
)"}}; THREE.ParticleDOMMaterial=function(a){this.domElement=a;this.toString=function(){return"THREE.ParticleDOMMaterial ( domElement: "+this.domElement+" )"}};THREE.Texture=function(a,c,f,h){this.image=a;this.mapping=c!==undefined?c:THREE.UVMapping;this.wrap_s=f!==undefined?f:THREE.ClampToEdge;this.wrap_t=h!==undefined?h:THREE.ClampToEdge;this.toString=function(){return"THREE.Texture (
image: "+this.image+"
wrap_s: "+this.wrap_s+"
wrap_t: "+this.wrap_t+"
)"}};THREE.UVMapping=0; THREE.ReflectionMap=1;THREE.RefractionMap=2;THREE.Multiply=0;THREE.Mix=1;THREE.Repeat=0;THREE.ClampToEdge=1;THREE.MirroredRepeat=2;THREE.TextureCube=function(a,c){this.image=a;this.mapping=c?c:THREE.ReflectionMap;this.toString=function(){return"THREE.TextureCube (
image: "+this.image+"
mapping: "+this.mapping+"
)"}}; -THREE.Scene=function(){this.objects=[];this.lights=[];this.addObject=function(a){this.objects.push(a)};this.removeObject=function(a){var c=this.objects.indexOf(a);c!==-1&&this.objects.splice(c,1);a.__removed=true};this.addLight=function(a){this.lights.push(a)};this.removeLight=function(a){a=this.lights.indexOf(a);a!==-1&&this.lights.splice(a,1)};this.toString=function(){return"THREE.Scene ( "+this.objects+" )"}}; +THREE.Scene=function(){this.objects=[];this.lights=[];this.addObject=function(a){this.objects.push(a)};this.removeObject=function(a){a=this.objects.indexOf(a);a!==-1&&this.objects.splice(a,1)};this.addLight=function(a){this.lights.push(a)};this.removeLight=function(a){a=this.lights.indexOf(a);a!==-1&&this.lights.splice(a,1)};this.toString=function(){return"THREE.Scene ( "+this.objects+" )"}}; THREE.Projector=function(){function a(r,q){var l=0,R=1,H=r.z+r.w,U=q.z+q.w,$=-r.z+r.w,t=-q.z+q.w;if(H>=0&&U>=0&&$>=0&&t>=0)return true;else if(H<0&&U<0||$<0&&t<0)return false;else{if(H<0)l=Math.max(l,H/(H-U));else if(U<0)R=Math.min(R,H/(H-U));if($<0)l=Math.max(l,$/($-t));else if(t<0)R=Math.min(R,$/($-t));if(R0&&N.z<1}oa=t.geometry.faces;H=0;for(U= oa.length;H=0;g--){i=e.__webGLObjects[g].__object;i.__removed&&e.__webGLObjects.splice(g,1)}};this.setupMatrices=function(e,g){e.autoUpdateMatrix&&e.updateMatrix();p.multiply(g.matrix,e.matrix);d.viewMatrixArray=new Float32Array(g.matrix.flatten());d.modelViewMatrixArray= -new Float32Array(p.flatten());d.projectionMatrixArray=new Float32Array(g.projectionMatrix.flatten());s=THREE.Matrix4.makeInvert3x3(p).transpose();d.normalMatrixArray=new Float32Array(s.m);b.uniformMatrix4fv(d.viewMatrix,false,d.viewMatrixArray);b.uniformMatrix4fv(d.modelViewMatrix,false,d.modelViewMatrixArray);b.uniformMatrix4fv(d.projectionMatrix,false,d.projectionMatrixArray);b.uniformMatrix3fv(d.normalMatrix,false,d.normalMatrixArray);b.uniformMatrix4fv(d.objMatrix,false,new Float32Array(e.matrix.flatten()))}; -this.setBlending=function(e){switch(e){case THREE.AdditiveBlending:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE);break;case THREE.SubtractiveBlending:b.blendFunc(b.DST_COLOR,b.ZERO);break;default:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE_MINUS_SRC_ALPHA)}};this.setFaceCulling=function(e,g){if(e){!g||g=="ccw"?b.frontFace(b.CCW):b.frontFace(b.CW);if(e=="back")b.cullFace(b.BACK);else e=="front"?b.cullFace(b.FRONT):b.cullFace(b.FRONT_AND_BACK);b.enable(b.CULL_FACE)}else b.disable(b.CULL_FACE)}}; +e.objects.length;g=0;k--){i=e.__webGLObjects[k].__object;g==i&&e.__webGLObjects.splice(k,1)}};this.setupMatrices=function(e,g){e.autoUpdateMatrix&&e.updateMatrix();p.multiply(g.matrix,e.matrix);d.viewMatrixArray=new Float32Array(g.matrix.flatten()); +d.modelViewMatrixArray=new Float32Array(p.flatten());d.projectionMatrixArray=new Float32Array(g.projectionMatrix.flatten());s=THREE.Matrix4.makeInvert3x3(p).transpose();d.normalMatrixArray=new Float32Array(s.m);b.uniformMatrix4fv(d.viewMatrix,false,d.viewMatrixArray);b.uniformMatrix4fv(d.modelViewMatrix,false,d.modelViewMatrixArray);b.uniformMatrix4fv(d.projectionMatrix,false,d.projectionMatrixArray);b.uniformMatrix3fv(d.normalMatrix,false,d.normalMatrixArray);b.uniformMatrix4fv(d.objMatrix,false, +new Float32Array(e.matrix.flatten()))};this.setBlending=function(e){switch(e){case THREE.AdditiveBlending:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE);break;case THREE.SubtractiveBlending:b.blendFunc(b.DST_COLOR,b.ZERO);break;default:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE_MINUS_SRC_ALPHA)}};this.setFaceCulling=function(e,g){if(e){!g||g=="ccw"?b.frontFace(b.CCW):b.frontFace(b.CW);if(e=="back")b.cullFace(b.BACK);else e=="front"?b.cullFace(b.FRONT):b.cullFace(b.FRONT_AND_BACK);b.enable(b.CULL_FACE)}else b.disable(b.CULL_FACE)}}; THREE.RenderableFace3=function(){this.v1=new THREE.Vertex;this.v2=new THREE.Vertex;this.v3=new THREE.Vertex;this.centroidWorld=new THREE.Vector3;this.centroidScreen=new THREE.Vector3;this.normalWorld=new THREE.Vector3;this.material=this.color=this.z=null}; THREE.RenderableFace4=function(){this.v1=new THREE.Vertex;this.v2=new THREE.Vertex;this.v3=new THREE.Vertex;this.v4=new THREE.Vertex;this.centroidWorld=new THREE.Vector3;this.centroidScreen=new THREE.Vector3;this.normalWorld=new THREE.Vector3;this.material=this.color=this.z=null};THREE.RenderableParticle=function(){this.rotation=this.z=this.y=this.x=null;this.scale=new THREE.Vector2;this.material=this.color=null}; THREE.RenderableLine=function(){this.v1=new THREE.Vertex;this.v2=new THREE.Vertex;this.material=this.color=this.z=null}; diff --git a/build/ThreeDebug.js b/build/ThreeDebug.js index 64a2ed4806f1459346c8e04b755fcb70c04bb08b..55644cea7957d515b681e7752b18c4158ded1051 100644 --- a/build/ThreeDebug.js +++ b/build/ThreeDebug.js @@ -11,10 +11,10 @@ distanceToSquared:function(a){var c=this.x-a.x,f=this.y-a.y;a=this.z-a.z;return THREE.Vector4.prototype={set:function(a,c,f,h){this.x=a;this.y=c;this.z=f;this.w=h;return this},copy:function(a){this.x=a.x;this.y=a.y;this.z=a.z;this.w=a.w||1;return this},add:function(a,c){this.x=a.x+c.x;this.y=a.y+c.y;this.z=a.z+c.z;this.w=a.w+c.w;return this},addSelf:function(a){this.x+=a.x;this.y+=a.y;this.z+=a.z;this.w+=a.w;return this},sub:function(a,c){this.x=a.x-c.x;this.y=a.y-c.y;this.z=a.z-c.z;this.w=a.w-c.w;return this},subSelf:function(a){this.x-=a.x;this.y-=a.y;this.z-=a.z;this.w-=a.w; return this},multiplyScalar:function(a){this.x*=a;this.y*=a;this.z*=a;this.w*=a;return this},divideScalar:function(a){this.x/=a;this.y/=a;this.z/=a;this.w/=a;return this},lerpSelf:function(a,c){this.x+=(a.x-this.x)*c;this.y+=(a.y-this.y)*c;this.z+=(a.z-this.z)*c;this.w+=(a.w-this.w)*c},clone:function(){return new THREE.Vector4(this.x,this.y,this.z,this.w)},toString:function(){return"THREE.Vector4 ("+this.x+", "+this.y+", "+this.z+", "+this.w+")"}}; THREE.Ray=function(a,c){this.origin=a||new THREE.Vector3;this.direction=c||new THREE.Vector3}; -THREE.Ray.prototype={intersectScene:function(a){var c,f,h=a.objects,b=[];a=0;for(c=h.length;a0&&C>0&&k+C<1}var f,h,b,d,p,s,o,e,g,l, -i,n=a.geometry,j=n.vertices,A=[];f=0;for(h=n.faces.length;f0&&C>0&&l+C<1}var f,h,b,d,p,s,o,e,g,k, +i,n=a.geometry,j=n.vertices,A=[];f=0;for(h=n.faces.length;f= 0&&Math.min(b,o.getBottom())-Math.max(f,o.getTop())>=0};this.empty=function(){s=true;b=h=f=c=0;a()};this.isEmpty=function(){return s};this.toString=function(){return"THREE.Rectangle ( left: "+c+", right: "+h+", top: "+f+", bottom: "+b+", width: "+d+", height: "+p+" )"}};THREE.Matrix3=function(){this.m=[]};THREE.Matrix3.prototype={transpose:function(){var a;a=this.m[1];this.m[1]=this.m[3];this.m[3]=a;a=this.m[2];this.m[2]=this.m[6];this.m[6]=a;a=this.m[5];this.m[5]=this.m[7];this.m[7]=a;return this}}; THREE.Matrix4=function(){this._x=new THREE.Vector3;this._y=new THREE.Vector3;this._z=new THREE.Vector3}; @@ -23,8 +23,8 @@ a.n41;this.n42=a.n42;this.n43=a.n43;this.n44=a.n44},lookAt:function(a,c,f){var h b;a.y=this.n21*c+this.n22*f+this.n23*h+this.n24*b;a.z=this.n31*c+this.n32*f+this.n33*h+this.n34*b;b=this.n41*c+this.n42*f+this.n43*h+this.n44*b;if(a.w)a.w=b;else{a.x/=b;a.y/=b;a.z/=b}return a},crossVector:function(a){var c=new THREE.Vector4;c.x=this.n11*a.x+this.n12*a.y+this.n13*a.z+this.n14*a.w;c.y=this.n21*a.x+this.n22*a.y+this.n23*a.z+this.n24*a.w;c.z=this.n31*a.x+this.n32*a.y+this.n33*a.z+this.n34*a.w;c.w=a.w?this.n41*a.x+this.n42*a.y+this.n43*a.z+this.n44*a.w:1;return c},multiply:function(a, c){this.n11=a.n11*c.n11+a.n12*c.n21+a.n13*c.n31+a.n14*c.n41;this.n12=a.n11*c.n12+a.n12*c.n22+a.n13*c.n32+a.n14*c.n42;this.n13=a.n11*c.n13+a.n12*c.n23+a.n13*c.n33+a.n14*c.n43;this.n14=a.n11*c.n14+a.n12*c.n24+a.n13*c.n34+a.n14*c.n44;this.n21=a.n21*c.n11+a.n22*c.n21+a.n23*c.n31+a.n24*c.n41;this.n22=a.n21*c.n12+a.n22*c.n22+a.n23*c.n32+a.n24*c.n42;this.n23=a.n21*c.n13+a.n22*c.n23+a.n23*c.n33+a.n24*c.n43;this.n24=a.n21*c.n14+a.n22*c.n24+a.n23*c.n34+a.n24*c.n44;this.n31=a.n31*c.n11+a.n32*c.n21+a.n33*c.n31+ a.n34*c.n41;this.n32=a.n31*c.n12+a.n32*c.n22+a.n33*c.n32+a.n34*c.n42;this.n33=a.n31*c.n13+a.n32*c.n23+a.n33*c.n33+a.n34*c.n43;this.n34=a.n31*c.n14+a.n32*c.n24+a.n33*c.n34+a.n34*c.n44;this.n41=a.n41*c.n11+a.n42*c.n21+a.n43*c.n31+a.n44*c.n41;this.n42=a.n41*c.n12+a.n42*c.n22+a.n43*c.n32+a.n44*c.n42;this.n43=a.n41*c.n13+a.n42*c.n23+a.n43*c.n33+a.n44*c.n43;this.n44=a.n41*c.n14+a.n42*c.n24+a.n43*c.n34+a.n44*c.n44},multiplySelf:function(a){var c=this.n11,f=this.n12,h=this.n13,b=this.n14,d=this.n21,p=this.n22, -s=this.n23,o=this.n24,e=this.n31,g=this.n32,l=this.n33,i=this.n34,n=this.n41,j=this.n42,A=this.n43,C=this.n44;this.n11=c*a.n11+f*a.n21+h*a.n31+b*a.n41;this.n12=c*a.n12+f*a.n22+h*a.n32+b*a.n42;this.n13=c*a.n13+f*a.n23+h*a.n33+b*a.n43;this.n14=c*a.n14+f*a.n24+h*a.n34+b*a.n44;this.n21=d*a.n11+p*a.n21+s*a.n31+o*a.n41;this.n22=d*a.n12+p*a.n22+s*a.n32+o*a.n42;this.n23=d*a.n13+p*a.n23+s*a.n33+o*a.n43;this.n24=d*a.n14+p*a.n24+s*a.n34+o*a.n44;this.n31=e*a.n11+g*a.n21+l*a.n31+i*a.n41;this.n32=e*a.n12+g*a.n22+ -l*a.n32+i*a.n42;this.n33=e*a.n13+g*a.n23+l*a.n33+i*a.n43;this.n34=e*a.n14+g*a.n24+l*a.n34+i*a.n44;this.n41=n*a.n11+j*a.n21+A*a.n31+C*a.n41;this.n42=n*a.n12+j*a.n22+A*a.n32+C*a.n42;this.n43=n*a.n13+j*a.n23+A*a.n33+C*a.n43;this.n44=n*a.n14+j*a.n24+A*a.n34+C*a.n44},multiplyScalar:function(a){this.n11*=a;this.n12*=a;this.n13*=a;this.n14*=a;this.n21*=a;this.n22*=a;this.n23*=a;this.n24*=a;this.n31*=a;this.n32*=a;this.n33*=a;this.n34*=a;this.n41*=a;this.n42*=a;this.n43*=a;this.n44*=a},determinant:function(){return this.n14* +s=this.n23,o=this.n24,e=this.n31,g=this.n32,k=this.n33,i=this.n34,n=this.n41,j=this.n42,A=this.n43,C=this.n44;this.n11=c*a.n11+f*a.n21+h*a.n31+b*a.n41;this.n12=c*a.n12+f*a.n22+h*a.n32+b*a.n42;this.n13=c*a.n13+f*a.n23+h*a.n33+b*a.n43;this.n14=c*a.n14+f*a.n24+h*a.n34+b*a.n44;this.n21=d*a.n11+p*a.n21+s*a.n31+o*a.n41;this.n22=d*a.n12+p*a.n22+s*a.n32+o*a.n42;this.n23=d*a.n13+p*a.n23+s*a.n33+o*a.n43;this.n24=d*a.n14+p*a.n24+s*a.n34+o*a.n44;this.n31=e*a.n11+g*a.n21+k*a.n31+i*a.n41;this.n32=e*a.n12+g*a.n22+ +k*a.n32+i*a.n42;this.n33=e*a.n13+g*a.n23+k*a.n33+i*a.n43;this.n34=e*a.n14+g*a.n24+k*a.n34+i*a.n44;this.n41=n*a.n11+j*a.n21+A*a.n31+C*a.n41;this.n42=n*a.n12+j*a.n22+A*a.n32+C*a.n42;this.n43=n*a.n13+j*a.n23+A*a.n33+C*a.n43;this.n44=n*a.n14+j*a.n24+A*a.n34+C*a.n44},multiplyScalar:function(a){this.n11*=a;this.n12*=a;this.n13*=a;this.n14*=a;this.n21*=a;this.n22*=a;this.n23*=a;this.n24*=a;this.n31*=a;this.n32*=a;this.n33*=a;this.n34*=a;this.n41*=a;this.n42*=a;this.n43*=a;this.n44*=a},determinant:function(){return this.n14* this.n23*this.n32*this.n41-this.n13*this.n24*this.n32*this.n41-this.n14*this.n22*this.n33*this.n41+this.n12*this.n24*this.n33*this.n41+this.n13*this.n22*this.n34*this.n41-this.n12*this.n23*this.n34*this.n41-this.n14*this.n23*this.n31*this.n42+this.n13*this.n24*this.n31*this.n42+this.n14*this.n21*this.n33*this.n42-this.n11*this.n24*this.n33*this.n42-this.n13*this.n21*this.n34*this.n42+this.n11*this.n23*this.n34*this.n42+this.n14*this.n22*this.n31*this.n43-this.n12*this.n24*this.n31*this.n43-this.n14* this.n21*this.n32*this.n43+this.n11*this.n24*this.n32*this.n43+this.n12*this.n21*this.n34*this.n43-this.n11*this.n22*this.n34*this.n43-this.n13*this.n22*this.n31*this.n44+this.n12*this.n23*this.n31*this.n44+this.n13*this.n21*this.n32*this.n44-this.n11*this.n23*this.n32*this.n44-this.n12*this.n21*this.n33*this.n44+this.n11*this.n22*this.n33*this.n44},transpose:function(){function a(c,f,h){var b=c[f];c[f]=c[h];c[h]=b}a(this,"n21","n12");a(this,"n31","n13");a(this,"n32","n23");a(this,"n41","n14");a(this, "n42","n24");a(this,"n43","n34");return this},clone:function(){var a=new THREE.Matrix4;a.n11=this.n11;a.n12=this.n12;a.n13=this.n13;a.n14=this.n14;a.n21=this.n21;a.n22=this.n22;a.n23=this.n23;a.n24=this.n24;a.n31=this.n31;a.n32=this.n32;a.n33=this.n33;a.n34=this.n34;a.n41=this.n41;a.n42=this.n42;a.n43=this.n43;a.n44=this.n44;return a},flatten:function(){return[this.n11,this.n21,this.n31,this.n41,this.n12,this.n22,this.n32,this.n42,this.n13,this.n23,this.n33,this.n43,this.n14,this.n24,this.n34,this.n44]}, @@ -53,7 +53,7 @@ THREE.Object3D=function(){this.position=new THREE.Vector3;this.rotation=new THRE this.matrixRotation.multiplySelf(THREE.Matrix4.rotationYMatrix(this.rotation.y));this.matrixRotation.multiplySelf(THREE.Matrix4.rotationZMatrix(this.rotation.z));this.matrixScale=THREE.Matrix4.scaleMatrix(this.scale.x,this.scale.y,this.scale.z);this.matrix.copy(this.matrixPosition);this.matrix.multiplySelf(this.matrixRotation);this.matrix.multiplySelf(this.matrixScale)}};THREE.Particle=function(a){THREE.Object3D.call(this);this.material=a instanceof Array?a:[a];this.autoUpdateMatrix=false}; THREE.Particle.prototype=new THREE.Object3D;THREE.Particle.prototype.constructor=THREE.Particle;THREE.Line=function(a,c){THREE.Object3D.call(this);this.geometry=a;this.material=c instanceof Array?c:[c]};THREE.Line.prototype=new THREE.Object3D;THREE.Line.prototype.constructor=THREE.Line; THREE.Mesh=function(a,c,f){THREE.Object3D.call(this);this.geometry=a;this.material=c instanceof Array?c:[c];this.overdraw=this.doubleSided=this.flipSided=false;this.materialFaceGroup={};this.sortFacesByMaterial();f&&this.normalizeUVs();this.geometry.computeBoundingBox()};THREE.Mesh.prototype=new THREE.Object3D;THREE.Mesh.prototype.constructor=THREE.Mesh; -THREE.Mesh.prototype.sortFacesByMaterial=function(){function a(g){var l=[];c=0;for(f=g.length;c65535){e[s].counter+=1;o=e[s].hash+"_"+e[s].counter;if(this.materialFaceGroup[o]==undefined)this.materialFaceGroup[o]={faces:[],material:p,vertices:0}}this.materialFaceGroup[o].faces.push(h);this.materialFaceGroup[o].vertices+=d}};THREE.Mesh.prototype.normalizeUVs=function(){var a,c,f,h,b;a=0;for(c=this.geometry.uvs.length;acolor: "+ @@ -78,54 +78,54 @@ THREE.ParticleBasicMaterial=function(a){this.color=new THREE.Color(16711680);thi this.blending+"
)"}};THREE.ParticleCircleMaterial=function(a){this.color=new THREE.Color(16711680);this.opacity=1;this.blending=THREE.NormalBlending;if(a){a.color!==undefined&&this.color.setHex(a.color);if(a.opacity!==undefined)this.opacity=a.opacity;if(a.blending!==undefined)this.blending=a.blending}this.toString=function(){return"THREE.ParticleCircleMaterial (
color: "+this.color+"
opacity: "+this.opacity+"
blending: "+this.blending+"
)"}}; THREE.ParticleDOMMaterial=function(a){this.domElement=a;this.toString=function(){return"THREE.ParticleDOMMaterial ( domElement: "+this.domElement+" )"}};THREE.Texture=function(a,c,f,h){this.image=a;this.mapping=c!==undefined?c:THREE.UVMapping;this.wrap_s=f!==undefined?f:THREE.ClampToEdge;this.wrap_t=h!==undefined?h:THREE.ClampToEdge;this.toString=function(){return"THREE.Texture (
image: "+this.image+"
wrap_s: "+this.wrap_s+"
wrap_t: "+this.wrap_t+"
)"}};THREE.UVMapping=0; THREE.ReflectionMap=1;THREE.RefractionMap=2;THREE.Multiply=0;THREE.Mix=1;THREE.Repeat=0;THREE.ClampToEdge=1;THREE.MirroredRepeat=2;THREE.TextureCube=function(a,c){this.image=a;this.mapping=c?c:THREE.ReflectionMap;this.toString=function(){return"THREE.TextureCube (
image: "+this.image+"
mapping: "+this.mapping+"
)"}}; -THREE.Scene=function(){this.objects=[];this.lights=[];this.addObject=function(a){this.objects.push(a)};this.removeObject=function(a){var c=this.objects.indexOf(a);c!==-1&&this.objects.splice(c,1);a.__removed=true};this.addLight=function(a){this.lights.push(a)};this.removeLight=function(a){a=this.lights.indexOf(a);a!==-1&&this.lights.splice(a,1)};this.toString=function(){return"THREE.Scene ( "+this.objects+" )"}}; -THREE.Projector=function(){function a(r,q){var k=0,R=1,H=r.z+r.w,U=q.z+q.w,$=-r.z+r.w,t=-q.z+q.w;if(H>=0&&U>=0&&$>=0&&t>=0)return true;else if(H<0&&U<0||$<0&&t<0)return false;else{if(H<0)k=Math.max(k,H/(H-U));else if(U<0)R=Math.min(R,H/(H-U));if($<0)k=Math.max(k,$/($-t));else if(t<0)R=Math.min(R,$/($-t));if(R0&&N.z<1}pa=t.geometry.faces;H=0;for(U= +THREE.Scene=function(){this.objects=[];this.lights=[];this.addObject=function(a){this.objects.push(a)};this.removeObject=function(a){a=this.objects.indexOf(a);a!==-1&&this.objects.splice(a,1)};this.addLight=function(a){this.lights.push(a)};this.removeLight=function(a){a=this.lights.indexOf(a);a!==-1&&this.lights.splice(a,1)};this.toString=function(){return"THREE.Scene ( "+this.objects+" )"}}; +THREE.Projector=function(){function a(r,q){var l=0,R=1,H=r.z+r.w,U=q.z+q.w,$=-r.z+r.w,t=-q.z+q.w;if(H>=0&&U>=0&&$>=0&&t>=0)return true;else if(H<0&&U<0||$<0&&t<0)return false;else{if(H<0)l=Math.max(l,H/(H-U));else if(U<0)R=Math.min(R,H/(H-U));if($<0)l=Math.max(l,$/($-t));else if(t<0)R=Math.min(R,$/($-t));if(R0&&N.z<1}pa=t.geometry.faces;H=0;for(U= pa.length;H0&&j.z<1){l=n[i]=n[i]|| -new THREE.RenderableParticle;l.x=j.x/j.w;l.y=j.y/j.w;l.z=j.z;l.rotation=t.rotation.z;l.scale.x=t.scale.x*Math.abs(l.x-(j.x+q.projectionMatrix.n11)/(j.w+q.projectionMatrix.n14));l.scale.y=t.scale.y*Math.abs(l.y-(j.y+q.projectionMatrix.n22)/(j.w+q.projectionMatrix.n24));l.material=t.material;c.push(l);i++}}}c.sort(function(X,O){return O.z-X.z});return c};this.unprojectVector=function(r,q){var k=new THREE.Matrix4;k.multiply(THREE.Matrix4.makeInvert(q.matrix),THREE.Matrix4.makeInvert(q.projectionMatrix)); -k.transform(r);return r}}; -THREE.DOMRenderer=function(){THREE.Renderer.call(this);var a=null,c=new THREE.Projector,f,h,b,d;this.domElement=document.createElement("div");this.setSize=function(p,s){f=p;h=s;b=f/2;d=h/2};this.render=function(p,s){var o,e,g,l,i,n,j,A;a=c.projectScene(p,s);o=0;for(e=a.length;o0&&j.z<1){k=n[i]=n[i]|| +new THREE.RenderableParticle;k.x=j.x/j.w;k.y=j.y/j.w;k.z=j.z;k.rotation=t.rotation.z;k.scale.x=t.scale.x*Math.abs(k.x-(j.x+q.projectionMatrix.n11)/(j.w+q.projectionMatrix.n14));k.scale.y=t.scale.y*Math.abs(k.y-(j.y+q.projectionMatrix.n22)/(j.w+q.projectionMatrix.n24));k.material=t.material;c.push(k);i++}}}c.sort(function(X,O){return O.z-X.z});return c};this.unprojectVector=function(r,q){var l=new THREE.Matrix4;l.multiply(THREE.Matrix4.makeInvert(q.matrix),THREE.Matrix4.makeInvert(q.projectionMatrix)); +l.transform(r);return r}}; +THREE.DOMRenderer=function(){THREE.Renderer.call(this);var a=null,c=new THREE.Projector,f,h,b,d;this.domElement=document.createElement("div");this.setSize=function(p,s){f=p;h=s;b=f/2;d=h/2};this.render=function(p,s){var o,e,g,k,i,n,j,A;a=c.projectScene(p,s);o=0;for(e=a.length;o0){I.r+=G.r*m;I.g+=G.g*m;I.b+=G.b*m}}else if(m instanceof THREE.PointLight){La.sub(m.position,M.centroidWorld);La.normalize();m=M.normalWorld.dot(La)*m.intensity;if(m>0){I.r+=G.r*m;I.g+=G.g*m;I.b+=G.b*m}}}}function c(x,M,I,J,m,G){if(m.opacity!=0){p(m.opacity);s(m.blending);S=x.positionScreen.x; B=x.positionScreen.y;X=M.positionScreen.x;O=M.positionScreen.y;T=I.positionScreen.x;z=I.positionScreen.y;if(m.map){ga=m.map.image;sa=ga.width-1;ta=ga.height-1;ea.u=J.uvs[0].u*sa;ea.v=J.uvs[0].v*ta;aa.u=J.uvs[1].u*sa;aa.v=J.uvs[1].v*ta;fa.u=J.uvs[2].u*sa;fa.v=J.uvs[2].v*ta;d(ga,S,B,X,O,T,z,ea.u,ea.v,aa.u,aa.v,fa.u,fa.v)}else if(m instanceof THREE.MeshBasicMaterial)h(S,B,X,O,T,z,m.color,m.wireframe,m.wireframe_linewidth);else if(m instanceof THREE.MeshLambertMaterial){if(Ha){ca.r=ha.r;ca.g=ha.g;ca.b= -ha.b;a(G,J,ca);V.r=m.color.r*ca.r;V.g=m.color.g*ca.g;V.b=m.color.b*ca.b;V.updateStyleString()}else V.__styleString=m.color.__styleString;h(S,B,X,O,T,z,V,m.wireframe,m.wireframe_linewidth)}else if(m instanceof THREE.MeshDepthMaterial){ua=m.__2near;va=m.__farPlusNear;wa=m.__farMinusNear;za=~~((1-ua/(va-x.positionScreen.z*wa))*255);Aa=~~((1-ua/(va-M.positionScreen.z*wa))*255);qa=~~((1-ua/(va-I.positionScreen.z*wa))*255);ga=l([za,za,za],[Aa,Aa,Aa],[qa,qa,qa],[qa,qa,qa]);ea.u=0;ea.v=0;aa.u=na;aa.v=0;fa.u= +ha.b;a(G,J,ca);V.r=m.color.r*ca.r;V.g=m.color.g*ca.g;V.b=m.color.b*ca.b;V.updateStyleString()}else V.__styleString=m.color.__styleString;h(S,B,X,O,T,z,V,m.wireframe,m.wireframe_linewidth)}else if(m instanceof THREE.MeshDepthMaterial){ua=m.__2near;va=m.__farPlusNear;wa=m.__farMinusNear;za=~~((1-ua/(va-x.positionScreen.z*wa))*255);Aa=~~((1-ua/(va-M.positionScreen.z*wa))*255);qa=~~((1-ua/(va-I.positionScreen.z*wa))*255);ga=k([za,za,za],[Aa,Aa,Aa],[qa,qa,qa],[qa,qa,qa]);ea.u=0;ea.v=0;aa.u=na;aa.v=0;fa.u= 0;fa.v=na;d(ga,S,B,X,O,T,z,ea.u,ea.v,aa.u,aa.v,fa.u,fa.v)}else if(m instanceof THREE.MeshNormalMaterial){V.r=i(J.normalWorld.x);V.g=i(J.normalWorld.y);V.b=i(J.normalWorld.z);V.updateStyleString();h(S,B,X,O,T,z,V,m.wireframe,m.wireframe_linewidth)}}}function f(x,M,I,J,m,G,W,w,Y){if(w.opacity!=0){p(w.opacity);s(w.blending);S=x.positionScreen.x;B=x.positionScreen.y;X=M.positionScreen.x;O=M.positionScreen.y;T=I.positionScreen.x;z=I.positionScreen.y;y=J.positionScreen.x;Q=J.positionScreen.y;ia=m.positionScreen.x; K=m.positionScreen.y;P=G.positionScreen.x;ja=G.positionScreen.y;if(w.map){ga=w.map.image;sa=ga.width-1;ta=ga.height-1;ea.copy(W.uvs[0]);aa.copy(W.uvs[1]);fa.copy(W.uvs[2]);ka.copy(W.uvs[3]);ea.u*=sa;ea.v*=ta;aa.u*=sa;aa.v*=ta;fa.u*=sa;fa.v*=ta;ka.u*=sa;ka.v*=ta;d(ga,S,B,X,O,y,Q,ea.u,ea.v,aa.u,aa.v,ka.u,ka.v);d(ga,ia,K,T,z,P,ja,aa.u,aa.v,fa.u,fa.v,ka.u,ka.v)}else if(w instanceof THREE.MeshBasicMaterial)b(S,B,X,O,T,z,y,Q,w.color,w.wireframe,w.wireframe_linewidth);else if(w instanceof THREE.MeshLambertMaterial){if(Ha){ca.r= -ha.r;ca.g=ha.g;ca.b=ha.b;a(Y,W,ca);V.r=w.color.r*ca.r;V.g=w.color.g*ca.g;V.b=w.color.b*ca.b;V.updateStyleString()}else V.__styleString=w.color.__styleString;b(S,B,X,O,T,z,y,Q,V,w.wireframe,w.wireframe_linewidth)}else if(w instanceof THREE.MeshDepthMaterial){ua=w.__2near;va=w.__farPlusNear;wa=w.__farMinusNear;za=~~((1-ua/(va-x.positionScreen.z*wa))*255);Aa=~~((1-ua/(va-M.positionScreen.z*wa))*255);qa=~~((1-ua/(va-I.positionScreen.z*wa))*255);Ia=~~((1-ua/(va-J.positionScreen.z*wa))*255);ga=l([za,za, -za],[Aa,Aa,Aa],[Ia,Ia,Ia],[qa,qa,qa]);ea.u=0;ea.v=0;aa.u=na;aa.v=0;fa.u=na;fa.v=na;ka.u=0;ka.v=na;d(ga,S,B,X,O,y,Q,ea.u,ea.v,aa.u,aa.v,ka.u,ka.v);d(ga,ia,K,T,z,P,ja,aa.u,aa.v,fa.u,fa.v,ka.u,ka.v)}else if(w instanceof THREE.MeshNormalMaterial){V.r=i(W.normalWorld.x);V.g=i(W.normalWorld.y);V.b=i(W.normalWorld.z);V.updateStyleString();b(S,B,X,O,T,z,y,Q,V,w.wireframe,w.wireframe_linewidth)}}}function h(x,M,I,J,m,G,W,w,Y){k.beginPath();k.moveTo(x,M);k.lineTo(I,J);k.lineTo(m,G);k.lineTo(x,M);k.closePath(); -if(w){o(Y);e(W.__styleString);k.stroke();ba.inflate(Y*2)}else{g(W.__styleString);k.fill()}}function b(x,M,I,J,m,G,W,w,Y,E,da){k.beginPath();k.moveTo(x,M);k.lineTo(I,J);k.lineTo(m,G);k.lineTo(W,w);k.lineTo(x,M);k.closePath();if(E){o(da);e(Y.__styleString);k.stroke();ba.inflate(da*2)}else{g(Y.__styleString);k.fill()}}function d(x,M,I,J,m,G,W,w,Y,E,da,oa,xa){k.beginPath();k.moveTo(M,I);k.lineTo(J,m);k.lineTo(G,W);k.closePath();J-=M;m-=I;G-=M;W-=I;E-=w;da-=Y;oa-=w;xa-=Y;var ya=1/(E*xa-oa*da),Da=(xa*J- -da*G)*ya;da=(xa*m-da*W)*ya;J=(E*G-oa*J)*ya;m=(E*W-oa*m)*ya;M=M-Da*w-J*Y;I=I-da*w-m*Y;k.save();k.transform(Da,da,J,m,M,I);k.clip();k.drawImage(x,0,0);k.restore()}function p(x){if(R!=x)k.globalAlpha=R=x}function s(x){if(H!=x){switch(x){case THREE.NormalBlending:k.globalCompositeOperation="source-over";break;case THREE.AdditiveBlending:k.globalCompositeOperation="lighter";break;case THREE.SubtractiveBlending:k.globalCompositeOperation="darker"}H=x}}function o(x){if(t!=x)k.lineWidth=t=x}function e(x){if(U!= -x)k.strokeStyle=U=x}function g(x){if($!=x)k.fillStyle=$=x}function l(x,M,I,J){la[0]=x[0];la[1]=x[1];la[2]=x[2];la[4]=M[0];la[5]=M[1];la[6]=M[2];la[8]=I[0];la[9]=I[1];la[10]=I[2];la[12]=J[0];la[13]=J[1];la[14]=J[2];Ea.putImageData(Ma,0,0);Ja.drawImage(Fa,0,0);return Ga}function i(x){return x<0?Math.min((1+x)*0.5,0.5):0.5+Math.min(x*0.5,0.5)}function n(x,M){var I=M.x-x.x,J=M.y-x.y,m=1/Math.sqrt(I*I+J*J);I*=m;J*=m;M.x+=I;M.y+=J;x.x-=I;x.y-=J}var j=null,A=new THREE.Projector,C=document.createElement("canvas"), -v,L,r,q,k=C.getContext("2d"),R=1,H=0,U=null,$=null,t=1,F,D,u,N,pa=new THREE.Vertex,Z=new THREE.Vertex,S,B,X,O,T,z,y,Q,ia,K,P,ja,za,Aa,qa,Ia,ua,va,wa,ga,sa,ta,ra=new THREE.Rectangle,ma=new THREE.Rectangle,ba=new THREE.Rectangle,Ha=false,V=new THREE.Color(16777215),ca=new THREE.Color(16777215),ha=new THREE.Color(0),Ba=new THREE.Color(0),Ca=new THREE.Color(0),Qa=Math.PI*2,La=new THREE.Vector3,ea=new THREE.UV,aa=new THREE.UV,fa=new THREE.UV,ka=new THREE.UV,Fa,Ea,Ma,la,Ga,Ja,na=16;Fa=document.createElement("canvas"); -Fa.width=Fa.height=2;Ea=Fa.getContext("2d");Ea.fillStyle="rgba(0,0,0,1)";Ea.fillRect(0,0,2,2);Ma=Ea.getImageData(0,0,2,2);la=Ma.data;Ga=document.createElement("canvas");Ga.width=Ga.height=na;Ja=Ga.getContext("2d");Ja.translate(-na/2,-na/2);Ja.scale(na,na);na--;this.domElement=C;this.autoClear=true;this.setSize=function(x,M){v=x;L=M;r=v/2;q=L/2;C.width=v;C.height=L;k.lineJoin="round";k.lineCap="round";ra.set(-r,-q,r,q)};this.clear=function(){if(!ma.isEmpty()){ma.inflate(1);ma.minSelf(ra);k.setTransform(1, -0,0,-1,r,q);k.clearRect(ma.getX(),ma.getY(),ma.getWidth(),ma.getHeight());ma.empty()}};this.render=function(x,M){var I,J,m,G,W,w,Y,E;this.autoClear&&this.clear();j=A.projectScene(x,M);k.setTransform(1,0,0,-1,r,q);k.fillStyle="rgba(0, 255, 255, 0.5)";k.fillRect(ra.getX(),ra.getY(),ra.getWidth(),ra.getHeight());if(Ha=x.lights.length>0){W=x.lights;ha.setRGB(0,0,0);Ba.setRGB(0,0,0);Ca.setRGB(0,0,0);I=0;for(J=W.length;I0){W=x.lights;ha.setRGB(0,0,0);Ba.setRGB(0,0,0);Ca.setRGB(0,0,0);I=0;for(J=W.length;I0){O.r+=y.color.r*Q;O.g+=y.color.g*Q;O.b+=y.color.b*Q}}else if(y instanceof THREE.PointLight){$.sub(y.position,X.centroidWorld);$.normalize();Q=X.normalWorld.dot($)*y.intensity;if(Q>0){O.r+=y.color.r*Q;O.g+=y.color.g*Q;O.b+=y.color.b*Q}}}}function c(B,X,O,T,z,y){u=h(N++);u.setAttribute("d","M "+B.positionScreen.x+ -" "+B.positionScreen.y+" L "+X.positionScreen.x+" "+X.positionScreen.y+" L "+O.positionScreen.x+","+O.positionScreen.y+"z");if(z instanceof THREE.MeshBasicMaterial)r.__styleString=z.color.__styleString;else if(z instanceof THREE.MeshLambertMaterial)if(L){q.r=k.r;q.g=k.g;q.b=k.b;a(y,T,q);r.r=z.color.r*q.r;r.g=z.color.g*q.g;r.b=z.color.b*q.b;r.updateStyleString()}else r.__styleString=z.color.__styleString;else if(z instanceof THREE.MeshDepthMaterial){U=1-z.__2near/(z.__farPlusNear-T.z*z.__farMinusNear); +" "+B.positionScreen.y+" L "+X.positionScreen.x+" "+X.positionScreen.y+" L "+O.positionScreen.x+","+O.positionScreen.y+"z");if(z instanceof THREE.MeshBasicMaterial)r.__styleString=z.color.__styleString;else if(z instanceof THREE.MeshLambertMaterial)if(L){q.r=l.r;q.g=l.g;q.b=l.b;a(y,T,q);r.r=z.color.r*q.r;r.g=z.color.g*q.g;r.b=z.color.b*q.b;r.updateStyleString()}else r.__styleString=z.color.__styleString;else if(z instanceof THREE.MeshDepthMaterial){U=1-z.__2near/(z.__farPlusNear-T.z*z.__farMinusNear); r.setRGB(U,U,U)}else z instanceof THREE.MeshNormalMaterial&&r.setRGB(b(T.normalWorld.x),b(T.normalWorld.y),b(T.normalWorld.z));z.wireframe?u.setAttribute("style","fill: none; stroke: "+r.__styleString+"; stroke-width: "+z.wireframe_linewidth+"; stroke-opacity: "+z.opacity+"; stroke-linecap: "+z.wireframe_linecap+"; stroke-linejoin: "+z.wireframe_linejoin):u.setAttribute("style","fill: "+r.__styleString+"; fill-opacity: "+z.opacity);s.appendChild(u)}function f(B,X,O,T,z,y,Q){u=h(N++);u.setAttribute("d", -"M "+B.positionScreen.x+" "+B.positionScreen.y+" L "+X.positionScreen.x+" "+X.positionScreen.y+" L "+O.positionScreen.x+","+O.positionScreen.y+" L "+T.positionScreen.x+","+T.positionScreen.y+"z");if(y instanceof THREE.MeshBasicMaterial)r.__styleString=y.color.__styleString;else if(y instanceof THREE.MeshLambertMaterial)if(L){q.r=k.r;q.g=k.g;q.b=k.b;a(Q,z,q);r.r=y.color.r*q.r;r.g=y.color.g*q.g;r.b=y.color.b*q.b;r.updateStyleString()}else r.__styleString=y.color.__styleString;else if(y instanceof THREE.MeshDepthMaterial){U= +"M "+B.positionScreen.x+" "+B.positionScreen.y+" L "+X.positionScreen.x+" "+X.positionScreen.y+" L "+O.positionScreen.x+","+O.positionScreen.y+" L "+T.positionScreen.x+","+T.positionScreen.y+"z");if(y instanceof THREE.MeshBasicMaterial)r.__styleString=y.color.__styleString;else if(y instanceof THREE.MeshLambertMaterial)if(L){q.r=l.r;q.g=l.g;q.b=l.b;a(Q,z,q);r.r=y.color.r*q.r;r.g=y.color.g*q.g;r.b=y.color.b*q.b;r.updateStyleString()}else r.__styleString=y.color.__styleString;else if(y instanceof THREE.MeshDepthMaterial){U= 1-y.__2near/(y.__farPlusNear-z.z*y.__farMinusNear);r.setRGB(U,U,U)}else y instanceof THREE.MeshNormalMaterial&&r.setRGB(b(z.normalWorld.x),b(z.normalWorld.y),b(z.normalWorld.z));y.wireframe?u.setAttribute("style","fill: none; stroke: "+r.__styleString+"; stroke-width: "+y.wireframe_linewidth+"; stroke-opacity: "+y.opacity+"; stroke-linecap: "+y.wireframe_linecap+"; stroke-linejoin: "+y.wireframe_linejoin):u.setAttribute("style","fill: "+r.__styleString+"; fill-opacity: "+y.opacity);s.appendChild(u)} -function h(B){if(t[B]==null){t[B]=document.createElementNS("http://www.w3.org/2000/svg","path");S==0&&t[B].setAttribute("shape-rendering","crispEdges");return t[B]}return t[B]}function b(B){return B<0?Math.min((1+B)*0.5,0.5):0.5+Math.min(B*0.5,0.5)}var d=null,p=new THREE.Projector,s=document.createElementNS("http://www.w3.org/2000/svg","svg"),o,e,g,l,i,n,j,A,C=new THREE.Rectangle,v=new THREE.Rectangle,L=false,r=new THREE.Color(16777215),q=new THREE.Color(16777215),k=new THREE.Color(0),R=new THREE.Color(0), -H=new THREE.Color(0),U,$=new THREE.Vector3,t=[],F=[],D=[],u,N,pa,Z,S=1;this.domElement=s;this.autoClear=true;this.setQuality=function(B){switch(B){case "high":S=1;break;case "low":S=0}};this.setSize=function(B,X){o=B;e=X;g=o/2;l=e/2;s.setAttribute("viewBox",-g+" "+-l+" "+o+" "+e);s.setAttribute("width",o);s.setAttribute("height",e);C.set(-g,-l,g,l)};this.clear=function(){for(;s.childNodes.length>0;)s.removeChild(s.childNodes[0])};this.render=function(B,X){var O,T,z,y,Q,ia,K,P;this.autoClear&&this.clear(); -d=p.projectScene(B,X);Z=pa=N=0;if(L=B.lights.length>0){K=B.lights;k.setRGB(0,0,0);R.setRGB(0,0,0);H.setRGB(0,0,0);O=0;for(T=K.length;O0;)s.removeChild(s.childNodes[0])};this.render=function(B,X){var O,T,z,y,Q,ia,K,P;this.autoClear&&this.clear(); +d=p.projectScene(B,X);Z=pa=N=0;if(L=B.lights.length>0){K=B.lights;l.setRGB(0,0,0);R.setRGB(0,0,0);H.setRGB(0,0,0);O=0;for(T=K.length;O=0;g--){i=e.__webGLObjects[g].__object;i.__removed&&e.__webGLObjects.splice(g,1)}};this.setupMatrices=function(e,g){e.autoUpdateMatrix&&e.updateMatrix();p.multiply(g.matrix,e.matrix);d.viewMatrixArray=new Float32Array(g.matrix.flatten());d.modelViewMatrixArray= -new Float32Array(p.flatten());d.projectionMatrixArray=new Float32Array(g.projectionMatrix.flatten());s=THREE.Matrix4.makeInvert3x3(p).transpose();d.normalMatrixArray=new Float32Array(s.m);b.uniformMatrix4fv(d.viewMatrix,false,d.viewMatrixArray);b.uniformMatrix4fv(d.modelViewMatrix,false,d.modelViewMatrixArray);b.uniformMatrix4fv(d.projectionMatrix,false,d.projectionMatrixArray);b.uniformMatrix3fv(d.normalMatrix,false,d.normalMatrixArray);b.uniformMatrix4fv(d.objMatrix,false,new Float32Array(e.matrix.flatten()))}; -this.setBlending=function(e){switch(e){case THREE.AdditiveBlending:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE);break;case THREE.SubtractiveBlending:b.blendFunc(b.DST_COLOR,b.ZERO);break;default:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE_MINUS_SRC_ALPHA)}};this.setFaceCulling=function(e,g){if(e){!g||g=="ccw"?b.frontFace(b.CCW):b.frontFace(b.CW);if(e=="back")b.cullFace(b.BACK);else e=="front"?b.cullFace(b.FRONT):b.cullFace(b.FRONT_AND_BACK);b.enable(b.CULL_FACE)}else b.disable(b.CULL_FACE)}}; +g.__webGLFaceCount,b.UNSIGNED_SHORT,0)}};this.renderPass=function(e,g,k,i){var n,j,A,C,v;A=0;for(C=e.material.length;A=0;k--){i=e.__webGLObjects[k].__object;g==i&&e.__webGLObjects.splice(k,1)}};this.setupMatrices=function(e,g){e.autoUpdateMatrix&&e.updateMatrix();p.multiply(g.matrix,e.matrix);d.viewMatrixArray=new Float32Array(g.matrix.flatten()); +d.modelViewMatrixArray=new Float32Array(p.flatten());d.projectionMatrixArray=new Float32Array(g.projectionMatrix.flatten());s=THREE.Matrix4.makeInvert3x3(p).transpose();d.normalMatrixArray=new Float32Array(s.m);b.uniformMatrix4fv(d.viewMatrix,false,d.viewMatrixArray);b.uniformMatrix4fv(d.modelViewMatrix,false,d.modelViewMatrixArray);b.uniformMatrix4fv(d.projectionMatrix,false,d.projectionMatrixArray);b.uniformMatrix3fv(d.normalMatrix,false,d.normalMatrixArray);b.uniformMatrix4fv(d.objMatrix,false, +new Float32Array(e.matrix.flatten()))};this.setBlending=function(e){switch(e){case THREE.AdditiveBlending:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE);break;case THREE.SubtractiveBlending:b.blendFunc(b.DST_COLOR,b.ZERO);break;default:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE_MINUS_SRC_ALPHA)}};this.setFaceCulling=function(e,g){if(e){!g||g=="ccw"?b.frontFace(b.CCW):b.frontFace(b.CW);if(e=="back")b.cullFace(b.BACK);else e=="front"?b.cullFace(b.FRONT):b.cullFace(b.FRONT_AND_BACK);b.enable(b.CULL_FACE)}else b.disable(b.CULL_FACE)}}; THREE.RenderableFace3=function(){this.v1=new THREE.Vertex;this.v2=new THREE.Vertex;this.v3=new THREE.Vertex;this.centroidWorld=new THREE.Vector3;this.centroidScreen=new THREE.Vector3;this.normalWorld=new THREE.Vector3;this.material=this.color=this.z=null}; THREE.RenderableFace4=function(){this.v1=new THREE.Vertex;this.v2=new THREE.Vertex;this.v3=new THREE.Vertex;this.v4=new THREE.Vertex;this.centroidWorld=new THREE.Vector3;this.centroidScreen=new THREE.Vector3;this.normalWorld=new THREE.Vector3;this.material=this.color=this.z=null};THREE.RenderableParticle=function(){this.rotation=this.z=this.y=this.x=null;this.scale=new THREE.Vector2;this.material=this.color=null}; THREE.RenderableLine=function(){this.v1=new THREE.Vertex;this.v2=new THREE.Vertex;this.material=this.color=this.z=null}; diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 71ad0d89df9840a6984223b7f78fbbeda21cc443..204912d14313c9616a66d7b089c7393c183ec441 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -736,13 +736,18 @@ THREE.WebGLRenderer = function ( scene ) { }*/ } - - // clean up orphaned objects + + }; + + this.removeObject = function ( scene, object ) { + + var o, ol, zobject; for ( o = scene.__webGLObjects.length - 1; o >= 0; o-- ) { - object = scene.__webGLObjects[ o ].__object; - if ( object.__removed ) { + zobject = scene.__webGLObjects[ o ].__object; + + if ( object == zobject ) { scene.__webGLObjects.splice( o, 1 ); @@ -750,10 +755,8 @@ THREE.WebGLRenderer = function ( scene ) { } - }; - this.setupMatrices = function ( object, camera ) { object.autoUpdateMatrix && object.updateMatrix(); diff --git a/src/scenes/Scene.js b/src/scenes/Scene.js index 5b56934da655de57c07b47144223c809bf4f5cf1..7ce7ee6f1e8de4eb9a8909d33d469a1a9c52eabd 100644 --- a/src/scenes/Scene.js +++ b/src/scenes/Scene.js @@ -22,8 +22,6 @@ THREE.Scene = function () { this.objects.splice( i, 1 ); } - - object.__removed = true; };