Browse Source

Clean up in the PBR j3md file to remove warnings

Nehon 9 years ago
parent
commit
f642e56517
1 changed files with 1 additions and 32 deletions
  1. 1 32
      jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md

+ 1 - 32
jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md

@@ -154,7 +154,6 @@ MaterialDef PBR Lighting {
         }
         }
 
 
         Defines {
         Defines {
-            COLOR_MAP : ColorMap
             DISCARD_ALPHA : AlphaDiscardThreshold
             DISCARD_ALPHA : AlphaDiscardThreshold
             NUM_BONES : NumberOfBones
             NUM_BONES : NumberOfBones
             INSTANCING : UseInstancing
             INSTANCING : UseInstancing
@@ -187,7 +186,7 @@ MaterialDef PBR Lighting {
             FILTER_MODE : FilterMode
             FILTER_MODE : FilterMode
             PCFEDGE : PCFEdge
             PCFEDGE : PCFEdge
             DISCARD_ALPHA : AlphaDiscardThreshold           
             DISCARD_ALPHA : AlphaDiscardThreshold           
-            COLOR_MAP : ColorMap
+            SHADOWMAP_SIZE : ShadowMapSize
             SHADOWMAP_SIZE : ShadowMapSize
             SHADOWMAP_SIZE : ShadowMapSize
             FADE : FadeInfo
             FADE : FadeInfo
             PSSM : Splits
             PSSM : Splits
@@ -219,7 +218,6 @@ MaterialDef PBR Lighting {
             FILTER_MODE : FilterMode
             FILTER_MODE : FilterMode
             PCFEDGE : PCFEdge
             PCFEDGE : PCFEdge
             DISCARD_ALPHA : AlphaDiscardThreshold           
             DISCARD_ALPHA : AlphaDiscardThreshold           
-            COLOR_MAP : ColorMap
             SHADOWMAP_SIZE : ShadowMapSize
             SHADOWMAP_SIZE : ShadowMapSize
             FADE : FadeInfo
             FADE : FadeInfo
             PSSM : Splits
             PSSM : Splits
@@ -249,29 +247,6 @@ MaterialDef PBR Lighting {
         }
         }
 
 
         Defines {
         Defines {
-            DIFFUSEMAP_ALPHA : DiffuseMap
-            NUM_BONES : NumberOfBones
-            INSTANCING : UseInstancing
-        }
-
-    }
-
-
-    Technique PreNormalPassDerivative {
-
-        VertexShader GLSL100 :   Common/MatDefs/MSSAO/normal.vert
-        FragmentShader GLSL100 : Common/MatDefs/MSSAO/normal.frag
-
-        WorldParameters {
-            WorldViewProjectionMatrix
-            WorldViewMatrix
-            NormalMatrix                        
-            ViewProjectionMatrix
-            ViewMatrix
-        }
-
-        Defines {
-            DIFFUSEMAP_ALPHA : DiffuseMap
             NUM_BONES : NumberOfBones
             NUM_BONES : NumberOfBones
             INSTANCING : UseInstancing
             INSTANCING : UseInstancing
         }
         }
@@ -292,12 +267,6 @@ MaterialDef PBR Lighting {
 
 
         Defines {
         Defines {
             VERTEX_COLOR : UseVertexColor
             VERTEX_COLOR : UseVertexColor
-            MATERIAL_COLORS : UseMaterialColors
-            V_TANGENT : VTangent
-            MINNAERT  : Minnaert
-            WARDISO   : WardIso
-
-            DIFFUSEMAP : DiffuseMap
             NORMALMAP : NormalMap
             NORMALMAP : NormalMap
             SPECULARMAP : SpecularMap
             SPECULARMAP : SpecularMap
             PARALLAXMAP : ParallaxMap
             PARALLAXMAP : ParallaxMap