mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

shaders:: fixed fog

Browse Source
This commit is contained in:
Zeno Rogue 2021-04-12 13:57:11 +02:00
parent 4b1b0516f3
commit d7d29d8827
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
shaders.cpp
View File

@ -128,10 +128,12 @@ shared_ptr<glhr::GLprogram> write_shader(flagtype shader_flags) {
vsh += "uniform mediump vec4 uColor;\n"; vsh += "uniform mediump vec4 uColor;\n";
} }
bool have_vfogs = false, have_vfogcolor = false;
if(shader_flags & GF_LIGHTFOG) { if(shader_flags & GF_LIGHTFOG) {
vmain += "mediump float fogx = clamp(1.0 + aPosition.z * uFog, 0.0, 1.0); vColor = vColor * fogx + uFogColor * (1.0-fogx);\n";
vsh += "uniform mediump float uFog;\n"; vsh += "uniform mediump float uFog;\n";
vsh += "uniform mediump vec4 uFogColor;\n"; vmain += "vFogs = clamp(1.0 + aPosition.z * uFog, 0.0, 1.0);\n";
have_vfogs = true;
} }
string coordinator; string coordinator;
@ -379,6 +381,8 @@ shared_ptr<glhr::GLprogram> write_shader(flagtype shader_flags) {
"vec4 ending = uRadarTransform * orig_t;\n"; "vec4 ending = uRadarTransform * orig_t;\n";
else vmain += else vmain +=
"vec4 ending = uRadarTransform * t;\n"; "vec4 ending = uRadarTransform * t;\n";
have_vfogs = true; have_vfogcolor = true;
vmain += vmain +=
"float len = acosh(ending.w);\n" "float len = acosh(ending.w);\n"
@ -392,30 +396,16 @@ shared_ptr<glhr::GLprogram> write_shader(flagtype shader_flags) {
" if(px.r < .9 || px.b < .9 || px.g > .1) last = px;\n" " if(px.r < .9 || px.b < .9 || px.g > .1) last = px;\n"
" fog += last;\n" " fog += last;\n"
" }\n" " }\n"
"mediump float fogs = (uFogBase - len / uFog);\n" "mediump float fogs = (uFogBase - len / uFog);\n"
"if(fogs < 0.) fogs = 0.;\n" "if(fogs < 0.) fogs = 0.;\n"
"fog.xyz /= fog.w;\n" "vFogs = fogs; vFogColor = fog / fog.w;\n";
"vColor.xyz = vColor.xyz * fogs + fog.xyz * (1.0-fogs);\n";
if(have_texture) {
varying += "varying mediump vec4 fog_color;\n";
vmain += "fog_color = fog;\n";
fmain +=
"if(vTexCoord.x == 0.) {\n"
"vec4 t = texture2D(tTexture, vTexCoord);\n"
"gl_FragColor = t * gl_FragColor + (1.-t) * fog_color;\n"
"}\n"
"else gl_FragColor *= texture2D(tTexture, vTexCoord);\n";
have_texture = false;
}
} }
else if(distfun != "") { else if(distfun != "") {
vmain += "mediump float fogs = (uFogBase - " + distfun + " / uFog);\n"; have_vfogs = true;
vmain += "vColor.xyz = vColor.xyz * fogs + uFogColor.xyz * (1.0-fogs);\n"; vmain += "vFogs = (uFogBase - " + distfun + " / uFog);\n";
vsh += vsh +=
"uniform mediump float uFog;\n" "uniform mediump float uFog;\n"
"uniform mediump float uFogBase;\n" "uniform mediump float uFogBase;\n";
"uniform mediump vec4 uFogColor;\n";
} }
if(shader_flags & GF_LEVELS) vmain += "vPos = t;\n"; if(shader_flags & GF_LEVELS) vmain += "vPos = t;\n";
if(treset) vmain += "t[3] = 1.0;\n"; if(treset) vmain += "t[3] = 1.0;\n";
@ -434,21 +424,32 @@ shared_ptr<glhr::GLprogram> write_shader(flagtype shader_flags) {
vmain += "gl_Position = uP * t;\n"; vmain += "gl_Position = uP * t;\n";
} }
if(shader_flags & SF_ZFOG) {
have_vfogs = true;
vmain +=
"vFogs = 0.5 - gl_Position.z / 2.0;\n";
}
if(have_texture) if(have_texture)
fmain += "gl_FragColor *= texture2D(tTexture, vTexCoord);\n"; fmain += "gl_FragColor *= texture2D(tTexture, vTexCoord);\n";
if(have_vfogcolor) {
varying +=
"varying mediump vec4 vFogColor;\n"
"varying mediump float vFogs;\n";
fmain += "gl_FragColor.xyz = gl_FragColor.xyz * vFogs + vFogColor.xyz * (1.0-vFogs);\n";
}
else if(have_vfogs) {
varying +=
"uniform mediump vec4 uFogColor;\n"
"varying mediump float vFogs;\n";
fmain += "gl_FragColor.xyz = gl_FragColor.xyz * vFogs + uFogColor.xyz * (1.0-vFogs);\n";
}
vsh += vsh +=
"uniform mediump mat4 uMV;\n" "uniform mediump mat4 uMV;\n"
"uniform mediump mat4 uP;\n"; "uniform mediump mat4 uP;\n";
if(shader_flags & SF_ZFOG) {
vmain +=
"mediump float pz = 0.5 + gl_Position.z / 2.0;\n"
"vColor.xyz = vColor.xyz * (1.-pz) + uFogColor.xyz * pz;\n";
vsh +=
"uniform mediump vec4 uFogColor;\n";
}
vmain += "}"; vmain += "}";
fmain += "}"; fmain += "}";