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

TSL: Vertex shader revision 2 #1451

Merged
merged 4 commits into from
Dec 20, 2024
Merged

TSL: Vertex shader revision 2 #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
835fd4a
TSL: Vertex shader revision 2
Methuselah96 Dec 20, 2024
9faffe8
Update three.js
Methuselah96 Dec 20, 2024
3ee503b
Add examples
Methuselah96 Dec 20, 2024
aae54b2
Update patch and delete examples
Methuselah96 Dec 20, 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
8 changes: 4 additions & 4 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13841,14 +13841,14 @@ index 6beae580..5e9c56e5 100644
});
});
diff --git a/examples-testing/examples/webgpu_lights_tiled.ts b/examples-testing/examples/webgpu_lights_tiled.ts
index ed195757..84114277 100644
index 1214909f..24a5b610 100644
--- a/examples-testing/examples/webgpu_lights_tiled.ts
+++ b/examples-testing/examples/webgpu_lights_tiled.ts
@@ -1,8 +1,9 @@
-import * as THREE from 'three';
-import { texture, uv, pass, uniform } from 'three/tsl';
-import { texture, uv, pass, normalMap, uniform } from 'three/tsl';
+import * as THREE from 'three/webgpu';
+import { texture, uv, pass, uniform, ShaderNodeObject } from 'three/tsl';
+import { texture, uv, pass, normalMap, uniform, ShaderNodeObject } from 'three/tsl';
import { bloom } from 'three/addons/tsl/display/BloomNode.js';

import { TiledLighting } from 'three/addons/lighting/TiledLighting.js';
Expand Down Expand Up @@ -13896,7 +13896,7 @@ index ed195757..84114277 100644
const light = new THREE.PointLight(hexColor, 1, distance);
light.position.set(Math.random() * 300 - 150, 1, Math.random() * 300 - 150);
light.power = power;
@@ -154,8 +155,7 @@ function init() {
@@ -156,8 +157,7 @@ function init() {
function updatePostProcessing() {
// tile indexes debug, needs to be updated every time the renderer size changes

Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 31 files
+3 −3 examples/jsm/csm/CSMShadowNode.js
+3 −3 examples/jsm/modifiers/CurveModifier.js
+1 −1 examples/jsm/modifiers/CurveModifierGPU.js
+4 −4 examples/jsm/postprocessing/OutlinePass.js
+2 −2 examples/jsm/postprocessing/UnrealBloomPass.js
+13 −13 examples/jsm/tsl/display/BloomNode.js
+1 −1 examples/jsm/tsl/display/GTAONode.js
+4 −4 examples/jsm/tsl/display/OutlineNode.js
+2 −2 examples/jsm/tsl/display/SSAAPassNode.js
+1 −1 examples/jsm/tsl/display/StereoCompositePassNode.js
+40 −34 examples/jsm/tsl/lighting/TiledLightsNode.js
+1 −1 examples/jsm/webxr/XREstimatedLight.js
+18 −18 examples/webgpu_compute_audio.html
+5 −3 examples/webgpu_lights_tiled.html
+1 −2 examples/webgpu_materials.html
+59 −0 src/loaders/nodes/NodeLoader.js
+45 −0 src/loaders/nodes/NodeMaterialLoader.js
+61 −0 src/loaders/nodes/NodeObjectLoader.js
+8 −1 src/materials/nodes/NodeMaterial.js
+4 −5 src/materials/nodes/SpriteNodeMaterial.js
+1 −1 src/nodes/accessors/MaterialNode.js
+7 −4 src/nodes/accessors/ModelViewProjectionNode.js
+1 −1 src/nodes/accessors/ReferenceBaseNode.js
+4 −4 src/nodes/accessors/StorageBufferNode.js
+220 −0 src/nodes/code/ScriptableNode.js
+82 −0 src/nodes/code/ScriptableValueNode.js
+1 −1 src/nodes/gpgpu/ComputeBuiltinNode.js
+1 −1 src/nodes/gpgpu/ComputeNode.js
+1 −0 src/nodes/lighting/LightsNode.js
+2 −2 src/renderers/webgpu/utils/WebGPUAttributeUtils.js
+3 −3 test/unit/src/core/BufferAttribute.tests.js
1 change: 1 addition & 0 deletions types/three/src/materials/nodes/NodeMaterial.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ declare class NodeMaterial extends Material {
setupHardwareClipping(builder: NodeBuilder): void;
setupDepth(builder: NodeBuilder): void;
setupPositionView(): Node;
setupModelViewProjection(): Node;
setupVertex(builder: NodeBuilder): Node;
setupPosition(builder: NodeBuilder): Node;
setupDiffuseColor(builder: NodeBuilder): void;
Expand Down
Loading