sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #531 from riccardobl/pr190716

Browse Source 
Use texture() instead of texture2D() in bloomExtract15 and bloomFinal15
This commit is contained in:
Rémy Bouquet 2016-07-19 18:35:42 +02:00 committed by GitHub
commit 0299e401cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-effects/src/main/resources/Common/MatDefs/Post/bloomExtract15.frag
View File

@ -24,7 +24,7 @@ void main(){
#endif #endif
#ifdef HAS_GLOWMAP #ifdef HAS_GLOWMAP
vec4 glowColor = texture2D( m_GlowMap, texCoord ); vec4 glowColor = texture( m_GlowMap, texCoord );
glowColor = pow(glowColor, vec4(m_ExposurePow)); glowColor = pow(glowColor, vec4(m_ExposurePow));
color += glowColor; color += glowColor;
#endif #endif

2
jme3-effects/src/main/resources/Common/MatDefs/Post/bloomFinal15.frag
View File

@ -10,7 +10,7 @@ out vec4 fragColor;
void main(){ void main(){
vec4 colorRes = getColor(m_Texture,texCoord); vec4 colorRes = getColor(m_Texture,texCoord);
vec4 bloom = texture2D(m_BloomTex, texCoord); vec4 bloom = texture(m_BloomTex, texCoord);
fragColor = bloom * m_BloomIntensity + colorRes; fragColor = bloom * m_BloomIntensity + colorRes;
} }