Selaa lähdekoodia

Updated builds.

Mr.doob 5 vuotta sitten
vanhempi
commit
718baa0b58
3 muutettua tiedostoa jossa 9 lisäystä ja 9 poistoa
  1. 4 4
      build/three.js
  2. 1 1
      build/three.min.js
  3. 4 4
      build/three.module.js

+ 4 - 4
build/three.js

@@ -18000,14 +18000,14 @@
 					].join( '\n' ),
 					[
 						'uniform mat4 modelViewMatrices[' + numMultiviewViews + '];',
-						'uniform mat3 normalMatrices[' + numMultiviewViews + '];',
-						'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
 						'uniform mat4 projectionMatrices[' + numMultiviewViews + '];',
+						'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
+						'uniform mat3 normalMatrices[' + numMultiviewViews + '];',
 
 						'#define modelViewMatrix modelViewMatrices[VIEW_ID]',
-						'#define normalMatrix normalMatrices[VIEW_ID]',
+						'#define projectionMatrix projectionMatrices[VIEW_ID]',
 						'#define viewMatrix viewMatrices[VIEW_ID]',
-						'#define projectionMatrix projectionMatrices[VIEW_ID]'
+						'#define normalMatrix normalMatrices[VIEW_ID]'
 					].join( '\n' )
 				);
 

+ 1 - 1
build/three.min.js

