From 6cf374e478586d6d8d8bd855a4062766763a38ed Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sat, 23 Aug 2025 16:59:19 +0200 Subject: [PATCH] rogueviz:: sag;: use hr::lerp --- rogueviz/sag/sag.cpp | 4 ++-- rogueviz/som/kohonen.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rogueviz/sag/sag.cpp b/rogueviz/sag/sag.cpp index 9bef7e1e..e953e06a 100644 --- a/rogueviz/sag/sag.cpp +++ b/rogueviz/sag/sag.cpp @@ -198,8 +198,8 @@ void auto_orth(bool set_colors) { applymodel(M*p, ret); auto& col = vdata[i].cp.color1; for(int j=0; j<3; j++) { - println(hlog, "coloring ", tie(i,j), ret[j], " -> ", ilerp(pmin[j], pmax[j], ret[j]), " -> ", lerp(0, 255, ilerp(pmin[j], pmax[j], ret[j]))); - part(col, j+1) = lerp(0, 255, ilerp(pmin[j], pmax[j], ret[j])); + println(hlog, "coloring ", tie(i,j), ret[j], " -> ", ilerp(pmin[j], pmax[j], ret[j]), " -> ", hr::lerp(0, 255, ilerp(pmin[j], pmax[j], ret[j]))); + part(col, j+1) = hr::lerp(0, 255, ilerp(pmin[j], pmax[j], ret[j])); } vdata[i].cp.color2 = col; } diff --git a/rogueviz/som/kohonen.cpp b/rogueviz/som/kohonen.cpp index 43423f8b..c8fa60ca 100644 --- a/rogueviz/som/kohonen.cpp +++ b/rogueviz/som/kohonen.cpp @@ -1408,7 +1408,7 @@ bool draw_heatmap() { queuecurve(atscreenpos(0,0), 0, darkena(heatmap(ilerp(width, vid.yres-width, y+pixstep/2.)), 0, 0xFF), PPR::LINE); } for(int p=0; p<=10; p++) { - ld y = lerp(width, vid.yres-width, p / 10.); + ld y = hr::lerp(width, vid.yres-width, p / 10.); curvepoint(eupoint(width*2, y)); curvepoint(eupoint(width*3, y)); queuecurve(atscreenpos(0,0), 0xFFFFFFFF, 0, PPR::LINE);