From 2ffa2d317a6c8a3e64290a3259f5acc3ff4e181b Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 16 Apr 2026 23:10:10 +0200 Subject: [PATCH] rogueviz:: adjusted to shmup changes --- rogueviz/rogueviz.h | 2 -- rogueviz/sag/sag.cpp | 7 ++----- rogueviz/som/kohonen.cpp | 11 +++++++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/rogueviz/rogueviz.h b/rogueviz/rogueviz.h index 81a09284..558b703e 100644 --- a/rogueviz/rogueviz.h +++ b/rogueviz/rogueviz.h @@ -175,7 +175,6 @@ template function roguevizslide(char c, const if(mode == 3 || mode == pmGeometry || mode == pmGeometryReset) { rogueviz::close(); - shmup::clearMonsters(); if(mode == pmGeometryReset && !(slides[currentslide].flags & QUICKGEO)) t(); } @@ -198,7 +197,6 @@ function roguevizslide_action(char c, const T& t, const U& act) if(mode == pmStop || mode == pmGeometry || mode == pmGeometryReset) { rogueviz::close(); - shmup::clearMonsters(); if(mode == pmGeometryReset && !(slides[currentslide].flags & QUICKGEO)) t(); } diff --git a/rogueviz/sag/sag.cpp b/rogueviz/sag/sag.cpp index 02795256..2db2dc3e 100644 --- a/rogueviz/sag/sag.cpp +++ b/rogueviz/sag/sag.cpp @@ -289,12 +289,9 @@ void viz_longpath() { void unoptimize() { use_cells_to_draw = true; drawthemap(); - for(int i=0; iat = inverse_shift(ggmatrix(cwt.at), ggmatrix(vdata[i].m->base)) * vdata[i].m->at; - vdata[i].m->base = cwt.at; - } + for(int i=0; ibase)) * vdata[i].m->at); use_cells_to_draw = false; - shmup::fixStorage(); rogueviz::rv_change(dont_optimize, true); rogueviz::rv_change(frustum_culling, false); } diff --git a/rogueviz/som/kohonen.cpp b/rogueviz/som/kohonen.cpp index bf6298d4..e1a4e121 100644 --- a/rogueviz/som/kohonen.cpp +++ b/rogueviz/som/kohonen.cpp @@ -374,16 +374,19 @@ void distribute_neurons() { int id = p.second; int s = p.first; auto& w = *whowon[s]; - vdata[id].m->base = w.where; - + + transmatrix At = Id; + if(!triangulate(data[s].val, w, find, vdata[id].m->at)) - vdata[id].m->at = + At = spin(TAU*w.csample / w.drawn_samples) * xpush(rad * (w.drawn_samples-1) / w.drawn_samples); + + vdata[id].be(w.where, At); + w.csample++; for(auto& e: vdata[id].edges) e.second->orig = nullptr; } - shmup::fixStorage(); setindex(false); }