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

fixed drawing warped water on spheres

This commit is contained in:
Zeno Rogue 2018-04-11 19:01:25 +02:00
parent 000eb87847
commit 77258cdb02
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graph.cpp
View File

@ -3107,7 +3107,7 @@ void plainfloor(cell *c, bool warp, const transmatrix &V, int col, int prio) {
}
else {
auto si = patterns::getpatterninfo(c, 0, 0);
queuepolyat(V * applyPatterndir(c, si), shTriheptaFloor[sphere ? ctof(c) : si.id], col, prio);
queuepolyat(V * applyPatterndir(c, si), shTriheptaFloor[/*sphere ? ctof(c) :*/ si.id], col, prio);
}
}
else if(is_nice_dual(c)) {
@ -4662,6 +4662,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
int fd0 = fd ? fd-1 : 0;
qfi.shape = &getSeabed(*qfi.shape);
// this draws the water surface
warpfloor(c, (*Vdp), darkena(fcol, fd0, 0x80), PPR_LAKELEV, isWarped(c));
}

3
polygons.cpp
View File

@ -1342,7 +1342,8 @@ void buildpolys() {
trihepta0 = trihepta1 = crossf * 1.35 / 2;
if(sphere&&S7==3&&!gp::on) trihepta0 *= 1.3, trihepta1 *= 1.6;
if(sphere&&S3==3&&gp::on) trihepta1 *= whatever;
if(sphere&&gp::on) trihepta1 *= 1.4;
int tshift0 = (a4?S14:0);
int tshift1 = (td + (!(S7&1))) ? S6:0; // +S6+(a4&(S7&1)?S6:0);