提交 6178bd51 编写于 作者: M Mr.doob

Updated builds.

上级 ac815236
......@@ -15947,11 +15947,7 @@ THREE.Texture.prototype = {
set needsUpdate ( value ) {
if ( value === true ) {
this.version ++;
}
if ( value === true ) this.version ++;
},
......@@ -21432,7 +21428,7 @@ THREE.WebGLRenderer = function ( parameters ) {
material instanceof THREE.MeshPhongMaterial ||
material.envMap ) {
if ( p_uniforms.cameraPosition !== null ) {
if ( p_uniforms.cameraPosition !== undefined ) {
_vector3.setFromMatrixPosition( camera.matrixWorld );
_gl.uniform3f( p_uniforms.cameraPosition, _vector3.x, _vector3.y, _vector3.z );
......@@ -21447,7 +21443,7 @@ THREE.WebGLRenderer = function ( parameters ) {
material instanceof THREE.ShaderMaterial ||
material.skinning ) {
if ( p_uniforms.viewMatrix !== null ) {
if ( p_uniforms.viewMatrix !== undefined ) {
_gl.uniformMatrix4fv( p_uniforms.viewMatrix, false, camera.matrixWorldInverse.elements );
......@@ -21463,13 +21459,13 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( material.skinning ) {
if ( object.bindMatrix && p_uniforms.bindMatrix !== null ) {
if ( object.bindMatrix && p_uniforms.bindMatrix !== undefined ) {
_gl.uniformMatrix4fv( p_uniforms.bindMatrix, false, object.bindMatrix.elements );
}
if ( object.bindMatrixInverse && p_uniforms.bindMatrixInverse !== null ) {
if ( object.bindMatrixInverse && p_uniforms.bindMatrixInverse !== undefined ) {
_gl.uniformMatrix4fv( p_uniforms.bindMatrixInverse, false, object.bindMatrixInverse.elements );
......@@ -21477,7 +21473,7 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( _supportsBoneTextures && object.skeleton && object.skeleton.useVertexTexture ) {
if ( p_uniforms.boneTexture !== null ) {
if ( p_uniforms.boneTexture !== undefined ) {
var textureUnit = getTextureUnit();
......@@ -21486,13 +21482,13 @@ THREE.WebGLRenderer = function ( parameters ) {
}
if ( p_uniforms.boneTextureWidth !== null ) {
if ( p_uniforms.boneTextureWidth !== undefined ) {
_gl.uniform1i( p_uniforms.boneTextureWidth, object.skeleton.boneTextureWidth );
}
if ( p_uniforms.boneTextureHeight !== null ) {
if ( p_uniforms.boneTextureHeight !== undefined ) {
_gl.uniform1i( p_uniforms.boneTextureHeight, object.skeleton.boneTextureHeight );
......@@ -21500,7 +21496,7 @@ THREE.WebGLRenderer = function ( parameters ) {
} else if ( object.skeleton && object.skeleton.boneMatrices ) {
if ( p_uniforms.boneGlobalMatrices !== null ) {
if ( p_uniforms.boneGlobalMatrices !== undefined ) {
_gl.uniformMatrix4fv( p_uniforms.boneGlobalMatrices, false, object.skeleton.boneMatrices );
......@@ -21601,7 +21597,7 @@ THREE.WebGLRenderer = function ( parameters ) {
loadUniformsMatrices( p_uniforms, object );
if ( p_uniforms.modelMatrix !== null ) {
if ( p_uniforms.modelMatrix !== undefined ) {
_gl.uniformMatrix4fv( p_uniforms.modelMatrix, false, object.matrixWorld.elements );
......
......@@ -506,9 +506,9 @@ morphNormals:d.morphNormals,maxMorphTargets:ka.maxMorphTargets,maxMorphNormals:k
T.push(d.defines[V]);for(V in Q)T.push(V),T.push(Q[V]);var oa=T.join(),Ga=!0;if(q.program)if(q.program.code!==oa)h(d);else if(void 0!==r)break a;else Ga=!1;else d.addEventListener("dispose",f);if(r){var Ba=THREE.ShaderLib[r];q.__webglShader={name:d.type,uniforms:THREE.UniformsUtils.clone(Ba.uniforms),vertexShader:Ba.vertexShader,fragmentShader:Ba.fragmentShader}}else q.__webglShader={name:d.type,uniforms:d.uniforms,vertexShader:d.vertexShader,fragmentShader:d.fragmentShader};for(var $,Ha=0,fa=va.length;Ha<
fa;Ha++){var ea=va[Ha];if(ea.code===oa){$=ea;Ga&&$.usedTimes++;break}}void 0===$&&(d.__webglShader=q.__webglShader,$=new THREE.WebGLProgram(ka,oa,d,Q),va.push($),Da.programs=va.length);q.program=$;var Pa=$.getAttributes();if(d.morphTargets)for(var ua=d.numSupportedMorphTargets=0;ua<ka.maxMorphTargets;ua++)0<=Pa["morphTarget"+ua]&&d.numSupportedMorphTargets++;if(d.morphNormals)for(ua=d.numSupportedMorphNormals=0;ua<ka.maxMorphNormals;ua++)0<=Pa["morphNormal"+ua]&&d.numSupportedMorphNormals++;q.uniformsList=
[];var pa=q.program.getUniforms(),xa;for(xa in q.__webglShader.uniforms){var Ia=pa[xa];Ia&&q.uniformsList.push([q.__webglShader.uniforms[xa],Ia])}}d.needsUpdate=!1}var Ja=!1,Ca=!1,wa=!1,Za=p.program,ca=Za.getUniforms(),K=p.__webglShader.uniforms;Za.id!==kb&&(t.useProgram(Za.program),kb=Za.id,wa=Ca=Ja=!0);d.id!==Xa&&(-1===Xa&&(wa=!0),Xa=d.id,Ca=!0);if(Ja||a!==Wa)t.uniformMatrix4fv(ca.projectionMatrix,!1,a.projectionMatrix.elements),L&&t.uniform1f(ca.logDepthBufFC,2/(Math.log(a.far+1)/Math.LN2)),a!==
Wa&&(Wa=a),(d instanceof THREE.ShaderMaterial||d instanceof THREE.MeshPhongMaterial||d.envMap)&&null!==ca.cameraPosition&&(na.setFromMatrixPosition(a.matrixWorld),t.uniform3f(ca.cameraPosition,na.x,na.y,na.z)),(d instanceof THREE.MeshPhongMaterial||d instanceof THREE.MeshLambertMaterial||d instanceof THREE.MeshBasicMaterial||d instanceof THREE.ShaderMaterial||d.skinning)&&null!==ca.viewMatrix&&t.uniformMatrix4fv(ca.viewMatrix,!1,a.matrixWorldInverse.elements);if(d.skinning)if(g.bindMatrix&&null!==
ca.bindMatrix&&t.uniformMatrix4fv(ca.bindMatrix,!1,g.bindMatrix.elements),g.bindMatrixInverse&&null!==ca.bindMatrixInverse&&t.uniformMatrix4fv(ca.bindMatrixInverse,!1,g.bindMatrixInverse.elements),lb&&g.skeleton&&g.skeleton.useVertexTexture){if(null!==ca.boneTexture){var Qa=v();t.uniform1i(ca.boneTexture,Qa);ka.setTexture(g.skeleton.boneTexture,Qa)}null!==ca.boneTextureWidth&&t.uniform1i(ca.boneTextureWidth,g.skeleton.boneTextureWidth);null!==ca.boneTextureHeight&&t.uniform1i(ca.boneTextureHeight,
g.skeleton.boneTextureHeight)}else g.skeleton&&g.skeleton.boneMatrices&&null!==ca.boneGlobalMatrices&&t.uniformMatrix4fv(ca.boneGlobalMatrices,!1,g.skeleton.boneMatrices);if(Ca){c&&d.fog&&(K.fogColor.value=c.color,c instanceof THREE.Fog?(K.fogNear.value=c.near,K.fogFar.value=c.far):c instanceof THREE.FogExp2&&(K.fogDensity.value=c.density));if(d instanceof THREE.MeshPhongMaterial||d instanceof THREE.MeshLambertMaterial||d.lights){if(eb){var wa=!0,ba,ra,Z,nb=0,ob=0,pb=0,Ka,Ya,db,Ra,qb,da=Nb,rb=da.directional.colors,
Wa&&(Wa=a),(d instanceof THREE.ShaderMaterial||d instanceof THREE.MeshPhongMaterial||d.envMap)&&void 0!==ca.cameraPosition&&(na.setFromMatrixPosition(a.matrixWorld),t.uniform3f(ca.cameraPosition,na.x,na.y,na.z)),(d instanceof THREE.MeshPhongMaterial||d instanceof THREE.MeshLambertMaterial||d instanceof THREE.MeshBasicMaterial||d instanceof THREE.ShaderMaterial||d.skinning)&&void 0!==ca.viewMatrix&&t.uniformMatrix4fv(ca.viewMatrix,!1,a.matrixWorldInverse.elements);if(d.skinning)if(g.bindMatrix&&void 0!==
ca.bindMatrix&&t.uniformMatrix4fv(ca.bindMatrix,!1,g.bindMatrix.elements),g.bindMatrixInverse&&void 0!==ca.bindMatrixInverse&&t.uniformMatrix4fv(ca.bindMatrixInverse,!1,g.bindMatrixInverse.elements),lb&&g.skeleton&&g.skeleton.useVertexTexture){if(void 0!==ca.boneTexture){var Qa=v();t.uniform1i(ca.boneTexture,Qa);ka.setTexture(g.skeleton.boneTexture,Qa)}void 0!==ca.boneTextureWidth&&t.uniform1i(ca.boneTextureWidth,g.skeleton.boneTextureWidth);void 0!==ca.boneTextureHeight&&t.uniform1i(ca.boneTextureHeight,
g.skeleton.boneTextureHeight)}else g.skeleton&&g.skeleton.boneMatrices&&void 0!==ca.boneGlobalMatrices&&t.uniformMatrix4fv(ca.boneGlobalMatrices,!1,g.skeleton.boneMatrices);if(Ca){c&&d.fog&&(K.fogColor.value=c.color,c instanceof THREE.Fog?(K.fogNear.value=c.near,K.fogFar.value=c.far):c instanceof THREE.FogExp2&&(K.fogDensity.value=c.density));if(d instanceof THREE.MeshPhongMaterial||d instanceof THREE.MeshLambertMaterial||d.lights){if(eb){var wa=!0,ba,ra,Z,nb=0,ob=0,pb=0,Ka,Ya,db,Ra,qb,da=Nb,rb=da.directional.colors,
sb=da.directional.positions,tb=da.point.colors,ub=da.point.positions,ib=da.point.distances,jb=da.point.decays,vb=da.spot.colors,wb=da.spot.positions,Ib=da.spot.distances,xb=da.spot.directions,Jb=da.spot.anglesCos,Kb=da.spot.exponents,Lb=da.spot.decays,yb=da.hemi.skyColors,zb=da.hemi.groundColors,Ab=da.hemi.positions,$a=0,La=0,ya=0,Sa=0,Bb=0,Cb=0,Db=0,gb=0,ab=0,bb=0,Ea=0,Ta=0;ba=0;for(ra=b.length;ba<ra;ba++)Z=b[ba],Z.onlyShadow||(Ka=Z.color,Ra=Z.intensity,qb=Z.distance,Z instanceof THREE.AmbientLight?
Z.visible&&(nb+=Ka.r,ob+=Ka.g,pb+=Ka.b):Z instanceof THREE.DirectionalLight?(Bb+=1,Z.visible&&(ha.setFromMatrixPosition(Z.matrixWorld),na.setFromMatrixPosition(Z.target.matrixWorld),ha.sub(na),ha.normalize(),ab=3*$a,sb[ab+0]=ha.x,sb[ab+1]=ha.y,sb[ab+2]=ha.z,z(rb,ab,Ka,Ra),$a+=1)):Z instanceof THREE.PointLight?(Cb+=1,Z.visible&&(bb=3*La,z(tb,bb,Ka,Ra),na.setFromMatrixPosition(Z.matrixWorld),ub[bb+0]=na.x,ub[bb+1]=na.y,ub[bb+2]=na.z,ib[La]=qb,jb[La]=0===Z.distance?0:Z.decay,La+=1)):Z instanceof THREE.SpotLight?
(Db+=1,Z.visible&&(Ea=3*ya,z(vb,Ea,Ka,Ra),ha.setFromMatrixPosition(Z.matrixWorld),wb[Ea+0]=ha.x,wb[Ea+1]=ha.y,wb[Ea+2]=ha.z,Ib[ya]=qb,na.setFromMatrixPosition(Z.target.matrixWorld),ha.sub(na),ha.normalize(),xb[Ea+0]=ha.x,xb[Ea+1]=ha.y,xb[Ea+2]=ha.z,Jb[ya]=Math.cos(Z.angle),Kb[ya]=Z.exponent,Lb[ya]=0===Z.distance?0:Z.decay,ya+=1)):Z instanceof THREE.HemisphereLight&&(gb+=1,Z.visible&&(ha.setFromMatrixPosition(Z.matrixWorld),ha.normalize(),Ta=3*Sa,Ab[Ta+0]=ha.x,Ab[Ta+1]=ha.y,Ab[Ta+2]=ha.z,Ya=Z.color,
......@@ -527,7 +527,7 @@ X._array);break;case "m4":t.uniformMatrix4fv(Y,!1,O.elements);break;case "m4v":v
(ga.addEventListener("dispose",e),Va.__image__webglTextureCube=t.createTexture(),Da.textures++);N.activeTexture(t.TEXTURE0+Tb);N.bindTexture(t.TEXTURE_CUBE_MAP,Va.__image__webglTextureCube);t.pixelStorei(t.UNPACK_FLIP_Y_WEBGL,ga.flipY);for(var Ub=ga instanceof THREE.CompressedTexture,Gb=ga.image[0]instanceof THREE.DataTexture,Na=[],ia=0;6>ia;ia++)Na[ia]=!ka.autoScaleCubemaps||Ub||Gb?Gb?ga.image[ia].image:ga.image[ia]:J(ga.image[ia],ac);var Vb=Na[0],Wb=THREE.Math.isPowerOfTwo(Vb.width)&&THREE.Math.isPowerOfTwo(Vb.height),
Fa=H(ga.format),Hb=H(ga.type);y(t.TEXTURE_CUBE_MAP,ga,Wb);for(ia=0;6>ia;ia++)if(Ub)for(var Oa,Xb=Na[ia].mipmaps,cb=0,bc=Xb.length;cb<bc;cb++)Oa=Xb[cb],ga.format!==THREE.RGBAFormat&&ga.format!==THREE.RGBFormat?-1<Yb().indexOf(Fa)?N.compressedTexImage2D(t.TEXTURE_CUBE_MAP_POSITIVE_X+ia,cb,Fa,Oa.width,Oa.height,0,Oa.data):console.warn("THREE.WebGLRenderer: Attempt to load unsupported compressed texture format in .setCubeTexture()"):N.texImage2D(t.TEXTURE_CUBE_MAP_POSITIVE_X+ia,cb,Fa,Oa.width,Oa.height,
0,Fa,Hb,Oa.data);else Gb?N.texImage2D(t.TEXTURE_CUBE_MAP_POSITIVE_X+ia,0,Fa,Na[ia].width,Na[ia].height,0,Fa,Hb,Na[ia].data):N.texImage2D(t.TEXTURE_CUBE_MAP_POSITIVE_X+ia,0,Fa,Fa,Hb,Na[ia]);ga.generateMipmaps&&Wb&&t.generateMipmap(t.TEXTURE_CUBE_MAP);Va.__version=ga.version;if(ga.onUpdate)ga.onUpdate(ga)}else N.activeTexture(t.TEXTURE0+Tb),N.bindTexture(t.TEXTURE_CUBE_MAP,Va.__image__webglTextureCube)}else if(sa instanceof THREE.WebGLRenderTargetCube){var cc=sa;N.activeTexture(t.TEXTURE0+Ma);N.bindTexture(t.TEXTURE_CUBE_MAP,
aa.get(cc).__webglTexture)}else ka.setTexture(sa,Ma);break;case "tv":void 0===X._array&&(X._array=[]);W=0;for(qa=X.value.length;W<qa;W++)X._array[W]=v();t.uniform1iv(Y,X._array);W=0;for(qa=X.value.length;W<qa;W++)sa=X.value[W],Ma=X._array[W],sa&&ka.setTexture(sa,Ma);break;default:console.warn("THREE.WebGLRenderer: Unknown uniform type: "+Sb)}}}}t.uniformMatrix4fv(ca.modelViewMatrix,!1,g._modelViewMatrix.elements);ca.normalMatrix&&t.uniformMatrix3fv(ca.normalMatrix,!1,g._normalMatrix.elements);null!==
aa.get(cc).__webglTexture)}else ka.setTexture(sa,Ma);break;case "tv":void 0===X._array&&(X._array=[]);W=0;for(qa=X.value.length;W<qa;W++)X._array[W]=v();t.uniform1iv(Y,X._array);W=0;for(qa=X.value.length;W<qa;W++)sa=X.value[W],Ma=X._array[W],sa&&ka.setTexture(sa,Ma);break;default:console.warn("THREE.WebGLRenderer: Unknown uniform type: "+Sb)}}}}t.uniformMatrix4fv(ca.modelViewMatrix,!1,g._modelViewMatrix.elements);ca.normalMatrix&&t.uniformMatrix3fv(ca.normalMatrix,!1,g._normalMatrix.elements);void 0!==
ca.modelMatrix&&t.uniformMatrix4fv(ca.modelMatrix,!1,g.matrixWorld.elements);return Za}function x(a,b){a.ambientLightColor.needsUpdate=b;a.directionalLightColor.needsUpdate=b;a.directionalLightDirection.needsUpdate=b;a.pointLightColor.needsUpdate=b;a.pointLightPosition.needsUpdate=b;a.pointLightDistance.needsUpdate=b;a.pointLightDecay.needsUpdate=b;a.spotLightColor.needsUpdate=b;a.spotLightPosition.needsUpdate=b;a.spotLightDistance.needsUpdate=b;a.spotLightDirection.needsUpdate=b;a.spotLightAngleCos.needsUpdate=
b;a.spotLightExponent.needsUpdate=b;a.spotLightDecay.needsUpdate=b;a.hemisphereLightSkyColor.needsUpdate=b;a.hemisphereLightGroundColor.needsUpdate=b;a.hemisphereLightDirection.needsUpdate=b}function v(){var a=fb;a>=db&&console.warn("WebGLRenderer: trying to use "+a+" texture units while this GPU supports only "+db);fb+=1;return a}function z(a,b,c,d){a[b+0]=c.r*d;a[b+1]=c.g*d;a[b+2]=c.b*d}function y(a,b,c){c?(t.texParameteri(a,t.TEXTURE_WRAP_S,H(b.wrapS)),t.texParameteri(a,t.TEXTURE_WRAP_T,H(b.wrapT)),
t.texParameteri(a,t.TEXTURE_MAG_FILTER,H(b.magFilter)),t.texParameteri(a,t.TEXTURE_MIN_FILTER,H(b.minFilter))):(t.texParameteri(a,t.TEXTURE_WRAP_S,t.CLAMP_TO_EDGE),t.texParameteri(a,t.TEXTURE_WRAP_T,t.CLAMP_TO_EDGE),b.wrapS===THREE.ClampToEdgeWrapping&&b.wrapT===THREE.ClampToEdgeWrapping||console.warn("THREE.WebGLRenderer: Texture is not power of two. Texture.wrapS and Texture.wrapT should be set to THREE.ClampToEdgeWrapping. ( "+b.sourceFile+" )"),t.texParameteri(a,t.TEXTURE_MAG_FILTER,B(b.magFilter)),
......
......@@ -2150,6 +2150,7 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( p_uniforms.viewMatrix !== undefined ) {
_gl.uniformMatrix4fv( p_uniforms.viewMatrix, false, camera.matrixWorldInverse.elements );
}
}
......@@ -2203,7 +2204,6 @@ THREE.WebGLRenderer = function ( parameters ) {
_gl.uniformMatrix4fv( p_uniforms.boneGlobalMatrices, false, object.skeleton.boneMatrices );
}
}
......@@ -2304,7 +2304,7 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( p_uniforms.modelMatrix !== undefined ) {
_gl.uniformMatrix4fv( p_uniforms.modelMatrix, false, object.matrixWorld.elements );
}
return program;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册