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.

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

WebGPURenderer: Introduce NodeMaterialObserver and updates #1263

Merged
merged 9 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
454 changes: 306 additions & 148 deletions src-testing/changes.patch

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src-testing/create-src.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import * as path from 'node:path';
import prettier from 'prettier';

const files = [
'materials/nodes/manager/NodeMaterialObserver',
'materials/nodes/NodeMaterial',
'nodes/accessors/BufferAttributeNode',
'nodes/accessors/TextureNode',
Expand Down
1 change: 1 addition & 0 deletions src-testing/declarations.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import * as path from 'node:path';
import { argv } from 'node:process';

const files = [
'materials/nodes/manager/NodeMaterialObserver',
'nodes/accessors/BufferAttributeNode',
'nodes/core/constants',
'nodes/core/Node',
Expand Down
2 changes: 1 addition & 1 deletion three.js
80 changes: 80 additions & 0 deletions types/three/src/materials/nodes/manager/NodeMaterialObserver.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import { Matrix4 } from "../../../math/Matrix4.js";
import NodeBuilder from "../../../nodes/core/NodeBuilder.js";
import NodeFrame from "../../../nodes/core/NodeFrame.js";
import RenderObject from "../../../renderers/common/RenderObject.js";
import { Material } from "../../Material.js";
declare const refreshUniforms: readonly [
"alphaMap",
"alphaTest",
"anisotropy",
"anisotropyMap",
"anisotropyRotation",
"aoMap",
"attenuationColor",
"attenuationDistance",
"bumpMap",
"clearcoat",
"clearcoatMap",
"clearcoatNormalMap",
"clearcoatNormalScale",
"clearcoatRoughness",
"color",
"dispersion",
"displacementMap",
"emissive",
"emissiveMap",
"envMap",
"gradientMap",
"ior",
"iridescence",
"iridescenceIOR",
"iridescenceMap",
"iridescenceThicknessMap",
"lightMap",
"map",
"matcap",
"metalness",
"metalnessMap",
"normalMap",
"normalScale",
"opacity",
"roughness",
"roughnessMap",
"sheen",
"sheenColor",
"sheenColorMap",
"sheenRoughnessMap",
"shininess",
"specular",
"specularColor",
"specularColorMap",
"specularIntensity",
"specularIntensityMap",
"specularMap",
"thickness",
"transmission",
"transmissionMap",
];
type RefreshUniform = (typeof refreshUniforms)[number];
type MaterialData = {
[K in RefreshUniform]?: unknown;
};
interface RenderObjectData {
material: MaterialData;
worldMatrix: Matrix4;
version?: number;
}
declare class NodeMaterialObserver {
renderObjects: WeakMap<RenderObject, RenderObjectData>;
hasNode: boolean;
refreshUniforms: readonly RefreshUniform[];
renderId: number;
constructor(builder: NodeBuilder);
firstInitialization(renderObject: RenderObject): boolean;
getRenderObjectData(renderObject: RenderObject): RenderObjectData;
containsNode(builder: NodeBuilder): boolean;
getMaterialData(material: Material): MaterialData;
equals(renderObject: RenderObject): boolean;
needsRefresh(renderObject: RenderObject, nodeFrame: NodeFrame): boolean;
}
export default NodeMaterialObserver;
3 changes: 3 additions & 0 deletions types/three/src/renderers/common/BundleGroup.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import { Group } from "../../objects/Group.js";
declare class BundleGroup extends Group {
readonly isBundleGroup: true;
readonly type: string;
static: boolean;
version: number;
constructor();
set needsUpdate(value: boolean);
}
export default BundleGroup;
5 changes: 5 additions & 0 deletions types/three/src/renderers/common/RenderObject.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import { InterleavedBuffer } from "../../core/InterleavedBuffer.js";
import { InterleavedBufferAttribute } from "../../core/InterleavedBufferAttribute.js";
import { Object3D } from "../../core/Object3D.js";
import { Material } from "../../materials/Material.js";
import NodeMaterialObserver from "../../materials/nodes/manager/NodeMaterialObserver.js";
import { LightsNode } from "../../nodes/Nodes.js";
import { Scene } from "../../scenes/Scene.js";
import BindGroup from "./BindGroup.js";
import BundleGroup from "./BundleGroup.js";
import ClippingContext from "./ClippingContext.js";
import Geometries from "./Geometries.js";
import NodeBuilderState from "./nodes/NodeBuilderState.js";
Expand Down Expand Up @@ -41,12 +43,14 @@ export default class RenderObject {
instanceCount: number;
firstInstance: number;
} | null;
bundle: BundleGroup | null;
clippingContext: ClippingContext;
clippingContextVersion: number;
initialNodesCacheKey: string;
initialCacheKey: string;
_nodeBuilderState: NodeBuilderState | null;
_bindings: BindGroup[] | null;
_monitor: NodeMaterialObserver | null;
onDispose: (() => void) | null;
readonly isRenderObject: true;
onMaterialDispose: () => void;
Expand All @@ -64,6 +68,7 @@ export default class RenderObject {
updateClipping(parent: ClippingContext): void;
get clippingNeedsUpdate(): boolean;
getNodeBuilderState(): NodeBuilderState;
getMonitor(): NodeMaterialObserver;
getBindings(): BindGroup[];
getIndex(): BufferAttribute | null;
getChainArray(): readonly [
Expand Down
3 changes: 3 additions & 0 deletions types/three/src/renderers/common/nodes/NodeBuilderState.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import NodeMaterialObserver from "../../../materials/nodes/manager/NodeMaterialObserver.js";
import Node from "../../../nodes/core/Node.js";
import NodeAttribute from "../../../nodes/core/NodeAttribute.js";
import BindGroup from "../BindGroup.js";
Expand All @@ -11,6 +12,7 @@ declare class NodeBuilderState {
updateNodes: Node[];
updateBeforeNodes: Node[];
updateAfterNodes: Node[];
monitor: NodeMaterialObserver;
instanceBindGroups: boolean;
usedTimes: number;
constructor(
Expand All @@ -22,6 +24,7 @@ declare class NodeBuilderState {
updateNodes: Node[],
updateBeforeNodes: Node[],
updateAfterNodes: Node[],
monitor: NodeMaterialObserver,
instanceBindGroups?: boolean,
transforms?: never[],
);
Expand Down
1 change: 1 addition & 0 deletions types/three/src/renderers/common/nodes/Nodes.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ declare class Nodes extends DataMap<{
updateAfter(renderObject: RenderObject): void;
updateForCompute(computeNode: ComputeNode): void;
updateForRender(renderObject: RenderObject): void;
needsRefresh(renderObject: RenderObject): boolean;
dispose(): void;
}
export default Nodes;
Loading