فهرست منبع

Update sheen block to make it NME friendly

Popov72 5 سال پیش
والد
کامیت
a8744ac2bd
2فایلهای تغییر یافته به همراه6 افزوده شده و 9 حذف شده
  1. 1 5
      src/Shaders/ShadersInclude/pbrBlockSheen.fx
  2. 5 4
      src/Shaders/pbr.fragment.fx

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

@@ -26,10 +26,7 @@
     #endif
     #endif
         const in float roughness,
         const in float roughness,
     #ifdef SHEEN_TEXTURE
     #ifdef SHEEN_TEXTURE
-        const in vec2 vSheenUV,
-        const in vec2 vSheenInfos,
-        const in vec2 uvOffset,
-        const in sampler2D sheenSampler,
+        const in vec4 sheenMapData,
     #endif
     #endif
         const in float reflectance,
         const in float reflectance,
     #ifdef SHEEN_LINKWITHALBEDO
     #ifdef SHEEN_LINKWITHALBEDO
@@ -71,7 +68,6 @@
         float sheenIntensity = vSheenColor.a;
         float sheenIntensity = vSheenColor.a;
 
 
         #ifdef SHEEN_TEXTURE
         #ifdef SHEEN_TEXTURE
-            vec4 sheenMapData = toLinearSpace(texture2D(sheenSampler, vSheenUV + uvOffset)) * vSheenInfos.y;
             sheenIntensity *= sheenMapData.a;
             sheenIntensity *= sheenMapData.a;
             #if DEBUGMODE > 0
             #if DEBUGMODE > 0
                 outParams.sheenMapData = sheenMapData;
                 outParams.sheenMapData = sheenMapData;

+ 5 - 4
src/Shaders/pbr.fragment.fx

@@ -251,6 +251,10 @@ void main(void) {
     #ifdef SHEEN
     #ifdef SHEEN
         sheenOutParams sheenOut;
         sheenOutParams sheenOut;
 
 
+        #ifdef SHEEN_TEXTURE
+            vec4 sheenMapData = toLinearSpace(texture2D(sheenSampler, vSheenUV + uvOffset)) * vSheenInfos.y;
+        #endif
+
         sheenBlock(
         sheenBlock(
             vSheenColor,
             vSheenColor,
         #ifdef SHEEN_ROUGHNESS
         #ifdef SHEEN_ROUGHNESS
@@ -258,10 +262,7 @@ void main(void) {
         #endif
         #endif
             roughness,
             roughness,
         #ifdef SHEEN_TEXTURE
         #ifdef SHEEN_TEXTURE
-            vSheenUV,
-            vSheenInfos,
-            uvOffset,
-            sheenSampler,
+            sheenMapData,
         #endif
         #endif
             reflectance,
             reflectance,
         #ifdef SHEEN_LINKWITHALBEDO
         #ifdef SHEEN_LINKWITHALBEDO