Browse Source

Remove texture from inside the Sheen block

Popov72 5 years ago
parent
commit
67cd1d635d
1 changed files with 10 additions and 10 deletions
  1. 10 10
      src/Materials/Node/Blocks/Fragment/sheenBlock.ts

+ 10 - 10
src/Materials/Node/Blocks/Fragment/sheenBlock.ts

@@ -3,18 +3,14 @@ import { NodeMaterialBlockConnectionPointTypes } from '../../Enums/nodeMaterialB
 import { NodeMaterialBuildState } from '../../nodeMaterialBuildState';
 import { NodeMaterialConnectionPoint } from '../../nodeMaterialBlockConnectionPoint';
 import { NodeMaterialBlockTargets } from '../../Enums/nodeMaterialBlockTargets';
-import { Nullable } from '../../../../types';
 import { _TypeStore } from '../../../../Misc/typeStore';
 
-import { BaseTexture } from '../../../Textures/baseTexture';
-
 export class SheenBlock extends NodeMaterialBlock {
 
-    public texture: Nullable<BaseTexture>;
-
     public constructor(name: string) {
         super(name, NodeMaterialBlockTargets.Fragment);
 
+        this.registerInput("texture", NodeMaterialBlockConnectionPointTypes.Color4, true, NodeMaterialBlockTargets.Fragment);
         this.registerInput("intensity", NodeMaterialBlockConnectionPointTypes.Float, true, NodeMaterialBlockTargets.Fragment);
         this.registerInput("color", NodeMaterialBlockConnectionPointTypes.Color3, true, NodeMaterialBlockTargets.Fragment);
         this.registerInput("roughness", NodeMaterialBlockConnectionPointTypes.Float, true, NodeMaterialBlockTargets.Fragment);
@@ -31,24 +27,28 @@ export class SheenBlock extends NodeMaterialBlock {
         return "SheenBlock";
     }
 
-    public get intensity(): NodeMaterialConnectionPoint {
+    public get texture(): NodeMaterialConnectionPoint {
         return this._inputs[0];
     }
 
-    public get color(): NodeMaterialConnectionPoint {
+    public get intensity(): NodeMaterialConnectionPoint {
         return this._inputs[1];
     }
 
-    public get roughness(): NodeMaterialConnectionPoint {
+    public get color(): NodeMaterialConnectionPoint {
         return this._inputs[2];
     }
 
-    public get albedoScaling(): NodeMaterialConnectionPoint {
+    public get roughness(): NodeMaterialConnectionPoint {
         return this._inputs[3];
     }
 
+    public get albedoScaling(): NodeMaterialConnectionPoint {
+        return this._inputs[4];
+    }
+
     public get sheen(): NodeMaterialConnectionPoint {
-        return this._outputs[0];
+        return this._outputs[5];
     }
 
     protected _buildBlock(state: NodeMaterialBuildState) {