فهرست منبع

Changes to anisotropic block to cope with NME edition

Popov72 5 سال پیش
والد
کامیت
87df2ef5ec
2فایلهای تغییر یافته به همراه7 افزوده شده و 10 حذف شده
  1. 1 5
      src/Shaders/ShadersInclude/pbrBlockAnisotropic.fx
  2. 6 5
      src/Shaders/pbr.fragment.fx

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

@@ -13,10 +13,7 @@
     void anisotropicBlock(
         const in vec3 vAnisotropy,
     #ifdef ANISOTROPIC_TEXTURE
-        const in vec2 vAnisotropyInfos,
-        const in vec2 vAnisotropyUV,
-        const in vec2 uvOffset,
-        const in sampler2D anisotropySampler,
+        const in vec3 anisotropyMapData,
     #endif
         const in mat3 TBN,
         const in vec3 normalW,
@@ -28,7 +25,6 @@
         vec3 anisotropyDirection = vec3(vAnisotropy.xy, 0.);
 
         #ifdef ANISOTROPIC_TEXTURE
-            vec3 anisotropyMapData = texture2D(anisotropySampler, vAnisotropyUV + uvOffset).rgb * vAnisotropyInfos.y;
             anisotropy *= anisotropyMapData.b;
             anisotropyDirection.rg *= anisotropyMapData.rg * 2.0 - 1.0;
             #if DEBUGMODE > 0

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

@@ -1,4 +1,4 @@
-#if defined(BUMP) || !defined(NORMAL) || defined(FORCENORMALFORWARD) || defined(SPECULARAA) || defined(CLEARCOAT_BUMP) || defined(ANISOTROPIC)
+#if defined(BUMP) || !defined(NORMAL) || defined(FORCENORMALFORWARD) || defined(SPECULARAA) || defined(CLEARCOAT_BUMP) || defined(ANISOTROPIC)
 #extension GL_OES_standard_derivatives : enable
 #endif
 
@@ -193,13 +193,14 @@ void main(void) {
     #ifdef ANISOTROPIC
         anisotropicOutParams anisotropicOut;
 
+        #ifdef ANISOTROPIC_TEXTURE
+            vec3 anisotropyMapData = texture2D(anisotropySampler, vAnisotropyUV + uvOffset).rgb * vAnisotropyInfos.y;
+        #endif
+
         anisotropicBlock(
             vAnisotropy,
         #ifdef ANISOTROPIC_TEXTURE
-            vAnisotropyInfos,
-            vAnisotropyUV,
-            uvOffset,
-            anisotropySampler,
+            anisotropyMapData,
         #endif
             TBN,
             normalW,