浏览代码

Merge pull request #18061 from martinRenou/node_material_types

NodeMaterial: missing attributes in type definition
Mr.doob 5 年之前
父节点
当前提交
1a1db23229

+ 16 - 0
examples/jsm/nodes/materials/MeshStandardNodeMaterial.d.ts

@@ -1,7 +1,23 @@
+import { Color } from '../../../../src/math/Color';
+import { Texture } from '../../../../src/textures/Texture';
+import { CubeTexture } from '../../../../src/textures/CubeTexture';
+import { Vector2 } from '../../../../src/math/Vector2';
+
+import { Node } from '../core/Node';
 import { NodeMaterial } from './NodeMaterial';
 
 export class MeshStandardNodeMaterial extends NodeMaterial {
 
 	constructor();
 
+	color: Color | Node;
+	roughness: number | Node;
+	metalness: number | Node;
+	map: Texture | Node;
+	normalMap: Texture | Node;
+	normalScale: Vector2 | Node;
+	metalnessMap: Texture | Node;
+	roughnessMap: Texture | Node;
+	envMap: CubeTexture | Node;
+
 }

+ 16 - 0
examples/jsm/nodes/materials/PhongNodeMaterial.d.ts

@@ -1,7 +1,23 @@
+import { Node } from '../core/Node';
 import { NodeMaterial } from './NodeMaterial';
 
 export class PhongNodeMaterial extends NodeMaterial {
 
 	constructor();
 
+	color: Node;
+	alpha: Node;
+	specular: Node;
+	shininess: Node;
+	normal: Node;
+	emissive: Node;
+	ambient: Node;
+	light: Node;
+	shadow: Node;
+	ao: Node;
+	environment: Node;
+	environmentAlpha: Node;
+	mask: Node;
+	position: Node;
+
 }

+ 7 - 0
examples/jsm/nodes/materials/SpriteNodeMaterial.d.ts

@@ -1,7 +1,14 @@
+import { Node } from '../core/Node';
 import { NodeMaterial } from './NodeMaterial';
 
 export class SpriteNodeMaterial extends NodeMaterial {
 
 	constructor();
 
+	color: Node;
+	alpha: Node;
+	mask: Node;
+	position: Node;
+	spherical: Node;
+
 }

+ 20 - 0
examples/jsm/nodes/materials/StandardNodeMaterial.d.ts

@@ -1,7 +1,27 @@
+import { Node } from '../core/Node';
 import { NodeMaterial } from './NodeMaterial';
 
 export class StandardNodeMaterial extends NodeMaterial {
 
 	constructor();
 
+	color: Node;
+	alpha: Node;
+	roughness: Node;
+	metalness: Node;
+	reflectivity: Node;
+	clearcoat: Node;
+	clearcoatRoughness: Node;
+	clearcoatNormal: Node;
+	normal: Node;
+	emissive: Node;
+	ambient: Node;
+	light: Node;
+	shadow: Node;
+	ao: Node;
+	environment: Node;
+	mask: Node;
+	position: Node;
+	sheen: Node;
+
 }

+ 3 - 5
examples/jsm/nodes/materials/nodes/PhongNode.d.ts

@@ -1,15 +1,13 @@
 import { NodeBuilder } from '../../core/NodeBuilder';
 import { Node } from '../../core/Node';
-import { ColorNode } from '../../inputs/ColorNode';
-import { FloatNode } from '../../inputs/FloatNode';
 
 export class PhongNode extends Node {
 
 	constructor();
 
-	color: ColorNode;
-	specular: ColorNode;
-	shininess: FloatNode;
+	color: Node;
+	specular: Node;
+	shininess: Node;
 	nodeType: string;
 
 	build( builder: NodeBuilder ): string;

+ 1 - 2
examples/jsm/nodes/materials/nodes/SpriteNode.d.ts

@@ -1,12 +1,11 @@
 import { NodeBuilder } from '../../core/NodeBuilder';
 import { Node } from '../../core/Node';
-import { ColorNode } from '../../inputs/ColorNode';
 
 export class SpriteNode extends Node {
 
 	constructor();
 
-	color: ColorNode;
+	color: Node;
 	spherical: true;
 	nodeType: string;
 

+ 3 - 5
examples/jsm/nodes/materials/nodes/StandardNode.d.ts

@@ -1,15 +1,13 @@
 import { NodeBuilder } from '../../core/NodeBuilder';
 import { Node } from '../../core/Node';
-import { ColorNode } from '../../inputs/ColorNode';
-import { FloatNode } from '../../inputs/FloatNode';
 
 export class StandardNode extends Node {
 
 	constructor();
 
-	color: ColorNode;
-	roughness: FloatNode;
-	metalness: FloatNode;
+	color: Node;
+	roughness: Node;
+	metalness: Node;
 	nodeType: string;
 
 	build( builder: NodeBuilder ): string;