mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-07 11:52:51 +00:00
Code Issues Releases Wiki Activity

fog color is now model color if the projection is not perspective

Browse Source
This commit is contained in:
Zeno Rogue 2023-03-16 14:48:16 +01:00
parent 2a45504580
commit eb867ecccc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shaders.cpp
View File

@ -658,12 +658,14 @@ void display_data::set_projection(int ed, ld shift) {
eyewidth_translate(ed); eyewidth_translate(ed);
} }
auto bcolor = models::is_perspective(pmodel) ? backcolor : (modelcolor >> 8);
auto ortho = [&] (ld x, ld y) { auto ortho = [&] (ld x, ld y) {
glhr::glmatrix M = glhr::ortho(x, y, 1); glhr::glmatrix M = glhr::ortho(x, y, 1);
if(shader_flags & SF_ZFOG) { if(shader_flags & SF_ZFOG) {
M[2][2] = 2 / (pconf.clip_max - pconf.clip_min); M[2][2] = 2 / (pconf.clip_max - pconf.clip_min);
M[3][2] = (pconf.clip_min + pconf.clip_max) / (pconf.clip_max - pconf.clip_min); M[3][2] = (pconf.clip_min + pconf.clip_max) / (pconf.clip_max - pconf.clip_min);
auto cols = glhr::acolor(darkena(backcolor, 0, 0xFF)); auto cols = glhr::acolor(darkena(bcolor, 0, 0xFF));
glUniform4f(selected->uFogColor, cols[0], cols[1], cols[2], cols[3]); glUniform4f(selected->uFogColor, cols[0], cols[1], cols[2], cols[3]);
} }
else M[2][2] /= 10000; else M[2][2] /= 10000;
@ -713,7 +715,7 @@ void display_data::set_projection(int ed, ld shift) {
} }
else if(shader_flags & SF_ODSBOX) { else if(shader_flags & SF_ODSBOX) {
ortho(M_PI, M_PI); ortho(M_PI, M_PI);
glhr::fog_max(1/sightranges[geometry], darkena(backcolor, 0, 0xFF)); glhr::fog_max(1/sightranges[geometry], darkena(bcolor, 0, 0xFF));
} }
else if(shader_flags & SF_PERS3) { else if(shader_flags & SF_PERS3) {
if(vrhr::rendering()) use_mv(); if(vrhr::rendering()) use_mv();
@ -733,7 +735,7 @@ void display_data::set_projection(int ed, ld shift) {
glhr::eyeshift = glhr::tmtogl(xpush(vid.ipd * ed/2)); glhr::eyeshift = glhr::tmtogl(xpush(vid.ipd * ed/2));
} }
} }
glhr::fog_max(1/sightranges[geometry], darkena(backcolor, 0, 0xFF)); glhr::fog_max(1/sightranges[geometry], darkena(bcolor, 0, 0xFF));
} }
else { else {
if(pconf.alpha > -1) { if(pconf.alpha > -1) {