Skip to content

Commit 8c77f33

Browse files
authored
Allow use of a GlowColor with GlowMap (#1444)
1 parent dbbd207 commit 8c77f33

File tree

1 file changed

+8
-2
lines changed
  • jme3-core/src/main/resources/Common/MatDefs/Light

1 file changed

+8
-2
lines changed

jme3-core/src/main/resources/Common/MatDefs/Light/Glow.frag

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,16 @@
1717

1818
void main(){
1919
#ifdef HAS_GLOWMAP
20+
#ifdef HAS_GLOWCOLOR
21+
vec4 color = m_GlowColor;
22+
#else
23+
vec4 color = vec4(1.0);
24+
#endif
25+
2026
#if defined(NEED_TEXCOORD1)
21-
gl_FragColor = texture2D(m_GlowMap, texCoord1);
27+
gl_FragColor = texture2D(m_GlowMap, texCoord1) * color;
2228
#else
23-
gl_FragColor = texture2D(m_GlowMap, texCoord);
29+
gl_FragColor = texture2D(m_GlowMap, texCoord) * color;
2430
#endif
2531
#else
2632
#ifdef HAS_GLOWCOLOR

0 commit comments

Comments
 (0)