mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-18 03:09:59 +00:00
Code Issues Releases Wiki Activity

ray:: volumetric improvements

Browse Source
This commit is contained in:
Zeno Rogue 2020-07-08 12:43:30 +02:00
parent e992c6a3cd
commit 65dd868cb7
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
raycaster.cpp
View File

@ -849,12 +849,11 @@ void enable_raycaster() {
if(volumetric::on) fmain += if(volumetric::on) fmain +=
"if(dist > 0. && go < " + to_glsl(hard_limit) + ") {\n" "if(dist > 0. && go < " + to_glsl(hard_limit) + ") {\n"
" if(dist > "+to_glsl(hard_limit)+" - go) dist = "+to_glsl(hard_limit)+" - go;\n" " if(dist > "+to_glsl(hard_limit)+" - go) dist = "+to_glsl(hard_limit)+" - go;\n"
" mediump float d = uExpStart * exp(-go / uExpDecay);\n"
" mediump vec4 col = texture2D(tVolumetric, cid);\n" " mediump vec4 col = texture2D(tVolumetric, cid);\n"
" mediump float factor = col.w; col.w = 1.;\n" " mediump float factor = col.w; col.w = 1.;\n"
" mediump float frac = (1.-exp(-(factor + 1. / uExpDecay) * dist));\n" " mediump float frac = exp(-(factor + 1. / uExpDecay) * dist);\n"
" col = frac * (col * d + uFogColor * (1.-d));\n" " gl_FragColor += left * (1.-frac) * col;\n"
" gl_FragColor += left * col;\n" " left *= frac;\n"
" }\n;"; " }\n;";
fmain += " go = go + dist;\n"; fmain += " go = go + dist;\n";
@ -894,7 +893,7 @@ void enable_raycaster() {
fmain += fmain +=
" mediump float d = max(1. - go / uLinearSightRange, uExpStart * exp(-go / uExpDecay));\n"; " mediump float d = max(1. - go / uLinearSightRange, uExpStart * exp(-go / uExpDecay));\n";
fmain += if(!volumetric::on) fmain +=
" col.xyz = col.xyz * d + uFogColor.xyz * (1.-d);\n"; " col.xyz = col.xyz * d + uFogColor.xyz * (1.-d);\n";
if(nil) fmain += if(nil) fmain +=
@ -1255,12 +1254,16 @@ EX void cast() {
if(1) for(cell *c: lst) { if(1) for(cell *c: lst) {
int id = ids[c]; int id = ids[c];
auto& vmap = volumetric::vmap; auto& vmap = volumetric::vmap;
if(volumetric::on && vmap.count(c) && (vmap[c] & 0xFF)) { if(volumetric::on) {
celldrawer dd; celldrawer dd;
dd.c = c; dd.c = c;
dd.setcolors(); dd.setcolors();
int u = (id/per_row*length) + (id%per_row * deg); int u = (id/per_row*length) + (id%per_row * deg);
color_t vcolor = (dd.fcol << 8) | vmap[c]; color_t vcolor;
if(vmap.count(c))
vcolor = vmap[c];
else
vcolor = (backcolor << 8);
volumetric[u] = glhr::acolor(vcolor); volumetric[u] = glhr::acolor(vcolor);
} }
forCellIdEx(c1, i, c) { forCellIdEx(c1, i, c) {
@ -1392,7 +1395,8 @@ EX void cast() {
if(volumetric::on) bind_array(volumetric, o->tVolumetric, txVolumetric, 6); if(volumetric::on) bind_array(volumetric, o->tVolumetric, txVolumetric, 6);
auto cols = glhr::acolor(darkena(backcolor, 0, 0xFF)); auto cols = glhr::acolor(darkena(backcolor, 0, 0xFF));
glUniform4f(o->uFogColor, cols[0], cols[1], cols[2], cols[3]); if(o->uFogColor != -1)
glUniform4f(o->uFogColor, cols[0], cols[1], cols[2], cols[3]);
} }
@ -1638,6 +1642,16 @@ int readArgs() {
rays_generate = false; rays_generate = false;
max_cells = argi(); max_cells = argi();
} }
else if(argis("-ray-random")) {
start_game();
shift(); volumetric::intensity = argi();
volumetric::random_fog();
}
else if(argis("-ray-cursor")) {
start_game();
volumetric::enable();
shift(); volumetric::vmap[centerover] = arghex();
}
else return 1; else return 1;
return 0; return 0;
} }