mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Orb of Choice: Two small disks.

This commit is contained in:
Jacob Mandelson 2022-08-27 15:51:31 -07:00
parent 46872919ba
commit af4a0c1da9
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geometry.cpp
View File

@ -253,7 +253,7 @@ hpcshape
shTriheptaSpecial[14], shTriheptaSpecial[14],
shCross, shGiantStar[2], shLake, shMirror, shCross, shGiantStar[2], shLake, shMirror,
shHalfFloor[6], shHalfMirror[3], shHalfFloor[6], shHalfMirror[3],
shGem[2], shStar, shDisk, shHalfDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shGem[2], shStar, shDisk, shHalfDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shEccentricDisk,
shTinyBird, shTinyShark, shTinyBird, shTinyShark,
shEgg, shEgg,
shRing, shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing, shRing, shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing,

4
graph.cpp
View File

@ -1096,12 +1096,12 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
(it == itOrbSide2 || it == itOrb37) ? cgi.shDiskT : (it == itOrbSide2 || it == itOrb37) ? cgi.shDiskT :
(it == itOrbGravity) ? cgi.shTinyArrow : (it == itOrbGravity) ? cgi.shTinyArrow :
(it == itOrbMorph) ? cgi.shDiskS : (it == itOrbMorph) ? cgi.shDiskS :
//(it == itOrbDiscord) ? cgi.shDiskM :
(it == itOrbMatter || it == itOrbStone) ? cgi.shDiskSq : (it == itOrbMatter || it == itOrbStone) ? cgi.shDiskSq :
(it == itOrbEnergy) ? cgi.shHalfDisk : (it == itOrbEnergy) ? cgi.shHalfDisk :
(it == itOrbChoice) ? cgi.shEccentricDisk :
cgi.shDisk; cgi.shDisk;
queuepolyat(Vit, shape, dark, prio); queuepolyat(Vit, shape, dark, prio);
if (it == itOrbSide1) if (it == itOrbSide1 || it == itOrbChoice)
queuepolyat(Vit*Mirror, shape, dark, prio); queuepolyat(Vit*Mirror, shape, dark, prio);
if (it == itOrbEnergy) if (it == itOrbEnergy)
queuepolyat(Vit*Mirror, shape, col, prio); queuepolyat(Vit*Mirror, shape, col, prio);

10
polygons.cpp
View File

@ -259,7 +259,8 @@ void geometry_information::bshape(hpcshape& sh, PPR prio) {
if(last) finishshape(); if(last) finishshape();
hpc.push_back(hpxy(0,0)); hpc.push_back(hpxy(0,0));
last = &sh; last = &sh;
last->s = isize(hpc), last->prio = prio; last->s = isize(hpc);
last->prio = prio;
last->flags = 0; last->flags = 0;
last->tinf = NULL; last->tinf = NULL;
first = true; first = true;
@ -606,13 +607,18 @@ void geometry_information::procedural_shapes() {
hpcpush(ddi(i, orbsize * .1) * C0); hpcpush(ddi(i, orbsize * .1) * C0);
} }
bshape(shEccentricDisk, PPR::ITEM);
for(int i=0; i<=S84; i+=SD3) {
hpcpush(hpxy(sin(i*2*M_PI/S84)*orbsize*.075,
cos(i*2*M_PI/S84)*orbsize*.075 + .07));
}
bshape(shDiskSq, PPR::ITEM); bshape(shDiskSq, PPR::ITEM);
for(int i=0; i<=S84; i+=S21) { for(int i=0; i<=S84; i+=S21) {
hpcpush(ddi(i, orbsize * .15) * C0); hpcpush(ddi(i, orbsize * .15) * C0);
} }
bshape(shEgg, PPR::ITEM); bshape(shEgg, PPR::ITEM);
RING(i) RING(i)
hpcpush(hpxy(sin(i*2*M_PI/S84)*0.242 * orbsize, cos(i*2*M_PI/S84)*0.177*orbsize)); hpcpush(hpxy(sin(i*2*M_PI/S84)*0.242 * orbsize, cos(i*2*M_PI/S84)*0.177*orbsize));