Pārlūkot izejas kodu

Merged astrodud's pull request.

alteredq 14 gadi atpakaļ
vecāks
revīzija
3e36fed048
3 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 1 1
      build/Three.js
  2. 1 1
      build/ThreeDebug.js
  3. 1 1
      build/ThreeExtras.js

+ 1 - 1
build/Three.js

@@ -32,7 +32,7 @@ f){var g=c[d];c[d]=c[f];c[f]=g}a(this,"n21","n12");a(this,"n31","n13");a(this,"n
 this.n21;this.flat[2]=this.n31;this.flat[3]=this.n41;this.flat[4]=this.n12;this.flat[5]=this.n22;this.flat[6]=this.n32;this.flat[7]=this.n42;this.flat[8]=this.n13;this.flat[9]=this.n23;this.flat[10]=this.n33;this.flat[11]=this.n43;this.flat[12]=this.n14;this.flat[13]=this.n24;this.flat[14]=this.n34;this.flat[15]=this.n44;return this.flat},setTranslation:function(a,c,d){this.set(1,0,0,a,0,1,0,c,0,0,1,d,0,0,0,1);return this},setScale:function(a,c,d){this.set(a,0,0,0,0,c,0,0,0,0,d,0,0,0,0,1);return this},
 setRotX:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(1,0,0,0,0,c,-a,0,0,a,c,0,0,0,0,1);return this},setRotY:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(c,0,a,0,0,1,0,0,-a,0,c,0,0,0,0,1);return this},setRotZ:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(c,-a,0,0,a,c,0,0,0,0,1,0,0,0,0,1);return this},setRotAxis:function(a,c){var d=Math.cos(c),f=Math.sin(c),g=1-d,h=a.x,o=a.y,b=a.z,i=g*h,k=g*o;this.set(i*h+d,i*o-f*b,i*b+f*o,0,i*o+f*b,k*o+d,k*b-f*h,0,i*b-f*o,k*b+f*h,g*b*b+d,0,0,
 0,0,1);return this},toString:function(){return"| "+this.n11+" "+this.n12+" "+this.n13+" "+this.n14+" |\n| "+this.n21+" "+this.n22+" "+this.n23+" "+this.n24+" |\n| "+this.n31+" "+this.n32+" "+this.n33+" "+this.n34+" |\n| "+this.n41+" "+this.n42+" "+this.n43+" "+this.n44+" |"}};THREE.Matrix4.translationMatrix=function(a,c,d){var f=new THREE.Matrix4;f.setTranslation(a,c,d);return f};THREE.Matrix4.scaleMatrix=function(a,c,d){var f=new THREE.Matrix4;f.setScale(a,c,d);return f};
