mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

use_equidistant option

Browse Source
This commit is contained in:
Zeno Rogue 2021-02-07 18:34:19 +01:00
parent ee341d77c7
commit ed2039ddee
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rogueviz/bringris.cpp
View File

@ -1129,9 +1129,15 @@ void draw_all_noray(int zlev) {
void start_new_game(); void start_new_game();
bool use_equidistant;
void bringris_frame() { void bringris_frame() {
if(!in_bringris) return; if(!in_bringris) return;
ray::want_use = use_raycaster ? 2 : 0; ray::want_use = use_raycaster ? 2 : 0;
#if CAP_VR
vrhr::hsm = explore ? vrhr::eHeadset::holonomy : vrhr::eHeadset::reference;
vrhr::eyes = use_equidistant ? vrhr::eEyes::equidistant : vrhr::eEyes::truesim;
#endif
int zlev = get_z(centerover); int zlev = get_z(centerover);
@ -1156,18 +1162,10 @@ void draw_screen(int xstart, bool show_next) {
if(state != tsFalling) steps = camera_level - (well_size + 1); if(state != tsFalling) steps = camera_level - (well_size + 1);
#if CAP_VR #if CAP_VR
if(explore)
vrhr::hsm = vrhr::eHeadset::holonomy,
vrhr::eyes = vrhr::eEyes::truesim;
else
vrhr::hsm = vrhr::eHeadset::reference,
vrhr::eyes = vrhr::eEyes::truesim;
if(!explore) { if(!explore) {
E4; E4;
vrhr::hmd_at_ui = vrhr::hmd_ref_at * cspin(0, 2, 30*degree); vrhr::hmd_at_ui = vrhr::hmd_ref_at * cspin(0, 2, 30*degree);
} }
#endif #endif
@ -1315,7 +1313,7 @@ void settings_menu() {
dialog::init("Bringris settings"); dialog::init("Bringris settings");
dialog::addItem("alternative geometry", 'g'); dialog::addItem("alternative geometry", 'g');
dialog::add_action_push(geometry_menu); dialog::add_action_push(geometry_menu);
dialog::addItem("visuals", 'v'); dialog::addItem("visuals & Virtual Reality", 'v');
dialog::add_action_push(visual_menu); dialog::add_action_push(visual_menu);
dialog::addItem("configure keys", 'k'); dialog::addItem("configure keys", 'k');
dialog::add_action_push(multi::get_key_configurer(1, move_names, "Bringris keys")); dialog::add_action_push(multi::get_key_configurer(1, move_names, "Bringris keys"));
@ -1410,7 +1408,9 @@ void render_next(int xstart) {
dynamicval<ld> dxma(current_display->xmax, 1); dynamicval<ld> dxma(current_display->xmax, 1);
dynamicval<ld> dymi(current_display->ymin, 0); dynamicval<ld> dymi(current_display->ymin, 0);
dynamicval<ld> dyma(current_display->ymax, 1); dynamicval<ld> dyma(current_display->ymax, 1);
#if CAP_VR
dynamicval<int> dvr(vrhr::state, 0); dynamicval<int> dvr(vrhr::state, 0);
#endif
calcparam(); calcparam();
current_display->set_viewport(0); current_display->set_viewport(0);
setGLProjection(); setGLProjection();
@ -1525,11 +1525,13 @@ void run() {
if(show_next) { if(show_next) {
displaystr(xstart + vid.fsize, vid.yres - vid.fsize * 27, 0, vid.fsize, "NEXT:", winf[waBarrier].color, 0); displaystr(xstart + vid.fsize, vid.yres - vid.fsize * 27, 0, vid.fsize, "NEXT:", winf[waBarrier].color, 0);
#if CAP_VR
if(vrhr::active()) if(vrhr::active())
vrhr::in_vr_ui([xstart] { vrhr::in_vr_ui([xstart] {
display_next(xstart); display_next(xstart);
}); });
else else
#endif
display_next(xstart); display_next(xstart);
} }
@ -1975,6 +1977,7 @@ void default_config() {
addsaver(bgeom, "bringris-geometry"); addsaver(bgeom, "bringris-geometry");
addsaver(use_raycaster, "bringris-ray"); addsaver(use_raycaster, "bringris-ray");
addsaver(draw_per_level, "draw-per-level"); addsaver(draw_per_level, "draw-per-level");
addsaver(use_equidistant, "bringris-equidistant");
addsaver(flashes, "bringris-flashes"); addsaver(flashes, "bringris-flashes");
} }