From afac8bf24a84aba81c9796e233f427103e1ba44e Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sun, 25 Aug 2019 19:44:10 +0200 Subject: [PATCH] fixup to shaders and everything --- config.cpp | 2 +- nonisotropic.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.cpp b/config.cpp index b9ecc1d1..a316145a 100644 --- a/config.cpp +++ b/config.cpp @@ -880,7 +880,7 @@ EX void edit_sightrange() { dialog::addSelItem(XLAT("max difference in X/Y coordinates"), fts(slr::range_xy), 'X'); dialog::add_action([] { 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::addSelItem(XLAT("steps"), its(slr::steps), 'Z'); diff --git a/nonisotropic.cpp b/nonisotropic.cpp index e1d82b2f..3482073d 100644 --- a/nonisotropic.cpp +++ b/nonisotropic.cpp @@ -1027,7 +1027,7 @@ EX namespace slr { " }" " }" "else {" - " hi_gphi = phi; hi_s = phi; hi_alpha = 9;" + " hi_gphi = phi; hi_s = phi; hi_alpha = 9.;" " int next_nan = 1;" " float mina = PI/4.;" " 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);" "alpha = lo_alpha + (hi_alpha-lo_alpha) * fr;" "s = lo_s + (hi_s-lo_s) * fr;"