@@ -77,7 +77,7 @@ q:"",f.premultipliedAlpha?"#define PREMULTIPLIED_ALPHA":"",f.physicallyCorrectLi
 "",0!==f.toneMapping?N.tonemapping_pars_fragment:"",0!==f.toneMapping?Pj("toneMapping",f.toneMapping):"",f.dithering?"#define DITHERING":"",f.outputEncoding||f.mapEncoding||f.matcapEncoding||f.envMapEncoding||f.emissiveMapEncoding?N.encodings_pars_fragment:"",f.mapEncoding?Ge("mapTexelToLinear",f.mapEncoding):"",f.matcapEncoding?Ge("matcapTexelToLinear",f.matcapEncoding):"",f.envMapEncoding?Ge("envMapTexelToLinear",f.envMapEncoding):"",f.emissiveMapEncoding?Ge("emissiveMapTexelToLinear",f.emissiveMapEncoding):
 "",f.outputEncoding?Oj("linearToOutputTexel",f.outputEncoding):"",f.depthPacking?"#define DEPTH_PACKING "+d.depthPacking:"","\n"].filter(Hd).join("\n"));l=l.replace($f,Zf);l=Ch(l,f);l=Dh(l,f);m=m.replace($f,Zf);m=Ch(m,f);m=Dh(m,f);l=l.replace(Gh,Eh);m=m.replace(Gh,Eh);f.isWebGL2&&!d.isRawShaderMaterial&&(q=!1,u=/^\s*#version\s+300\s+es\s*\n/,d.isShaderMaterial&&null!==l.match(u)&&null!==m.match(u)&&(q=!0,l=l.replace(u,""),m=m.replace(u,"")),h="#version 300 es\n\n#define attribute in\n#define varying out\n#define texture2D texture\n"+
 h,b=["#version 300 es\n\n#define varying in",q?"":"out highp vec4 pc_fragColor;",q?"":"#define gl_FragColor pc_fragColor","#define gl_FragDepthEXT gl_FragDepth\n#define texture2D texture\n#define textureCube texture\n#define texture2DProj textureProj\n#define texture2DLodEXT textureLod\n#define texture2DProjLodEXT textureProjLod\n#define textureCubeLodEXT textureLod\n#define texture2DGradEXT textureGrad\n#define texture2DProjGradEXT textureProjGrad\n#define textureCubeGradEXT textureGrad"].join("\n")+
-"\n"+b,0<y&&(h=h.replace("#version 300 es\n",["#version 300 es\n\n#extension GL_OVR_multiview2 : require","layout(num_views = "+y+") in;","#define VIEW_ID gl_ViewID_OVR"].join("\n")),h=h.replace("uniform mat4 modelViewMatrix;\nuniform mat4 projectionMatrix;\nuniform mat4 viewMatrix;\nuniform mat3 normalMatrix;",["uniform mat4 modelViewMatrices["+y+"];","uniform mat3 normalMatrices["+y+"];","uniform mat4 viewMatrices["+y+"];","uniform mat4 projectionMatrices["+y+"];","#define modelViewMatrix modelViewMatrices[VIEW_ID]\n#define normalMatrix normalMatrices[VIEW_ID]\n#define viewMatrix viewMatrices[VIEW_ID]\n#define projectionMatrix projectionMatrices[VIEW_ID]"].join("\n")),
+"\n"+b,0<y&&(h=h.replace("#version 300 es\n",["#version 300 es\n\n#extension GL_OVR_multiview2 : require","layout(num_views = "+y+") in;","#define VIEW_ID gl_ViewID_OVR"].join("\n")),h=h.replace("uniform mat4 modelViewMatrix;\nuniform mat4 projectionMatrix;\nuniform mat4 viewMatrix;\nuniform mat3 normalMatrix;",["uniform mat4 modelViewMatrices["+y+"];","uniform mat4 projectionMatrices["+y+"];","uniform mat4 viewMatrices["+y+"];","uniform mat3 normalMatrices["+y+"];","#define modelViewMatrix modelViewMatrices[VIEW_ID]\n#define projectionMatrix projectionMatrices[VIEW_ID]\n#define viewMatrix viewMatrices[VIEW_ID]\n#define normalMatrix normalMatrices[VIEW_ID]"].join("\n")),
 b=b.replace("#version 300 es\n","#version 300 es\n\n#extension GL_OVR_multiview2 : require\n#define VIEW_ID gl_ViewID_OVR"),b=b.replace("uniform mat4 viewMatrix;",["uniform mat4 viewMatrices["+y+"];","#define viewMatrix viewMatrices[VIEW_ID]"].join("\n"))));m=b+m;l=zh(g,35633,h+l);m=zh(g,35632,m);g.attachShader(n,l);g.attachShader(n,m);void 0!==d.index0AttributeName?g.bindAttribLocation(n,0,d.index0AttributeName):!0===f.morphTargets&&g.bindAttribLocation(n,0,"position");g.linkProgram(n);if(a.debug.checkShaderErrors){a=
 g.getProgramInfoLog(n).trim();f=g.getShaderInfoLog(l).trim();q=g.getShaderInfoLog(m).trim();k=u=!0;if(!1===g.getProgramParameter(n,35714))u=!1,r=Bh(g,l,"vertex"),p=Bh(g,m,"fragment"),console.error("THREE.WebGLProgram: shader error: ",g.getError(),"35715",g.getProgramParameter(n,35715),"gl.getProgramInfoLog",a,r,p);else if(""!==a)console.warn("THREE.WebGLProgram: gl.getProgramInfoLog()",a);else if(""===f||""===q)k=!1;k&&(this.diagnostics={runnable:u,material:d,programLog:a,vertexShader:{log:f,prefix:h},
 fragmentShader:{log:q,prefix:b}})}g.deleteShader(l);g.deleteShader(m);var V;this.getUniforms=function(){void 0===V&&(V=new Bb(g,n));return V};var P;this.getAttributes=function(){if(void 0===P){for(var a={},b=g.getProgramParameter(n,35721),c=0;c<b;c++){var d=g.getActiveAttrib(n,c).name;a[d]=g.getAttribLocation(n,d)}P=a}return P};this.destroy=function(){g.deleteProgram(n);this.program=void 0};this.name=e.name;this.id=Xj++;this.code=c;this.usedTimes=1;this.program=n;this.vertexShader=l;this.fragmentShader=

+ 4 - 4
build/three.module.js

@@ -17987,14 +17987,14 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
 				].join( '\n' ),
 				[
 					'uniform mat4 modelViewMatrices[' + numMultiviewViews + '];',
-					'uniform mat3 normalMatrices[' + numMultiviewViews + '];',
-					'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
 					'uniform mat4 projectionMatrices[' + numMultiviewViews + '];',
+					'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
+					'uniform mat3 normalMatrices[' + numMultiviewViews + '];',
 
 					'#define modelViewMatrix modelViewMatrices[VIEW_ID]',
-					'#define normalMatrix normalMatrices[VIEW_ID]',
+					'#define projectionMatrix projectionMatrices[VIEW_ID]',
 					'#define viewMatrix viewMatrices[VIEW_ID]',
-					'#define projectionMatrix projectionMatrices[VIEW_ID]'
+					'#define normalMatrix normalMatrices[VIEW_ID]'
 				].join( '\n' )
 			);