Parcourir la source

Update PBRSurface.glsl

Ryan McDonough il y a 7 mois
Parent
commit
95e2dbba25

+ 9 - 5
jme3-core/src/main/resources/Common/ShaderLib/module/PBRSurface.glsl

@@ -11,19 +11,23 @@
         bool frontFacing; //gl_FrontFacing
         float depth;
         mat3 tbnMat;
+        bool hasTangents;
 
-        // from texture
+        // from texture/param reads
         vec3 albedo;
         float alpha;
         float metallic;              // metallic value at the surface
         float roughness;
-        vec3 diffuseColor;
-        vec3 specularColor;
-        vec3 fZero;
         vec3 ao;
+        vec3 lightMapColor;
+        bool hasBasicLightMap;
         float exposure;
         vec3 emission;
 
+        //from post param-read calculations
+        vec3 diffuseColor;
+        vec3 specularColor;
+        vec3 fZero;
 
         // computed
         float NdotV;
@@ -33,7 +37,7 @@
         vec3 directLightContribution; // light from direct light sources
         vec3 envLightContribution; // light from environment 
 
-        float brightestLightStrength;
+        float brightestNonGlobalLightStrength;
     #endstruct
     #define PBRSurface StdPBRSurface    
 #endif