mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00
Code Issues Releases Wiki Activity

improved floorshape debugger

Browse Source
This commit is contained in:
Zeno Rogue 2018-08-18 17:38:07 +02:00
parent 1a6427ba32
commit 18d917da79
2 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
floorshapes.cpp
View File

@ -508,10 +508,6 @@ namespace gp {
nextid = 0; nextid = 0;
} }
bool just_matrices = false;
map<cell*, matrixlist> usedml;
void build_plainshape(int& id, gp::local_info& li, cell *c0, int siid, int sidir) { void build_plainshape(int& id, gp::local_info& li, cell *c0, int siid, int sidir) {
id = nextid++; id = nextid++;
@ -546,7 +542,7 @@ namespace gp {
sidir = 0; sidir = 0;
} }
auto& id = pshid[siid][sidir][draw_li.relative.first&31][draw_li.relative.second&31][fix6(draw_li.total_dir)]; auto& id = pshid[siid][sidir][draw_li.relative.first&31][draw_li.relative.second&31][fix6(draw_li.total_dir)];
if(id == -1 || just_matrices) build_plainshape(id, draw_li, c, siid, sidir); if(id == -1) build_plainshape(id, draw_li, c, siid, sidir);
return id; return id;
} }
} }
@ -630,45 +626,34 @@ void draw_qfi(cell *c, const transmatrix& V, int col, int prio = -1, vector<hpcs
else draw_shapevec(c, V, (qfi.fshape->*tab), col, prio); else draw_shapevec(c, V, (qfi.fshape->*tab), col, prio);
} }
bool floorshape_debug;
void viewmat() { void viewmat() {
/* if(floorshape_debug) {
int id = 0; transmatrix V = ggmatrix(cwt.at);
if(gp::on) {
gp::just_matrices = true;
gp::draw_li = gp::get_local_info(cwt.at);
if(gp::draw_li.last_dir == -1) gp::draw_li.total_dir = 0;
gp::draw_li.total_dir = fix6(gp::draw_li.total_dir);
gp::get_plainshape_id(cwt.at);
gp::just_matrices = false;
}
// if(gp::on && !gp::usedml.count(cwt.at)) return;
// for(auto& v: (pseudohept(cwt.at) ? hept_matrices : hex_matrices).v) {
// for(auto& v: (gp::on ? gp::usedml[cwt.c] : pseudohept(cwt.at) ? hept_matrices : hex_matrices).v) {
// hyperpoint h1 = gmatrix[cwt.c] * v.second[0] * hpxyz(1,0,0);
id = irr::cellindex[cwt.c];
for(auto& v: irr::usedml[id].v) {
// for(auto& v: (gp::on ? gp::usedml[cwt.c] : pseudohept(cwt.at) ? hept_matrices : hex_matrices).v) {
hyperpoint h1 = gmatrix[cwt.c] * v.second[0] * hpxyz(1,0,0); for(int i=0; i<cwt.at->type; i++) {
hyperpoint h2 = gmatrix[cwt.c] * v.second[0] * hpxyz(0,1,0); hyperpoint ci = V * get_corner_position(cwt.at, i);
hyperpoint h3 = gmatrix[cwt.c] * v.second[0] * hpxyz(0,0,1); hyperpoint ci1 = V * get_corner_position(cwt.at, (i+1) % cwt.at->type);
queueline(h1, h2, 0xFFFFFFFF, 4, PPR_LINE); hyperpoint cn = V * nearcorner(cwt.at, i);
queueline(h2, h3, 0xFFFFFFFF, 4, PPR_LINE); hyperpoint cf0 = V * farcorner(cwt.at, i, 0);
queueline(h3, h1, 0xFFFFFFFF, 4, PPR_LINE); hyperpoint cf1 = V * farcorner(cwt.at, i, 1);
hyperpoint ch = mid3(h1, h2, h3); queueline(V * C0, ci, 0xFFFFFFFF, 3);
queuestr(ch, vid.fsize, its(id), 0xFFFFFF); queueline(ci, ci1, 0xFFFF00FF, 3);
if(0) { queueline(ci, cn, 0xFF00FFFF, 3);
hyperpoint h1 = gmatrix[cwt.c] * inverse(v.first) * hpxyz(1,0,0); queueline(ci1, cn, 0xFF0000FF, 3);
hyperpoint h2 = gmatrix[cwt.c] * inverse(v.first) * hpxyz(0,1,0); queueline(ci, cf0, 0x00FFFFFF, 3);
hyperpoint h3 = gmatrix[cwt.c] * inverse(v.first) * hpxyz(0,0,1); queueline(cn, cf0, 0x00FF00FF, 3);
queueline(h1, h2, 0xFF00FF80, 4, PPR_LINE); queueline(cn, cf1, 0x0000FFFF, 3);
queueline(h2, h3, 0xFF00FF80, 4, PPR_LINE); }
queueline(h3, h1, 0xFF00FF80, 4, PPR_LINE);
hyperpoint ch = mid3(h1, h2, h3);
queuestr(ch, vid.fsize, its(id), 0xFFFFFF);
} }
id++;
} */
} }
auto hook =
addHook(hooks_args, 100, [] () {
using namespace arg;
if(argis("-floordebug")) { floorshape_debug = true; return 0; }
else return 1;
});
} }

2
graph.cpp
View File

@ -4934,6 +4934,8 @@ void drawMarkers() {
if(!(cmode & sm::NORMAL)) return; if(!(cmode & sm::NORMAL)) return;
viewmat();
for(cell *c1: crush_now) for(cell *c1: crush_now)
queuecircleat(c1, .8, darkena(minf[moCrusher].color, 0, 0xFF)); queuecircleat(c1, .8, darkena(minf[moCrusher].color, 0, 0xFF));