-THREE.Matrix4.rotationXMatrix=function(a){var c=new THREE.Matrix4;c.setRotX(a);return c};THREE.Matrix4.rotationYMatrix=function(a){var c=new THREE.Matrix4;c.setRotY(a);return c};THREE.Matrix4.rotationZMatrix=function(a){var c=new THREE.Matrix4;c.setRotZ(a);return c};THREE.Matrix4.rotationAxisAngleMatrix=function(a,c){var d=new THREE.Matrix4;setRotAxis(a,c);return d};
+THREE.Matrix4.rotationXMatrix=function(a){var c=new THREE.Matrix4;c.setRotX(a);return c};THREE.Matrix4.rotationYMatrix=function(a){var c=new THREE.Matrix4;c.setRotY(a);return c};THREE.Matrix4.rotationZMatrix=function(a){var c=new THREE.Matrix4;c.setRotZ(a);return c};THREE.Matrix4.rotationAxisAngleMatrix=function(a,c){var d=new THREE.Matrix4;d.setRotAxis(a,c);return d};
 THREE.Matrix4.makeInvert=function(a){var c=a.n11,d=a.n12,f=a.n13,g=a.n14,h=a.n21,o=a.n22,b=a.n23,i=a.n24,k=a.n31,y=a.n32,z=a.n33,u=a.n34,x=a.n41,H=a.n42,J=a.n43,K=a.n44,p=new THREE.Matrix4;p.n11=b*u*H-i*z*H+i*y*J-o*u*J-b*y*K+o*z*K;p.n12=g*z*H-f*u*H-g*y*J+d*u*J+f*y*K-d*z*K;p.n13=f*i*H-g*b*H+g*o*J-d*i*J-f*o*K+d*b*K;p.n14=g*b*y-f*i*y-g*o*z+d*i*z+f*o*u-d*b*u;p.n21=i*z*x-b*u*x-i*k*J+h*u*J+b*k*K-h*z*K;p.n22=f*u*x-g*z*x+g*k*J-c*u*J-f*k*K+c*z*K;p.n23=g*b*x-f*i*x-g*h*J+c*i*J+f*h*K-c*b*K;p.n24=f*i*k-g*b*k+
 g*h*z-c*i*z-f*h*u+c*b*u;p.n31=o*u*x-i*y*x+i*k*H-h*u*H-o*k*K+h*y*K;p.n32=g*y*x-d*u*x-g*k*H+c*u*H+d*k*K-c*y*K;p.n33=f*i*x-g*o*x+g*h*H-c*i*H-d*h*K+c*o*K;p.n34=g*o*k-d*i*k-g*h*y+c*i*y+d*h*u-c*o*u;p.n41=b*y*x-o*z*x-b*k*H+h*z*H+o*k*J-h*y*J;p.n42=d*z*x-f*y*x+f*k*H-c*z*H-d*k*J+c*y*J;p.n43=f*o*x-d*b*x-f*h*H+c*b*H+d*h*J-c*o*J;p.n44=d*b*k-f*o*k+f*h*y-c*b*y-d*h*z+c*o*z;p.multiplyScalar(1/a.determinant());return p};
 THREE.Matrix4.makeInvert3x3=function(a){var c=a.flatten();a=a.m33;var d=c[10]*c[5]-c[6]*c[9],f=-c[10]*c[1]+c[2]*c[9],g=c[6]*c[1]-c[2]*c[5],h=-c[10]*c[4]+c[6]*c[8],o=c[10]*c[0]-c[2]*c[8],b=-c[6]*c[0]+c[2]*c[4],i=c[9]*c[4]-c[5]*c[8],k=-c[9]*c[0]+c[1]*c[8],y=c[5]*c[0]-c[1]*c[4];c=c[0]*d+c[1]*h+c[2]*i;if(c==0)throw"matrix not invertible";c=1/c;a.m[0]=c*d;a.m[1]=c*f;a.m[2]=c*g;a.m[3]=c*h;a.m[4]=c*o;a.m[5]=c*b;a.m[6]=c*i;a.m[7]=c*k;a.m[8]=c*y;return a};

+ 1 - 1
build/ThreeDebug.js

