WebGLRenderer: renderState lights needs to be updated per ArrayCamera's subcamera.

mrdoob · mrdoob · commit c2a469a9c7fa · 2018-08-20T18:10:30.000-07:00
diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js
@@ -1366,6 +1366,8 @@ function WebGLRenderer( parameters ) {
 
 						}
 
+						currentRenderState.setupLights( camera2 );
+
 						renderObject( object, scene, camera2, geometry, material, group );
 
 					}
@@ -1691,7 +1693,7 @@ function WebGLRenderer( parameters ) {
 
 		}
 
-		if ( refreshProgram || camera !== _currentCamera ) {
+		if ( refreshProgram || _currentCamera !== camera ) {
 
 			p_uniforms.setValue( _gl, 'projectionMatrix', camera.projectionMatrix );
 
@@ -1702,11 +1704,9 @@ function WebGLRenderer( parameters ) {
 
 			}
 
-			// Avoid unneeded uniform updates per ArrayCamera's sub-camera
-
-			if ( _currentCamera !== ( _currentArrayCamera || camera ) ) {
+			if ( _currentCamera !== camera ) {
 
-				_currentCamera = ( _currentArrayCamera || camera );
+				_currentCamera = camera;
 
 				// lighting uniforms depend on the camera so enforce an update
 				// now, in case this material supports lights - or later, when

Original file line number	Diff line number	Diff line change
`@@ -1366,6 +1366,8 @@ function WebGLRenderer( parameters ) {`
`1366`	`1366`
`1367`	`1367`	`}`
`1368`	`1368`
	`1369`	`+ currentRenderState.setupLights( camera2 );`
	`1370`	`+`
`1369`	`1371`	`renderObject( object, scene, camera2, geometry, material, group );`
`1370`	`1372`
`1371`	`1373`	`}`
`@@ -1691,7 +1693,7 @@ function WebGLRenderer( parameters ) {`
`1691`	`1693`
`1692`	`1694`	`}`
`1693`	`1695`
`1694`		`- if ( refreshProgram \|\| camera !== _currentCamera ) {`
	`1696`	`+ if ( refreshProgram \|\| _currentCamera !== camera ) {`
`1695`	`1697`
`1696`	`1698`	`p_uniforms.setValue( _gl, 'projectionMatrix', camera.projectionMatrix );`
`1697`	`1699`
`@@ -1702,11 +1704,9 @@ function WebGLRenderer( parameters ) {`
`1702`	`1704`
`1703`	`1705`	`}`
`1704`	`1706`
`1705`		`- // Avoid unneeded uniform updates per ArrayCamera's sub-camera`
`1706`		`-`
`1707`		`- if ( _currentCamera !== ( _currentArrayCamera \|\| camera ) ) {`
	`1707`	`+ if ( _currentCamera !== camera ) {`
`1708`	`1708`
`1709`		`- _currentCamera = ( _currentArrayCamera \|\| camera );`
	`1709`	`+ _currentCamera = camera;`
`1710`	`1710`
`1711`	`1711`	`// lighting uniforms depend on the camera so enforce an update`
`1712`	`1712`	`// now, in case this material supports lights - or later, when`