mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 22:12:59 +00:00
Code Issues Releases Wiki Activity

adjusted Rogueviz to HR changes

Browse Source
This commit is contained in:
Zeno Rogue
2019-12-27 12:50:56 +01:00
parent 0aa94f073a
commit 1cfeba9666
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rogueviz/magiccube.cpp
View File

@@ -3,7 +3,6 @@
namespace hr { namespace hr {
#if CAP_CRYSTAL #if CAP_CRYSTAL
void performMarkCommand(cell *c);
void curvepoint(const hyperpoint& H1); void curvepoint(const hyperpoint& H1);
dqi_poly& queuecurve(color_t linecol, color_t fillcol, PPR prio); dqi_poly& queuecurve(color_t linecol, color_t fillcol, PPR prio);
@@ -157,7 +156,7 @@ bool magic_rugkey(int sym, int uni) {
return true; return true;
} }
if((cmode & sm::NORMAL) && uni == 'r' && on) { if((cmode & sm::NORMAL) && uni == 'r' && on) {
performMarkCommand(mouseover); mine::performMarkCommand(mouseover);
return true; return true;
} }
if((cmode & sm::NORMAL) && uni == 'R' && on) { 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) 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); + addHook(hooks_handleKey, 150, magic_rugkey);
} }

20
rogueviz/rogueviz.cpp
View File

@@ -23,6 +23,12 @@
#include "../hyper.h" #include "../hyper.h"
#include "rogueviz.h" #include "rogueviz.h"
namespace hr {
namespace linepatterns {
extern linepattern patPalace, patZebraTriangles, patZebraLines;
}
}
namespace rogueviz { namespace rogueviz {
ld fat_edges = 0; ld fat_edges = 0;
@@ -1881,9 +1887,9 @@ int readArgs() {
else if(argis("-net")) { else if(argis("-net")) {
PHASE(3); PHASE(3);
init(); kind = kFullNet; init(); kind = kFullNet;
linepatterns::setColor(linepatterns::patTriTree, 0x30); linepatterns::patTriTree.color = 0x30;
linepatterns::setColor(linepatterns::patTriOther, 0x10); linepatterns::patTriOther.color = 0x10;
linepatterns::setColor(linepatterns::patTriRings, 0xFF); linepatterns::patTriRings.color = 0xFF;
} }
else if(argis("-spiraledge")) { else if(argis("-spiraledge")) {
@@ -2030,7 +2036,7 @@ void search_marker() {
auto& m = vd.m; auto& m = vd.m;
if(!m) return; if(!m) return;
hyperpoint H = ggmatrix(m->base) * tC0(m->at); 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); addauraspecial(H, iinf[itOrbYendor].color, 0);
} }
} }
@@ -2198,10 +2204,8 @@ slide rvslides[] = {
[] (presmode mode) { [] (presmode mode) {
using namespace linepatterns; using namespace linepatterns;
slidecommand = "toggle the Palace lines"; slidecommand = "toggle the Palace lines";
if(mode == 4) if(mode == 4) patPalace.color = 0xFFD500FF;
switchAlpha(patPalace, 0xFF); if(mode == 3) patPalace.color = 0xFFD50000;
if(mode == 3)
setColor(patPalace, 0xFFD50000);
} }
}, },
{"Collatz conjecture", 51, LEGAL_UNLIMITED | QUICKGEO, {"Collatz conjecture", 51, LEGAL_UNLIMITED | QUICKGEO,

4
rogueviz/video.cpp
View File

@@ -89,12 +89,12 @@ struct storydata { int s; int e; const char *text; } story[] = {
if(dt && drawtris < 255) drawtris++; if(dt && drawtris < 255) drawtris++;
else if(drawtris && !dt) drawtris--; else if(drawtris && !dt) drawtris--;
linepatterns::setColor(linepatterns::patZebraTriangles, 0x40FF4000 + drawtris); linepatterns::patZebraTriangles.color = 0x40FF4000 + drawtris;
if(dn && drawnet < 255) drawnet++; if(dn && drawnet < 255) drawnet++;
else if(drawnet && !dn) drawnet--; else if(drawnet && !dn) drawnet--;
linepatterns::setColor(linepatterns::patZebraLines, 0xFF000000 + drawnet); linepatterns::patZebraLines.color = 0xFF000000 + drawnet;
vid.grid = drawnet; vid.grid = drawnet;