Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
javascript
/
three.js
-ын хуулбар https://github.com/tazdij/three.js.git
2
0
Салаа 0
Файлууд Асуудлууд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Fix toggling receiveShadow without changing material

Fix the case where there are two objects with the same material in the scene and one has receiveShadow=true and the other has receiveShadow=false.

This also prevents possible extra shader compiles when the same material is reused with receiveShadow enabled or disabled in the same scene.
Olli Etuaho 6 жил өмнө
parent
eb4ecd9631
commit
80f49cfca9
5 өөрчлөгдсөн 100 нэмэгдсэн , 4 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 88 0
      examples/webgl_shadowmap_receiveshadow.html
  2. 7 0
      src/renderers/WebGLRenderer.js
  3. 3 3
      src/renderers/shaders/ShaderChunk/lights_fragment_begin.glsl.js
  4. 1 0
      src/renderers/shaders/ShaderChunk/lights_pars_begin.glsl.js
  5. 1 1
      src/renderers/webgl/WebGLPrograms.js

+ 88 - 0
examples/webgl_shadowmap_receiveshadow.html
Файл харах 

@@ -0,0 +1,88 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+	<head>
 
+		<title>three.js webgl - shadow map - per-object receive shadow</title>
 
+		<meta charset="utf-8">
 
+		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
+		<link type="text/css" rel="stylesheet" href="main.css">
 
+	</head>
 
+	<body>
 
+
 
+		<script type="module">
 
+
 
+			import * as THREE from '../build/three.module.js';
 
+
 
+			var camera, scene, renderer;
 
+			var caster;
 
+
 
+			init();
 
+			animate();
 
+
 
+			function init() {
 
+
 
+				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 1000 );
 
+				camera.position.set(0, 200, 400);
 
+				camera.lookAt( new THREE.Vector3(0, 0, 0) );
 
+
 
+				scene = new THREE.Scene();
 
+
 
+				var geometry = new THREE.BoxBufferGeometry( 100, 100, 100 );
 
+				var material = new THREE.MeshPhysicalMaterial( { color: 0xff8800 } );
 
+
 
+				caster = new THREE.Mesh( geometry, material );
 
+				caster.castShadow = true;
 
+				caster.receiveShadow = false;
 
+				scene.add( caster );
 
+
 
+				var ground = new THREE.Mesh( new THREE.PlaneBufferGeometry( 1000, 1000 ), material );
 
+				scene.add( ground );
 
+				ground.position.set(0, -80, 0);
 
+				ground.rotation.x = - Math.PI / 2;
 
+				ground.castShadow = false;
 
+				ground.receiveShadow = true;
 
+
 
+				var light = new THREE.PointLight();
 
+				scene.add(light);
 
+				light.position.set(0, 600, 0);
 
+				light.castShadow = true;
 
+				light.shadow.camera.far = 1000;
 
+
 
+				// We use a high bias value mostly because that can reveal bugs in the implementation of caster.receiveShadow
 
+				light.shadow.bias = 0.05;
 
+
 
+				renderer = new THREE.WebGLRenderer( { antialias: true } );
 
+				renderer.setPixelRatio( window.devicePixelRatio );
 
+				renderer.setSize( window.innerWidth, window.innerHeight );
 
+				renderer.shadowMap.enabled = true;
 
+				document.body.appendChild( renderer.domElement );
 
+
 
+				//
 
+
 
+				window.addEventListener( 'resize', onWindowResize, false );
 
+
 
+			}
 
+
 
+			function onWindowResize() {
 
+
 
+				camera.aspect = window.innerWidth / window.innerHeight;
 
+				camera.updateProjectionMatrix();
 
+
 
+				renderer.setSize( window.innerWidth, window.innerHeight );
 
+
 
+			}
 
+
 
+			function animate() {
 
+
 
+				requestAnimationFrame( animate );
 
+
 
+				caster.rotation.x += 0.005;
 
+				caster.rotation.y += 0.01;
 
+
 
+				renderer.render( scene, camera );
 
+
 
+			}
 
+
 
+		</script>
 
+
 
+	</body>
 
+</html>

+ 7 - 0
src/renderers/WebGLRenderer.js
Файл харах 

@@ -1792,6 +1792,13 @@ function WebGLRenderer( parameters ) {
 
 
 
 		}
 
 		}
 
 
 
+		if ( refreshMaterial || materialProperties.receiveShadow !== object.receiveShadow ) {
 
+
 
+			materialProperties.receiveShadow = object.receiveShadow;
 
+			p_uniforms.setValue( _gl, 'receiveShadow', object.receiveShadow );
 
+
 
+		}
 
