Riccardo Balbo 1 년 전
부모
커밋
a606ac110e
1개의 변경된 파일5개의 추가작업 그리고 13개의 파일을 삭제
  1. 5 13
      jme3-core/src/main/resources/Common/ShaderLib/module/pbrlighting/PBRLightingUtils.glsllib

+ 5 - 13
jme3-core/src/main/resources/Common/ShaderLib/module/pbrlighting/PBRLightingUtils.glsllib

@@ -20,25 +20,19 @@
 // #define ENABLE_PBRLightingUtils_computeDirectLightContribution 1
 // #define ENABLE_PBRLightingUtils_computeProbesContribution 1
 
-#if defined(ENABLE_PBRLightingUtils_readPBRSurface) || 
-    defined(ENABLE_PBRLightingUtils_getWorldPosition)
+#if defined(ENABLE_PBRLightingUtils_readPBRSurface)||defined(ENABLE_PBRLightingUtils_getWorldPosition)
     varying vec3 wPosition;
 #endif 
 
-#if defined(ENABLE_PBRLightingUtils_readPBRSurface) || 
-    defined(ENABLE_PBRLightingUtils_getWorldNormal)
+#if defined(ENABLE_PBRLightingUtils_readPBRSurface)||defined(ENABLE_PBRLightingUtils_getWorldNormal)
     varying vec3 wNormal;
 #endif 
 
-#if (defined(ENABLE_PBRLightingUtils_readPBRSurface) &&
-    (defined(NORMALMAP) || defined(PARALLAXMAP))
-    ) || 
-    defined(ENABLE_PBRLightingUtils_getWorldTangent)
-    varying vec3 wTangent;
+#if (defined(ENABLE_PBRLightingUtils_readPBRSurface)&&(defined(NORMALMAP)||defined(PARALLAXMAP)))||defined(ENABLE_PBRLightingUtils_getWorldTangent)
+    varying vec4 wTangent;
 #endif 
 
-#if defined(ENABLE_PBRLightingUtils_readPBRSurface) ||
-    defined(ENABLE_PBRLightingUtils_getTexCoord)
+#if defined(ENABLE_PBRLightingUtils_readPBRSurface)||defined(ENABLE_PBRLightingUtils_getTexCoord)
     varying vec2 texCoord;
     #ifdef SEPARATE_TEXCOORD
         varying vec2 texCoord2;
@@ -48,9 +42,7 @@
 
 
 #ifdef ENABLE_PBRLightingUtils_readPBRSurface   
-
     varying vec4 Color;
-
     
     uniform vec4 g_AmbientLightColor;   
     uniform float m_Roughness;