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: MeshMatcapNodeMaterial #950

Merged
merged 4 commits into from
May 18, 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
1 change: 1 addition & 0 deletions examples-testing/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ const exceptionList = [
'webgpu_lines_fat',
'webgpu_loader_materialx',
'webgpu_materials',
'webgpu_materials_matcap',
'webgpu_materials_sss',
'webgpu_materialx_noise',
'webgpu_multiple_rendertargets',
Expand Down
1 change: 1 addition & 0 deletions types/three/examples/jsm/nodes/materials/Materials.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export { default as LineBasicNodeMaterial } from "./LineBasicNodeMaterial.js";
export { default as MeshBasicNodeMaterial } from "./MeshBasicNodeMaterial.js";
export { default as MeshMatcapNodeMaterial } from "./MeshMatcapNodeMaterial.js";
export { default as MeshNormalNodeMaterial } from "./MeshNormalNodeMaterial.js";
export { default as MeshPhongNodeMaterial } from "./MeshPhongNodeMaterial.js";
export { default as MeshPhysicalNodeMaterial } from "./MeshPhysicalNodeMaterial.js";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Color, MeshMatcapMaterialParameters, NormalMapTypes, Texture, Vector2 } from "three";
import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js";

export interface MeshMatcapNodeMaterialParameters extends NodeMaterialParameters, MeshMatcapMaterialParameters {
}

export default class MeshMatcapNodeMaterial extends NodeMaterial {
readonly isMeshMatcapNodeMaterial: true;

// Properties from MeshMatcapMaterial
readonly isMeshMatcapMaterial: true;
color: Color;
matcap: Texture | null;
map: Texture | null;
bumpMap: Texture | null;
bumpScale: number;
normalMap: Texture | null;
normalMapType: NormalMapTypes;
normalScale: Vector2;
displacementMap: Texture | null;
displacementScale: number;
displacementBias: number;
alphaMap: Texture | null;
flatShading: boolean;
fog: boolean;

constructor(paramters: MeshMatcapNodeMaterialParameters);
}
3 changes: 3 additions & 0 deletions types/three/examples/jsm/nodes/materials/NodeMaterial.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
LineBasicMaterial,
Material,
MeshBasicMaterial,
MeshMatcapMaterial,
MeshNormalMaterial,
MeshPhongMaterial,
MeshPhysicalMaterial,
Expand All @@ -20,6 +21,7 @@ import LightsNode from "../lighting/LightsNode.js";
import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
import LineBasicNodeMaterial from "./LineBasicNodeMaterial.js";
import MeshBasicNodeMaterial from "./MeshBasicNodeMaterial.js";
import MeshMatcapNodeMaterial from "./MeshMatcapNodeMaterial.js";
import MeshNormalNodeMaterial from "./MeshNormalNodeMaterial.js";
import MeshPhongNodeMaterial from "./MeshPhongNodeMaterial.js";
import MeshPhysicalNodeMaterial from "./MeshPhysicalNodeMaterial.js";
Expand Down Expand Up @@ -102,6 +104,7 @@ export default class NodeMaterial extends ShaderMaterial {

static fromMaterial(material: LineBasicMaterial): LineBasicNodeMaterial;
static fromMaterial(material: MeshBasicMaterial): MeshBasicNodeMaterial;
static fromMaterial(material: MeshMatcapMaterial): MeshMatcapNodeMaterial;
static fromMaterial(material: MeshNormalMaterial): MeshNormalNodeMaterial;
static fromMaterial(material: MeshPhongMaterial): MeshPhongNodeMaterial;
static fromMaterial(material: MeshPhysicalMaterial): MeshPhysicalNodeMaterial;
Expand Down
Loading