+
 
 		if ( refreshMaterial ) {
 
 		if ( refreshMaterial ) {
 
 
 
 			p_uniforms.setValue( _gl, 'toneMappingExposure', _this.toneMappingExposure );
 
 			p_uniforms.setValue( _gl, 'toneMappingExposure', _this.toneMappingExposure );

+ 3 - 3
src/renderers/shaders/ShaderChunk/lights_fragment_begin.glsl.js
Файл харах 

@@ -40,7 +40,7 @@ IncidentLight directLight;
 
 		getPointDirectLightIrradiance( pointLight, geometry, directLight );
 
 		getPointDirectLightIrradiance( pointLight, geometry, directLight );
 
 
 
 		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_POINT_LIGHT_SHADOWS )
 
 		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_POINT_LIGHT_SHADOWS )
 
-		directLight.color *= all( bvec2( pointLight.shadow, directLight.visible ) ) ? getPointShadow( pointShadowMap[ i ], pointLight.shadowMapSize, pointLight.shadowBias, pointLight.shadowRadius, vPointShadowCoord[ i ], pointLight.shadowCameraNear, pointLight.shadowCameraFar ) : 1.0;
 
+		directLight.color *= all( bvec3( pointLight.shadow, directLight.visible, receiveShadow ) ) ? getPointShadow( pointShadowMap[ i ], pointLight.shadowMapSize, pointLight.shadowBias, pointLight.shadowRadius, vPointShadowCoord[ i ], pointLight.shadowCameraNear, pointLight.shadowCameraFar ) : 1.0;
 
 		#endif
 
 		#endif
 
 
 
 		RE_Direct( directLight, geometry, material, reflectedLight );
 
 		RE_Direct( directLight, geometry, material, reflectedLight );
 
@@ -61,7 +61,7 @@ IncidentLight directLight;
 
 		getSpotDirectLightIrradiance( spotLight, geometry, directLight );
 
 		getSpotDirectLightIrradiance( spotLight, geometry, directLight );
 
 
 
 		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_SPOT_LIGHT_SHADOWS )
 
 		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_SPOT_LIGHT_SHADOWS )
 
-		directLight.color *= all( bvec2( spotLight.shadow, directLight.visible ) ) ? getShadow( spotShadowMap[ i ], spotLight.shadowMapSize, spotLight.shadowBias, spotLight.shadowRadius, vSpotShadowCoord[ i ] ) : 1.0;
 
+		directLight.color *= all( bvec3( spotLight.shadow, directLight.visible, receiveShadow ) ) ? getShadow( spotShadowMap[ i ], spotLight.shadowMapSize, spotLight.shadowBias, spotLight.shadowRadius, vSpotShadowCoord[ i ] ) : 1.0;
 
 		#endif
 
 		#endif
 
 
 
 		RE_Direct( directLight, geometry, material, reflectedLight );
 
 		RE_Direct( directLight, geometry, material, reflectedLight );
 
@@ -82,7 +82,7 @@ IncidentLight directLight;
 
 		getDirectionalDirectLightIrradiance( directionalLight, geometry, directLight );
 
 		getDirectionalDirectLightIrradiance( directionalLight, geometry, directLight );
 
 
 
 		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS )
 
 		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS )
 
-		directLight.color *= all( bvec2( directionalLight.shadow, directLight.visible ) ) ? getShadow( directionalShadowMap[ i ], directionalLight.shadowMapSize, directionalLight.shadowBias, directionalLight.shadowRadius, vDirectionalShadowCoord[ i ] ) : 1.0;
 
+		directLight.color *= all( bvec3( directionalLight.shadow, directLight.visible, receiveShadow ) ) ? getShadow( directionalShadowMap[ i ], directionalLight.shadowMapSize, directionalLight.shadowBias, directionalLight.shadowRadius, vDirectionalShadowCoord[ i ] ) : 1.0;
 
 		#endif
 
 		#endif
 
 
 
 		RE_Direct( directLight, geometry, material, reflectedLight );
 
 		RE_Direct( directLight, geometry, material, reflectedLight );

+ 1 - 0
src/renderers/shaders/ShaderChunk/lights_pars_begin.glsl.js
Файл харах 

@@ -1,4 +1,5 @@
 
 export default /* glsl */`
 
 export default /* glsl */`
 
+uniform bool receiveShadow;
 
 uniform vec3 ambientLightColor;
 
 uniform vec3 ambientLightColor;
 
 uniform vec3 lightProbe[ 9 ];
 
 uniform vec3 lightProbe[ 9 ];

+ 1 - 1
src/renderers/webgl/WebGLPrograms.js
Файл харах 

@@ -205,7 +205,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 
 
 			dithering: material.dithering,
 
 			dithering: material.dithering,
 
 
 
-			shadowMapEnabled: renderer.shadowMap.enabled && object.receiveShadow && shadows.length > 0,
 
+			shadowMapEnabled: renderer.shadowMap.enabled && shadows.length > 0,
 
 			shadowMapType: renderer.shadowMap.type,
 
 			shadowMapType: renderer.shadowMap.type,
 
 
 
 			toneMapping: material.toneMapped ? renderer.toneMapping : NoToneMapping,
 
 			toneMapping: material.toneMapped ? renderer.toneMapping : NoToneMapping,