浏览代码

Rename a define to make things clearer

Popov72 5 年之前
父节点
当前提交
e7bd94d2ae

+ 1 - 1
src/Materials/PBR/pbrBaseMaterial.ts

@@ -243,7 +243,7 @@ export class PBRMaterialDefines extends MaterialDefines
     public SHEEN_LINKWITHALBEDO = false;
     public SHEEN_ROUGHNESS = false;
     public SHEEN_ALBEDOSCALING = false;
-    public SHEEN_USE_ROUGHNESS_FROM_TEXTURE = false;
+    public SHEEN_USE_ROUGHNESS_FROM_MAINTEXTURE = false;
     public SHEEN_TEXTURE_ROUGHNESS_IDENTICAL = false;
 
     public SUBSURFACE = false;

+ 3 - 3
src/Materials/PBR/pbrSheenConfiguration.ts

@@ -20,7 +20,7 @@ export interface IMaterialSheenDefines {
     SHEEN_LINKWITHALBEDO: boolean;
     SHEEN_ROUGHNESS: boolean;
     SHEEN_ALBEDOSCALING: boolean;
-    SHEEN_USE_ROUGHNESS_FROM_TEXTURE: boolean;
+    SHEEN_USE_ROUGHNESS_FROM_MAINTEXTURE: boolean;
     SHEEN_TEXTURE_ROUGHNESS_IDENTICAL: boolean;
 
     /** @hidden */
@@ -162,7 +162,7 @@ export class PBRSheenConfiguration {
             defines.SHEEN_LINKWITHALBEDO = this._linkSheenWithAlbedo;
             defines.SHEEN_ROUGHNESS = this._roughness !== null;
             defines.SHEEN_ALBEDOSCALING = this._albedoScaling;
-            defines.SHEEN_USE_ROUGHNESS_FROM_TEXTURE = this._useRoughnessFromMainTexture;
+            defines.SHEEN_USE_ROUGHNESS_FROM_MAINTEXTURE = this._useRoughnessFromMainTexture;
             defines.SHEEN_TEXTURE_ROUGHNESS_IDENTICAL = this.texture !== null && this.texture._texture === this.textureRoughness?._texture;
 
             if (defines._areTexturesDirty) {
@@ -187,7 +187,7 @@ export class PBRSheenConfiguration {
             defines.SHEEN_LINKWITHALBEDO = false;
             defines.SHEEN_ROUGHNESS = false;
             defines.SHEEN_ALBEDOSCALING = false;
-            defines.SHEEN_USE_ROUGHNESS_FROM_TEXTURE = false;
+            defines.SHEEN_USE_ROUGHNESS_FROM_MAINTEXTURE = false;
             defines.SHEEN_TEXTURE_ROUGHNESS_IDENTICAL = false;
         }
     }

+ 1 - 1
src/Shaders/ShadersInclude/pbrBlockSheen.fx

@@ -100,7 +100,7 @@
             
             #ifdef SHEEN_ROUGHNESS
                 float sheenRoughness = vSheenRoughness;
-                #if defined(SHEEN_TEXTURE) && defined(SHEEN_USE_ROUGHNESS_FROM_TEXTURE)
+                #if defined(SHEEN_TEXTURE) && defined(SHEEN_USE_ROUGHNESS_FROM_MAINTEXTURE)
                     sheenRoughness *= sheenMapData.a;
                 #elif defined(SHEEN_TEXTURE_ROUGHNESS)
                     #ifdef SHEEN_TEXTURE_ROUGHNESS_IDENTICAL