mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-03-01 11:19:43 +00:00
Code Issues Releases Wiki Activity

3D:: animation for all birds; fixed a crash on Butterfly drawing

Browse Source
This commit is contained in:
Zeno Rogue
2019-05-16 17:08:12 +02:00
parent dc92ff2eda
commit fc7100bbf1
3 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
3d-models.cpp
View File

@@ -682,8 +682,8 @@ void animate_bird(hpcshape& orig, hpcshape animated[30], ld body) {
}
}
}
for(int i=0; i<30; i++) shift_shape(animated[i], geom3::BIRD);
shift_shape(orig, geom3::BIRD);
// for(int i=0; i<30; i++) shift_shape(animated[i], geom3::BIRD);
// shift_shape(orig, geom3::BIRD);
}
void slimetriangle(hyperpoint a, hyperpoint b, hyperpoint c, ld rad, int lev) {
@@ -978,8 +978,8 @@ void make_3d_models() {
make_revolution_cut(shGhost, 60, geom3::GHOST + g);
make_revolution_cut(shEagle, 180, -geom3::BIRD, 0.05*S);
make_revolution_cut(shHawk, 180, -geom3::BIRD, 0.05*S);
make_revolution_cut(shEagle, 180, 0, 0.05*S);
make_revolution_cut(shHawk, 180, 0, 0.05*S);
make_revolution_cut(shTinyBird, 180, 0, 0.025 * S);
make_revolution_cut(shTinyShark, 90);
@@ -987,14 +987,14 @@ void make_3d_models() {
make_revolution_cut(shGargoyleWings, 180, 0, 0.05*S);
make_revolution_cut(shGargoyleBody, 180, 0, 0.05*S);
make_revolution_cut(shGadflyWing, 180, -geom3::BIRD, 0.05*S);
make_revolution_cut(shBatWings, 180, -geom3::BIRD, 0.05*S);
make_revolution_cut(shBatBody, 180, -geom3::BIRD, 0.05*S);
make_revolution_cut(shGadflyWing, 180, 0, 0.05*S);
make_revolution_cut(shBatWings, 180, 0, 0.05*S);
make_revolution_cut(shBatBody, 180, 0, 0.05*S);
make_revolution_cut(shJelly, 60);
make_revolution(shFoxTail1);
make_revolution(shFoxTail2);
make_revolution(shGadflyBody, 180, -geom3::BIRD);
make_revolution(shGadflyBody, 180, 0);
for(int i=0; i<8; i++)
make_revolution(shAsteroid[i], 360);
@@ -1003,11 +1003,21 @@ void make_3d_models() {
make_revolution(shBugArmor, 180, geom3::ABODY);
make_revolution_cut(shBugAntenna, 90, geom3::ABODY);
make_revolution_cut(shButterflyBody, 180, -geom3::BIRD);
make_revolution_cut(shButterflyBody, 180, 0);
make_revolution_cut(shButterflyWing, 180, 0, 0.05*S);
finishshape();
animate_bird(shEagle, shAnimatedEagle, 0.05*S);
animate_bird(shTinyBird, shAnimatedTinyEagle, 0.05*S/2);
animate_bird(shButterflyWing, shAnimatedButterfly, 0);
animate_bird(shGadflyWing, shAnimatedGadfly, 0);
animate_bird(shHawk, shAnimatedHawk, 0.05*S);
animate_bird(shGargoyleWings, shAnimatedGargoyle, 0.05*S);
animate_bird(shGargoyleBody, shAnimatedGargoyle2, 0.05*S);
animate_bird(shBatWings, shAnimatedBat, 0.05*S);
animate_bird(shBatBody, shAnimatedBat2, 0.05*S);
disable(shWolfRearLeg);
disable(shWolfFrontLeg);
disable(shDogRearLeg);