mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

3D: Roses (items) did not appear

Browse Source
This commit is contained in:
Zeno Rogue 2019-05-20 18:57:29 +02:00
parent fbbe37a4c4
commit 73a742119d
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3d-models.cpp
View File

@ -1108,6 +1108,7 @@ void make_3d_models() {
make_revolution_cut(shStatue, 60);
shift_shape(shThorns, geom3::FLOOR - geom3::human_height * 1/40);
clone_shape(shRose, shRoseItem);
shift_shape(shRose, geom3::FLOOR - geom3::human_height * 1/20);
DEBB(DF_POLY, ("slime"));

2
graph.cpp
View File

@ -909,7 +909,7 @@ bool drawItemType(eItem it, cell *c, const transmatrix& V, color_t icol, int pti
else if(it == itRose) {
for(int u=0; u<4; u++)
queuepoly(Vit * spinptick(1500) * spin(2*M_PI / 3 / 4 * u), shRose, darkena(icol, 0, hidden ? 0x30 : 0xA0));
queuepoly(Vit * spinptick(1500) * spin(2*M_PI / 3 / 4 * u), shRoseItem, darkena(icol, 0, hidden ? 0x30 : 0xA0));
}
else if(it == itBarrow && c) {

5
polygons.cpp
View File

@ -1725,7 +1725,7 @@ hpcshape
shPrincessDress, shPrinceDress,
shWizardCape1, shWizardCape2,
shBigCarpet1, shBigCarpet2, shBigCarpet3,
shGoatHead, shRose, shThorns,
shGoatHead, shRose, shRoseItem, shThorns,
shRatHead, shRatTail, shRatEyes, shRatCape1, shRatCape2,
shWizardHat1, shWizardHat2,
shTortoise[13][6],
@ -2408,6 +2408,9 @@ void procedural_shapes() {
bshape(shRose, PPR::ITEM);
PRING(t)
hpcpush(xspinpush0(M_PI * t / (S42+.0), scalefactor * hcrossf7 * (0.2 + .15 * sin(M_PI * t / (S42+.0) * 3))));
finishshape();
shRoseItem = shRose;
bshape(shThorns, PPR::THORNS);
for(int t=0; t<=60; t++)