Browse Source

Removed unneeded console.log().

Mr.doob 13 years ago
parent
commit
c78374730e
2 changed files with 6 additions and 8 deletions
  1. 6 6
      build/three.min.js
  2. 0 2
      src/core/Projector.js

+ 6 - 6
build/three.min.js

@@ -78,12 +78,12 @@ clone:function(){}};THREE.Object3D.__m1=new THREE.Matrix4;THREE.Object3DCount=0;
 THREE.Projector=function(){function a(){if(e===h){var a=new THREE.RenderableObject;g.push(a);h++;e++;return a}return g[e++]}function b(){if(l===n){var a=new THREE.RenderableVertex;j.push(a);n++;l++;return a}return j[l++]}function c(a,b){return b.z-a.z}function d(a,b){var c=0,d=1,f=a.z+a.w,e=b.z+b.w,g=-a.z+a.w,h=-b.z+b.w;if(f>=0&&e>=0&&g>=0&&h>=0)return true;if(f<0&&e<0||g<0&&h<0)return false;f<0?c=Math.max(c,f/(f-e)):e<0&&(d=Math.min(d,f/(f-e)));g<0?c=Math.max(c,g/(g-h)):h<0&&(d=Math.min(d,g/(g-h)));
 if(d<c)return false;a.lerpSelf(b,c);b.lerpSelf(a,1-d);return true}var f,e,g=[],h=0,i,l,j=[],n=0,m,p,q=[],o=0,t,s=[],u=0,v,r,A=[],x=0,B,C,z=[],F=0,H={objects:[],sprites:[],lights:[],elements:[]},K=new THREE.Vector3,E=new THREE.Vector4,L=new THREE.Matrix4,J=new THREE.Matrix4,I=new THREE.Frustum,R=new THREE.Vector4,P=new THREE.Vector4;this.projectVector=function(a,b){b.matrixWorldInverse.getInverse(b.matrixWorld);L.multiply(b.projectionMatrix,b.matrixWorldInverse);L.multiplyVector3(a);return a};this.unprojectVector=
 function(a,b){b.projectionMatrixInverse.getInverse(b.projectionMatrix);L.multiply(b.matrixWorld,b.projectionMatrixInverse);L.multiplyVector3(a);return a};this.pickingRay=function(a,b){var c;a.z=-1;c=new THREE.Vector3(a.x,a.y,1);this.unprojectVector(a,b);this.unprojectVector(c,b);c.subSelf(a).normalize();return new THREE.Ray(a,c)};this.projectScene=function(g,h,n,M){var ea=h.near,Q=h.far,ba=false,ta,fa,$,S,X,ia,Ia,pa,ua,Ca,Ja,Xa,ja,pb,Oa,Ya;C=r=t=p=0;H.elements.length=0;g.updateMatrixWorld();h.parent===
-void 0&&h.updateMatrixWorld();h.matrixWorldInverse.getInverse(h.matrixWorld);L.multiply(h.projectionMatrix,h.matrixWorldInverse);I.setFromMatrix(L);e=0;H.objects.length=0;H.sprites.length=0;H.lights.length=0;var qb=function(b){if(b.visible!==false){if((b instanceof THREE.Mesh||b instanceof THREE.Line)&&(b.frustumCulled===false||I.contains(b)===true)){f=a();f.object=b;if(b.renderDepth!==null){console.log(b.renderDepth);f.z=b.renderDepth}else{K.copy(b.matrixWorld.getPosition());L.multiplyVector3(K);
-f.z=K.z}H.objects.push(f)}else if(b instanceof THREE.Sprite||b instanceof THREE.Particle){f=a();f.object=b;if(b.renderDepth!==null)f.z=b.renderDepth;else{K.copy(b.matrixWorld.getPosition());L.multiplyVector3(K);f.z=K.z}H.sprites.push(f)}else b instanceof THREE.Light&&H.lights.push(b);for(var c=0,d=b.children.length;c<d;c++)qb(b.children[c])}};qb(g);n===true&&H.objects.sort(c);g=0;for(n=H.objects.length;g<n;g++){pa=H.objects[g].object;ua=pa.matrixWorld;l=0;if(pa instanceof THREE.Mesh){Ca=pa.geometry;
-Ja=pa.geometry.materials;$=Ca.vertices;Xa=Ca.faces;pb=Ca.faceVertexUvs;Ca=pa.matrixRotationWorld.extractRotation(ua);Ya=pa.material instanceof THREE.MeshFaceMaterial;ta=0;for(fa=$.length;ta<fa;ta++){i=b();i.positionWorld.copy($[ta]);ua.multiplyVector3(i.positionWorld);i.positionScreen.copy(i.positionWorld);L.multiplyVector4(i.positionScreen);i.positionScreen.x=i.positionScreen.x/i.positionScreen.w;i.positionScreen.y=i.positionScreen.y/i.positionScreen.w;i.visible=i.positionScreen.z>ea&&i.positionScreen.z<
-Q}$=0;for(ta=Xa.length;$<ta;$++){Ia=Xa[$];fa=Ya===true?Ja[Ia.materialIndex]:pa.material;if(fa!==void 0){ia=fa.side;if(Ia instanceof THREE.Face3){S=j[Ia.a];X=j[Ia.b];ja=j[Ia.c];if(S.visible===true&&X.visible===true&&ja.visible===true){ba=(ja.positionScreen.x-S.positionScreen.x)*(X.positionScreen.y-S.positionScreen.y)-(ja.positionScreen.y-S.positionScreen.y)*(X.positionScreen.x-S.positionScreen.x)<0;if(ia===THREE.DoubleSide||ba===(ia===THREE.FrontSide)){if(p===o){Oa=new THREE.RenderableFace3;q.push(Oa);
-o++;p++;m=Oa}else m=q[p++];m.v1.copy(S);m.v2.copy(X);m.v3.copy(ja)}else continue}else continue}else if(Ia instanceof THREE.Face4){S=j[Ia.a];X=j[Ia.b];ja=j[Ia.c];Oa=j[Ia.d];if(S.visible===true&&X.visible===true&&ja.visible===true&&Oa.visible===true){ba=(Oa.positionScreen.x-S.positionScreen.x)*(X.positionScreen.y-S.positionScreen.y)-(Oa.positionScreen.y-S.positionScreen.y)*(X.positionScreen.x-S.positionScreen.x)<0||(X.positionScreen.x-ja.positionScreen.x)*(Oa.positionScreen.y-ja.positionScreen.y)-(X.positionScreen.y-
-ja.positionScreen.y)*(Oa.positionScreen.x-ja.positionScreen.x)<0;if(ia===THREE.DoubleSide||ba===(ia===THREE.FrontSide)){if(t===u){var wb=new THREE.RenderableFace4;s.push(wb);u++;t++;m=wb}else m=s[t++];m.v1.copy(S);m.v2.copy(X);m.v3.copy(ja);m.v4.copy(Oa)}else continue}else continue}m.normalWorld.copy(Ia.normal);ba===false&&(ia===THREE.BackSide||ia===THREE.DoubleSide)&&m.normalWorld.negate();Ca.multiplyVector3(m.normalWorld);m.centroidWorld.copy(Ia.centroid);ua.multiplyVector3(m.centroidWorld);m.centroidScreen.copy(m.centroidWorld);
+void 0&&h.updateMatrixWorld();h.matrixWorldInverse.getInverse(h.matrixWorld);L.multiply(h.projectionMatrix,h.matrixWorldInverse);I.setFromMatrix(L);e=0;H.objects.length=0;H.sprites.length=0;H.lights.length=0;var qb=function(b){if(b.visible!==false){if((b instanceof THREE.Mesh||b instanceof THREE.Line)&&(b.frustumCulled===false||I.contains(b)===true)){f=a();f.object=b;if(b.renderDepth!==null)f.z=b.renderDepth;else{K.copy(b.matrixWorld.getPosition());L.multiplyVector3(K);f.z=K.z}H.objects.push(f)}else if(b instanceof
+THREE.Sprite||b instanceof THREE.Particle){f=a();f.object=b;if(b.renderDepth!==null)f.z=b.renderDepth;else{K.copy(b.matrixWorld.getPosition());L.multiplyVector3(K);f.z=K.z}H.sprites.push(f)}else b instanceof THREE.Light&&H.lights.push(b);for(var c=0,d=b.children.length;c<d;c++)qb(b.children[c])}};qb(g);n===true&&H.objects.sort(c);g=0;for(n=H.objects.length;g<n;g++){pa=H.objects[g].object;ua=pa.matrixWorld;l=0;if(pa instanceof THREE.Mesh){Ca=pa.geometry;Ja=pa.geometry.materials;$=Ca.vertices;Xa=Ca.faces;
+pb=Ca.faceVertexUvs;Ca=pa.matrixRotationWorld.extractRotation(ua);Ya=pa.material instanceof THREE.MeshFaceMaterial;ta=0;for(fa=$.length;ta<fa;ta++){i=b();i.positionWorld.copy($[ta]);ua.multiplyVector3(i.positionWorld);i.positionScreen.copy(i.positionWorld);L.multiplyVector4(i.positionScreen);i.positionScreen.x=i.positionScreen.x/i.positionScreen.w;i.positionScreen.y=i.positionScreen.y/i.positionScreen.w;i.visible=i.positionScreen.z>ea&&i.positionScreen.z<Q}$=0;for(ta=Xa.length;$<ta;$++){Ia=Xa[$];
+fa=Ya===true?Ja[Ia.materialIndex]:pa.material;if(fa!==void 0){ia=fa.side;if(Ia instanceof THREE.Face3){S=j[Ia.a];X=j[Ia.b];ja=j[Ia.c];if(S.visible===true&&X.visible===true&&ja.visible===true){ba=(ja.positionScreen.x-S.positionScreen.x)*(X.positionScreen.y-S.positionScreen.y)-(ja.positionScreen.y-S.positionScreen.y)*(X.positionScreen.x-S.positionScreen.x)<0;if(ia===THREE.DoubleSide||ba===(ia===THREE.FrontSide)){if(p===o){Oa=new THREE.RenderableFace3;q.push(Oa);o++;p++;m=Oa}else m=q[p++];m.v1.copy(S);
+m.v2.copy(X);m.v3.copy(ja)}else continue}else continue}else if(Ia instanceof THREE.Face4){S=j[Ia.a];X=j[Ia.b];ja=j[Ia.c];Oa=j[Ia.d];if(S.visible===true&&X.visible===true&&ja.visible===true&&Oa.visible===true){ba=(Oa.positionScreen.x-S.positionScreen.x)*(X.positionScreen.y-S.positionScreen.y)-(Oa.positionScreen.y-S.positionScreen.y)*(X.positionScreen.x-S.positionScreen.x)<0||(X.positionScreen.x-ja.positionScreen.x)*(Oa.positionScreen.y-ja.positionScreen.y)-(X.positionScreen.y-ja.positionScreen.y)*
+(Oa.positionScreen.x-ja.positionScreen.x)<0;if(ia===THREE.DoubleSide||ba===(ia===THREE.FrontSide)){if(t===u){var wb=new THREE.RenderableFace4;s.push(wb);u++;t++;m=wb}else m=s[t++];m.v1.copy(S);m.v2.copy(X);m.v3.copy(ja);m.v4.copy(Oa)}else continue}else continue}m.normalWorld.copy(Ia.normal);ba===false&&(ia===THREE.BackSide||ia===THREE.DoubleSide)&&m.normalWorld.negate();Ca.multiplyVector3(m.normalWorld);m.centroidWorld.copy(Ia.centroid);ua.multiplyVector3(m.centroidWorld);m.centroidScreen.copy(m.centroidWorld);
 L.multiplyVector3(m.centroidScreen);Ia=Ia.vertexNormals;S=0;for(X=Ia.length;S<X;S++){ja=m.vertexNormalsWorld[S];ja.copy(Ia[S]);ba===false&&(ia===THREE.BackSide||ia===THREE.DoubleSide)&&ja.negate();Ca.multiplyVector3(ja)}m.vertexNormalsLength=Ia.length;S=0;for(X=pb.length;S<X;S++){ja=pb[S][$];if(ja!==void 0){ia=0;for(Ia=ja.length;ia<Ia;ia++)m.uvs[S][ia]=ja[ia]}}m.material=fa;m.z=m.centroidScreen.z;H.elements.push(m)}}}else if(pa instanceof THREE.Line){J.multiply(L,ua);$=pa.geometry.vertices;S=b();
 S.positionScreen.copy($[0]);J.multiplyVector4(S.positionScreen);ua=pa.type===THREE.LinePieces?2:1;ta=1;for(fa=$.length;ta<fa;ta++){S=b();S.positionScreen.copy($[ta]);J.multiplyVector4(S.positionScreen);if(!((ta+1)%ua>0)){X=j[l-2];R.copy(S.positionScreen);P.copy(X.positionScreen);if(d(R,P)===true){R.multiplyScalar(1/R.w);P.multiplyScalar(1/P.w);if(r===x){Ja=new THREE.RenderableLine;A.push(Ja);x++;r++;v=Ja}else v=A[r++];v.v1.positionScreen.copy(R);v.v2.positionScreen.copy(P);v.z=Math.max(R.z,P.z);v.material=
 pa.material;H.elements.push(v)}}}}}g=0;for(n=H.sprites.length;g<n;g++){pa=H.sprites[g].object;ua=pa.matrixWorld;if(pa instanceof THREE.Particle){E.set(ua.elements[12],ua.elements[13],ua.elements[14],1);L.multiplyVector4(E);E.z=E.z/E.w;if(E.z>0&&E.z<1){if(C===F){ea=new THREE.RenderableParticle;z.push(ea);F++;C++;B=ea}else B=z[C++];B.object=pa;B.x=E.x/E.w;B.y=E.y/E.w;B.z=E.z;B.rotation=pa.rotation.z;B.scale.x=pa.scale.x*Math.abs(B.x-(E.x+h.projectionMatrix.elements[0])/(E.w+h.projectionMatrix.elements[12]));

+ 0 - 2
src/core/Projector.js

@@ -88,8 +88,6 @@ THREE.Projector = function() {
 
 				if ( object.renderDepth !== null ) {
 
-					console.log( object.renderDepth );
-
 					_object.z = object.renderDepth;
 
 				} else {