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

uniform VR control

Browse Source
This commit is contained in:
Zeno Rogue
2020-12-30 18:34:13 +01:00
parent db46f247c5
commit 1b976d364b
5 changed files with 103 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dialogs.cpp
View File

@@ -385,11 +385,6 @@ EX namespace dialog {
EX void display() {
#if CAP_VR
for(auto h: vrhr::get_hits())
displaystr(h.x, h.y, 2, vid.fsize * 2, "X", 0xFFD500, 8);
#endif
callhooks(hooks_display_dialog);
int N = items.size();
dfsize = vid.fsize;
@@ -442,16 +437,6 @@ EX namespace dialog {
xthis = xthis && (mousex >= dcenter - dialogwidth/2 && mousex <= dcenter + dialogwidth/2);
displayfr(dcenter, mid, 2, dfsize * I.scale/100, I.body, I.color, 8);
if(xthis) getcstat = I.key;
#if CAP_VR
for(auto h: vrhr::get_hits()) {
bool vrthis = (h.y >= top && h.y < tothei);
if(cmode & sm::DIALOG_STRICT_X)
vrthis = vrthis && (mousex >= dcenter - dialogwidth/2 && mousex <= dcenter + dialogwidth/2);
if(vrthis) I.color = I.colors;
if(vrthis && h.clicked) queue_key(I.key);
}
#endif
}
else if(I.type == diItem || I.type == diBigItem) {
bool xthis = (mousey >= top && mousey < tothei);
@@ -470,18 +455,6 @@ EX namespace dialog {
}
#endif
#if CAP_VR
for(auto h: vrhr::get_hits()) {
bool vrthis = (h.y >= top && h.y < tothei);
if(cmode & sm::DIALOG_STRICT_X)
vrthis = vrthis && (mousex >= dcenter - dialogwidth/2 && mousex <= dcenter + dialogwidth/2);
if(vrthis) I.color = I.colors;
if(vrthis && h.clicked) {
queue_key(I.key);
}
}
#endif
if(I.type == diBigItem) {
displayfr(dcenter, mid, 2, dfsize * I.scale/100, I.body, I.color, 8);
}
@@ -516,16 +489,6 @@ EX namespace dialog {
displayfr(sr, mid, 2, dfsize * I.scale/100, "}", I.color, 0);
}
if(xthis) getcstat = I.key, inslider = true, slider_x = mousex;
#if CAP_VR
for(auto h: vrhr::get_hits()) {
bool vrthis = (h.y >= top && h.y < tothei);
if(cmode & sm::DIALOG_STRICT_X)
vrthis = vrthis && (mousex >= dcenter - dialogwidth/2 && mousex <= dcenter + dialogwidth/2);
if(vrthis) I.color = I.colors;
if(vrthis && h.clicked) queue_key(I.key), inslider = true, slider_x = h.x;
}
#endif
}
else if(I.type == diKeyboard) {
int len = 0;
@@ -749,13 +712,6 @@ EX namespace dialog {
if(mousey >= y - vid.fsize && mousey < y + vid.fsize)
getcstat = 'A' + i, inslider = true, slider_x = mousex;
#if CAP_VR
for(auto h: vrhr::get_hits()) {
bool vrthis = (h.y >= y - vid.fsize && h.y < y + vid.fsize);
if(vrthis && h.clicked) queue_key('A' + i), inslider = true, slider_x = h.x;
}
#endif
}
displayColorButton(dcenter, vid.yres/2+vid.fsize * 6, XLAT("select this color") + " : " + format(colorAlpha ? "%08X" : "%06X", color), ' ', 8, 0, color >> (colorAlpha ? ash : 0));