|
|
@@ -748,7 +748,7 @@ const UniformsLib = {
|
|
|
|
|
|
envMap: { value: null },
|
|
|
envMapRotation: { value: /*@__PURE__*/ new Matrix3() },
|
|
|
- flipEnvMap: { value: - 1 },
|
|
|
+ flipEnvMap: { value: -1 },
|
|
|
reflectivity: { value: 1.0 }, // basic, lambert, phong
|
|
|
ior: { value: 1.5 }, // physical
|
|
|
refractionRatio: { value: 0.98 }, // basic, lambert, phong
|
|
|
@@ -1169,7 +1169,7 @@ const ShaderLib = {
|
|
|
|
|
|
uniforms: {
|
|
|
envMap: { value: null },
|
|
|
- flipEnvMap: { value: - 1 },
|
|
|
+ flipEnvMap: { value: -1 },
|
|
|
backgroundBlurriness: { value: 0 },
|
|
|
backgroundIntensity: { value: 1 },
|
|
|
backgroundRotation: { value: /*@__PURE__*/ new Matrix3() }
|
|
|
@@ -1184,7 +1184,7 @@ const ShaderLib = {
|
|
|
|
|
|
uniforms: {
|
|
|
tCube: { value: null },
|
|
|
- tFlip: { value: - 1 },
|
|
|
+ tFlip: { value: -1 },
|
|
|
opacity: { value: 1.0 }
|
|
|
},
|
|
|
|
|
|
@@ -1418,18 +1418,18 @@ function WebGLBackground( renderer, cubemaps, cubeuvmaps, state, objects, alpha,
|
|
|
_e1$1.copy( scene.backgroundRotation );
|
|
|
|
|
|
// accommodate left-handed frame
|
|
|
- _e1$1.x *= - 1; _e1$1.y *= - 1; _e1$1.z *= - 1;
|
|
|
+ _e1$1.x *= -1; _e1$1.y *= -1; _e1$1.z *= -1;
|
|
|
|
|
|
if ( background.isCubeTexture && background.isRenderTargetTexture === false ) {
|
|
|
|
|
|
// environment maps which are not cube render targets or PMREMs follow a different convention
|
|
|
- _e1$1.y *= - 1;
|
|
|
- _e1$1.z *= - 1;
|
|
|
+ _e1$1.y *= -1;
|
|
|
+ _e1$1.z *= -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
boxMesh.material.uniforms.envMap.value = background;
|
|
|
- boxMesh.material.uniforms.flipEnvMap.value = ( background.isCubeTexture && background.isRenderTargetTexture === false ) ? - 1 : 1;
|
|
|
+ boxMesh.material.uniforms.flipEnvMap.value = ( background.isCubeTexture && background.isRenderTargetTexture === false ) ? -1 : 1;
|
|
|
boxMesh.material.uniforms.backgroundBlurriness.value = scene.backgroundBlurriness;
|
|
|
boxMesh.material.uniforms.backgroundIntensity.value = scene.backgroundIntensity;
|
|
|
boxMesh.material.uniforms.backgroundRotation.value.setFromMatrix4( _m1$1.makeRotationFromEuler( _e1$1 ) );
|
|
|
@@ -2693,11 +2693,13 @@ const _axisDirections = [
|
|
|
/*@__PURE__*/ new Vector3( INV_PHI, 0, PHI ),
|
|
|
/*@__PURE__*/ new Vector3( 0, PHI, - INV_PHI ),
|
|
|
/*@__PURE__*/ new Vector3( 0, PHI, INV_PHI ),
|
|
|
- /*@__PURE__*/ new Vector3( - 1, 1, - 1 ),
|
|
|
- /*@__PURE__*/ new Vector3( 1, 1, - 1 ),
|
|
|
- /*@__PURE__*/ new Vector3( - 1, 1, 1 ),
|
|
|
+ /*@__PURE__*/ new Vector3( -1, 1, -1 ),
|
|
|
+ /*@__PURE__*/ new Vector3( 1, 1, -1 ),
|
|
|
+ /*@__PURE__*/ new Vector3( -1, 1, 1 ),
|
|
|
/*@__PURE__*/ new Vector3( 1, 1, 1 ) ];
|
|
|
|
|
|
+const _origin = /*@__PURE__*/ new Vector3();
|
|
|
+
|
|
|
/**
|
|
|
* This class generates a Prefiltered, Mipmapped Radiance Environment Map
|
|
|
* (PMREM) from a cubeMap environment texture. This allows different levels of
|
|
|
@@ -2738,16 +2740,21 @@ class PMREMGenerator {
|
|
|
* Generates a PMREM from a supplied Scene, which can be faster than using an
|
|
|
* image if networking bandwidth is low. Optional sigma specifies a blur radius
|
|
|
* in radians to be applied to the scene before PMREM generation. Optional near
|
|
|
- * and far planes ensure the scene is rendered in its entirety (the cubeCamera
|
|
|
- * is placed at the origin).
|
|
|
+ * and far planes ensure the scene is rendered in its entirety.
|
|
|
*
|
|
|
* @param {Scene} scene
|
|
|
* @param {number} sigma
|
|
|
* @param {number} near
|
|
|
* @param {number} far
|
|
|
+ * @param {Object} [options={}]
|
|
|
* @return {WebGLRenderTarget}
|
|
|
*/
|
|
|
- fromScene( scene, sigma = 0, near = 0.1, far = 100 ) {
|
|
|
+ fromScene( scene, sigma = 0, near = 0.1, far = 100, options = {} ) {
|
|
|
+
|
|
|
+ const {
|
|
|
+ size = 256,
|
|
|
+ position = _origin,
|
|
|
+ } = options;
|
|
|
|
|
|
_oldTarget = this._renderer.getRenderTarget();
|
|
|
_oldActiveCubeFace = this._renderer.getActiveCubeFace();
|
|
|
@@ -2756,12 +2763,12 @@ class PMREMGenerator {
|
|
|
|
|
|
this._renderer.xr.enabled = false;
|
|
|
|
|
|
- this._setSize( 256 );
|
|
|
+ this._setSize( size );
|
|
|
|
|
|
const cubeUVRenderTarget = this._allocateTargets();
|
|
|
cubeUVRenderTarget.depthBuffer = true;
|
|
|
|
|
|
- this._sceneToCubeUV( scene, near, far, cubeUVRenderTarget );
|
|
|
+ this._sceneToCubeUV( scene, near, far, cubeUVRenderTarget, position );
|
|
|
|
|
|
if ( sigma > 0 ) {
|
|
|
|
|
|
@@ -2783,7 +2790,7 @@ class PMREMGenerator {
|
|
|
* The smallest supported equirectangular image size is 64 x 32.
|
|
|
*
|
|
|
* @param {Texture} equirectangular
|
|
|
- * @param {WebGLRenderTarget} [renderTarget=null] - Optional render target.
|
|
|
+ * @param {?WebGLRenderTarget} [renderTarget=null] - Optional render target.
|
|
|
* @return {WebGLRenderTarget}
|
|
|
*/
|
|
|
fromEquirectangular( equirectangular, renderTarget = null ) {
|
|
|
@@ -2958,13 +2965,13 @@ class PMREMGenerator {
|
|
|
|
|
|
}
|
|
|
|
|
|
- _sceneToCubeUV( scene, near, far, cubeUVRenderTarget ) {
|
|
|
+ _sceneToCubeUV( scene, near, far, cubeUVRenderTarget, position ) {
|
|
|
|
|
|
const fov = 90;
|
|
|
const aspect = 1;
|
|
|
const cubeCamera = new PerspectiveCamera( fov, aspect, near, far );
|
|
|
- const upSign = [ 1, - 1, 1, 1, 1, 1 ];
|
|
|
- const forwardSign = [ 1, 1, 1, - 1, - 1, - 1 ];
|
|
|
+ const upSign = [ 1, -1, 1, 1, 1, 1 ];
|
|
|
+ const forwardSign = [ 1, 1, 1, -1, -1, -1 ];
|
|
|
const renderer = this._renderer;
|
|
|
|
|
|
const originalAutoClear = renderer.autoClear;
|
|
|
@@ -3010,17 +3017,21 @@ class PMREMGenerator {
|
|
|
if ( col === 0 ) {
|
|
|
|
|
|
cubeCamera.up.set( 0, upSign[ i ], 0 );
|
|
|
- cubeCamera.lookAt( forwardSign[ i ], 0, 0 );
|
|
|
+ cubeCamera.position.set( position.x, position.y, position.z );
|
|
|
+ cubeCamera.lookAt( position.x + forwardSign[ i ], position.y, position.z );
|
|
|
|
|
|
} else if ( col === 1 ) {
|
|
|
|
|
|
cubeCamera.up.set( 0, 0, upSign[ i ] );
|
|
|
- cubeCamera.lookAt( 0, forwardSign[ i ], 0 );
|
|
|
+ cubeCamera.position.set( position.x, position.y, position.z );
|
|
|
+ cubeCamera.lookAt( position.x, position.y + forwardSign[ i ], position.z );
|
|
|
+
|
|
|
|
|
|
} else {
|
|
|
|
|
|
cubeCamera.up.set( 0, upSign[ i ], 0 );
|
|
|
- cubeCamera.lookAt( 0, 0, forwardSign[ i ] );
|
|
|
+ cubeCamera.position.set( position.x, position.y, position.z );
|
|
|
+ cubeCamera.lookAt( position.x, position.y, position.z + forwardSign[ i ] );
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -3063,7 +3074,7 @@ class PMREMGenerator {
|
|
|
|
|
|
}
|
|
|
|
|
|
- this._cubemapMaterial.uniforms.flipEnvMap.value = ( texture.isRenderTargetTexture === false ) ? - 1 : 1;
|
|
|
+ this._cubemapMaterial.uniforms.flipEnvMap.value = ( texture.isRenderTargetTexture === false ) ? -1 : 1;
|
|
|
|
|
|
} else {
|
|
|
|
|
|
@@ -3282,7 +3293,7 @@ function _createPlanes( lodMax ) {
|
|
|
for ( let face = 0; face < cubeFaces; face ++ ) {
|
|
|
|
|
|
const x = ( face % 3 ) * 2 / 3 - 1;
|
|
|
- const y = face > 2 ? 0 : - 1;
|
|
|
+ const y = face > 2 ? 0 : -1;
|
|
|
const coordinates = [
|
|
|
x, y, 0,
|
|
|
x + 2 / 3, y, 0,
|
|
|
@@ -3481,7 +3492,7 @@ function _getCubemapMaterial() {
|
|
|
|
|
|
uniforms: {
|
|
|
'envMap': { value: null },
|
|
|
- 'flipEnvMap': { value: - 1 }
|
|
|
+ 'flipEnvMap': { value: -1 }
|
|
|
},
|
|
|
|
|
|
vertexShader: _getCommonVertexShader(),
|
|
|
@@ -7851,18 +7862,18 @@ function WebGLLights( extensions ) {
|
|
|
version: 0,
|
|
|
|
|
|
hash: {
|
|
|
- directionalLength: - 1,
|
|
|
- pointLength: - 1,
|
|
|
- spotLength: - 1,
|
|
|
- rectAreaLength: - 1,
|
|
|
- hemiLength: - 1,
|
|
|
-
|
|
|
- numDirectionalShadows: - 1,
|
|
|
- numPointShadows: - 1,
|
|
|
- numSpotShadows: - 1,
|
|
|
- numSpotMaps: - 1,
|
|
|
-
|
|
|
- numLightProbes: - 1
|
|
|
+ directionalLength: -1,
|
|
|
+ pointLength: -1,
|
|
|
+ spotLength: -1,
|
|
|
+ rectAreaLength: -1,
|
|
|
+ hemiLength: -1,
|
|
|
+
|
|
|
+ numDirectionalShadows: -1,
|
|
|
+ numPointShadows: -1,
|
|
|
+ numSpotShadows: -1,
|
|
|
+ numSpotMaps: -1,
|
|
|
+
|
|
|
+ numLightProbes: -1
|
|
|
},
|
|
|
|
|
|
ambient: [ 0, 0, 0 ],
|
|
|
@@ -8403,7 +8414,7 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
|
|
|
fullScreenTri.setAttribute(
|
|
|
'position',
|
|
|
new BufferAttribute(
|
|
|
- new Float32Array( [ - 1, - 1, 0.5, 3, - 1, 0.5, - 1, 3, 0.5 ] ),
|
|
|
+ new Float32Array( [ -1, -1, 0.5, 3, -1, 0.5, -1, 3, 0.5 ] ),
|
|
|
3
|
|
|
)
|
|
|
);
|
|
|
@@ -8836,7 +8847,7 @@ function WebGLState( gl, extensions ) {
|
|
|
locked = false;
|
|
|
|
|
|
currentColorMask = null;
|
|
|
- currentColorClear.set( - 1, 0, 0, 0 ); // set to invalid state
|
|
|
+ currentColorClear.set( -1, 0, 0, 0 ); // set to invalid state
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -9165,12 +9176,12 @@ function WebGLState( gl, extensions ) {
|
|
|
let version = 0;
|
|
|
const glVersion = gl.getParameter( gl.VERSION );
|
|
|
|
|
|
- if ( glVersion.indexOf( 'WebGL' ) !== - 1 ) {
|
|
|
+ if ( glVersion.indexOf( 'WebGL' ) !== -1 ) {
|
|
|
|
|
|
version = parseFloat( /^WebGL (\d)/.exec( glVersion )[ 1 ] );
|
|
|
lineWidthAvailable = ( version >= 1.0 );
|
|
|
|
|
|
- } else if ( glVersion.indexOf( 'OpenGL ES' ) !== - 1 ) {
|
|
|
+ } else if ( glVersion.indexOf( 'OpenGL ES' ) !== -1 ) {
|
|
|
|
|
|
version = parseFloat( /^OpenGL ES (\d)/.exec( glVersion )[ 1 ] );
|
|
|
lineWidthAvailable = ( version >= 2.0 );
|
|
|
@@ -9749,7 +9760,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.compressedTexImage2D.apply( gl, arguments );
|
|
|
+ gl.compressedTexImage2D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -9763,7 +9774,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.compressedTexImage3D.apply( gl, arguments );
|
|
|
+ gl.compressedTexImage3D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -9777,7 +9788,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.texSubImage2D.apply( gl, arguments );
|
|
|
+ gl.texSubImage2D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -9791,7 +9802,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.texSubImage3D.apply( gl, arguments );
|
|
|
+ gl.texSubImage3D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -9805,7 +9816,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.compressedTexSubImage2D.apply( gl, arguments );
|
|
|
+ gl.compressedTexSubImage2D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -9819,7 +9830,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.compressedTexSubImage3D.apply( gl, arguments );
|
|
|
+ gl.compressedTexSubImage3D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -9833,7 +9844,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.texStorage2D.apply( gl, arguments );
|
|
|
+ gl.texStorage2D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -9847,7 +9858,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.texStorage3D.apply( gl, arguments );
|
|
|
+ gl.texStorage3D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -9861,7 +9872,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.texImage2D.apply( gl, arguments );
|
|
|
+ gl.texImage2D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -9875,7 +9886,7 @@ function WebGLState( gl, extensions ) {
|
|
|
|
|
|
try {
|
|
|
|
|
|
- gl.texImage3D.apply( gl, arguments );
|
|
|
+ gl.texImage3D( ...arguments );
|
|
|
|
|
|
} catch ( error ) {
|
|
|
|
|
|
@@ -12697,7 +12708,7 @@ class WebXRManager extends EventDispatcher {
|
|
|
|
|
|
const controllerIndex = controllerInputSources.indexOf( event.inputSource );
|
|
|
|
|
|
- if ( controllerIndex === - 1 ) {
|
|
|
+ if ( controllerIndex === -1 ) {
|
|
|
|
|
|
return;
|
|
|
|
|
|
@@ -12879,7 +12890,10 @@ class WebXRManager extends EventDispatcher {
|
|
|
format: RGBAFormat,
|
|
|
type: UnsignedByteType,
|
|
|
colorSpace: renderer.outputColorSpace,
|
|
|
- stencilBuffer: attributes.stencil
|
|
|
+ stencilBuffer: attributes.stencil,
|
|
|
+ resolveDepthBuffer: ( glBaseLayer.ignoreDepthValues === false ),
|
|
|
+ resolveStencilBuffer: ( glBaseLayer.ignoreDepthValues === false )
|
|
|
+
|
|
|
}
|
|
|
);
|
|
|
|
|
|
@@ -12922,7 +12936,8 @@ class WebXRManager extends EventDispatcher {
|
|
|
stencilBuffer: attributes.stencil,
|
|
|
colorSpace: renderer.outputColorSpace,
|
|
|
samples: attributes.antialias ? 4 : 0,
|
|
|
- resolveDepthBuffer: ( glProjLayer.ignoreDepthValues === false )
|
|
|
+ resolveDepthBuffer: ( glProjLayer.ignoreDepthValues === false ),
|
|
|
+ resolveStencilBuffer: ( glProjLayer.ignoreDepthValues === false )
|
|
|
} );
|
|
|
|
|
|
}
|
|
|
@@ -12987,7 +13002,7 @@ class WebXRManager extends EventDispatcher {
|
|
|
|
|
|
let controllerIndex = controllerInputSources.indexOf( inputSource );
|
|
|
|
|
|
- if ( controllerIndex === - 1 ) {
|
|
|
+ if ( controllerIndex === -1 ) {
|
|
|
|
|
|
// Assign input source a controller that currently has no input source
|
|
|
|
|
|
@@ -13011,7 +13026,7 @@ class WebXRManager extends EventDispatcher {
|
|
|
|
|
|
// If all controllers do currently receive input we ignore new ones
|
|
|
|
|
|
- if ( controllerIndex === - 1 ) break;
|
|
|
+ if ( controllerIndex === -1 ) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -13078,7 +13093,7 @@ class WebXRManager extends EventDispatcher {
|
|
|
camera.matrixWorldInverse.copy( camera.matrixWorld ).invert();
|
|
|
|
|
|
// Check if the projection uses an infinite far plane.
|
|
|
- if ( projL[ 10 ] === - 1.0 ) {
|
|
|
+ if ( projL[ 10 ] === -1 ) {
|
|
|
|
|
|
// Use the projection matrix from the left eye.
|
|
|
// The camera offset is sufficient to include the view volumes
|
|
|
@@ -13579,7 +13594,7 @@ function WebGLMaterials( renderer, properties ) {
|
|
|
|
|
|
if ( material.side === BackSide ) {
|
|
|
|
|
|
- uniforms.bumpScale.value *= - 1;
|
|
|
+ uniforms.bumpScale.value *= -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -13646,19 +13661,19 @@ function WebGLMaterials( renderer, properties ) {
|
|
|
_e1.copy( envMapRotation );
|
|
|
|
|
|
// accommodate left-handed frame
|
|
|
- _e1.x *= - 1; _e1.y *= - 1; _e1.z *= - 1;
|
|
|
+ _e1.x *= -1; _e1.y *= -1; _e1.z *= -1;
|
|
|
|
|
|
if ( envMap.isCubeTexture && envMap.isRenderTargetTexture === false ) {
|
|
|
|
|
|
// environment maps which are not cube render targets or PMREMs follow a different convention
|
|
|
- _e1.y *= - 1;
|
|
|
- _e1.z *= - 1;
|
|
|
+ _e1.y *= -1;
|
|
|
+ _e1.z *= -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
uniforms.envMapRotation.value.setFromMatrix4( _m1.makeRotationFromEuler( _e1 ) );
|
|
|
|
|
|
- uniforms.flipEnvMap.value = ( envMap.isCubeTexture && envMap.isRenderTargetTexture === false ) ? - 1 : 1;
|
|
|
+ uniforms.flipEnvMap.value = ( envMap.isCubeTexture && envMap.isRenderTargetTexture === false ) ? -1 : 1;
|
|
|
|
|
|
uniforms.reflectivity.value = material.reflectivity;
|
|
|
uniforms.ior.value = material.ior;
|
|
|
@@ -14081,7 +14096,7 @@ function WebGLUniformsGroups( gl, info, capabilities, state ) {
|
|
|
|
|
|
for ( let i = 0; i < maxBindingPoints; i ++ ) {
|
|
|
|
|
|
- if ( allocatedBindingPoints.indexOf( i ) === - 1 ) {
|
|
|
+ if ( allocatedBindingPoints.indexOf( i ) === -1 ) {
|
|
|
|
|
|
allocatedBindingPoints.push( i );
|
|
|
return i;
|
|
|
@@ -14503,7 +14518,7 @@ class WebGLRenderer {
|
|
|
let _currentActiveCubeFace = 0;
|
|
|
let _currentActiveMipmapLevel = 0;
|
|
|
let _currentRenderTarget = null;
|
|
|
- let _currentMaterialId = - 1;
|
|
|
+ let _currentMaterialId = -1;
|
|
|
|
|
|
let _currentCamera = null;
|
|
|
|
|
|
@@ -14865,7 +14880,7 @@ class WebGLRenderer {
|
|
|
|
|
|
this.setClearColor = function () {
|
|
|
|
|
|
- background.setClearColor.apply( background, arguments );
|
|
|
+ background.setClearColor( ...arguments );
|
|
|
|
|
|
};
|
|
|
|
|
|
@@ -14877,7 +14892,7 @@ class WebGLRenderer {
|
|
|
|
|
|
this.setClearAlpha = function () {
|
|
|
|
|
|
- background.setClearAlpha.apply( background, arguments );
|
|
|
+ background.setClearAlpha( ...arguments );
|
|
|
|
|
|
};
|
|
|
|
|
|
@@ -15213,6 +15228,8 @@ class WebGLRenderer {
|
|
|
|
|
|
if ( object._multiDrawInstances !== null ) {
|
|
|
|
|
|
+ // @deprecated, r174
|
|
|
+ warnOnce( 'THREE.WebGLRenderer: renderMultiDrawInstances has been deprecated and will be removed in r184. Append to renderMultiDraw arguments and use indirection.' );
|
|
|
renderer.renderMultiDrawInstances( object._multiDrawStarts, object._multiDrawCounts, object._multiDrawCount, object._multiDrawInstances );
|
|
|
|
|
|
} else {
|
|
|
@@ -15369,8 +15386,7 @@ class WebGLRenderer {
|
|
|
|
|
|
} );
|
|
|
|
|
|
- renderStateStack.pop();
|
|
|
- currentRenderState = null;
|
|
|
+ currentRenderState = renderStateStack.pop();
|
|
|
|
|
|
return materials;
|
|
|
|
|
|
@@ -15634,7 +15650,7 @@ class WebGLRenderer {
|
|
|
// _gl.finish();
|
|
|
|
|
|
bindingStates.resetDefaultState();
|
|
|
- _currentMaterialId = - 1;
|
|
|
+ _currentMaterialId = -1;
|
|
|
_currentCamera = null;
|
|
|
|
|
|
renderStateStack.pop();
|
|
|
@@ -16450,7 +16466,7 @@ class WebGLRenderer {
|
|
|
|
|
|
m_uniforms.envMap.value = envMap;
|
|
|
|
|
|
- m_uniforms.flipEnvMap.value = ( envMap.isCubeTexture && envMap.isRenderTargetTexture === false ) ? - 1 : 1;
|
|
|
+ m_uniforms.flipEnvMap.value = ( envMap.isCubeTexture && envMap.isRenderTargetTexture === false ) ? -1 : 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -16759,7 +16775,7 @@ class WebGLRenderer {
|
|
|
|
|
|
}
|
|
|
|
|
|
- _currentMaterialId = - 1; // reset current material to ensure correct uniform bindings
|
|
|
+ _currentMaterialId = -1; // reset current material to ensure correct uniform bindings
|
|
|
|
|
|
};
|
|
|
|