Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Examples: Make AO demo more configurable. #1108

Merged
merged 3 commits into from
Jul 21, 2024
Merged

Examples: Make AO demo more configurable. #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15e1e54
Update three.js
Methuselah96 Jul 21, 2024
5485fb2
Add examples
Methuselah96 Jul 21, 2024
18ed9a7
Update patch and delete examples
Methuselah96 Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14624,16 +14624,18 @@ index 4c3a1d66..4337b2c8 100644
postProcessing.outputNode = combinedPass;

diff --git a/examples-testing/examples/webgpu_postprocessing_ao.ts b/examples-testing/examples/webgpu_postprocessing_ao.ts
index 86fa7686..2f5cc263 100644
index 5fe9a9b7..130a7821 100644
--- a/examples-testing/examples/webgpu_postprocessing_ao.ts
+++ b/examples-testing/examples/webgpu_postprocessing_ao.ts
@@ -1,4 +1,4 @@
@@ -1,5 +1,5 @@
-import * as THREE from 'three';
-import { pass, mrt, output, transformedNormalView } from 'three/tsl';
+import * as THREE from 'three/webgpu';
import { pass, mrt, output, transformedNormalView } from 'three/tsl';
+import { pass, mrt, output, transformedNormalView, ShaderNodeObject, GTAONode } from 'three/tsl';

import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
@@ -9,7 +9,14 @@ import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
import { DRACOLoader } from 'three/addons/loaders/DRACOLoader.js';
@@ -9,9 +9,16 @@ import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
import Stats from 'three/addons/libs/stats.module.js';
import { GUI } from 'three/addons/libs/lil-gui.module.min.js';

Expand All @@ -14647,6 +14649,9 @@ index 86fa7686..2f5cc263 100644
+ stats: Stats,
+ mixer: THREE.AnimationMixer;

-let aoPass;
+let aoPass: ShaderNodeObject<GTAONode>;

const params = {
blendIntensity: 1,
diff --git a/examples-testing/examples/webgpu_postprocessing_dof.ts b/examples-testing/examples/webgpu_postprocessing_dof.ts
Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 1 files
+25 −5 examples/webgpu_postprocessing_ao.html
Loading