mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-27 15:32:53 +00:00
Code Issues Releases Wiki Activity

rogueviz:: collatz:: 3D trees

Browse Source
This commit is contained in:
Zeno Rogue 2019-04-22 14:48:42 +02:00
parent 5965a622b5
commit 7ed3ee6098
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
rogueviz.cpp
View File

@ -280,6 +280,8 @@ namespace collatz {
double s2, s3, p2, p3; double s2, s3, p2, p3;
double cshift = -1; double cshift = -1;
transmatrix T2, T3;
edgetype *collatz1, *collatz2; edgetype *collatz1, *collatz2;
void start() { void start() {
@ -295,6 +297,9 @@ namespace collatz {
addedge(0, 0, 1, false, collatz::collatz1); addedge(0, 0, 1, false, collatz::collatz1);
vd.name = "1"; vd.name = "1";
storeall(); storeall();
T2 = spin(collatz::s2) * xpush(collatz::p2);
T3 = spin(collatz::s3) * xpush(collatz::p3);
} }
} }
@ -1342,7 +1347,7 @@ bool drawVertex(const transmatrix &V, cell *c, shmup::monster *m) {
int i0 = isize(vdata); int i0 = isize(vdata);
vdata.resize(i0+1); vdata.resize(i0+1);
vertexdata& vdn = vdata[i0]; vertexdata& vdn = vdata[i0];
createViz(i0, m->base, m->at * spin(collatz::s2) * xpush(collatz::p2)); createViz(i0, m->base, m->at * collatz::T2);
virtualRebase(vdn.m, true); virtualRebase(vdn.m, true);
vdn.cp = perturb(cp); vdn.cp = perturb(cp);
@ -1366,7 +1371,7 @@ bool drawVertex(const transmatrix &V, cell *c, shmup::monster *m) {
if(m3 % 3 == 2 && s != "2" && s != "1") { if(m3 % 3 == 2 && s != "2" && s != "1") {
vdata.resize(i0+2); vdata.resize(i0+2);
vertexdata& vdn = vdata[i0+1]; vertexdata& vdn = vdata[i0+1];
createViz(i0+1, m->base, m->at * spin(collatz::s3) * xpush(collatz::p3)); createViz(i0+1, m->base, m->at * collatz::T3);
virtualRebase(vdn.m, true); virtualRebase(vdn.m, true);
vdn.cp = perturb(cp); vdn.cp = perturb(cp);
vdn.data = 0; vdn.data = 0;
@ -1615,6 +1620,16 @@ bool turn(int delta) {
#define CAP_RVSLIDES (CAP_TOUR && !ISWEB) #define CAP_RVSLIDES (CAP_TOUR && !ISWEB)
#endif #endif
int dimid(char x) {
if(x >= 'a' && x < 'a' + DIM) return x - 'a';
else if(x >= '0' && x < '0' + DIM) return x - '0';
else if(x >= 'x' && x < 'x' + DIM) return x - 'x';
else {
println(hlog, "incorrect dimension ID");
throw hr_exception();
}
}
#if CAP_COMMANDLINE #if CAP_COMMANDLINE
int readArgs() { int readArgs() {
using namespace arg; using namespace arg;
@ -1698,6 +1713,22 @@ int readArgs() {
start(); start();
} }
else if(argis("-collatz3")) {
PHASE(3);
using namespace collatz;
s2 = p2 = s3 = p3 = 0;
start();
shift();
transmatrix *T = &T2;
while(true) {
if(arg::pos >= isize(arg::argument)) break;
else if(argis("fd")) { shift(); *T = *T * xpush(argf()); shift(); }
else if(argcs()[0] == 't') { shift(); *T = *T * hr::cspin(dimid(argcs()[1]),dimid(argcs()[2]),argf()); shift(); }
else if(argis("/")) { shift(); if(T == &T2) T = &T3; else break; }
else break;
}
}
else if(argis("-spiral")) { else if(argis("-spiral")) {
PHASE(3); PHASE(3);
ld mul = 2; ld mul = 2;