@@ -32,7 +32,7 @@ f){var g=c[d];c[d]=c[f];c[f]=g}a(this,"n21","n12");a(this,"n31","n13");a(this,"n
 this.n21;this.flat[2]=this.n31;this.flat[3]=this.n41;this.flat[4]=this.n12;this.flat[5]=this.n22;this.flat[6]=this.n32;this.flat[7]=this.n42;this.flat[8]=this.n13;this.flat[9]=this.n23;this.flat[10]=this.n33;this.flat[11]=this.n43;this.flat[12]=this.n14;this.flat[13]=this.n24;this.flat[14]=this.n34;this.flat[15]=this.n44;return this.flat},setTranslation:function(a,c,d){this.set(1,0,0,a,0,1,0,c,0,0,1,d,0,0,0,1);return this},setScale:function(a,c,d){this.set(a,0,0,0,0,c,0,0,0,0,d,0,0,0,0,1);return this},
 setRotX:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(1,0,0,0,0,c,-a,0,0,a,c,0,0,0,0,1);return this},setRotY:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(c,0,a,0,0,1,0,0,-a,0,c,0,0,0,0,1);return this},setRotZ:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(c,-a,0,0,a,c,0,0,0,0,1,0,0,0,0,1);return this},setRotAxis:function(a,c){var d=Math.cos(c),f=Math.sin(c),g=1-d,h=a.x,o=a.y,b=a.z,j=g*h,i=g*o;this.set(j*h+d,j*o-f*b,j*b+f*o,0,j*o+f*b,i*o+d,i*b-f*h,0,j*b-f*o,i*b+f*h,g*b*b+d,0,0,
 0,0,1);return this},toString:function(){return"| "+this.n11+" "+this.n12+" "+this.n13+" "+this.n14+" |\n| "+this.n21+" "+this.n22+" "+this.n23+" "+this.n24+" |\n| "+this.n31+" "+this.n32+" "+this.n33+" "+this.n34+" |\n| "+this.n41+" "+this.n42+" "+this.n43+" "+this.n44+" |"}};THREE.Matrix4.translationMatrix=function(a,c,d){var f=new THREE.Matrix4;f.setTranslation(a,c,d);return f};THREE.Matrix4.scaleMatrix=function(a,c,d){var f=new THREE.Matrix4;f.setScale(a,c,d);return f};
-THREE.Matrix4.rotationXMatrix=function(a){var c=new THREE.Matrix4;c.setRotX(a);return c};THREE.Matrix4.rotationYMatrix=function(a){var c=new THREE.Matrix4;c.setRotY(a);return c};THREE.Matrix4.rotationZMatrix=function(a){var c=new THREE.Matrix4;c.setRotZ(a);return c};THREE.Matrix4.rotationAxisAngleMatrix=function(a,c){var d=new THREE.Matrix4;setRotAxis(a,c);return d};
+THREE.Matrix4.rotationXMatrix=function(a){var c=new THREE.Matrix4;c.setRotX(a);return c};THREE.Matrix4.rotationYMatrix=function(a){var c=new THREE.Matrix4;c.setRotY(a);return c};THREE.Matrix4.rotationZMatrix=function(a){var c=new THREE.Matrix4;c.setRotZ(a);return c};THREE.Matrix4.rotationAxisAngleMatrix=function(a,c){var d=new THREE.Matrix4;d.setRotAxis(a,c);return d};
 THREE.Matrix4.makeInvert=function(a){var c=a.n11,d=a.n12,f=a.n13,g=a.n14,h=a.n21,o=a.n22,b=a.n23,j=a.n24,i=a.n31,y=a.n32,z=a.n33,u=a.n34,x=a.n41,H=a.n42,J=a.n43,K=a.n44,p=new THREE.Matrix4;p.n11=b*u*H-j*z*H+j*y*J-o*u*J-b*y*K+o*z*K;p.n12=g*z*H-f*u*H-g*y*J+d*u*J+f*y*K-d*z*K;p.n13=f*j*H-g*b*H+g*o*J-d*j*J-f*o*K+d*b*K;p.n14=g*b*y-f*j*y-g*o*z+d*j*z+f*o*u-d*b*u;p.n21=j*z*x-b*u*x-j*i*J+h*u*J+b*i*K-h*z*K;p.n22=f*u*x-g*z*x+g*i*J-c*u*J-f*i*K+c*z*K;p.n23=g*b*x-f*j*x-g*h*J+c*j*J+f*h*K-c*b*K;p.n24=f*j*i-g*b*i+
 g*h*z-c*j*z-f*h*u+c*b*u;p.n31=o*u*x-j*y*x+j*i*H-h*u*H-o*i*K+h*y*K;p.n32=g*y*x-d*u*x-g*i*H+c*u*H+d*i*K-c*y*K;p.n33=f*j*x-g*o*x+g*h*H-c*j*H-d*h*K+c*o*K;p.n34=g*o*i-d*j*i-g*h*y+c*j*y+d*h*u-c*o*u;p.n41=b*y*x-o*z*x-b*i*H+h*z*H+o*i*J-h*y*J;p.n42=d*z*x-f*y*x+f*i*H-c*z*H-d*i*J+c*y*J;p.n43=f*o*x-d*b*x-f*h*H+c*b*H+d*h*J-c*o*J;p.n44=d*b*i-f*o*i+f*h*y-c*b*y-d*h*z+c*o*z;p.multiplyScalar(1/a.determinant());return p};
 THREE.Matrix4.makeInvert3x3=function(a){var c=a.flatten();a=a.m33;var d=c[10]*c[5]-c[6]*c[9],f=-c[10]*c[1]+c[2]*c[9],g=c[6]*c[1]-c[2]*c[5],h=-c[10]*c[4]+c[6]*c[8],o=c[10]*c[0]-c[2]*c[8],b=-c[6]*c[0]+c[2]*c[4],j=c[9]*c[4]-c[5]*c[8],i=-c[9]*c[0]+c[1]*c[8],y=c[5]*c[0]-c[1]*c[4];c=c[0]*d+c[1]*h+c[2]*j;if(c==0)throw"matrix not invertible";c=1/c;a.m[0]=c*d;a.m[1]=c*f;a.m[2]=c*g;a.m[3]=c*h;a.m[4]=c*o;a.m[5]=c*b;a.m[6]=c*j;a.m[7]=c*i;a.m[8]=c*y;return a};

