mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-11 18:00:34 +00:00
Code Issues Releases Wiki Activity

fixed 2D vector art displayed on sphere

Browse Source
This commit is contained in:
Zeno Rogue 2022-12-08 21:21:14 +01:00
parent 2857bc95dc
commit 107cae8f5c
2 changed files with 111 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
graph.cpp
View File

@ -769,6 +769,7 @@ EX shiftmatrix face_the_player(const shiftmatrix V) {
return shiftless(cspin90(1, 2) * lrspintox(cspin90(2, 1) * uh) * xpush(hdist0(uh)) * cspin90(0, 2) * spin270()); return shiftless(cspin90(1, 2) * lrspintox(cspin90(2, 1) * uh) * xpush(hdist0(uh)) * cspin90(0, 2) * spin270());
} }
#endif #endif
if(embedded_plane && msphere) return shiftless(map_relative_push(unshift(V * zpush0(1))) * zpush(-1));
return rgpushxto0(tC0(V)); return rgpushxto0(tC0(V));
} }

218
polygons.cpp
View File

@ -415,13 +415,15 @@ void geometry_information::procedural_shapes() {
if(i != 8) hpcpush(xspinpush0(90._deg * i + 45._deg, crossf/4)); if(i != 8) hpcpush(xspinpush0(90._deg * i + 45._deg, crossf/4));
} }
hyperpoint TC0 = tile_center();
// procedural floors // procedural floors
bshape(shBarrel, PPR::FLOOR); bshape(shBarrel, PPR::FLOOR);
for(int t=0; t<=S84; t+=2) hpcpush(ddi(t, floorrad1*.5) * C0); for(int t=0; t<=S84; t+=2) hpcpush(ddi(t, floorrad1*.5) * TC0);
bshape(shCircleFloor, PPR::FLOOR); bshape(shCircleFloor, PPR::FLOOR);
for(int t=0; t<=S84; t+=2) hpcpush(ddi(t, floorrad1*.9) * C0); for(int t=0; t<=S84; t+=2) hpcpush(ddi(t, floorrad1*.9) * TC0);
for(int i=0; i<3; i++) for(int j=0; j<3; j++) shadowmulmatrix[i][j] = for(int i=0; i<3; i++) for(int j=0; j<3; j++) shadowmulmatrix[i][j] =
i==2&&j==2 ? 1: i==2&&j==2 ? 1:
@ -430,61 +432,61 @@ void geometry_information::procedural_shapes() {
for(int d=0; d<2; d++) { for(int d=0; d<2; d++) {
bshape(shSemiFloor[d], PPR::FLOOR); bshape(shSemiFloor[d], PPR::FLOOR);
for(int t=0; t<=4; t++) hpcpush(ddi(S7 + (3+3*d+t%4)*S14, floorrad0) * C0); for(int t=0; t<=4; t++) hpcpush(ddi(S7 + (3+3*d+t%4)*S14, floorrad0) * TC0);
} }
// todo not shexf // todo not shexf
bshape(shBigCarpet1, PPR::GFLOORa); bshape(shBigCarpet1, PPR::GFLOORa);
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, -zhexf*2.1) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, -zhexf*2.1) * TC0);
bshape(shBigCarpet2, PPR::GFLOORb); bshape(shBigCarpet2, PPR::GFLOORb);
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, -zhexf*1.9) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, -zhexf*1.9) * TC0);
bshape(shBigCarpet3, PPR::GFLOORc); bshape(shBigCarpet3, PPR::GFLOORc);
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12*3, -zhexf*1.7) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12*3, -zhexf*1.7) * TC0);
bshape(shBFloor[0], PPR::BFLOOR); bshape(shBFloor[0], PPR::BFLOOR);
for(int t=0; t<=SD6; t++) hpcpush(ddi(SD7 + t*S14, floorrad0*.1) * C0); for(int t=0; t<=SD6; t++) hpcpush(ddi(SD7 + t*S14, floorrad0*.1) * TC0);
bshape(shBFloor[1], PPR::BFLOOR); bshape(shBFloor[1], PPR::BFLOOR);
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, floorrad1*.1) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, floorrad1*.1) * TC0);
bshape(shMineMark[0], PPR::MINEMARK); bshape(shMineMark[0], PPR::MINEMARK);
for(int t=0; t<=SD6; t++) hpcpush(ddi(S7 + t*S14, floorrad0*.1) * C0); for(int t=0; t<=SD6; t++) hpcpush(ddi(S7 + t*S14, floorrad0*.1) * TC0);
bshape(shMineMark[1], PPR::MINEMARK); bshape(shMineMark[1], PPR::MINEMARK);
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, floorrad1*.1) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, floorrad1*.1) * TC0);
bshape(shBigMineMark[0], PPR::MINEMARK); bshape(shBigMineMark[0], PPR::MINEMARK);
for(int t=0; t<=SD6; t++) hpcpush(ddi(S7 + t*S14, floorrad0*.15) * C0); for(int t=0; t<=SD6; t++) hpcpush(ddi(S7 + t*S14, floorrad0*.15) * TC0);
bshape(shBigMineMark[1], PPR::MINEMARK); bshape(shBigMineMark[1], PPR::MINEMARK);
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, floorrad1*.15) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, floorrad1*.15) * TC0);
for(int d=0; d<2; d++) { for(int d=0; d<2; d++) {
bshape(shSemiBFloor[d], PPR::BFLOOR); bshape(shSemiBFloor[d], PPR::BFLOOR);
for(int t=0; t<=4; t++) hpcpush(ddi(SD7 + (3+3*d+t%4)*S14, floorrad0*.1) * C0); for(int t=0; t<=4; t++) hpcpush(ddi(SD7 + (3+3*d+t%4)*S14, floorrad0*.1) * TC0);
} }
// walls etc // walls etc
bshape(shGiantStar[1], PPR::GFLOORa); bshape(shGiantStar[1], PPR::GFLOORa);
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S36, -zhexf*2.4) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S36, -zhexf*2.4) * TC0);
bshape(shGiantStar[0], PPR::GFLOORa); bshape(shGiantStar[0], PPR::GFLOORa);
for(int t=0; t<=SD6; t++) { for(int t=0; t<=SD6; t++) {
hpcpush(ddi(t*S14, -zhexf*2.4) * C0); hpcpush(ddi(t*S14, -zhexf*2.4) * TC0);
hpcpush(ddi(t*S14+S7, zhexf*1.5) * C0); hpcpush(ddi(t*S14+S7, zhexf*1.5) * TC0);
} }
hpcpush(ddi(0, -zhexf*2.4) * C0); hpcpush(ddi(0, -zhexf*2.4) * TC0);
bshape(shMirror, PPR::WALL); bshape(shMirror, PPR::WALL);
if(PURE) { if(PURE) {
for(int t=0; t<=S7; t++) hpcpush(ddi(t*12, floorrad1*7/8) * C0); for(int t=0; t<=S7; t++) hpcpush(ddi(t*12, floorrad1*7/8) * TC0);
} }
else { else {
for(int t=0; t<=6; t++) hpcpush(ddi(S7 + t*S14, floorrad0*7/8) * C0); for(int t=0; t<=6; t++) hpcpush(ddi(S7 + t*S14, floorrad0*7/8) * TC0);
} }
if(0); if(0);
@ -506,20 +508,20 @@ void geometry_information::procedural_shapes() {
if(S3 >= OINF) rad0 = rad1 = zhexf; if(S3 >= OINF) rad0 = rad1 = zhexf;
bshape(shWall[0], PPR::WALL); bshape(shWall[0], PPR::WALL);
for(int t=0; t<=S6; t++) { for(int t=0; t<=S6; t++) {
hpcpush(ddi(S7 + t*S14, rad0) * C0); hpcpush(ddi(S7 + t*S14, rad0) * TC0);
if(t != S6) hpcpush(ddi(S14 + t*S14, rad0 /4) * C0); if(t != S6) hpcpush(ddi(S14 + t*S14, rad0 /4) * TC0);
} }
bshape(shWall[1], PPR::WALL); bshape(shWall[1], PPR::WALL);
int td = ((!BITRUNCATED || euclid) && !(S7&1)) ? S42+S6 : 0; int td = ((!BITRUNCATED || euclid) && !(S7&1)) ? S42+S6 : 0;
if(S7 == 6 || S7 == 4) { if(S7 == 6 || S7 == 4) {
for(int t=0; t<=S6; t++) { for(int t=0; t<=S6; t++) {
hpcpush(ddi(S7 + t*S14, rad1) * C0); hpcpush(ddi(S7 + t*S14, rad1) * TC0);
if(t != S6) hpcpush(ddi(S14 + t*S14, rad1/4) * C0); if(t != S6) hpcpush(ddi(S14 + t*S14, rad1/4) * TC0);
} }
} }
else else
for(int t=0; t<=S7; t++) hpcpush(ddi(t*S36+td, rad1) * C0); for(int t=0; t<=S7; t++) hpcpush(ddi(t*S36+td, rad1) * TC0);
} }
bshape(shCross, PPR::WALL); bshape(shCross, PPR::WALL);
@ -530,50 +532,50 @@ void geometry_information::procedural_shapes() {
bshape(shGem[0], PPR::ITEM); bshape(shGem[0], PPR::ITEM);
for(int t=0; t<=SD6; t++) { for(int t=0; t<=SD6; t++) {
hpcpush(ddi(SD7 + t*S14, zhexf*.4) * C0); hpcpush(ddi(SD7 + t*S14, zhexf*.4) * TC0);
if(t != SD6) hpcpush(ddi(S14 + t*S14, zhexf*.1) * C0); if(t != SD6) hpcpush(ddi(S14 + t*S14, zhexf*.1) * TC0);
} }
bshape(shGem[1], PPR::ITEM); bshape(shGem[1], PPR::ITEM);
if(SD7 == 6) { if(SD7 == 6) {
for(int t=0; t<=SD6; t++) { for(int t=0; t<=SD6; t++) {
hpcpush(ddi(SD7 + t*S14, zhexf*.4) * C0); hpcpush(ddi(SD7 + t*S14, zhexf*.4) * TC0);
if(t != SD6) hpcpush(ddi(S14 + t*S14, zhexf*.1) * C0); if(t != SD6) hpcpush(ddi(S14 + t*S14, zhexf*.1) * TC0);
} }
} }
else else
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S36, zhexf*.5) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S36, zhexf*.5) * TC0);
bshape(shStar, PPR::ITEM); bshape(shStar, PPR::ITEM);
for(int t=0; t<=S84; t+=SD6) { for(int t=0; t<=S84; t+=SD6) {
hpcpush(ddi(t, zhexf*.2) * C0); hpcpush(ddi(t, zhexf*.2) * TC0);
if(t != S84) hpcpush(ddi(t+3, zhexf*.6) * C0); if(t != S84) hpcpush(ddi(t+3, zhexf*.6) * TC0);
} }
bshape(shFlash, PPR::ITEM); bshape(shFlash, PPR::ITEM);
for(int t=0; t<S84+SD6; t+=SD6) { for(int t=0; t<S84+SD6; t+=SD6) {
hpcpush(ddi(t, zhexf*.25) * C0); hpcpush(ddi(t, zhexf*.25) * TC0);
hpcpush(ddi(t+3, zhexf*.4) * C0); hpcpush(ddi(t+3, zhexf*.4) * TC0);
} }
hpcpush(ddi(3, zhexf*.4) * C0); hpcpush(ddi(3, zhexf*.4) * TC0);
bshape(shDaisy, PPR::ITEM); bshape(shDaisy, PPR::ITEM);
for(int t=0; t<=SD6; t++) { for(int t=0; t<=SD6; t++) {
hpcpush(ddi(t*S14, zhexf*.8*3/4) * C0); hpcpush(ddi(t*S14, zhexf*.8*3/4) * TC0);
if(t != SD6) hpcpush(ddi(t*S14+SD7, zhexf*-.5*3/4) * C0); if(t != SD6) hpcpush(ddi(t*S14+SD7, zhexf*-.5*3/4) * TC0);
} }
hpcpush(ddi(0, zhexf*.6) * C0); hpcpush(ddi(0, zhexf*.6) * TC0);
bshape(shSnowflake, PPR::ITEM); bshape(shSnowflake, PPR::ITEM);
for(int t=0; t<=SD6; t++) { for(int t=0; t<=SD6; t++) {
hpcpush(ddi(t*S14, zhexf*.7*.8*3/4) * C0); hpcpush(ddi(t*S14, zhexf*.7*.8*3/4) * TC0);
if(t != SD6) hpcpush(ddi(t*S14+SD7, zhexf*.7*-.5*3/4) * C0); if(t != SD6) hpcpush(ddi(t*S14+SD7, zhexf*.7*-.5*3/4) * TC0);
} }
hpcpush(ddi(0, zhexf*.7*.6) * C0); hpcpush(ddi(0, zhexf*.7*.6) * TC0);
bshape(shTriangle, PPR::ITEM); bshape(shTriangle, PPR::ITEM);
for(int t=0; t<=SD3; t++) { for(int t=0; t<=SD3; t++) {
hpcpush(ddi(t*S28, zhexf*.5) * C0); hpcpush(ddi(t*S28, zhexf*.5) * TC0);
} }
bshape(shTinyArrow, PPR::ITEM); bshape(shTinyArrow, PPR::ITEM);
@ -582,53 +584,53 @@ void geometry_information::procedural_shapes() {
bshape(shHeptagon, PPR::ITEM); bshape(shHeptagon, PPR::ITEM);
for(int i=0; i<=S84; i+=S12) for(int i=0; i<=S84; i+=S12)
hpcpush(ddi(i, orbsize * .2) * C0); hpcpush(ddi(i, orbsize * .2) * TC0);
bshape(shHeptagram, PPR::ITEM); bshape(shHeptagram, PPR::ITEM);
for(int i=0, skip=3; i<=S84*skip; i+=S12*skip) for(int i=0, skip=3; i<=S84*skip; i+=S12*skip)
hpcpush(ddi(i, orbsize * .2) * C0); hpcpush(ddi(i, orbsize * .2) * TC0);
bshape(shDisk, PPR::ITEM); bshape(shDisk, PPR::ITEM);
for(int i=0; i<=S84; i+=SD3) for(int i=0; i<=S84; i+=SD3)
hpcpush(ddi(i, orbsize * .2) * C0); hpcpush(ddi(i, orbsize * .2) * TC0);
bshape(shHalfDisk, PPR::ITEM); bshape(shHalfDisk, PPR::ITEM);
for(int i=0; i<=S84/2; i+=SD3) for(int i=0; i<=S84/2; i+=SD3)
hpcpush(ddi(i, orbsize * .2) * C0); hpcpush(ddi(i, orbsize * .2) * TC0);
bshape(shDiskSegment, PPR::ITEM); bshape(shDiskSegment, PPR::ITEM);
for(int i=0; i<=S84/2.5; i+=SD3) for(int i=0; i<=S84/2.5; i+=SD3)
hpcpush(ddi(i, orbsize * .2) * C0); hpcpush(ddi(i, orbsize * .2) * TC0);
bshape(shMoonDisk, PPR::ITEM); bshape(shMoonDisk, PPR::ITEM);
for(int i=0; i<=S84; i+=SD3) for(int i=0; i<=S84; i+=SD3)
if(i <= S84 * 2 / 3) if(i <= S84 * 2 / 3)
hpcpush(ddi(i, orbsize * .2) * C0); hpcpush(ddi(i, orbsize * .2) * TC0);
else { else {
hyperpoint h1 = ddi(i, orbsize * .2) * C0; hyperpoint h1 = ddi(i, orbsize * .2) * TC0;
hyperpoint h2 = ddi(S84-i*2, orbsize * .2) * C0; hyperpoint h2 = ddi(S84-i*2, orbsize * .2) * TC0;
hpcpush(mid(mid(h1,h2), h2)); hpcpush(mid(mid(h1,h2), h2));
} }
bshape(shHugeDisk, PPR::ITEM); bshape(shHugeDisk, PPR::ITEM);
for(int i=0; i<=S84; i+=SD3) for(int i=0; i<=S84; i+=SD3)
hpcpush(ddi(i, orbsize * .4) * C0); hpcpush(ddi(i, orbsize * .4) * TC0);
bshape(shDiskT, PPR::ITEM); bshape(shDiskT, PPR::ITEM);
for(int i=0; i<=S84; i+=S28) for(int i=0; i<=S84; i+=S28)
hpcpush(ddi(i, orbsize * .2) * C0); hpcpush(ddi(i, orbsize * .2) * TC0);
bshape(shDiskS, PPR::ITEM); bshape(shDiskS, PPR::ITEM);
for(int i=0; i<=S84; i+=S21) { for(int i=0; i<=S84; i+=S21) {
hpcpush(ddi(i, orbsize * .2) * C0); hpcpush(ddi(i, orbsize * .2) * TC0);
if(i != S84) { if(i != S84) {
hpcpush(ddi(i+S21/3, orbsize * .1) * C0); hpcpush(ddi(i+S21/3, orbsize * .1) * TC0);
hpcpush(ddi(i+S21-S21/3, orbsize * .1) * C0); hpcpush(ddi(i+S21-S21/3, orbsize * .1) * TC0);
} }
} }
bshape(shDiskM, PPR::ITEM); bshape(shDiskM, PPR::ITEM);
for(int i=0; i<=S84; i+=SD3) { for(int i=0; i<=S84; i+=SD3) {
hpcpush(ddi(i, orbsize * .1) * C0); hpcpush(ddi(i, orbsize * .1) * TC0);
} }
bshape(shEccentricDisk, PPR::ITEM); bshape(shEccentricDisk, PPR::ITEM);
@ -639,7 +641,7 @@ void geometry_information::procedural_shapes() {
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) * TC0);
} }
bshape(shEgg, PPR::ITEM); bshape(shEgg, PPR::ITEM);
@ -650,64 +652,64 @@ void geometry_information::procedural_shapes() {
RING(i) RING(i)
hpcpush(hpxy(sin(i*S_step)*0.242 * orbsize/2, cos(i*S_step)*0.177*orbsize/2)); hpcpush(hpxy(sin(i*S_step)*0.242 * orbsize/2, cos(i*S_step)*0.177*orbsize/2));
auto make_ring = [this] (hpcshape& sh, reaction_t f) { auto make_ring = [this, &TC0] (hpcshape& sh, reaction_t f) {
bshape(sh, PPR::ITEM); bshape(sh, PPR::ITEM);
RING(i) RING(i)
hpcpush(ddi(i, orbsize * .25) * C0); hpcpush(ddi(i, orbsize * .25) * TC0);
first = true; first = true;
f(); f();
first = true; first = true;
hpcpush(ddi(0, orbsize * .25) * C0); hpcpush(ddi(0, orbsize * .25) * TC0);
}; };
make_ring(shRing, [this] { make_ring(shRing, [this, &TC0] {
orb_inner_ring = isize(hpc) - shRing.s; orb_inner_ring = isize(hpc) - shRing.s;
REVPRING(i) { REVPRING(i) {
hpcpush(ddi(i, orbsize * .30) * C0); hpcpush(ddi(i, orbsize * .30) * TC0);
} }
}); });
make_ring(shSpikedRing, [this] { make_ring(shSpikedRing, [this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * (int(i)&1?.35:.30)) * C0); hpcpush(ddi(i, orbsize * (int(i)&1?.35:.30)) * TC0);
}); });
make_ring(shTargetRing, [this] { make_ring(shTargetRing, [this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * (i >= S42-6 && i <= S42+6 ?.36:.30)) * C0); hpcpush(ddi(i, orbsize * (i >= S42-6 && i <= S42+6 ?.36:.30)) * TC0);
}); });
make_ring(shFrogRing, [this] { make_ring(shFrogRing, [this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * (((i >= S42-8 && i <= S42-2) || (i >= S42+2 && i <= S42+8)) ?.36:.30)) * C0); hpcpush(ddi(i, orbsize * (((i >= S42-8 && i <= S42-2) || (i >= S42+2 && i <= S42+8)) ?.36:.30)) * TC0);
}); });
make_ring(shSpearRing, [this] { make_ring(shSpearRing, [this, &TC0] {
REVPRING(i) { REVPRING(i) {
double d = i - S42; double d = i - S42;
if(d<0) d = -d; if(d<0) d = -d;
d = 8 - 2 * d; d = 8 - 2 * d;
if(d<0) d = 0; if(d<0) d = 0;
hpcpush(ddi(i, orbsize * (.3 + .04 * d)) * C0); hpcpush(ddi(i, orbsize * (.3 + .04 * d)) * TC0);
} }
}); });
/* three nice spikes /* three nice spikes
bshape(shLoveRing, PPR::ITEM); bshape(shLoveRing, PPR::ITEM);
for(int i=0; i<=S84; i+=3) for(int i=0; i<=S84; i+=3)
hpcpush(ddi(i, orbsize * .25) * C0); hpcpush(ddi(i, orbsize * .25) * TC0);
for(int i=S84; i>=0; i--) { for(int i=S84; i>=0; i--) {
int j = i*3 % S84; int j = i*3 % S84;
int d = j - S42; int d = j - S42;
if(d<0) d = -d; if(d<0) d = -d;
d = 8 - 2 * d; d = 8 - 2 * d;
if(d<0) d = 0; if(d<0) d = 0;
hpcpush(ddi(i, orbsize * (.3 + .02 * d)) * C0); hpcpush(ddi(i, orbsize * (.3 + .02 * d)) * TC0);
} }
hpcpush(ddi(0, orbsize * .25) * C0); hpcpush(ddi(0, orbsize * .25) * TC0);
*/ */
make_ring(shLoveRing, [this] { make_ring(shLoveRing, [this, &TC0] {
REVPRING(i) { REVPRING(i) {
double j = i*3; double j = i*3;
while(j >= S84) j -= S84; while(j >= S84) j -= S84;
@ -717,87 +719,87 @@ void geometry_information::procedural_shapes() {
d = 8 - 2 * d; d = 8 - 2 * d;
if(d<0) d = 0; if(d<0) d = 0;
if(d >= 6) d -= (d-6)/3; if(d >= 6) d -= (d-6)/3;
hpcpush(ddi(i, orbsize * (.27 + .02 * d)) * C0); hpcpush(ddi(i, orbsize * (.27 + .02 * d)) * TC0);
} }
}); });
auto dmod = [] (ld a, ld b) { return a - int(a/b)*b; }; auto dmod = [] (ld a, ld b) { return a - int(a/b)*b; };
make_ring(shSawRing, [this] { make_ring(shSawRing, [this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * (.3 + (int(i) & 3) * .02)) * C0); hpcpush(ddi(i, orbsize * (.3 + (int(i) & 3) * .02)) * TC0);
}); });
make_ring(shMoveRing, [this] { make_ring(shMoveRing, [this, &TC0] {
REVPRING(i) { REVPRING(i) {
int ii = i + 3; int ii = i + 3;
if(int(ii) % 7 == 0) { if(int(ii) % 7 == 0) {
hpcpush(ddi(i-2, orbsize * (.3 - .02)) * C0); hpcpush(ddi(i-2, orbsize * (.3 - .02)) * TC0);
hpcpush(ddi(i-1, orbsize * (.3 - .01)) * C0); hpcpush(ddi(i-1, orbsize * (.3 - .01)) * TC0);
} }
hpcpush(ddi(i, orbsize * (.3 + (int(ii) % 7) * .01)) * C0); hpcpush(ddi(i, orbsize * (.3 + (int(ii) % 7) * .01)) * TC0);
} }
}); });
make_ring(shGearRing, [dmod, this] { make_ring(shGearRing, [dmod, this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * ((dmod(i, 6)<3)?.3:.36)) * C0); hpcpush(ddi(i, orbsize * ((dmod(i, 6)<3)?.3:.36)) * TC0);
}); });
make_ring(shProtectiveRing, [dmod, this] { make_ring(shProtectiveRing, [dmod, this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * ((dmod(i, 12)<3)?.3:.36)) * C0); hpcpush(ddi(i, orbsize * ((dmod(i, 12)<3)?.3:.36)) * TC0);
}); });
make_ring(shPowerGearRing, [dmod, this] { make_ring(shPowerGearRing, [dmod, this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * ((dmod(i, 6)<3)?.3:(dmod(i,12) < 6) ? .36 : .42)) * C0); hpcpush(ddi(i, orbsize * ((dmod(i, 6)<3)?.3:(dmod(i,12) < 6) ? .36 : .42)) * TC0);
}); });
make_ring(shTerraRing, [dmod, this] { make_ring(shTerraRing, [dmod, this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * ((dmod(i, 6)<3)?.36:(dmod(i,12) < 6) ? .3 : .42)) * C0); hpcpush(ddi(i, orbsize * ((dmod(i, 6)<3)?.36:(dmod(i,12) < 6) ? .3 : .42)) * TC0);
}); });
make_ring(shPeaceRing, [dmod, this] { make_ring(shPeaceRing, [dmod, this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * (dmod(i, S28) < SD7?.36 : .3)) * C0); hpcpush(ddi(i, orbsize * (dmod(i, S28) < SD7?.36 : .3)) * TC0);
}); });
make_ring(shHeptaRing, [dmod, this] { make_ring(shHeptaRing, [dmod, this, &TC0] {
REVPRING(i) REVPRING(i)
hpcpush(ddi(i, orbsize * (dmod(i, S12) < SD3?.4 : .27)) * C0); hpcpush(ddi(i, orbsize * (dmod(i, S12) < SD3?.4 : .27)) * TC0);
}); });
bshape(shCompass1, PPR::ITEM); bshape(shCompass1, PPR::ITEM);
RING(i) RING(i)
hpcpush(ddi(i, orbsize * .35) * C0); hpcpush(ddi(i, orbsize * .35) * TC0);
bshape(shCompass2, PPR::ITEMa); bshape(shCompass2, PPR::ITEMa);
RING(i) RING(i)
hpcpush(ddi(i, orbsize * .30) * C0); hpcpush(ddi(i, orbsize * .30) * TC0);
bshape(shCompass3, PPR::ITEMb); bshape(shCompass3, PPR::ITEMb);
hpcpush(ddi(0, orbsize * .29) * C0); hpcpush(ddi(0, orbsize * .29) * TC0);
hpcpush(ddi(S21, orbsize * .04) * C0); hpcpush(ddi(S21, orbsize * .04) * TC0);
hpcpush(ddi(-S21, orbsize * .04) * C0); hpcpush(ddi(-S21, orbsize * .04) * TC0);
hpcpush(ddi(0, orbsize * .29) * C0); hpcpush(ddi(0, orbsize * .29) * TC0);
bshape(shILeaf[0], PPR::ONTENTACLE); bshape(shILeaf[0], PPR::ONTENTACLE);
for(int t=0; t<=SD6; t++) { for(int t=0; t<=SD6; t++) {
hpcpush(ddi(SD7 + t*S14, zhexf*.7) * C0); hpcpush(ddi(SD7 + t*S14, zhexf*.7) * TC0);
if(t != SD6) if(t != SD6)
hpcpush(ddi(S14 + t*S14, zhexf*.15) * C0); hpcpush(ddi(S14 + t*S14, zhexf*.15) * TC0);
} }
bshape(shILeaf[1], PPR::ONTENTACLE); bshape(shILeaf[1], PPR::ONTENTACLE);
if(SD3 == 3 && SD7 % 3) if(SD3 == 3 && SD7 % 3)
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S36, zhexf*.8) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S36, zhexf*.8) * TC0);
else { else {
for(int t=0; t<=SD7; t++) { for(int t=0; t<=SD7; t++) {
hpcpush(ddi(t*S12, zhexf*.8) * C0); hpcpush(ddi(t*S12, zhexf*.8) * TC0);
if(t != SD6) if(t != SD6)
hpcpush(ddi(t*S12 + SD6, zhexf*.2) * C0); hpcpush(ddi(t*S12 + SD6, zhexf*.2) * TC0);
} }
} }
@ -811,17 +813,17 @@ void geometry_information::procedural_shapes() {
bshape(shSlime, PPR::MONSTER_BODY); bshape(shSlime, PPR::MONSTER_BODY);
PRING(i) PRING(i)
hpcpush(ddi(i, scalefactor * hcrossf7 * (0.7 + .2 * sin(i * S_step * 9))) * C0); hpcpush(ddi(i, scalefactor * hcrossf7 * (0.7 + .2 * sin(i * S_step * 9))) * TC0);
bshape(shJelly, PPR::MONSTER_BODY); bshape(shJelly, PPR::MONSTER_BODY);
PRING(i) PRING(i)
hpcpush(ddi(i, scalefactor * hcrossf7 * (0.4 + .03 * sin(i * S_step * 7))) * C0); hpcpush(ddi(i, scalefactor * hcrossf7 * (0.4 + .03 * sin(i * S_step * 7))) * TC0);
bshape(shHeptaMarker, PPR::HEPTAMARK); bshape(shHeptaMarker, PPR::HEPTAMARK);
for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, zhexf*.2) * C0); for(int t=0; t<=SD7; t++) hpcpush(ddi(t*S12, zhexf*.2) * TC0);
bshape(shSnowball, PPR::ITEM); bshape(shSnowball, PPR::ITEM);
for(int t=0; t<=SD7*4; t++) hpcpush(ddi(t*SD3, zhexf*.1) * C0); for(int t=0; t<=SD7*4; t++) hpcpush(ddi(t*SD3, zhexf*.1) * TC0);
bshape(shRose, PPR::ITEM); bshape(shRose, PPR::ITEM);
PRING(t) PRING(t)
@ -856,7 +858,7 @@ void geometry_information::procedural_shapes() {
hpc.push_back(hpc[last->s]); hpc.push_back(hpc[last->s]);
} }
bshape(shSwitchDisk, PPR::FLOOR); for(int i=0; i<=S84; i+=S3) hpcpush(ddi(i, .06) * C0); bshape(shSwitchDisk, PPR::FLOOR); for(int i=0; i<=S84; i+=S3) hpcpush(ddi(i, .06) * TC0);
} }
vector<ld> equal_weights(1000, 1); vector<ld> equal_weights(1000, 1);