1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 17:40:36 +00:00

fixup to shaders and everything

This commit is contained in:
Zeno Rogue 2019-08-25 19:44:10 +02:00
parent d4ac431004
commit afac8bf24a
2 changed files with 3 additions and 3 deletions

View File

@ -880,7 +880,7 @@ EX void edit_sightrange() {
dialog::addSelItem(XLAT("max difference in X/Y coordinates"), fts(slr::range_xy), 'X'); dialog::addSelItem(XLAT("max difference in X/Y coordinates"), fts(slr::range_xy), 'X');
dialog::add_action([] { dialog::add_action([] {
auto xo = dialog::extra_options; auto xo = dialog::extra_options;
dialog::editNumber(solv::solrange_xy, 0, 10, 0.5, 4, XLAT("max difference in X/Y coordinates"), ""); dialog::editNumber(slr::range_xy, 0, 10, 0.5, 4, XLAT("max difference in X/Y coordinates"), "");
dialog::extra_options = xo; popScreen(); dialog::extra_options = xo; popScreen();
}); });
dialog::addSelItem(XLAT("steps"), its(slr::steps), 'Z'); dialog::addSelItem(XLAT("steps"), its(slr::steps), 'Z');

View File

@ -1027,7 +1027,7 @@ EX namespace slr {
" }" " }"
" }" " }"
"else {" "else {"
" hi_gphi = phi; hi_s = phi; hi_alpha = 9;" " hi_gphi = phi; hi_s = phi; hi_alpha = 9.;"
" int next_nan = 1;" " int next_nan = 1;"
" float mina = PI/4.;" " float mina = PI/4.;"
" float maxa = PI/2.;" " float maxa = PI/2.;"
@ -1055,7 +1055,7 @@ EX namespace slr {
" }" " }"
" }" " }"
" }" " }"
"if(hi_alpha < 9) {" "if(hi_alpha < 9.) {"
"float fr = (phi-lo_gphi) / (hi_gphi-lo_gphi);" "float fr = (phi-lo_gphi) / (hi_gphi-lo_gphi);"
"alpha = lo_alpha + (hi_alpha-lo_alpha) * fr;" "alpha = lo_alpha + (hi_alpha-lo_alpha) * fr;"
"s = lo_s + (hi_s-lo_s) * fr;" "s = lo_s + (hi_s-lo_s) * fr;"