mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-13 10:50:35 +00:00
Code Issues Releases Wiki Activity

rogueviz:: undef IF_ macros

Browse Source
This commit is contained in:
Zeno Rogue 2024-04-28 02:04:40 +02:00
parent f229c489cd
commit de20daf708
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rogueviz/intra-demos.cpp
View File

@ -534,6 +534,12 @@ bool vr_keys(int sym, int uni) {
// all generators will add to the current scene // all generators will add to the current scene
#if CAP_VR
#define IF_VR(x) x
#else
#define IF_VR(x)
#endif
auto hooks = auto hooks =
// generate scene with H3, H2xE, E3, S2xE (8x6), S3 (16-cell) with floors; runs automatically // generate scene with H3, H2xE, E3, S2xE (8x6), S3 (16-cell) with floors; runs automatically
arg::add3("-intra-floors", create_intra_floors) arg::add3("-intra-floors", create_intra_floors)
@ -574,11 +580,11 @@ auto hooks =
mapstream::loadMap(s); mapstream::loadMap(s);
slide_backup(ray::fixed_map, true); slide_backup(ray::fixed_map, true);
slide_backup(ray::max_iter_intra, y); slide_backup(ray::max_iter_intra, y);
#if CAP_VR IF_VR(
slide_backup(vrhr::hsm, vrhr::eHeadset::holonomy); slide_backup(vrhr::hsm, vrhr::eHeadset::holonomy);
slide_backup(vrhr::eyes, vrhr::eEyes::truesim); slide_backup(vrhr::eyes, vrhr::eEyes::truesim);
slide_backup(vrhr::cscr, vrhr::eCompScreen::eyes); slide_backup(vrhr::cscr, vrhr::eCompScreen::eyes);
#endif )
starter.clear(); starter.clear();
rogueviz::rv_hook(hooks_handleKey, 101, vr_keys); rogueviz::rv_hook(hooks_handleKey, 101, vr_keys);
popScreenAll(); popScreenAll();
@ -630,5 +636,6 @@ auto hooks =
{loader{"run this visualization", 'r', load("solv-h3-scene.lev", 0.05, 3000)}}); {loader{"run this visualization", 'r', load("solv-h3-scene.lev", 0.05, 3000)}});
})); }));
} }
#undef IF_VR
#endif #endif
} }

15
rogueviz/qtm.cpp
View File

@ -190,6 +190,12 @@ int args() {
return 0; return 0;
} }
#if CAP_RAY
#define IF_RAY(x) x
#else
#define IF_RAY(x)
#endif
auto hooks = auto hooks =
addHook(hooks_args, 100, args) addHook(hooks_args, 100, args)
+ addHook_rvslides(180, [] (string s, vector<tour::slide>& v) { + addHook_rvslides(180, [] (string s, vector<tour::slide>& v) {
@ -214,10 +220,10 @@ auto hooks =
set_geometry(gRotSpace); set_geometry(gRotSpace);
slide_backup(rots::underlying_scale, .25); slide_backup(rots::underlying_scale, .25);
slide_backup(qmode, m); slide_backup(qmode, m);
#if CAP_RAY IF_RAY(
slide_backup(ray::max_cells, 32768); slide_backup(ray::max_cells, 32768);
slide_backup(ray::fixed_map, true); slide_backup(ray::fixed_map, true);
#endif )
slide_backup(camera_speed, .1); slide_backup(camera_speed, .1);
enable(); enable();
start_game(); start_game();
@ -240,11 +246,11 @@ auto hooks =
set_geometry(gRotSpace); set_geometry(gRotSpace);
slide_backup(rots::underlying_scale, .25); slide_backup(rots::underlying_scale, .25);
slide_backup(qmode, m); slide_backup(qmode, m);
#if CAP_RAY IF_RAY(
slide_backup(ray::max_cells, 32768); slide_backup(ray::max_cells, 32768);
slide_backup(ray::fixed_map, true); slide_backup(ray::fixed_map, true);
slide_backup(ray::want_use, 2); slide_backup(ray::want_use, 2);
#endif )
slide_backup(camera_speed, .1); slide_backup(camera_speed, .1);
enable(); enable();
start_game(); start_game();
@ -256,6 +262,7 @@ auto hooks =
} }
}); });
#undef IF_RAY
} }
} }