AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-21 13:39:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix ShotSmoke effect

Browse Source
This commit is contained in:
Jack Andersen
2018-02-12 12:27:40 -10:00
parent 46a4a37cc6
commit e263345b0a
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Graphics/Shaders/CElementGenShadersGLSL.cpp
View File

@@ -124,8 +124,7 @@ BOO_GLSL_BINDING_HEAD
" vec2 tindTexel = texture(tindMap, vtf.uvTind).zw;\n"
" vec4 sceneTexel = texture(sceneMap, mix(vtf.uvScene.xy, vtf.uvScene.zw, tindTexel));\n"
" vec4 texrTexel = texture(texrMap, vtf.uvTexr);\n"
" colorOut = vtf.color * sceneTexel + texrTexel;\n"
" colorOut.a = vtf.color.a * texrTexel.a;\n"
" colorOut = vtf.color * vec4(sceneTexel.rgb, 1.0) + texrTexel;\n"
"}\n";
static const char* FS_GLSL_CINDTEX =
@@ -148,7 +147,7 @@ BOO_GLSL_BINDING_HEAD
"{\n"
" vec2 tindTexel = texture(tindMap, vtf.uvTind).zw;\n"
" vec4 sceneTexel = texture(sceneMap, mix(vtf.uvScene.xy, vtf.uvScene.zw, tindTexel));\n"
" colorOut = vtf.color * sceneTexel * texture(texrMap, vtf.uvTexr);\n"
" colorOut = vtf.color * vec4(sceneTexel.rgb, 1.0) * texture(texrMap, vtf.uvTexr);\n"
"}\n";
static const char* VS_GLSL_NOTEX =