mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-04-04 17:57:03 +00:00
adjusted Rogueviz to HR changes
This commit is contained in:
parent
0aa94f073a
commit
1cfeba9666
@ -3,7 +3,6 @@
|
||||
namespace hr {
|
||||
|
||||
#if CAP_CRYSTAL
|
||||
void performMarkCommand(cell *c);
|
||||
|
||||
void curvepoint(const hyperpoint& H1);
|
||||
dqi_poly& queuecurve(color_t linecol, color_t fillcol, PPR prio);
|
||||
@ -157,7 +156,7 @@ bool magic_rugkey(int sym, int uni) {
|
||||
return true;
|
||||
}
|
||||
if((cmode & sm::NORMAL) && uni == 'r' && on) {
|
||||
performMarkCommand(mouseover);
|
||||
mine::performMarkCommand(mouseover);
|
||||
return true;
|
||||
}
|
||||
if((cmode & sm::NORMAL) && uni == 'R' && on) {
|
||||
@ -171,7 +170,7 @@ bool magic_rugkey(int sym, int uni) {
|
||||
}
|
||||
|
||||
auto magichook = addHook(hooks_args, 100, readArgs) + addHook(hooks_drawcell, 100, magic_markers)
|
||||
+ addHook(hooks_mark, 150, magic_rotate)
|
||||
+ addHook(mine::hooks_mark, 150, magic_rotate)
|
||||
+ addHook(hooks_handleKey, 150, magic_rugkey);
|
||||
|
||||
}
|
||||
|
@ -23,6 +23,12 @@
|
||||
#include "../hyper.h"
|
||||
#include "rogueviz.h"
|
||||
|
||||
namespace hr {
|
||||
namespace linepatterns {
|
||||
extern linepattern patPalace, patZebraTriangles, patZebraLines;
|
||||
}
|
||||
}
|
||||
|
||||
namespace rogueviz {
|
||||
|
||||
ld fat_edges = 0;
|
||||
@ -1881,9 +1887,9 @@ int readArgs() {
|
||||
else if(argis("-net")) {
|
||||
PHASE(3);
|
||||
init(); kind = kFullNet;
|
||||
linepatterns::setColor(linepatterns::patTriTree, 0x30);
|
||||
linepatterns::setColor(linepatterns::patTriOther, 0x10);
|
||||
linepatterns::setColor(linepatterns::patTriRings, 0xFF);
|
||||
linepatterns::patTriTree.color = 0x30;
|
||||
linepatterns::patTriOther.color = 0x10;
|
||||
linepatterns::patTriRings.color = 0xFF;
|
||||
}
|
||||
|
||||
else if(argis("-spiraledge")) {
|
||||
@ -2030,7 +2036,7 @@ void search_marker() {
|
||||
auto& m = vd.m;
|
||||
if(!m) return;
|
||||
hyperpoint H = ggmatrix(m->base) * tC0(m->at);
|
||||
queuechr(H, 2*vid.fsize, 'X', 0x10101 * int(128 + 100 * sin(ticks / 150.)));
|
||||
queuestr(H, 2*vid.fsize, "X", 0x10101 * int(128 + 100 * sin(ticks / 150.)));
|
||||
addauraspecial(H, iinf[itOrbYendor].color, 0);
|
||||
}
|
||||
}
|
||||
@ -2198,10 +2204,8 @@ slide rvslides[] = {
|
||||
[] (presmode mode) {
|
||||
using namespace linepatterns;
|
||||
slidecommand = "toggle the Palace lines";
|
||||
if(mode == 4)
|
||||
switchAlpha(patPalace, 0xFF);
|
||||
if(mode == 3)
|
||||
setColor(patPalace, 0xFFD50000);
|
||||
if(mode == 4) patPalace.color = 0xFFD500FF;
|
||||
if(mode == 3) patPalace.color = 0xFFD50000;
|
||||
}
|
||||
},
|
||||
{"Collatz conjecture", 51, LEGAL_UNLIMITED | QUICKGEO,
|
||||
|
@ -89,12 +89,12 @@ struct storydata { int s; int e; const char *text; } story[] = {
|
||||
if(dt && drawtris < 255) drawtris++;
|
||||
else if(drawtris && !dt) drawtris--;
|
||||
|
||||
linepatterns::setColor(linepatterns::patZebraTriangles, 0x40FF4000 + drawtris);
|
||||
linepatterns::patZebraTriangles.color = 0x40FF4000 + drawtris;
|
||||
|
||||
if(dn && drawnet < 255) drawnet++;
|
||||
else if(drawnet && !dn) drawnet--;
|
||||
|
||||
linepatterns::setColor(linepatterns::patZebraLines, 0xFF000000 + drawnet);
|
||||
linepatterns::patZebraLines.color = 0xFF000000 + drawnet;
|
||||
|
||||
vid.grid = drawnet;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user