mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-24 05:17:17 +00:00
Code Issues Releases Wiki Activity

2D3D:: in elliptic, draw only the correct orientation

Browse Source
This commit is contained in:
Zeno Rogue 2019-05-15 12:41:02 +02:00
parent b9fa90cafb
commit 66b73648d5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graph.cpp
View File

@ -2277,7 +2277,7 @@ void drawWormSegments() {
bool dont_face_pc = false; bool dont_face_pc = false;
bool drawMonster(const transmatrix& Vparam, int ct, cell *c, color_t col) { bool drawMonster(const transmatrix& Vparam, int ct, cell *c, color_t col, bool mirrored) {
#if CAP_SHAPES #if CAP_SHAPES
bool darkhistory = conformal::includeHistory && conformal::inkillhistory.count(c); bool darkhistory = conformal::includeHistory && conformal::inkillhistory.count(c);
@ -2298,6 +2298,8 @@ bool drawMonster(const transmatrix& Vparam, int ct, cell *c, color_t col) {
eMonster m = c->monst; eMonster m = c->monst;
if(!m) ; if(!m) ;
else if(elliptic && GDIM == 3 && WDIM == 2 && mirrored) ;
else if(isAnyIvy(c) || isWorm(c)) { else if(isAnyIvy(c) || isWorm(c)) {
@ -2632,12 +2634,13 @@ bool drawMonster(const transmatrix& Vparam, int ct, cell *c, color_t col) {
for(int i=0; i<numplayers(); i++) if(c == playerpos(i) && !shmup::on && mapeditor::drawplayer && for(int i=0; i<numplayers(); i++) if(c == playerpos(i) && !shmup::on && mapeditor::drawplayer &&
!(hardcore && !canmove)) { !(hardcore && !canmove)) {
bool mirr = multi::players > 1 ? multi::player[i].mirrored : cwt.mirrored;
if(elliptic && GDIM == 3 && WDIM == 2 && mirr != mirrored) continue;
if(!nospins) { if(!nospins) {
Vs = playerV; Vs = playerV;
if(multi::players > 1 ? multi::flipped[i] : flipplayer) Vs = Vs * pispin; if(multi::players > 1 ? multi::flipped[i] : flipplayer) Vs = Vs * pispin;
} }
else { else {
bool mirr = multi::players > 1 ? multi::player[i].mirrored : cwt.mirrored;
if(mirr) Vs = Vs * Mirror; if(mirr) Vs = Vs * Mirror;
} }
shmup::cpid = i; shmup::cpid = i;
@ -5826,7 +5829,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
#if CAP_SHAPES #if CAP_SHAPES
int q = ptds.size(); int q = ptds.size();
#endif #endif
bool m = drawMonster(V, ctype, c, moncol); bool m = drawMonster(V, ctype, c, moncol, mirrored);
if(m) error = true; if(m) error = true;
if(m || c->monst) onradar = false; if(m || c->monst) onradar = false;
#if CAP_SHAPES #if CAP_SHAPES