mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-09-17 01:21:19 +00:00
Code Issues Releases Wiki Activity

rogueviz:: adjusted to shmup changes

Browse Source
This commit is contained in:
Zeno Rogue
2026-04-16 23:10:10 +02:00
parent 3fa030a617
commit 2ffa2d317a
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rogueviz/rogueviz.h
-2
View File
@@ -175,7 +175,6 @@ template<class T, class U> function<void(presmode)> roguevizslide(char c, const
if(mode == 3 || mode == pmGeometry || mode == pmGeometryReset) { if(mode == 3 || mode == pmGeometry || mode == pmGeometryReset) {
rogueviz::close(); rogueviz::close();
shmup::clearMonsters();
if(mode == pmGeometryReset && !(slides[currentslide].flags & QUICKGEO)) t(); if(mode == pmGeometryReset && !(slides[currentslide].flags & QUICKGEO)) t();
} }
@@ -198,7 +197,6 @@ function<void(presmode)> roguevizslide_action(char c, const T& t, const U& act)
if(mode == pmStop || mode == pmGeometry || mode == pmGeometryReset) { if(mode == pmStop || mode == pmGeometry || mode == pmGeometryReset) {
rogueviz::close(); rogueviz::close();
shmup::clearMonsters();
if(mode == pmGeometryReset && !(slides[currentslide].flags & QUICKGEO)) t(); if(mode == pmGeometryReset && !(slides[currentslide].flags & QUICKGEO)) t();
} }
rogueviz/sag/sag.cpp
+2 -5
View File
@@ -289,12 +289,9 @@ void viz_longpath() {
void unoptimize() { void unoptimize() {
use_cells_to_draw = true; use_cells_to_draw = true;
drawthemap(); drawthemap();
for(int i=0; i<isize(vdata); i++) { for(int i=0; i<isize(vdata); i++)
vdata[i].m->at = inverse_shift(ggmatrix(cwt.at), ggmatrix(vdata[i].m->base)) * vdata[i].m->at; vdata[i].be(cwt.at, inverse_shift(ggmatrix(cwt.at), ggmatrix(vdata[i].m->base)) * vdata[i].m->at);
vdata[i].m->base = cwt.at;
}
use_cells_to_draw = false; use_cells_to_draw = false;
shmup::fixStorage();
rogueviz::rv_change(dont_optimize, true); rogueviz::rv_change(dont_optimize, true);
rogueviz::rv_change(frustum_culling, false); rogueviz::rv_change(frustum_culling, false);
} }
rogueviz/som/kohonen.cpp
+7 -4
View File
@@ -374,16 +374,19 @@ void distribute_neurons() {
int id = p.second; int id = p.second;
int s = p.first; int s = p.first;
auto& w = *whowon[s]; auto& w = *whowon[s];
vdata[id].m->base = w.where;
transmatrix At = Id;
if(!triangulate(data[s].val, w, find, vdata[id].m->at)) 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); spin(TAU*w.csample / w.drawn_samples) * xpush(rad * (w.drawn_samples-1) / w.drawn_samples);
vdata[id].be(w.where, At);
w.csample++; w.csample++;
for(auto& e: vdata[id].edges) e.second->orig = nullptr; for(auto& e: vdata[id].edges) e.second->orig = nullptr;
} }
shmup::fixStorage();
setindex(false); setindex(false);
} }