+ 1 - 1
build/ThreeExtras.js

@@ -32,7 +32,7 @@ e){var f=c[d];c[d]=c[e];c[e]=f}a(this,"n21","n12");a(this,"n31","n13");a(this,"n
 this.n21;this.flat[2]=this.n31;this.flat[3]=this.n41;this.flat[4]=this.n12;this.flat[5]=this.n22;this.flat[6]=this.n32;this.flat[7]=this.n42;this.flat[8]=this.n13;this.flat[9]=this.n23;this.flat[10]=this.n33;this.flat[11]=this.n43;this.flat[12]=this.n14;this.flat[13]=this.n24;this.flat[14]=this.n34;this.flat[15]=this.n44;return this.flat},setTranslation:function(a,c,d){this.set(1,0,0,a,0,1,0,c,0,0,1,d,0,0,0,1);return this},setScale:function(a,c,d){this.set(a,0,0,0,0,c,0,0,0,0,d,0,0,0,0,1);return this},
 setRotX:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(1,0,0,0,0,c,-a,0,0,a,c,0,0,0,0,1);return this},setRotY:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(c,0,a,0,0,1,0,0,-a,0,c,0,0,0,0,1);return this},setRotZ:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(c,-a,0,0,a,c,0,0,0,0,1,0,0,0,0,1);return this},setRotAxis:function(a,c){var d=Math.cos(c),e=Math.sin(c),f=1-d,h=a.x,j=a.y,b=a.z,i=f*h,k=f*j;this.set(i*h+d,i*j-e*b,i*b+e*j,0,i*j+e*b,k*j+d,k*b-e*h,0,i*b-e*j,k*b+e*h,f*b*b+d,0,0,
 0,0,1);return this},toString:function(){return"| "+this.n11+" "+this.n12+" "+this.n13+" "+this.n14+" |\n| "+this.n21+" "+this.n22+" "+this.n23+" "+this.n24+" |\n| "+this.n31+" "+this.n32+" "+this.n33+" "+this.n34+" |\n| "+this.n41+" "+this.n42+" "+this.n43+" "+this.n44+" |"}};THREE.Matrix4.translationMatrix=function(a,c,d){var e=new THREE.Matrix4;e.setTranslation(a,c,d);return e};THREE.Matrix4.scaleMatrix=function(a,c,d){var e=new THREE.Matrix4;e.setScale(a,c,d);return e};
