Skip to content

Commit 3e6ea9d

Browse files
vanruescvanruesc
authored
Merge pull request #486 from pmndrs/dev
Version 6.31.0
2 parents da28cd5 + ba9b266 commit 3e6ea9d

File tree

91 files changed

+1968
-2065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1968
-2065
lines changed

‎demo/src/demos/BloomDemo.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
DirectionalLight,
55
PerspectiveCamera,
66
Raycaster,
7-
sRGBEncoding,
7+
SRGBColorSpace,
88
Vector2
99
} from "three";
1010

@@ -176,7 +176,7 @@ export class BloomDemo extends PostProcessingDemo {
176176

177177
cubeTextureLoader.load(urls, (t) => {
178178

179-
t.encoding = sRGBEncoding;
179+
t.colorSpace = SRGBColorSpace;
180180
assets.set("sky", t);
181181

182182
});
@@ -232,7 +232,7 @@ export class BloomDemo extends PostProcessingDemo {
232232

233233
// Lights
234234

235-
const ambientLight = new AmbientLight(0x323232);
235+
const ambientLight = new AmbientLight(0x7a7a7a);
236236
const mainLight = new DirectionalLight(0xffffff, 1.0);
237237
mainLight.position.set(-1, 1, 1);
238238

@@ -265,7 +265,7 @@ export class BloomDemo extends PostProcessingDemo {
265265
const effect = new SelectiveBloomEffect(scene, camera, {
266266
blendFunction: BlendFunction.ADD,
267267
mipmapBlur: true,
268-
luminanceThreshold: 0.7,
268+
luminanceThreshold: 0.4,
269269
luminanceSmoothing: 0.3,
270270
intensity: 3.0
271271
});

‎demo/src/demos/BlurDemo.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
CubeTextureLoader,
44
DirectionalLight,
55
PerspectiveCamera,
6-
sRGBEncoding
6+
SRGBColorSpace
77
} from "three";
88

99
import { ControlMode, SpatialControls } from "spatial-controls";
@@ -104,7 +104,7 @@ export class BlurDemo extends PostProcessingDemo {
104104

105105
cubeTextureLoader.load(urls, (t) => {
106106

107-
t.encoding = sRGBEncoding;
107+
t.colorSpace = SRGBColorSpace;
108108
assets.set("sky", t);
109109

110110
});
@@ -160,8 +160,8 @@ export class BlurDemo extends PostProcessingDemo {
160160

161161
// Lights
162162

163-
const ambientLight = new AmbientLight(0x323232);
164-
const mainLight = new DirectionalLight(0xff7e66, 1.0);
163+
const ambientLight = new AmbientLight(0x7a7a7a);
164+
const mainLight = new DirectionalLight(0xffbbaa, 1.0);
165165
mainLight.position.set(1.44, 0.2, 2.0);
166166

167167
scene.add(ambientLight);

‎demo/src/demos/ColorGradingDemo.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ export class ColorGradingDemo extends PostProcessingDemo {
295295
const lutEffect = capabilities.isWebGL2 ? new LUT3DEffect(lut) :
296296
new LUT3DEffect(lut.convertToUint8().toDataTexture());
297297

298-
// lutEffect.setInputEncoding(LinearEncoding); // Debug
298+
// lutEffect.inputColorSpace = LinearSRGBColorSpace; // Debug
299299

300300
this.brightnessContrastEffect = brightnessContrastEffect;
301301
this.colorAverageEffect = colorAverageEffect;

‎demo/src/demos/GodRaysDemo.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
MeshBasicMaterial,
88
PerspectiveCamera,
99
PointLight,
10-
SphereBufferGeometry
10+
SphereGeometry
1111
} from "three";
1212

1313
import { SpatialControls } from "spatial-controls";
@@ -156,9 +156,9 @@ export class GodRaysDemo extends PostProcessingDemo {
156156

157157
// Lights
158158

159-
const ambientLight = new AmbientLight(0x101010);
159+
const ambientLight = new AmbientLight(0x474747);
160160

161-
const mainLight = new PointLight(0xffe3b1);
161+
const mainLight = new PointLight(0xffddaa);
162162
mainLight.position.set(-0.5, 3, -0.25);
163163
mainLight.castShadow = true;
164164
mainLight.shadow.bias = 0.0000125;
@@ -188,7 +188,7 @@ export class GodRaysDemo extends PostProcessingDemo {
188188
fog: false
189189
});
190190

191-
const sunGeometry = new SphereBufferGeometry(0.75, 32, 32);
191+
const sunGeometry = new SphereGeometry(0.75, 32, 32);
192192
const sun = new Mesh(sunGeometry, sunMaterial);
193193
sun.frustumCulled = false;
194194
sun.matrixAutoUpdate = false;
@@ -240,8 +240,6 @@ export class GodRaysDemo extends PostProcessingDemo {
240240

241241
registerOptions(menu) {
242242

243-
const color = new Color();
244-
245243
const sun = this.sun;
246244
const light = this.light;
247245

@@ -259,7 +257,7 @@ export class GodRaysDemo extends PostProcessingDemo {
259257
"exposure": uniforms.exposure.value,
260258
"clampMax": uniforms.clampMax.value,
261259
"samples": effect.samples,
262-
"color": color.copyLinearToSRGB(sun.material.color).getHex(),
260+
"color": sun.material.color.getHex(),
263261
"opacity": blendMode.opacity.value,
264262
"blend mode": blendMode.blendFunction
265263
};
@@ -315,8 +313,8 @@ export class GodRaysDemo extends PostProcessingDemo {
315313

316314
menu.addColor(params, "color").onChange((value) => {
317315

318-
sun.material.color.setHex(value).convertSRGBToLinear();
319-
light.color.setHex(value).convertSRGBToLinear();
316+
sun.material.color.setHex(value);
317+
light.color.setHex(value);
320318

321319
});
322320

‎demo/src/demos/OutlineDemo.js‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import {
22
AmbientLight,
33
AnimationMixer,
4-
BoxBufferGeometry,
5-
CircleBufferGeometry,
4+
BoxGeometry,
5+
CircleGeometry,
66
Color,
77
CubeTextureLoader,
8-
ConeBufferGeometry,
8+
ConeGeometry,
99
DirectionalLight,
1010
DoubleSide,
1111
Mesh,
1212
MeshPhongMaterial,
13-
OctahedronBufferGeometry,
13+
OctahedronGeometry,
1414
PerspectiveCamera,
1515
Raycaster,
16-
SphereBufferGeometry,
17-
sRGBEncoding,
16+
SphereGeometry,
1817
TextureLoader,
19-
Vector2
18+
Vector2,
19+
SRGBColorSpace
2020
} from "three";
2121

2222
import { ControlMode, SpatialControls } from "spatial-controls";
@@ -85,7 +85,7 @@ export class OutlineDemo extends PostProcessingDemo {
8585
/**
8686
* An effect.
8787
*
88-
* @type {Effect}
88+
* @type {OutlineEffect}
8989
* @private
9090
*/
9191

@@ -200,14 +200,14 @@ export class OutlineDemo extends PostProcessingDemo {
200200

201201
cubeTextureLoader.load(urls, (t) => {
202202

203-
t.encoding = sRGBEncoding;
203+
t.colorSpace = SRGBColorSpace;
204204
assets.set("sky", t);
205205

206206
});
207207

208208
textureLoader.load("textures/pattern.png", (t) => {
209209

210-
t.encoding = sRGBEncoding;
210+
t.colorSpace = SRGBColorSpace;
211211
assets.set("pattern-color", t);
212212

213213
});
@@ -270,9 +270,9 @@ export class OutlineDemo extends PostProcessingDemo {
270270

271271
// Lights
272272

273-
const ambientLight = new AmbientLight(0x212121);
274-
const mainLight = new DirectionalLight(0xff7e66, 1.0);
275-
const backLight = new DirectionalLight(0xff7e66, 0.1);
273+
const ambientLight = new AmbientLight(0x656565);
274+
const mainLight = new DirectionalLight(0xffbbaa, 1.0);
275+
const backLight = new DirectionalLight(0xffbbaa, 0.1);
276276

277277
mainLight.position.set(14.4, 2, 20);
278278
backLight.position.copy(mainLight.position).negate();
@@ -285,7 +285,7 @@ export class OutlineDemo extends PostProcessingDemo {
285285
const meshes = [];
286286

287287
let mesh = new Mesh(
288-
new SphereBufferGeometry(1, 32, 32),
288+
new SphereGeometry(1, 32, 32),
289289
new MeshPhongMaterial({
290290
color: 0xffff00
291291
})
@@ -296,7 +296,7 @@ export class OutlineDemo extends PostProcessingDemo {
296296
selection.push(mesh);
297297

298298
mesh = new Mesh(
299-
new OctahedronBufferGeometry(),
299+
new OctahedronGeometry(),
300300
new MeshPhongMaterial({
301301
color: 0xff00ff
302302
})
@@ -307,7 +307,7 @@ export class OutlineDemo extends PostProcessingDemo {
307307
selection.push(mesh);
308308

309309
mesh = new Mesh(
310-
new CircleBufferGeometry(0.75, 32),
310+
new CircleGeometry(0.75, 32),
311311
new MeshPhongMaterial({
312312
side: DoubleSide,
313313
color: 0xff0000
@@ -320,7 +320,7 @@ export class OutlineDemo extends PostProcessingDemo {
320320
selection.push(mesh);
321321

322322
mesh = new Mesh(
323-
new ConeBufferGeometry(1, 1, 32),
323+
new ConeGeometry(1, 1, 32),
324324
new MeshPhongMaterial({
325325
color: 0x00ff00
326326
})
@@ -331,7 +331,7 @@ export class OutlineDemo extends PostProcessingDemo {
331331
selection.push(mesh);
332332

333333
mesh = new Mesh(
334-
new BoxBufferGeometry(1, 1, 1),
334+
new BoxGeometry(1, 1, 1),
335335
new MeshPhongMaterial({
336336
color: 0x00ffff
337337
})
@@ -426,41 +426,38 @@ export class OutlineDemo extends PostProcessingDemo {
426426
"use pattern": false,
427427
"pattern scale": 60.0,
428428
"pulse speed": effect.pulseSpeed,
429-
"edge strength": uniforms.get("edgeStrength").value,
430-
"visible edge": color.copyLinearToSRGB(
431-
uniforms.get("visibleEdgeColor").value).getHex(),
432-
"hidden edge": color.copyLinearToSRGB(
433-
uniforms.get("hiddenEdgeColor").value).getHex(),
429+
"edge strength": effect.edgeStrength,
430+
"visible edge": color.copyLinearToSRGB(effect.visibleEdgeColor).getHex(),
431+
"hidden edge": color.copyLinearToSRGB(effect.hiddenEdgeColor).getHex(),
434432
"x-ray": true,
435433
"opacity": blendMode.opacity.value,
436434
"blend mode": blendMode.blendFunction
437435
};
438436

439-
menu.add(params, "resolution", [240, 360, 480, 720, 1080])
440-
.onChange((value) => {
437+
menu.add(params, "resolution", [240, 360, 480, 720, 1080]).onChange((value) => {
441438

442-
effect.resolution.height = Number(value);
439+
effect.resolution.height = Number(value);
443440

444-
});
441+
});
445442

446443
menu.add(params, "blurriness",
447444
KernelSize.VERY_SMALL, KernelSize.HUGE + 1, 1).onChange((value) => {
448445

449-
effect.blur = (value > 0);
450-
effect.blurPass.kernelSize = value - 1;
446+
effect.blurPass.enabled = (value > 0);
447+
effect.blurPass.blurMaterial.kernelSize = value - 1;
451448

452449
});
453450

454451
menu.add(params, "use pattern").onChange((value) => {
455452

456453
if(value) {
457454

458-
effect.setPatternTexture(assets.get("pattern-color"));
455+
effect.patternTexture = assets.get("pattern-color");
459456
uniforms.get("patternScale").value = params["pattern scale"];
460457

461458
} else {
462459

463-
effect.setPatternTexture(null);
460+
effect.patternTexture = null;
464461

465462
}
466463

@@ -486,15 +483,13 @@ export class OutlineDemo extends PostProcessingDemo {
486483

487484
menu.addColor(params, "visible edge").onChange((value) => {
488485

489-
uniforms.get("visibleEdgeColor").value.setHex(value)
490-
.convertSRGBToLinear();
486+
effect.visibleEdgeColor.setHex(value).convertSRGBToLinear();
491487

492488
});
493489

494490
menu.addColor(params, "hidden edge").onChange((value) => {
495491

496-
uniforms.get("hiddenEdgeColor").value.setHex(value)
497-
.convertSRGBToLinear();
492+
effect.hiddenEdgeColor.setHex(value).convertSRGBToLinear();
498493

499494
});
500495

0 commit comments

Comments
 (0)