teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-24 04:51:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Configurable super sampling (standalone only)

Browse source
This commit is contained in:
Petr Bartos 2023-12-13 19:15:09 +01:00 committed by Simon
parent 437d584421
commit b0ceacda6f
13 changed files with 435 additions and 220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Projects/Android/jni/OpenJK/JKXR/VrCvars.h
View file

@ -33,4 +33,4 @@ extern cvar_t *vr_gesture_triggered_use;
extern cvar_t *vr_use_gesture_boundary; extern cvar_t *vr_use_gesture_boundary;
extern cvar_t *vr_align_weapons; // Only used for development extern cvar_t *vr_align_weapons; // Only used for development
extern cvar_t *vr_refresh; extern cvar_t *vr_refresh;
extern cvar_t *vr_super_sampling;

1
Projects/Android/jni/OpenJK/JKXR/VrInputCommon.cpp
View file

@ -46,6 +46,7 @@ cvar_t *vr_gesture_triggered_use;
cvar_t *vr_use_gesture_boundary; cvar_t *vr_use_gesture_boundary;
cvar_t *vr_align_weapons; cvar_t *vr_align_weapons;
cvar_t *vr_refresh; cvar_t *vr_refresh;
cvar_t *vr_super_sampling;
ovrInputStateTrackedRemote leftTrackedRemoteState_old; ovrInputStateTrackedRemote leftTrackedRemoteState_old;
ovrInputStateTrackedRemote leftTrackedRemoteState_new; ovrInputStateTrackedRemote leftTrackedRemoteState_new;

1
Projects/Android/jni/OpenJK/JKXR/android/JKXR_SurfaceView.cpp
View file

