mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 15:40:26 +00:00
Code Issues Releases Wiki Activity

tiny bird and tiny shark shapes, for use in RogueViz

Browse Source
This commit is contained in:
Zeno Rogue 2018-11-20 00:20:11 +01:00
parent 248863ef08
commit 5e0bd401fc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hyper.h
View File

@ -4014,7 +4014,7 @@ ld frac(ld x);
extern color_t poly_outline; extern color_t poly_outline;
extern hpcshape shDisk, shTriangle, shHeptaMarker, shSnowball, shDiskT, shDiskS, shDiskSq, shDiskM; extern hpcshape shDisk, shTriangle, shHeptaMarker, shSnowball, shDiskT, shDiskS, shDiskSq, shDiskM, shTinyBird, shTinyShark;
extern std::mt19937 hrngen; extern std::mt19937 hrngen;

3
polygons.cpp
View File

@ -1496,6 +1496,7 @@ hpcshape
shCross, shGiantStar[2], shLake, shMirror, shCross, shGiantStar[2], shLake, shMirror,
shHalfFloor[3], shHalfMirror[3], shHalfFloor[3], shHalfMirror[3],
shGem[2], shStar, shDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shRing, shGem[2], shStar, shDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shRing,
shTinyBird, shTinyShark,
shEgg, shEgg,
shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing, shHeptaRing, shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing, shHeptaRing,
shSpearRing, shLoveRing, shSpearRing, shLoveRing,
@ -2366,6 +2367,7 @@ void buildpolys() {
bshape(shFoxTail2, PPR::MONSTER_BODY, scalefactor, 364); bshape(shFoxTail2, PPR::MONSTER_BODY, scalefactor, 364);
bshape(shHawk, PPR::MONSTER_BODY, scalefactor, 77); bshape(shHawk, PPR::MONSTER_BODY, scalefactor, 77);
bshape(shEagle, PPR::MONSTER_BODY, scalefactor, 78); bshape(shEagle, PPR::MONSTER_BODY, scalefactor, 78);
bshape(shTinyBird, PPR::MONSTER_BODY, scalefactor / 2, 78);
bshape(shWaterElemental, PPR::MONSTER_BODY, scalefactor, 81); bshape(shWaterElemental, PPR::MONSTER_BODY, scalefactor, 81);
bshape(shMouse, PPR::MONSTER_BODY, scalefactor, 82); bshape(shMouse, PPR::MONSTER_BODY, scalefactor, 82);
bshape(shMouseLegs, PPR::MONSTER_LEG, scalefactor, 83); bshape(shMouseLegs, PPR::MONSTER_LEG, scalefactor, 83);
@ -2489,6 +2491,7 @@ void buildpolys() {
bshape(shPFace, PPR::MONSTER_FACE, scalefactor, 134); bshape(shPFace, PPR::MONSTER_FACE, scalefactor, 134);
bshape(shEyes, PPR::MONSTER_EYE0, scalefactor, 135); bshape(shEyes, PPR::MONSTER_EYE0, scalefactor, 135);
bshape(shShark, PPR::MONSTER_BODY, scalefactor, 136); bshape(shShark, PPR::MONSTER_BODY, scalefactor, 136);
bshape(shTinyShark, PPR::MONSTER_BODY, scalefactor / 2, 136);
bshape(shBugBody, PPR::MONSTER_BODY, scalefactor, 137); bshape(shBugBody, PPR::MONSTER_BODY, scalefactor, 137);
bshape(shBugArmor, PPR::MONSTER_ARMOR0, scalefactor, 138); bshape(shBugArmor, PPR::MONSTER_ARMOR0, scalefactor, 138);
bshape(shBugLeg, PPR::MONSTER_BODY, scalefactor, 306); bshape(shBugLeg, PPR::MONSTER_BODY, scalefactor, 306);

7
rogueviz.cpp
View File

@ -27,10 +27,6 @@
#include "rogueviz.h" #include "rogueviz.h"
namespace hr {
extern hpcshape shEagle;
}
namespace rogueviz { namespace rogueviz {
const transmatrix centralsym = {{{-1,0,0}, {0,-1,0}, {0,0,-1}}}; const transmatrix centralsym = {{{-1,0,0}, {0,-1,0}, {0,0,-1}}};
@ -1132,7 +1128,8 @@ void queuedisk(const transmatrix& V, const colorpair& cp, bool legend, const str
if(cp.shade == 's') queuepoly(V1, shDiskS, darken_a(cp.color2)); if(cp.shade == 's') queuepoly(V1, shDiskS, darken_a(cp.color2));
if(cp.shade == 'q') queuepoly(V1, shDiskSq, darken_a(cp.color2)); if(cp.shade == 'q') queuepoly(V1, shDiskSq, darken_a(cp.color2));
if(cp.shade == 'm') queuepoly(V1, shDiskM, darken_a(cp.color2)); if(cp.shade == 'm') queuepoly(V1, shDiskM, darken_a(cp.color2));
if(cp.shade == 'b') queuepoly(V1, shEagle, darken_a(cp.color2)); if(cp.shade == 'b') queuepoly(V1, shTinyBird, darken_a(cp.color2));
if(cp.shade == 'f') queuepoly(V1, shTinyShark, darken_a(cp.color2));
} }
unordered_map<pair<edgeinfo*, int>, int> drawn_edges; unordered_map<pair<edgeinfo*, int>, int> drawn_edges;