-THREE.Matrix4.rotationXMatrix=function(a){var c=new THREE.Matrix4;c.setRotX(a);return c};THREE.Matrix4.rotationYMatrix=function(a){var c=new THREE.Matrix4;c.setRotY(a);return c};THREE.Matrix4.rotationZMatrix=function(a){var c=new THREE.Matrix4;c.setRotZ(a);return c};THREE.Matrix4.rotationAxisAngleMatrix=function(a,c){var d=new THREE.Matrix4;setRotAxis(a,c);return d};
+THREE.Matrix4.rotationXMatrix=function(a){var c=new THREE.Matrix4;c.setRotX(a);return c};THREE.Matrix4.rotationYMatrix=function(a){var c=new THREE.Matrix4;c.setRotY(a);return c};THREE.Matrix4.rotationZMatrix=function(a){var c=new THREE.Matrix4;c.setRotZ(a);return c};THREE.Matrix4.rotationAxisAngleMatrix=function(a,c){var d=new THREE.Matrix4;d.setRotAxis(a,c);return d};
 THREE.Matrix4.makeInvert=function(a){var c=a.n11,d=a.n12,e=a.n13,f=a.n14,h=a.n21,j=a.n22,b=a.n23,i=a.n24,k=a.n31,r=a.n32,z=a.n33,n=a.n34,u=a.n41,x=a.n42,y=a.n43,H=a.n44,p=new THREE.Matrix4;p.n11=b*n*x-i*z*x+i*r*y-j*n*y-b*r*H+j*z*H;p.n12=f*z*x-e*n*x-f*r*y+d*n*y+e*r*H-d*z*H;p.n13=e*i*x-f*b*x+f*j*y-d*i*y-e*j*H+d*b*H;p.n14=f*b*r-e*i*r-f*j*z+d*i*z+e*j*n-d*b*n;p.n21=i*z*u-b*n*u-i*k*y+h*n*y+b*k*H-h*z*H;p.n22=e*n*u-f*z*u+f*k*y-c*n*y-e*k*H+c*z*H;p.n23=f*b*u-e*i*u-f*h*y+c*i*y+e*h*H-c*b*H;p.n24=e*i*k-f*b*k+
 f*h*z-c*i*z-e*h*n+c*b*n;p.n31=j*n*u-i*r*u+i*k*x-h*n*x-j*k*H+h*r*H;p.n32=f*r*u-d*n*u-f*k*x+c*n*x+d*k*H-c*r*H;p.n33=e*i*u-f*j*u+f*h*x-c*i*x-d*h*H+c*j*H;p.n34=f*j*k-d*i*k-f*h*r+c*i*r+d*h*n-c*j*n;p.n41=b*r*u-j*z*u-b*k*x+h*z*x+j*k*y-h*r*y;p.n42=d*z*u-e*r*u+e*k*x-c*z*x-d*k*y+c*r*y;p.n43=e*j*u-d*b*u-e*h*x+c*b*x+d*h*y-c*j*y;p.n44=d*b*k-e*j*k+e*h*r-c*b*r-d*h*z+c*j*z;p.multiplyScalar(1/a.determinant());return p};
 THREE.Matrix4.makeInvert3x3=function(a){var c=a.flatten();a=a.m33;var d=c[10]*c[5]-c[6]*c[9],e=-c[10]*c[1]+c[2]*c[9],f=c[6]*c[1]-c[2]*c[5],h=-c[10]*c[4]+c[6]*c[8],j=c[10]*c[0]-c[2]*c[8],b=-c[6]*c[0]+c[2]*c[4],i=c[9]*c[4]-c[5]*c[8],k=-c[9]*c[0]+c[1]*c[8],r=c[5]*c[0]-c[1]*c[4];c=c[0]*d+c[1]*h+c[2]*i;if(c==0)throw"matrix not invertible";c=1/c;a.m[0]=c*d;a.m[1]=c*e;a.m[2]=c*f;a.m[3]=c*h;a.m[4]=c*j;a.m[5]=c*b;a.m[6]=c*i;a.m[7]=c*k;a.m[8]=c*r;return a};