Merge pull request #486 from pmndrs/dev

Version 6.31.0
pmndrs · May 7, 2023 · 3e6ea9d · 3e6ea9d
2 parents da28cd5 + ba9b266
commit 3e6ea9d
Show file tree

Hide file tree

Showing 91 changed files with 1,968 additions and 2,065 deletions.
diff --git a/demo/src/demos/BloomDemo.js b/demo/src/demos/BloomDemo.js
@@ -4,7 +4,7 @@ import {
 	DirectionalLight,
 	PerspectiveCamera,
 	Raycaster,
-	sRGBEncoding,
+	SRGBColorSpace,
 	Vector2
 } from "three";
 
@@ -176,7 +176,7 @@ export class BloomDemo extends PostProcessingDemo {
 
 				cubeTextureLoader.load(urls, (t) => {
 
-					t.encoding = sRGBEncoding;
+					t.colorSpace = SRGBColorSpace;
 					assets.set("sky", t);
 
 				});
@@ -232,7 +232,7 @@ export class BloomDemo extends PostProcessingDemo {
 
 		// Lights
 
-		const ambientLight = new AmbientLight(0x323232);
+		const ambientLight = new AmbientLight(0x7a7a7a);
 		const mainLight = new DirectionalLight(0xffffff, 1.0);
 		mainLight.position.set(-1, 1, 1);
 
@@ -265,7 +265,7 @@ export class BloomDemo extends PostProcessingDemo {
 		const effect = new SelectiveBloomEffect(scene, camera, {
 			blendFunction: BlendFunction.ADD,
 			mipmapBlur: true,
-			luminanceThreshold: 0.7,
+			luminanceThreshold: 0.4,
 			luminanceSmoothing: 0.3,
 			intensity: 3.0
 		});

diff --git a/demo/src/demos/BlurDemo.js b/demo/src/demos/BlurDemo.js
@@ -3,7 +3,7 @@ import {
 	CubeTextureLoader,
 	DirectionalLight,
 	PerspectiveCamera,
-	sRGBEncoding
+	SRGBColorSpace
 } from "three";
 
 import { ControlMode, SpatialControls } from "spatial-controls";
@@ -104,7 +104,7 @@ export class BlurDemo extends PostProcessingDemo {
 
 				cubeTextureLoader.load(urls, (t) => {
 
-					t.encoding = sRGBEncoding;
+					t.colorSpace = SRGBColorSpace;
 					assets.set("sky", t);
 
 				});
@@ -160,8 +160,8 @@ export class BlurDemo extends PostProcessingDemo {
 
 		// Lights
 
-		const ambientLight = new AmbientLight(0x323232);
-		const mainLight = new DirectionalLight(0xff7e66, 1.0);
+		const ambientLight = new AmbientLight(0x7a7a7a);
+		const mainLight = new DirectionalLight(0xffbbaa, 1.0);
 		mainLight.position.set(1.44, 0.2, 2.0);
 
 		scene.add(ambientLight);

diff --git a/demo/src/demos/ColorGradingDemo.js b/demo/src/demos/ColorGradingDemo.js
@@ -295,7 +295,7 @@ export class ColorGradingDemo extends PostProcessingDemo {
 		const lutEffect = capabilities.isWebGL2 ? new LUT3DEffect(lut) :
 			new LUT3DEffect(lut.convertToUint8().toDataTexture());
 
-		// lutEffect.setInputEncoding(LinearEncoding); // Debug
+		// lutEffect.inputColorSpace = LinearSRGBColorSpace; // Debug
 
 		this.brightnessContrastEffect = brightnessContrastEffect;
 		this.colorAverageEffect = colorAverageEffect;

diff --git a/demo/src/demos/GodRaysDemo.js b/demo/src/demos/GodRaysDemo.js
@@ -7,7 +7,7 @@ import {
 	MeshBasicMaterial,
 	PerspectiveCamera,
 	PointLight,
-	SphereBufferGeometry
+	SphereGeometry
 } from "three";
 
 import { SpatialControls } from "spatial-controls";
@@ -156,9 +156,9 @@ export class GodRaysDemo extends PostProcessingDemo {
 
 		// Lights
 
-		const ambientLight = new AmbientLight(0x101010);
+		const ambientLight = new AmbientLight(0x474747);
 
-		const mainLight = new PointLight(0xffe3b1);
+		const mainLight = new PointLight(0xffddaa);
 		mainLight.position.set(-0.5, 3, -0.25);
 		mainLight.castShadow = true;
 		mainLight.shadow.bias = 0.0000125;
@@ -188,7 +188,7 @@ export class GodRaysDemo extends PostProcessingDemo {
 			fog: false
 		});
 
-		const sunGeometry = new SphereBufferGeometry(0.75, 32, 32);
+		const sunGeometry = new SphereGeometry(0.75, 32, 32);
 		const sun = new Mesh(sunGeometry, sunMaterial);
 		sun.frustumCulled = false;
 		sun.matrixAutoUpdate = false;
@@ -240,8 +240,6 @@ export class GodRaysDemo extends PostProcessingDemo {
 
 	registerOptions(menu) {
 
-		const color = new Color();
-
 		const sun = this.sun;
 		const light = this.light;
 
@@ -259,7 +257,7 @@ export class GodRaysDemo extends PostProcessingDemo {
 			"exposure": uniforms.exposure.value,
 			"clampMax": uniforms.clampMax.value,
 			"samples": effect.samples,
-			"color": color.copyLinearToSRGB(sun.material.color).getHex(),
+			"color": sun.material.color.getHex(),
 			"opacity": blendMode.opacity.value,
 			"blend mode": blendMode.blendFunction
 		};
@@ -315,8 +313,8 @@ export class GodRaysDemo extends PostProcessingDemo {
 
 		menu.addColor(params, "color").onChange((value) => {
 
-			sun.material.color.setHex(value).convertSRGBToLinear();
-			light.color.setHex(value).convertSRGBToLinear();
+			sun.material.color.setHex(value);
+			light.color.setHex(value);
 
 		});
 

diff --git a/demo/src/demos/OutlineDemo.js b/demo/src/demos/OutlineDemo.js
@@ -1,22 +1,22 @@
 import {
 	AmbientLight,
 	AnimationMixer,
-	BoxBufferGeometry,
-	CircleBufferGeometry,
+	BoxGeometry,
+	CircleGeometry,
 	Color,
 	CubeTextureLoader,
-	ConeBufferGeometry,
+	ConeGeometry,
 	DirectionalLight,
 	DoubleSide,
 	Mesh,
 	MeshPhongMaterial,
-	OctahedronBufferGeometry,
+	OctahedronGeometry,
 	PerspectiveCamera,
 	Raycaster,
-	SphereBufferGeometry,
-	sRGBEncoding,
+	SphereGeometry,
 	TextureLoader,
-	Vector2
+	Vector2,
+	SRGBColorSpace
 } from "three";
 
 import { ControlMode, SpatialControls } from "spatial-controls";
@@ -85,7 +85,7 @@ export class OutlineDemo extends PostProcessingDemo {
 		/**
 		 * An effect.
 		 *
-		 * @type {Effect}
+		 * @type {OutlineEffect}
 		 * @private
 		 */
 
@@ -200,14 +200,14 @@ export class OutlineDemo extends PostProcessingDemo {
 
 				cubeTextureLoader.load(urls, (t) => {
 
-					t.encoding = sRGBEncoding;
+					t.colorSpace = SRGBColorSpace;
 					assets.set("sky", t);
 
 				});
 
 				textureLoader.load("textures/pattern.png", (t) => {
 
-					t.encoding = sRGBEncoding;
+					t.colorSpace = SRGBColorSpace;
 					assets.set("pattern-color", t);
 
 				});
@@ -270,9 +270,9 @@ export class OutlineDemo extends PostProcessingDemo {
 
 		// Lights
 
-		const ambientLight = new AmbientLight(0x212121);
-		const mainLight = new DirectionalLight(0xff7e66, 1.0);
-		const backLight = new DirectionalLight(0xff7e66, 0.1);
+		const ambientLight = new AmbientLight(0x656565);
+		const mainLight = new DirectionalLight(0xffbbaa, 1.0);
+		const backLight = new DirectionalLight(0xffbbaa, 0.1);
 
 		mainLight.position.set(14.4, 2, 20);
 		backLight.position.copy(mainLight.position).negate();
@@ -285,7 +285,7 @@ export class OutlineDemo extends PostProcessingDemo {
 		const meshes = [];
 
 		let mesh = new Mesh(
-			new SphereBufferGeometry(1, 32, 32),
+			new SphereGeometry(1, 32, 32),
 			new MeshPhongMaterial({
 				color: 0xffff00
 			})
@@ -296,7 +296,7 @@ export class OutlineDemo extends PostProcessingDemo {
 		selection.push(mesh);
 
 		mesh = new Mesh(
-			new OctahedronBufferGeometry(),
+			new OctahedronGeometry(),
 			new MeshPhongMaterial({
 				color: 0xff00ff
 			})
@@ -307,7 +307,7 @@ export class OutlineDemo extends PostProcessingDemo {
 		selection.push(mesh);
 
 		mesh = new Mesh(
-			new CircleBufferGeometry(0.75, 32),
+			new CircleGeometry(0.75, 32),
 			new MeshPhongMaterial({
 				side: DoubleSide,
 				color: 0xff0000
@@ -320,7 +320,7 @@ export class OutlineDemo extends PostProcessingDemo {
 		selection.push(mesh);
 
 		mesh = new Mesh(
-			new ConeBufferGeometry(1, 1, 32),
+			new ConeGeometry(1, 1, 32),
 			new MeshPhongMaterial({
 				color: 0x00ff00
 			})
@@ -331,7 +331,7 @@ export class OutlineDemo extends PostProcessingDemo {
 		selection.push(mesh);
 
 		mesh = new Mesh(
-			new BoxBufferGeometry(1, 1, 1),
+			new BoxGeometry(1, 1, 1),
 			new MeshPhongMaterial({
 				color: 0x00ffff
 			})
@@ -426,41 +426,38 @@ export class OutlineDemo extends PostProcessingDemo {
 			"use pattern": false,
 			"pattern scale": 60.0,
 			"pulse speed": effect.pulseSpeed,
-			"edge strength": uniforms.get("edgeStrength").value,
-			"visible edge": color.copyLinearToSRGB(
-				uniforms.get("visibleEdgeColor").value).getHex(),
-			"hidden edge": color.copyLinearToSRGB(
-				uniforms.get("hiddenEdgeColor").value).getHex(),
+			"edge strength": effect.edgeStrength,
+			"visible edge": color.copyLinearToSRGB(effect.visibleEdgeColor).getHex(),
+			"hidden edge": color.copyLinearToSRGB(effect.hiddenEdgeColor).getHex(),
 			"x-ray": true,
 			"opacity": blendMode.opacity.value,
 			"blend mode": blendMode.blendFunction
 		};
 
-		menu.add(params, "resolution", [240, 360, 480, 720, 1080])
-			.onChange((value) => {
+		menu.add(params, "resolution", [240, 360, 480, 720, 1080]).onChange((value) => {
 
-				effect.resolution.height = Number(value);
+			effect.resolution.height = Number(value);
 
-			});
+		});
 
 		menu.add(params, "blurriness",
 			KernelSize.VERY_SMALL, KernelSize.HUGE + 1, 1).onChange((value) => {
 
-			effect.blur = (value > 0);
-			effect.blurPass.kernelSize = value - 1;
+			effect.blurPass.enabled = (value > 0);
+			effect.blurPass.blurMaterial.kernelSize = value - 1;
 
 		});
 
 		menu.add(params, "use pattern").onChange((value) => {
 
 			if(value) {
 
-				effect.setPatternTexture(assets.get("pattern-color"));
+				effect.patternTexture = assets.get("pattern-color");
 				uniforms.get("patternScale").value = params["pattern scale"];
 
 			} else {
 
-				effect.setPatternTexture(null);
+				effect.patternTexture = null;
 
 			}
 
@@ -486,15 +483,13 @@ export class OutlineDemo extends PostProcessingDemo {
 
 		menu.addColor(params, "visible edge").onChange((value) => {
 
-			uniforms.get("visibleEdgeColor").value.setHex(value)
-				.convertSRGBToLinear();
+			effect.visibleEdgeColor.setHex(value).convertSRGBToLinear();
 
 		});
 
 		menu.addColor(params, "hidden edge").onChange((value) => {
 
-			uniforms.get("hiddenEdgeColor").value.setHex(value)
-				.convertSRGBToLinear();
+			effect.hiddenEdgeColor.setHex(value).convertSRGBToLinear();
 
 		});