@ -362,6 +362,7 @@ void VR_Init()
vr_use_gesture_boundary = Cvar_Get ("vr_use_gesture_boundary", "0.35", CVAR_ARCHIVE); vr_use_gesture_boundary = Cvar_Get ("vr_use_gesture_boundary", "0.35", CVAR_ARCHIVE);
vr_align_weapons = Cvar_Get ("vr_align_weapons", "0", CVAR_ARCHIVE); vr_align_weapons = Cvar_Get ("vr_align_weapons", "0", CVAR_ARCHIVE);
vr_refresh = Cvar_Get ("vr_refresh", "72", CVAR_ARCHIVE); vr_refresh = Cvar_Get ("vr_refresh", "72", CVAR_ARCHIVE);
vr_super_sampling = Cvar_Get ("vr_super_sampling", "1.0", CVAR_ARCHIVE);
cvar_t *expanded_menu_enabled = Cvar_Get ("expanded_menu_enabled", "0", CVAR_ARCHIVE); cvar_t *expanded_menu_enabled = Cvar_Get ("expanded_menu_enabled", "0", CVAR_ARCHIVE);
if (FS_FileExists("expanded_menu.pk3") || FS_BaseFileExists("expanded_menu.pk3")) { if (FS_FileExists("expanded_menu.pk3") || FS_BaseFileExists("expanded_menu.pk3")) {

41
Projects/Android/jni/OpenJK/JKXR/android/TBXR_Common.cpp
View file

@ -71,6 +71,9 @@ const float ZOOM_FOV_ADJUST = 1.05f;
GLboolean stageSupported = GL_FALSE; GLboolean stageSupported = GL_FALSE;
float superSampling = 1.0f;
qboolean usingScreenLayer = qtrue;
qboolean resetScreenLayerRenderer = qfalse;
const char* const requiredExtensionNames_meta[] = { const char* const requiredExtensionNames_meta[] = {
XR_KHR_OPENGL_ES_ENABLE_EXTENSION_NAME, XR_KHR_OPENGL_ES_ENABLE_EXTENSION_NAME,
@ -1218,8 +1221,15 @@ bool destroyed = qfalse;
void TBXR_GetScreenRes(int *width, int *height) void TBXR_GetScreenRes(int *width, int *height)
{ {
*width = gAppState.Width; float configuredSuperSampling = Cvar_VariableValue("vr_super_sampling");
*height = gAppState.Height; if (configuredSuperSampling != 0.0f && configuredSuperSampling != superSampling) {
superSampling = configuredSuperSampling;
resetScreenLayerRenderer = qtrue;
Cbuf_AddText( "vid_restart\n" );
}
*width = gAppState.Width * superSampling;
*height = gAppState.Height * superSampling;
} }
XrInstance TBXR_GetXrInstance() { XrInstance TBXR_GetXrInstance() {
@ -1570,11 +1580,14 @@ void TBXR_InitRenderer( ) {
pfnXrGetConfigPICO(gAppState.Session, GET_DISPLAY_RATE, &gAppState.currentDisplayRefreshRate); pfnXrGetConfigPICO(gAppState.Session, GET_DISPLAY_RATE, &gAppState.currentDisplayRefreshRate);
} }
int eyeW, eyeH;
TBXR_GetScreenRes(&eyeW, &eyeH);
ovrRenderer_Create( ovrRenderer_Create(
gAppState.Session, gAppState.Session,
&gAppState.Renderer, &gAppState.Renderer,
gAppState.ViewConfigurationView[0].recommendedImageRectWidth, eyeW,
gAppState.ViewConfigurationView[0].recommendedImageRectHeight); eyeH);
} }
void VR_DestroyRenderer( ) void VR_DestroyRenderer( )
@ -1583,6 +1596,13 @@ void VR_DestroyRenderer( )
free(gAppState.Views); free(gAppState.Views);
} }
void VR_ResetRenderer()
{
VR_DestroyRenderer();
TBXR_InitialiseResolution();
TBXR_InitRenderer();
}
void TBXR_InitialiseOpenXR() void TBXR_InitialiseOpenXR()
{ {
ovrApp_Clear(&gAppState); ovrApp_Clear(&gAppState);
@ -1949,6 +1969,12 @@ void TBXR_submitFrame()
if (!VR_UseScreenLayer()) if (!VR_UseScreenLayer())
{ {
if (usingScreenLayer) {
usingScreenLayer = qfalse;
VR_ResetRenderer();
}
memset(&projection_layer, 0, sizeof(XrCompositionLayerProjection)); memset(&projection_layer, 0, sizeof(XrCompositionLayerProjection));
projection_layer.type = XR_TYPE_COMPOSITION_LAYER_PROJECTION; projection_layer.type = XR_TYPE_COMPOSITION_LAYER_PROJECTION;
projection_layer.layerFlags = XR_COMPOSITION_LAYER_BLEND_TEXTURE_SOURCE_ALPHA_BIT; projection_layer.layerFlags = XR_COMPOSITION_LAYER_BLEND_TEXTURE_SOURCE_ALPHA_BIT;
@ -1982,6 +2008,13 @@ void TBXR_submitFrame()
} }
else else
{ {
usingScreenLayer = qtrue;
if (resetScreenLayerRenderer) {
resetScreenLayerRenderer = qfalse;
VR_ResetRenderer();
}
#ifdef _WIN32 #ifdef _WIN32
//Empty black projection for now //Empty black projection for now
memset(&projection_layer, 0, sizeof(XrCompositionLayerProjection)); memset(&projection_layer, 0, sizeof(XrCompositionLayerProjection));

6
z_vr_assets_jka/strings/english/menus_vr.str
View file

@ -583,4 +583,10 @@ LANG_ENGLISH "Distant Curves Detail:"
REFERENCE CURVES_DETAIL_DESC REFERENCE CURVES_DETAIL_DESC
LANG_ENGLISH "Configures how far away are curves approximated by edges." LANG_ENGLISH "Configures how far away are curves approximated by edges."
REFERENCE SUPER_SAMPLING_ITEM
LANG_ENGLISH "Super Sampling:"
REFERENCE SUPER_SAMPLING_DESC
LANG_ENGLISH "Configures super sampling value."
ENDMARKER ENDMARKER

8
z_vr_assets_jka/strings/french/menus_vr.str
View file

@ -773,4 +773,12 @@ REFERENCE CURVES_DETAIL_DESC
LANG_ENGLISH "Configures how far away are curves approximated by edges." LANG_ENGLISH "Configures how far away are curves approximated by edges."
LANG_FRENCH "#same" LANG_FRENCH "#same"
REFERENCE SUPER_SAMPLING_ITEM
LANG_ENGLISH "Super Sampling:"
LANG_FRENCH "#same"
REFERENCE SUPER_SAMPLING_DESC
LANG_ENGLISH "Configures super sampling value."
LANG_FRENCH "#same"
ENDMARKER ENDMARKER

8
z_vr_assets_jka/strings/german/menus_vr.str
View file

@ -773,4 +773,12 @@ REFERENCE CURVES_DETAIL_DESC
LANG_ENGLISH "Configures how far away are curves approximated by edges." LANG_ENGLISH "Configures how far away are curves approximated by edges."
LANG_GERMAN "#same" LANG_GERMAN "#same"
REFERENCE SUPER_SAMPLING_ITEM
LANG_ENGLISH "Super Sampling:"
LANG_GERMAN "#same"
REFERENCE SUPER_SAMPLING_DESC
LANG_ENGLISH "Configures super sampling value."
LANG_GERMAN "#same"
ENDMARKER ENDMARKER

8
z_vr_assets_jka/strings/spanish/menus_vr.str
View file

@ -773,4 +773,12 @@ REFERENCE CURVES_DETAIL_DESC
LANG_ENGLISH "Configures how far away are curves approximated by edges." LANG_ENGLISH "Configures how far away are curves approximated by edges."
LANG_SPANISH "#same" LANG_SPANISH "#same"
REFERENCE SUPER_SAMPLING_ITEM
LANG_ENGLISH "Super Sampling:"
LANG_SPANISH "#same"
REFERENCE SUPER_SAMPLING_DESC
LANG_ENGLISH "Configures super sampling value."
LANG_SPANISH "#same"
ENDMARKER ENDMARKER

141
z_vr_assets_jka/ui/ingamesetup.menu
View file

@ -1073,13 +1073,48 @@
} }
} }
itemDef
{
name super_sampling
group video
type ITEM_TYPE_MULTI
text @MENUS_VR_SUPER_SAMPLING_ITEM
rect 260 216 340 14
textalign ITEM_ALIGN_RIGHT
textalignx 174
textaligny 0
font 4
textscale 1
forecolor .615 .615 .956 1
cvarFloatList { "0.8" 0.8 "0.9" 0.9 "1.0" 1.0 "1.1" 1.1 "1.2" 1.2 "1.3" 1.3 }
descText @MENUS_VR_SUPER_SAMPLING_DESC
cvar "vr_super_sampling"
cvarTest openXRHMD
showCvar { meta }
visible 0
mouseenter
{
show highlight3
}
mouseexit
{
hide highlight3
}
action
{
play "sound/interface/button1.wav" ;
}
}
itemDef itemDef
{ {
name geometric_detail name geometric_detail
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_GEOMETRIC_DETAIL text @MENUS_GEOMETRIC_DETAIL
rect 260 216 340 14 rect 260 230 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
textaligny 0 textaligny 0
@ -1094,11 +1129,11 @@
mouseenter mouseenter
{ {
show highlight3 show highlight4
} }
mouseexit mouseexit
{ {
hide highlight3 hide highlight4
} }
action action
{ {
@ -1116,7 +1151,7 @@
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_TEXTURE_DETAIL text @MENUS_TEXTURE_DETAIL
rect 260 230 340 14 rect 260 244 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
textaligny 0 textaligny 0
@ -1129,42 +1164,6 @@
visible 0 visible 0
mouseenter
{
show highlight4
}
mouseexit
{
hide highlight4
}
action
{
play "sound/interface/button1.wav" ;
uiScript glCustom ;
setcvar ui_r_modified 1 ;
show applyChanges
}
}
itemDef
{
name texture_filter
group video
type ITEM_TYPE_MULTI
text @MENUS_TEXTURE_FILTER
rect 260 244 340 14
textalign ITEM_ALIGN_RIGHT
textalignx 174
textaligny 0
font 4
textscale 1
forecolor .615 .615 .956 1
cvarStrList { @MENUS_BILINEAR , "GL_LINEAR_MIPMAP_NEAREST" , @MENUS_TRILINEAR , "GL_LINEAR_MIPMAP_LINEAR" }
descText @MENUS_ADJUST_HOW_WELL_THE_TEXTURES
cvar "ui_r_texturemode"
visible 0
mouseenter mouseenter
{ {
show highlight5 show highlight5
@ -1184,10 +1183,10 @@
itemDef itemDef
{ {
name simple_shaders name texture_filter
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_DETAILED_SHADERS text @MENUS_TEXTURE_FILTER
rect 260 258 340 14 rect 260 258 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
@ -1195,9 +1194,9 @@
font 4 font 4
textscale 1 textscale 1
forecolor .615 .615 .956 1 forecolor .615 .615 .956 1
cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 } cvarStrList { @MENUS_BILINEAR , "GL_LINEAR_MIPMAP_NEAREST" , @MENUS_TRILINEAR , "GL_LINEAR_MIPMAP_LINEAR" }
descText @MENUS_HIDE_OR_UNHIDE_TEXTURES descText @MENUS_ADJUST_HOW_WELL_THE_TEXTURES
cvar "ui_r_detailtextures" cvar "ui_r_texturemode"
visible 0 visible 0
@ -1220,10 +1219,10 @@
itemDef itemDef
{ {
name curves_detail name simple_shaders
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_VR_CURVES_DETAIL_ITEM text @MENUS_DETAILED_SHADERS
rect 260 272 340 14 rect 260 272 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
@ -1231,9 +1230,9 @@
font 4 font 4
textscale 1 textscale 1
forecolor .615 .615 .956 1 forecolor .615 .615 .956 1
cvarFloatList { @MENUS_LOW 250 @MENUS_MEDIUM 500 @MENUS_HIGH 1000 } cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 }
descText @MENUS_VR_CURVES_DETAIL_DESC descText @MENUS_HIDE_OR_UNHIDE_TEXTURES
cvar "r_lodCurveError" cvar "ui_r_detailtextures"
visible 0 visible 0
@ -1254,13 +1253,49 @@
} }
} }
itemDef
{
name curves_detail
group video
type ITEM_TYPE_MULTI
text @MENUS_VR_CURVES_DETAIL_ITEM
rect 260 286 340 14
textalign ITEM_ALIGN_RIGHT
textalignx 174
textaligny 0
font 4
textscale 1
forecolor .615 .615 .956 1
cvarFloatList { @MENUS_LOW 250 @MENUS_MEDIUM 500 @MENUS_HIGH 1000 }
descText @MENUS_VR_CURVES_DETAIL_DESC
cvar "r_lodCurveError"
visible 0
mouseenter
{
show highlight8
}
mouseexit
{
hide highlight8
}
action
{
play "sound/interface/button1.wav" ;
uiScript glCustom ;
setcvar ui_r_modified 1 ;
show applyChanges
}
}
itemDef itemDef
{ {
name compress_textures name compress_textures
group video_obsolete group video_obsolete
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_COMPRESSED_TEXTURES text @MENUS_COMPRESSED_TEXTURES
rect 260 286 340 14 rect 260 230 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
textaligny 0 textaligny 0
@ -1275,11 +1310,11 @@
mouseenter mouseenter
{ {
show highlight8 show highlight9
} }
mouseexit mouseexit
{ {
hide highlight8 hide highlight9
} }
action action
{ {

141
z_vr_assets_jka/ui/setup.menu
View file

@ -1080,13 +1080,48 @@
} }
} }
itemDef
{
name super_sampling
group video
type ITEM_TYPE_MULTI
text @MENUS_VR_SUPER_SAMPLING_ITEM
rect 260 216 340 14
textalign ITEM_ALIGN_RIGHT
textalignx 174
textaligny 0
font 4
textscale 1
forecolor .615 .615 .956 1
cvarFloatList { "0.8" 0.8 "0.9" 0.9 "1.0" 1.0 "1.1" 1.1 "1.2" 1.2 "1.3" 1.3 }
descText @MENUS_VR_SUPER_SAMPLING_DESC
cvar "vr_super_sampling"
cvarTest openXRHMD
showCvar { meta }
visible 0
mouseenter
{
show highlight3
}
mouseexit
{
hide highlight3
}
action
{
play "sound/interface/button1.wav" ;
}
}
itemDef itemDef
{ {
name geometric_detail name geometric_detail
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_GEOMETRIC_DETAIL text @MENUS_GEOMETRIC_DETAIL
rect 260 216 340 14 rect 260 230 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
textaligny 0 textaligny 0
@ -1101,11 +1136,11 @@
mouseenter mouseenter
{ {
show highlight3 show highlight4
} }
mouseexit mouseexit
{ {
hide highlight3 hide highlight4
} }
action action
{ {
@ -1123,7 +1158,7 @@
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_TEXTURE_DETAIL text @MENUS_TEXTURE_DETAIL
rect 260 230 340 14 rect 260 244 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
textaligny 0 textaligny 0
@ -1136,42 +1171,6 @@
visible 0 visible 0
mouseenter
{
show highlight4
}
mouseexit
{
hide highlight4
}
action
{
play "sound/interface/button1.wav" ;
uiScript glCustom ;
setcvar ui_r_modified 1 ;
show applyChanges
}
}
itemDef
{
name texture_filter
group video
type ITEM_TYPE_MULTI
text @MENUS_TEXTURE_FILTER
rect 260 244 340 14
textalign ITEM_ALIGN_RIGHT
textalignx 174
textaligny 0
font 4
textscale 1
forecolor .615 .615 .956 1
cvarStrList { @MENUS_BILINEAR , "GL_LINEAR_MIPMAP_NEAREST" , @MENUS_TRILINEAR , "GL_LINEAR_MIPMAP_LINEAR" }
descText @MENUS_ADJUST_HOW_WELL_THE_TEXTURES
cvar "ui_r_texturemode"
visible 0
mouseenter mouseenter
{ {
show highlight5 show highlight5
@ -1191,10 +1190,10 @@
itemDef itemDef
{ {
name simple_shaders name texture_filter
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_DETAILED_SHADERS text @MENUS_TEXTURE_FILTER
rect 260 258 340 14 rect 260 258 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
@ -1202,9 +1201,9 @@
font 4 font 4
textscale 1 textscale 1
forecolor .615 .615 .956 1 forecolor .615 .615 .956 1
cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 } cvarStrList { @MENUS_BILINEAR , "GL_LINEAR_MIPMAP_NEAREST" , @MENUS_TRILINEAR , "GL_LINEAR_MIPMAP_LINEAR" }
descText @MENUS_HIDE_OR_UNHIDE_TEXTURES descText @MENUS_ADJUST_HOW_WELL_THE_TEXTURES
cvar "ui_r_detailtextures" cvar "ui_r_texturemode"
visible 0 visible 0
@ -1227,10 +1226,10 @@
itemDef itemDef
{ {
name curves_detail name simple_shaders
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_VR_CURVES_DETAIL_ITEM text @MENUS_DETAILED_SHADERS
rect 260 272 340 14 rect 260 272 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
@ -1238,9 +1237,9 @@
font 4 font 4
textscale 1 textscale 1
forecolor .615 .615 .956 1 forecolor .615 .615 .956 1
cvarFloatList { @MENUS_LOW 250 @MENUS_MEDIUM 500 @MENUS_HIGH 1000 } cvarFloatList { @MENUS_OFF 0 @MENUS_ON 1 }
descText @MENUS_VR_CURVES_DETAIL_DESC descText @MENUS_HIDE_OR_UNHIDE_TEXTURES
cvar "r_lodCurveError" cvar "ui_r_detailtextures"
visible 0 visible 0
@ -1261,13 +1260,49 @@
} }
} }
itemDef
{
name curves_detail
group video
type ITEM_TYPE_MULTI
text @MENUS_VR_CURVES_DETAIL_ITEM
rect 260 286 340 14
textalign ITEM_ALIGN_RIGHT
textalignx 174
textaligny 0
font 4
textscale 1
forecolor .615 .615 .956 1
cvarFloatList { @MENUS_LOW 250 @MENUS_MEDIUM 500 @MENUS_HIGH 1000 }
descText @MENUS_VR_CURVES_DETAIL_DESC
cvar "r_lodCurveError"
visible 0
mouseenter
{
show highlight8
}
mouseexit
{
hide highlight8
}
action
{
play "sound/interface/button1.wav" ;
uiScript glCustom ;
setcvar ui_r_modified 1 ;
show applyChanges
}
}
itemDef itemDef
{ {
name compress_textures name compress_textures
group video_obsolete group video_obsolete
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_COMPRESSED_TEXTURES text @MENUS_COMPRESSED_TEXTURES
rect 260 286 340 14 rect 260 300 340 14
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 174 textalignx 174
textaligny 0 textaligny 0
@ -1282,11 +1317,11 @@
mouseenter mouseenter
{ {
show highlight8 show highlight9
} }
mouseexit mouseexit
{ {
hide highlight8 hide highlight9
} }
action action
{ {

12
z_vr_assets_jko/strip/menus_vr.sp
View file

@ -3,7 +3,7 @@ CONFIG W:\bin\striped.cfg
ID 100 ID 100
REFERENCE MENUS_VR REFERENCE MENUS_VR
DESCRIPTION "VR Menu Localizations" DESCRIPTION "VR Menu Localizations"
COUNT 175 COUNT 177
INDEX 0 INDEX 0
{ {
REFERENCE COMMON_CONTROLS_ITEM REFERENCE COMMON_CONTROLS_ITEM
@ -879,3 +879,13 @@ INDEX 174
REFERENCE CURVES_DETAIL_DESC REFERENCE CURVES_DETAIL_DESC
TEXT_LANGUAGE1 "Configures how far away are curves approximated by edges." TEXT_LANGUAGE1 "Configures how far away are curves approximated by edges."
} }
INDEX 175
{
REFERENCE SUPER_SAMPLING_ITEM
TEXT_LANGUAGE1 "Super Sampling:"
}
INDEX 176
{
REFERENCE SUPER_SAMPLING_DESC
TEXT_LANGUAGE1 "Configures super sampling value."
}

141
z_vr_assets_jko/ui/ingamesetup.menu
View file

@ -1277,13 +1277,48 @@
} }
} }
itemDef
{
name super_sampling
group video
type ITEM_TYPE_MULTI
text @MENUS_VR_SUPER_SAMPLING_ITEM
rect 305 211 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 165
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
cvarFloatList { "0.8" 0.8 "0.9" 0.9 "1.0" 1.0 "1.1" 1.1 "1.2" 1.2 "1.3" 1.3 }
descText @MENUS_VR_SUPER_SAMPLING_DESC
cvar "vr_super_sampling"
cvarTest openXRHMD
showCvar { meta }
visible 0
mouseenter
{
show highlight3
}
mouseexit
{
hide highlight3
}
action
{
play "sound/interface/button1.wav" ;
}
}
itemDef itemDef
{ {
name geometric_detail name geometric_detail
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS0_GEOMETRIC_DETAIL text @MENUS0_GEOMETRIC_DETAIL
rect 305 211 300 20 rect 305 231 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
textaligny -2 textaligny -2
@ -1298,11 +1333,11 @@
mouseenter mouseenter
{ {
show highlight3 show highlight4
} }
mouseexit mouseexit
{ {
hide highlight3 hide highlight4
} }
action action
{ {
@ -1320,7 +1355,7 @@
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS0_TEXTURE_DETAIL text @MENUS0_TEXTURE_DETAIL
rect 305 231 300 20 rect 305 251 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
textaligny -2 textaligny -2
@ -1333,42 +1368,6 @@
visible 0 visible 0
mouseenter
{
show highlight4
}
mouseexit
{
hide highlight4
}
action
{
play "sound/interface/button1.wav" ;
uiScript glCustom ;
setcvar ui_r_modified 1 ;
show applyChanges
}
}
itemDef
{
name texture_filter
group video
type ITEM_TYPE_MULTI
text @MENUS0_TEXTURE_FILTER
rect 305 251 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 165
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
cvarStrList { @MENUS1_BILINEAR , "GL_LINEAR_MIPMAP_NEAREST" , @MENUS1_TRILINEAR , "GL_LINEAR_MIPMAP_LINEAR" }
descText @MENUS1_ADJUST_HOW_WELL_THE_TEXTURES
cvar "ui_r_texturemode"
visible 0
mouseenter mouseenter
{ {
show highlight5 show highlight5
@ -1388,10 +1387,10 @@
itemDef itemDef
{ {
name simple_shaders name texture_filter
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS0_DETAILED_SHADERS text @MENUS0_TEXTURE_FILTER
rect 305 271 300 20 rect 305 271 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
@ -1399,9 +1398,9 @@
font 2 font 2
textscale 0.8 textscale 0.8
forecolor 1 1 1 1 forecolor 1 1 1 1
cvarFloatList { @MENUS0_OFF 0 @MENUS0_ON 1 } cvarStrList { @MENUS1_BILINEAR , "GL_LINEAR_MIPMAP_NEAREST" , @MENUS1_TRILINEAR , "GL_LINEAR_MIPMAP_LINEAR" }
descText @MENUS1_HIDE_OR_UNHIDE_TEXTURES descText @MENUS1_ADJUST_HOW_WELL_THE_TEXTURES
cvar "ui_r_detailtextures" cvar "ui_r_texturemode"
visible 0 visible 0
@ -1424,10 +1423,10 @@
itemDef itemDef
{ {
name curves_detail name simple_shaders
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_VR_CURVES_DETAIL_ITEM text @MENUS0_DETAILED_SHADERS
rect 305 291 300 20 rect 305 291 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
@ -1435,9 +1434,9 @@
font 2 font 2
textscale 0.8 textscale 0.8
forecolor 1 1 1 1 forecolor 1 1 1 1
cvarFloatList { @MENUS0_LOW 250 @MENUS0_MEDIUM 500 @MENUS0_HIGH 1000 } cvarFloatList { @MENUS0_OFF 0 @MENUS0_ON 1 }
descText @MENUS_VR_CURVES_DETAIL_DESC descText @MENUS1_HIDE_OR_UNHIDE_TEXTURES
cvar "r_lodCurveError" cvar "ui_r_detailtextures"
visible 0 visible 0
@ -1458,13 +1457,49 @@
} }
} }
itemDef
{
name curves_detail
group video
type ITEM_TYPE_MULTI
text @MENUS_VR_CURVES_DETAIL_ITEM
rect 305 311 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 165
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
cvarFloatList { @MENUS0_LOW 250 @MENUS0_MEDIUM 500 @MENUS0_HIGH 1000 }
descText @MENUS_VR_CURVES_DETAIL_DESC
cvar "r_lodCurveError"
visible 0
mouseenter
{
show highlight8
}
mouseexit
{
hide highlight8
}
action
{
play "sound/interface/button1.wav" ;
uiScript glCustom ;
setcvar ui_r_modified 1 ;
show applyChanges
}
}
itemDef itemDef
{ {
name compress_textures name compress_textures
group video_obsolete group video_obsolete
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS0_COMPRESSED_TEXTURES text @MENUS0_COMPRESSED_TEXTURES
rect 305 311 300 20 rect 305 331 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
textaligny -2 textaligny -2
@ -1479,11 +1514,11 @@
mouseenter mouseenter
{ {
show highlight8 show highlight9
} }
mouseexit mouseexit
{ {
hide highlight8 hide highlight9
} }
action action
{ {

141
z_vr_assets_jko/ui/setup.menu
View file

@ -1376,13 +1376,48 @@
} }
} }
itemDef
{
name super_sampling
group video
type ITEM_TYPE_MULTI
text @MENUS_VR_SUPER_SAMPLING_ITEM
rect 305 211 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 165
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
cvarFloatList { "0.8" 0.8 "0.9" 0.9 "1.0" 1.0 "1.1" 1.1 "1.2" 1.2 "1.3" 1.3 }
descText @MENUS_VR_SUPER_SAMPLING_DESC
cvar "vr_super_sampling"
cvarTest openXRHMD
showCvar { meta }
visible 0
mouseenter
{
show highlight3
}
mouseexit
{
hide highlight3
}
action
{
play "sound/interface/button1.wav" ;
}
}
itemDef itemDef
{ {
name geometric_detail name geometric_detail
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS0_GEOMETRIC_DETAIL text @MENUS0_GEOMETRIC_DETAIL
rect 305 211 300 20 rect 305 231 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
textaligny -2 textaligny -2
@ -1397,11 +1432,11 @@
mouseenter mouseenter
{ {
show highlight3 show highlight4
} }
mouseexit mouseexit
{ {
hide highlight3 hide highlight4
} }
action action
{ {
@ -1419,7 +1454,7 @@
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS0_TEXTURE_DETAIL text @MENUS0_TEXTURE_DETAIL
rect 305 231 300 20 rect 305 251 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
textaligny -2 textaligny -2
@ -1432,42 +1467,6 @@
visible 0 visible 0
mouseenter
{
show highlight4
}
mouseexit
{
hide highlight4
}
action
{
play "sound/interface/button1.wav" ;
uiScript glCustom ;
setcvar ui_r_modified 1 ;
show applyChanges
}
}
itemDef
{
name texture_filter
group video
type ITEM_TYPE_MULTI
text @MENUS0_TEXTURE_FILTER
rect 305 251 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 165
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
cvarStrList { @MENUS1_BILINEAR , "GL_LINEAR_MIPMAP_NEAREST" , @MENUS1_TRILINEAR , "GL_LINEAR_MIPMAP_LINEAR" }
descText @MENUS1_ADJUST_HOW_WELL_THE_TEXTURES
cvar "ui_r_texturemode"
visible 0
mouseenter mouseenter
{ {
show highlight5 show highlight5
@ -1487,10 +1486,10 @@
itemDef itemDef
{ {
name simple_shaders name texture_filter
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS0_DETAILED_SHADERS text @MENUS0_TEXTURE_FILTER
rect 305 271 300 20 rect 305 271 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
@ -1498,9 +1497,9 @@
font 2 font 2
textscale 0.8 textscale 0.8
forecolor 1 1 1 1 forecolor 1 1 1 1
cvarFloatList { @MENUS0_OFF 0 @MENUS0_ON 1 } cvarStrList { @MENUS1_BILINEAR , "GL_LINEAR_MIPMAP_NEAREST" , @MENUS1_TRILINEAR , "GL_LINEAR_MIPMAP_LINEAR" }
descText @MENUS1_HIDE_OR_UNHIDE_TEXTURES descText @MENUS1_ADJUST_HOW_WELL_THE_TEXTURES
cvar "ui_r_detailtextures" cvar "ui_r_texturemode"
visible 0 visible 0
@ -1523,10 +1522,10 @@
itemDef itemDef
{ {
name curves_detail name simple_shaders
group video group video
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS_VR_CURVES_DETAIL_ITEM text @MENUS0_DETAILED_SHADERS
rect 305 291 300 20 rect 305 291 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
@ -1534,9 +1533,9 @@
font 2 font 2
textscale 0.8 textscale 0.8
forecolor 1 1 1 1 forecolor 1 1 1 1
cvarFloatList { @MENUS0_LOW 250 @MENUS0_MEDIUM 500 @MENUS0_HIGH 1000 } cvarFloatList { @MENUS0_OFF 0 @MENUS0_ON 1 }
descText @MENUS_VR_CURVES_DETAIL_DESC descText @MENUS1_HIDE_OR_UNHIDE_TEXTURES
cvar "r_lodCurveError" cvar "ui_r_detailtextures"
visible 0 visible 0
@ -1557,13 +1556,49 @@
} }
} }
itemDef
{
name curves_detail
group video
type ITEM_TYPE_MULTI
text @MENUS_VR_CURVES_DETAIL_ITEM
rect 305 311 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 165
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
cvarFloatList { @MENUS0_LOW 250 @MENUS0_MEDIUM 500 @MENUS0_HIGH 1000 }
descText @MENUS_VR_CURVES_DETAIL_DESC
cvar "r_lodCurveError"
visible 0
mouseenter
{
show highlight8
}
mouseexit
{
hide highlight8
}
action
{
play "sound/interface/button1.wav" ;
uiScript glCustom ;
setcvar ui_r_modified 1 ;
show applyChanges
}
}
itemDef itemDef
{ {
name compress_textures name compress_textures
group video_obsolete group video_obsolete
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text @MENUS0_COMPRESSED_TEXTURES text @MENUS0_COMPRESSED_TEXTURES
rect 305 311 300 20 rect 305 331 300 20
textalign ITEM_ALIGN_RIGHT textalign ITEM_ALIGN_RIGHT
textalignx 165 textalignx 165
textaligny -2 textaligny -2
@ -1578,11 +1613,11 @@
mouseenter mouseenter
{ {
show highlight8 show highlight9
} }
mouseexit mouseexit
{ {
hide highlight8 hide highlight9
} }
action action
{ {