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

3d:: renamed shBinaryWall to shWall3D

Browse Source
This commit is contained in:
?
2019-02-27 16:15:59 +01:00
committed by Zeno Rogue
parent 42e4342c4a
commit c2b6600ce5
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
graph.cpp
View File

@@ -4650,10 +4650,10 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
if(a < 4 && hyperbolic) { if(a < 4 && hyperbolic) {
if(celldistAlt(c) >= celldistAlt(viewctr.at->c7)) continue; if(celldistAlt(c) >= celldistAlt(viewctr.at->c7)) continue;
dynamicval<color_t> p (poly_outline, 0); dynamicval<color_t> p (poly_outline, 0);
queuepoly(V, shBinaryWall[a], darkena(wcol - d * darkval[a], 0, 0xFF)); queuepoly(V, shWall3D[a], darkena(wcol - d * darkval[a], 0, 0xFF));
} }
else { else {
queuepoly(V, shBinaryWall[a], darkena(wcol - d * darkval[a], 0, 0xFF)); queuepoly(V, shWall3D[a], darkena(wcol - d * darkval[a], 0, 0xFF));
} }
} }
} }
@@ -5190,7 +5190,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
if(hyperbolic && !among(t, 5, 6, 8)) continue; if(hyperbolic && !among(t, 5, 6, 8)) continue;
if(!hyperbolic && c->move(t) < c) continue; if(!hyperbolic && c->move(t) < c) continue;
dynamicval<color_t> p (poly_outline, gridcolor(c, c->move(t))); dynamicval<color_t> p (poly_outline, gridcolor(c, c->move(t)));
queuepoly(V, shBinaryWall[t], 0); queuepoly(V, shWall3D[t], 0);
} }
} }
#endif #endif
@@ -5377,7 +5377,7 @@ void queuecircleat(cell *c, double rad, color_t col) {
dynamicval<color_t> p(poly_outline, col); dynamicval<color_t> p(poly_outline, col);
for(int i=0; i<c->type; i++) { for(int i=0; i<c->type; i++) {
if(binarytiling && i < 4) continue; if(binarytiling && i < 4) continue;
queuepolyat(gmatrix[c], shBinaryWall[i], 0, PPR::SUPERLINE); queuepolyat(gmatrix[c], shWall3D[i], 0, PPR::SUPERLINE);
} }
return; return;
} }

24
polygons.cpp
View File

@@ -1659,7 +1659,7 @@ hpcshape
shAsymmetric, shAsymmetric,
shBinaryWall[12], shWall3D[12],
shDodeca; shDodeca;
#endif #endif
@@ -2500,20 +2500,20 @@ void buildpolys() {
bshape(shDragonHead, PPR::ONTENTACLE, scalefactor, 242); bshape(shDragonHead, PPR::ONTENTACLE, scalefactor, 242);
if(DIM == 3 && binarytiling) { if(DIM == 3 && binarytiling) {
make_wall(shBinaryWall[0], 0,0,-1, -1,0,-1, 0,-1,-1, 2); make_wall(shWall3D[0], 0,0,-1, -1,0,-1, 0,-1,-1, 2);
make_wall(shBinaryWall[1], 0,0,-1, +1,0,-1, 0,-1,-1, 2); make_wall(shWall3D[1], 0,0,-1, +1,0,-1, 0,-1,-1, 2);
make_wall(shBinaryWall[2], 0,0,-1, -1,0,-1, 0,+1,-1, 2); make_wall(shWall3D[2], 0,0,-1, -1,0,-1, 0,+1,-1, 2);
make_wall(shBinaryWall[3], 0,0,-1, +1,0,-1, 0,+1,-1, 2); make_wall(shWall3D[3], 0,0,-1, +1,0,-1, 0,+1,-1, 2);
make_wall(shBinaryWall[4], -1,-1,-1, -1,1,-1, -1,-1,+1, 1); make_wall(shWall3D[4], -1,-1,-1, -1,1,-1, -1,-1,+1, 1);
make_wall(shBinaryWall[5], +1,-1,-1, +1,1,-1, +1,-1,+1, 1); make_wall(shWall3D[5], +1,-1,-1, +1,1,-1, +1,-1,+1, 1);
make_wall(shBinaryWall[6], -1,-1,-1, 1,-1,-1, -1,-1,+1, 1); make_wall(shWall3D[6], -1,-1,-1, 1,-1,-1, -1,-1,+1, 1);
make_wall(shBinaryWall[7], -1,+1,-1, 1,+1,-1, -1,+1,+1, 1); make_wall(shWall3D[7], -1,+1,-1, 1,+1,-1, -1,+1,+1, 1);
make_wall(shBinaryWall[8], 1,1,+1, -1,1,+1, 1,-1,+1, 0); make_wall(shWall3D[8], 1,1,+1, -1,1,+1, 1,-1,+1, 0);
} }
if(DIM == 3 && euclid) { if(DIM == 3 && euclid) {
for(int w=0; w<6; w++) { for(int w=0; w<6; w++) {
bshape(shBinaryWall[w], PPR::WALL); bshape(shWall3D[w], PPR::WALL);
for(int a=0; a<=4; a++) { for(int a=0; a<=4; a++) {
int t[3]; int t[3];
t[0] = (w>=3) ? -1 : 1; t[0] = (w>=3) ? -1 : 1;
@@ -2529,7 +2529,7 @@ void buildpolys() {
if(DIM == 3 && sphere) { if(DIM == 3 && sphere) {
for(int w=0; w<12; w++) { for(int w=0; w<12; w++) {
bshape(shBinaryWall[w], PPR::WALL); bshape(shWall3D[w], PPR::WALL);
for(int a=0; a<=5; a++) for(int a=0; a<=5; a++)
hpcpush(sphere3::dodefaces[w*5+a%5]); hpcpush(sphere3::dodefaces[w*5+a%5]);
} }