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

rogueviz:: added guards to rogueviz.h, and also added addHook macros which return 0 with no CAP_RVSLIDES

Browse Source
This commit is contained in:
Zeno Rogue 2021-06-25 13:43:33 +02:00
parent 74e4e4c014
commit 6a0e18d22d
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rogueviz/rogueviz.h
View File

@ -70,18 +70,22 @@ namespace rogueviz {
extern vector<int> legend; extern vector<int> legend;
extern vector<cell*> named; extern vector<cell*> named;
#if CAP_TEXTURE
struct rvimage { struct rvimage {
basic_textureinfo tinf; basic_textureinfo tinf;
texture::texture_data tdata; texture::texture_data tdata;
vector<hyperpoint> vertices; vector<hyperpoint> vertices;
}; };
#endif
extern int brm_limit; extern int brm_limit;
struct colorpair { struct colorpair {
color_t color1, color2; color_t color1, color2;
char shade; char shade;
#if CAP_TEXTURE
shared_ptr<rvimage> img; shared_ptr<rvimage> img;
#endif
colorpair(color_t col = 0xC0C0C0FF) { shade = 0; color1 = color2 = col; } colorpair(color_t col = 0xC0C0C0FF) { shade = 0; color1 = color2 = col; }
}; };
@ -141,12 +145,15 @@ namespace rogueviz {
void close(); void close();
extern bool showlabels; extern bool showlabels;
namespace pres { namespace pres {
using namespace hr::tour; using namespace hr::tour;
#if CAP_RVSLIDES
inline hookset<void(string, vector<slide>&)> hooks_build_rvtour; inline hookset<void(string, vector<slide>&)> hooks_build_rvtour;
slide *gen_rvtour(); slide *gen_rvtour();
#if CAP_TEXTURE
void draw_texture(texture::texture_data& tex); void draw_texture(texture::texture_data& tex);
#endif
template<class T, class U> function<void(presmode)> roguevizslide(char c, const T& t, const U& f) { template<class T, class U> function<void(presmode)> roguevizslide(char c, const T& t, const U& f) {
return [c,t,f] (presmode mode) { return [c,t,f] (presmode mode) {
@ -225,6 +232,7 @@ function<void(presmode)> roguevizslide_action(char c, const T& t, const U& act)
inline ld angle = 0; inline ld angle = 0;
inline int dir = -1; inline int dir = -1;
hyperpoint p2(ld x, ld y); hyperpoint p2(ld x, ld y);
#endif
} }
void createViz(int id, cell *c, transmatrix at); void createViz(int id, cell *c, transmatrix at);
@ -268,6 +276,7 @@ namespace objmodels {
return int(ceil(maxlen)); return int(ceil(maxlen));
} }
#if CAP_TEXTURE
struct model { struct model {
string path, fname; string path, fname;
@ -297,9 +306,19 @@ namespace objmodels {
}; };
void add_model_settings(); void add_model_settings();
#endif
} }
#if CAP_RVSLIDES
#define addHook_rvslides(x, y) addHook(rogueviz::pres::hooks_build_rvtour, x, y)
#define addHook_slideshows(x, y) addHook(tour::ss::hooks_extra_slideshows, x, y)
#define addHook_rvtour(x, y) addHook(pres::hooks_build_rvtour, x, y)
#else
#define addHook_rvslides(x, y) 0
#define addHook_slideshows(x, y) 0
#define addHook_rvtour(x, y) 0
#endif
} }
#endif #endif