From de009e2ea76c9f4273ef1d403cd2e537bc41be0b Mon Sep 17 00:00:00 2001 From: Nehon Date: Tue, 8 Aug 2017 19:44:55 +0200 Subject: [PATCH] Added the Glow technique to PBR material so that it can work with the bloom filter. --- .../Common/MatDefs/Light/PBRLighting.j3md | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md index 43f3fad51..375c71015 100644 --- a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md +++ b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md @@ -236,7 +236,7 @@ MaterialDef PBR Lighting { } } - Technique PreNormalPass { + Technique PreNormalPass { VertexShader GLSL100 : Common/MatDefs/SSAO/normal.vert FragmentShader GLSL100 : Common/MatDefs/SSAO/normal.frag @@ -256,23 +256,24 @@ MaterialDef PBR Lighting { } - Technique GBuf { + Technique Glow { - VertexShader GLSL100: Common/MatDefs/Light/GBuf.vert - FragmentShader GLSL100: Common/MatDefs/Light/GBuf.frag + VertexShader GLSL100 GLSL150: Common/MatDefs/Misc/Unshaded.vert + FragmentShader GLSL100 GLSL150: Common/MatDefs/Light/Glow.frag WorldParameters { WorldViewProjectionMatrix - NormalMatrix - WorldViewMatrix - WorldMatrix + ViewProjectionMatrix + ViewMatrix } Defines { - VERTEX_COLOR : UseVertexColor - NORMALMAP : NormalMap - SPECULARMAP : SpecularMap - PARALLAXMAP : ParallaxMap + NEED_TEXCOORD1 + HAS_GLOWMAP : GlowMap + HAS_GLOWCOLOR : GlowColor + + NUM_BONES : NumberOfBones + INSTANCING : UseInstancing } }