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

2d3d:: boats

Browse Source
This commit is contained in:
Zeno Rogue
2019-05-10 01:28:18 +02:00
parent dbb8857a39
commit b6c8727e1f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
3d-models.cpp
View File

@@ -882,6 +882,9 @@ void make_3d_models() {
for(int i=0; i<3; i++) for(int i=0; i<3; i++)
shift_shape(shHalfFloor[i], geom3::lev_to_factor(geom3::human_height * .01)); shift_shape(shHalfFloor[i], geom3::lev_to_factor(geom3::human_height * .01));
} }
shift_shape(shBoatOuter, geom3::FLOOR);
shift_shape(shBoatInner, (geom3::FLOOR+geom3::LAKE)/2);
} }
#undef S #undef S

4
graph.cpp
View File

@@ -4114,7 +4114,7 @@ void drawBoat(cell *c, const transmatrix*& Vboat, transmatrix& Vboat0, transmatr
int incol = magical ? 0x0060C0FF : 0x804000FF; int incol = magical ? 0x0060C0FF : 0x804000FF;
bool nospin = false; bool nospin = false;
if(DIM == 3) { if(WDIM == 3) {
Vboat0 = V; Vboat0 = V;
nospin = c->wall == waBoat && applyAnimation(c, Vboat0, footphase, LAYER_BOAT); nospin = c->wall == waBoat && applyAnimation(c, Vboat0, footphase, LAYER_BOAT);
if(!nospin) Vboat0 = face_the_player(V); if(!nospin) Vboat0 = face_the_player(V);
@@ -4141,7 +4141,7 @@ void drawBoat(cell *c, const transmatrix*& Vboat, transmatrix& Vboat0, transmatr
if(applyAnimation(c, Vx, footphase, LAYER_SMALL)) if(applyAnimation(c, Vx, footphase, LAYER_SMALL))
animations[LAYER_SMALL][c].footphase = 0; animations[LAYER_SMALL][c].footphase = 0;
} }
if(wmspatial) if(wmspatial && GDIM == 2)
queuepolyat(mscale(Vboat0, (geom3::LAKE+1)/2), shBoatOuter, outcol, PPR::BOATLEV2); queuepolyat(mscale(Vboat0, (geom3::LAKE+1)/2), shBoatOuter, outcol, PPR::BOATLEV2);
queuepoly(Vboat0, shBoatOuter, outcol); queuepoly(Vboat0, shBoatOuter, outcol);
queuepoly(Vboat0, shBoatInner, incol); queuepoly(Vboat0, shBoatInner, incol);