three-types · Methuselah96 · May 23, 2024 · May 23, 2024 · May 23, 2024 · May 23, 2024
diff --git a/examples-testing/index.js b/examples-testing/index.js
@@ -100,6 +100,8 @@ const exceptionList = [
     'webgpu_multisampled_renderbuffers',
     'webgpu_storage_buffer',
     'webgpu_texturegrad',
+    'webgpu_volume_cloud',
+    'webgpu_volume_perlin',
     'webxr_vr_handinput_cubes',
     'webxr_vr_handinput_profiles',
     'webxr_vr_handinput_pointerclick',

diff --git a/three.js b/three.js
diff --git a/types/three/examples/jsm/nodes/Nodes.d.ts b/types/three/examples/jsm/nodes/Nodes.d.ts
@@ -276,6 +276,7 @@ export { default as RendererReferenceNode, rendererReference } from "./accessors
 export { default as SkinningNode, skinning } from "./accessors/SkinningNode.js";
 export { default as StorageBufferNode, storage, storageObject } from "./accessors/StorageBufferNode.js";
 export * from "./accessors/TangentNode.js";
+export { default as Texture3DNode } from "./accessors/Texture3DNode.js";
 export { default as TextureBicubicNode, textureBicubic } from "./accessors/TextureBicubicNode.js";
 export { default as TextureNode, sampler, texture } from "./accessors/TextureNode.js";
 export { default as UniformsNode, uniforms } from "./accessors/UniformsNode.js";

diff --git a/types/three/examples/jsm/nodes/accessors/CubeTextureNode.d.ts b/types/three/examples/jsm/nodes/accessors/CubeTextureNode.d.ts
@@ -8,7 +8,7 @@ export default class CubeTextureNode extends TextureNode {
     uvNode: ShaderNodeObject<Node> | null;
     levelNode: ShaderNodeObject<Node> | null;
 
-    constructor(value: CubeTexture, uvNode?: Node | null, levelNode?: Node | null);
+    constructor(value: CubeTexture, uvNode?: ShaderNodeObject<Node> | null, levelNode?: ShaderNodeObject<Node> | null);
 
     getDefaultUV(): Node;
 }

diff --git a/types/three/examples/jsm/nodes/accessors/Texture3DNode.d.ts b/types/three/examples/jsm/nodes/accessors/Texture3DNode.d.ts
@@ -0,0 +1,16 @@
+import { CubeTexture, Texture } from "three";
+import Node from "../core/Node.js";
+import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import TextureNode from "./TextureNode.js";
+
+export default class Texture3DNode extends TextureNode {
+    readonly isTexture3DNode: true;
+
+    constructor(value: Texture, uvNode?: ShaderNodeObject<Node> | null, levelNode?: ShaderNodeObject<Node> | null);
+}
+
+export const texture3D: (
+    value: CubeTexture,
+    uvNode?: NodeRepresentation,
+    levelNode?: NodeRepresentation,
+) => ShaderNodeObject<Texture3DNode>;
diff --git a/types/three/examples/jsm/nodes/accessors/TextureNode.d.ts b/types/three/examples/jsm/nodes/accessors/TextureNode.d.ts
@@ -17,7 +17,7 @@ export default class TextureNode extends UniformNode<Texture> {
 
     referenceNode: Node | null;
 
-    constructor(value: Texture, uvNode?: ShaderNodeObject<Node>, levelNode?: ShaderNodeObject<Node> | null);
+    constructor(value: Texture, uvNode?: ShaderNodeObject<Node> | null, levelNode?: ShaderNodeObject<Node> | null);
 
     getDefaultUV(): Node;
 

diff --git a/types/three/examples/jsm/nodes/materials/Materials.d.ts b/types/three/examples/jsm/nodes/materials/Materials.d.ts
@@ -11,3 +11,4 @@ export { default as NodeMaterial } from "./NodeMaterial.js";
 export { default as PointsNodeMaterial } from "./PointsNodeMaterial.js";
 export { default as ShadowNodeMaterial } from "./ShadowNodeMaterial.js";
 export { default as SpriteNodeMaterial } from "./SpriteNodeMaterial.js";
+export { default as VolumeNodeMaterial } from "./VolumeNodeMaterial.js";
diff --git a/types/three/examples/jsm/nodes/materials/VolumeNodeMaterial.d.ts b/types/three/examples/jsm/nodes/materials/VolumeNodeMaterial.d.ts
@@ -0,0 +1,10 @@
+import Node from "../core/Node.js";
+import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js";
+
+export default class VolumeNodeMaterial extends NodeMaterial {
+    lights: boolean;
+    readonly isVolumeNodeMaterial: true;
+    testNode: Node | null;
+
+    constructor(parameters?: NodeMaterialParameters);
+}
+139 −11		build/three.cjs
+139 −11		build/three.module.js
+1 −1		build/three.module.min.js
+3 −3		docs/api/en/objects/InstancedMesh.html
+17 −0		editor/css/main.css
+0 −1		editor/js/Editor.js
+96 −2		editor/js/Menubar.View.js
+58 −12		editor/js/Script.js
+46 −14		editor/js/Sidebar.Project.Image.js
+0 −22		editor/js/Viewport.Controls.js
+10 −1		editor/js/Viewport.Pathtracer.js
+58 −14		editor/js/Viewport.js
+8 −0		editor/js/libs/ui.js
+3 −1		examples/files.json
+1 −0		examples/jsm/nodes/Nodes.js
+6 −0		examples/jsm/nodes/accessors/ReferenceNode.js
+100 −0		examples/jsm/nodes/accessors/Texture3DNode.js
+2 −2		examples/jsm/nodes/core/NodeBuilder.js
+1 −0		examples/jsm/nodes/materials/Materials.js
+106 −0		examples/jsm/nodes/materials/VolumeNodeMaterial.js
+13 −1		examples/jsm/renderers/common/nodes/NodeSampledTexture.js
+11 −1		examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js
+14 −0		examples/jsm/renderers/webgl/utils/WebGLTextureUtils.js
+13 −5		examples/jsm/renderers/webgpu/nodes/WGSLNodeBuilder.js
+8 −0		examples/jsm/renderers/webgpu/utils/WebGPUBindingUtils.js
+2 −2		examples/jsm/renderers/webgpu/utils/WebGPUTextureUtils.js
+ −		examples/screenshots/webgpu_volume_cloud.jpg
+ −		examples/screenshots/webgpu_volume_perlin.jpg
+203 −0		examples/webgpu_volume_cloud.html
+159 −0		examples/webgpu_volume_perlin.html
+8 −2		src/renderers/WebGLRenderer.js
+6 −0		src/renderers/webgl/WebGLBackground.js