teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-25 05:21:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add brightness setting, remove color depth and texture filter setting

Browse source
This commit is contained in:
Petr Bartos 2022-03-30 21:25:12 +02:00
parent a750c2e540
commit a44bdc323b
4 changed files with 179 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/app/src/main/assets/pakQ3Q.pk3
View file

Binary file not shown.

108
android/app/src/main/cpp/code/q3_ui/ui_video.c
View file

@ -252,6 +252,7 @@ GRAPHICS OPTIONS MENU
#define ID_DYNAMICLIGHTS 112
#define ID_SYNCEVERYFRAME 113
#define ID_SHADOWS 114
#define ID_GAMMA 115
#define NUM_REFRESHRATE 4
#define NUM_SHADOWS 2
@ -285,6 +286,7 @@ typedef struct {
menuradiobutton_s dynamiclights;
menuradiobutton_s synceveryframe;
menulist_s shadows;
menuslider_s gamma;
menubitmap_s apply;
menubitmap_s back;
@ -306,6 +308,7 @@ typedef struct
qboolean dynamiclights;
qboolean synceveryframe;
int shadows;
float gamma;
} InitialVideoOptions_s;
static InitialVideoOptions_s s_ivo;
@ -484,7 +487,7 @@ GraphicsOptions_GetInitialVideo
*/
static void GraphicsOptions_GetInitialVideo( void )
{
s_ivo.colordepth = s_graphicsoptions.colordepth.curvalue;
// s_ivo.colordepth = s_graphicsoptions.colordepth.curvalue;
// s_ivo.driver = s_graphicsoptions.driver.curvalue;
// s_ivo.mode = s_graphicsoptions.mode.curvalue;
// s_ivo.fullscreen = s_graphicsoptions.fs.curvalue;
@ -492,12 +495,13 @@ static void GraphicsOptions_GetInitialVideo( void )
s_ivo.tq = s_graphicsoptions.tq.curvalue;
s_ivo.lighting = s_graphicsoptions.lighting.curvalue;
s_ivo.geometry = s_graphicsoptions.geometry.curvalue;
s_ivo.filter = s_graphicsoptions.filter.curvalue;
s_ivo.texturebits = s_graphicsoptions.texturebits.curvalue;
// s_ivo.filter = s_graphicsoptions.filter.curvalue;
// s_ivo.texturebits = s_graphicsoptions.texturebits.curvalue;
s_ivo.refreshrate = s_graphicsoptions.refreshrate.curvalue;
s_ivo.dynamiclights = s_graphicsoptions.dynamiclights.curvalue;
s_ivo.synceveryframe = s_graphicsoptions.synceveryframe.curvalue;
s_ivo.shadows = s_graphicsoptions.refreshrate.curvalue;
s_ivo.gamma = s_graphicsoptions.gamma.curvalue;
}
/*
@ -639,23 +643,27 @@ static void GraphicsOptions_UpdateMenuItems( void )
{
s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE);
}
if ( s_ivo.colordepth != s_graphicsoptions.colordepth.curvalue )
{
s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE);
}
// if ( s_ivo.colordepth != s_graphicsoptions.colordepth.curvalue )
// {
// s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE);
// }
// if ( s_ivo.driver != s_graphicsoptions.driver.curvalue )
// {
// s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE);
// }
if ( s_ivo.texturebits != s_graphicsoptions.texturebits.curvalue )
{
s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE);
}
// if ( s_ivo.texturebits != s_graphicsoptions.texturebits.curvalue )
// {
// s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE);
// }
if ( s_ivo.geometry != s_graphicsoptions.geometry.curvalue )
{
s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE);
}
if ( s_ivo.filter != s_graphicsoptions.filter.curvalue )
// if ( s_ivo.filter != s_graphicsoptions.filter.curvalue )
// {
// s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE);
// }
if ( s_ivo.gamma != s_graphicsoptions.gamma.curvalue )
{
s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE);
}
@ -838,6 +846,10 @@ static void GraphicsOptions_Event( void* ptr, int event ) {
}
break;
case ID_GAMMA:
trap_Cvar_SetValue( "r_gamma", s_graphicsoptions.gamma.curvalue );
break;
// case ID_LIST:
// ivo = &s_ivo_templates[s_graphicsoptions.list.curvalue];
//
@ -1044,6 +1056,7 @@ static void GraphicsOptions_SetMenuItems( void )
s_graphicsoptions.dynamiclights.curvalue = trap_Cvar_VariableValue( "r_dynamiclight" ) != 0;
s_graphicsoptions.synceveryframe.curvalue = trap_Cvar_VariableValue( "r_finish" ) != 0;
s_graphicsoptions.gamma.curvalue = trap_Cvar_VariableValue( "r_gamma" );
}
/*
@ -1206,7 +1219,7 @@ void GraphicsOptions_MenuInit( void )
s_graphicsoptions.network.style = UI_RIGHT;
s_graphicsoptions.network.color = color_red;
y = 254 - 6 * (BIGCHAR_HEIGHT + 2);
y = 254 - 4 * (BIGCHAR_HEIGHT + 2);
// s_graphicsoptions.list.generic.type = MTYPE_SPINCONTROL;
// s_graphicsoptions.list.generic.name = "Graphics Settings:";
// s_graphicsoptions.list.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
@ -1278,15 +1291,27 @@ void GraphicsOptions_MenuInit( void )
s_graphicsoptions.synceveryframe.generic.id = ID_SYNCEVERYFRAME;
y += BIGCHAR_HEIGHT+2;
// references "r_colorbits"
s_graphicsoptions.colordepth.generic.type = MTYPE_SPINCONTROL;
s_graphicsoptions.colordepth.generic.name = "Color Depth:";
s_graphicsoptions.colordepth.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
s_graphicsoptions.colordepth.generic.x = 400;
s_graphicsoptions.colordepth.generic.y = y;
s_graphicsoptions.colordepth.itemnames = colordepth_names;
// references "r_gamma"
s_graphicsoptions.gamma.generic.type = MTYPE_SLIDER;
s_graphicsoptions.gamma.generic.name = "Brightness:";
s_graphicsoptions.gamma.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
s_graphicsoptions.gamma.generic.x = 400;
s_graphicsoptions.gamma.generic.y = y;
s_graphicsoptions.gamma.generic.callback = GraphicsOptions_Event;
s_graphicsoptions.gamma.generic.id = ID_GAMMA;
s_graphicsoptions.gamma.minvalue = 0.8f;
s_graphicsoptions.gamma.maxvalue = 1.3f;
y += BIGCHAR_HEIGHT+2;
// // references "r_colorbits"
// s_graphicsoptions.colordepth.generic.type = MTYPE_SPINCONTROL;
// s_graphicsoptions.colordepth.generic.name = "Color Depth:";
// s_graphicsoptions.colordepth.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
// s_graphicsoptions.colordepth.generic.x = 400;
// s_graphicsoptions.colordepth.generic.y = y;
// s_graphicsoptions.colordepth.itemnames = colordepth_names;
// y += BIGCHAR_HEIGHT+2;
// // references/modifies "r_fullscreen"
// s_graphicsoptions.fs.generic.type = MTYPE_SPINCONTROL;
// s_graphicsoptions.fs.generic.name = "Fullscreen:";
@ -1345,26 +1370,26 @@ void GraphicsOptions_MenuInit( void )
s_graphicsoptions.tq.minvalue = 0;
s_graphicsoptions.tq.maxvalue = 3;
s_graphicsoptions.tq.generic.callback = GraphicsOptions_TQEvent;
y += BIGCHAR_HEIGHT+2;
// references/modifies "r_textureBits"
s_graphicsoptions.texturebits.generic.type = MTYPE_SPINCONTROL;
s_graphicsoptions.texturebits.generic.name = "Texture Quality:";
s_graphicsoptions.texturebits.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
s_graphicsoptions.texturebits.generic.x = 400;
s_graphicsoptions.texturebits.generic.y = y;
s_graphicsoptions.texturebits.itemnames = tq_names;
y += BIGCHAR_HEIGHT+2;
// references/modifies "r_textureMode"
s_graphicsoptions.filter.generic.type = MTYPE_SPINCONTROL;
s_graphicsoptions.filter.generic.name = "Texture Filter:";
s_graphicsoptions.filter.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
s_graphicsoptions.filter.generic.x = 400;
s_graphicsoptions.filter.generic.y = y;
s_graphicsoptions.filter.itemnames = filter_names;
y += 2*BIGCHAR_HEIGHT;
// // references/modifies "r_textureBits"
// s_graphicsoptions.texturebits.generic.type = MTYPE_SPINCONTROL;
// s_graphicsoptions.texturebits.generic.name = "Texture Quality:";
// s_graphicsoptions.texturebits.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
// s_graphicsoptions.texturebits.generic.x = 400;
// s_graphicsoptions.texturebits.generic.y = y;
// s_graphicsoptions.texturebits.itemnames = tq_names;
// y += BIGCHAR_HEIGHT+2;
// // references/modifies "r_textureMode"
// s_graphicsoptions.filter.generic.type = MTYPE_SPINCONTROL;
// s_graphicsoptions.filter.generic.name = "Texture Filter:";
// s_graphicsoptions.filter.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
// s_graphicsoptions.filter.generic.x = 400;
// s_graphicsoptions.filter.generic.y = y;
// s_graphicsoptions.filter.itemnames = filter_names;
// y += 2*BIGCHAR_HEIGHT;
s_graphicsoptions.driverinfo.generic.type = MTYPE_PTEXT;
s_graphicsoptions.driverinfo.generic.flags = QMF_CENTER_JUSTIFY|QMF_PULSEIFFOCUS;
s_graphicsoptions.driverinfo.generic.callback = GraphicsOptions_Event;
@ -1412,15 +1437,16 @@ void GraphicsOptions_MenuInit( void )
// Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.mode );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.refreshrate );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.synceveryframe );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.colordepth );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.gamma );
// Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.colordepth );
// Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.fs );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.lighting );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.dynamiclights );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.shadows );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.geometry );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.tq );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.texturebits );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.filter );
// Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.texturebits );
// Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.filter );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.driverinfo );
Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.back );

99
android/app/src/main/pakQ3Q/ui/ingame_system.menu
View file

@ -227,22 +227,37 @@ itemDef {
action { uiScript glCustom }
}
// itemDef {
// name graphics
// group grpSystem
// type ITEM_TYPE_MULTI
// text "Color Depth:"
// cvar "r_colorbits"
// cvarFloatList { "Desktop Default" 0 "16-bit" 16 "32-bit" 32 }
// rect 0 90 256 20
// textalign ITEM_ALIGN_RIGHT
// textalignx 133
// textaligny 17
// textscale .25
// forecolor 1 1 1 1
// visible 0
// action { uiScript glCustom ; uiScript update "r_colorbits" }
// }
itemDef {
name graphics
group grpSystem
type ITEM_TYPE_MULTI
text "Color Depth:"
cvar "r_colorbits"
cvarFloatList { "Desktop Default" 0 "16-bit" 16 "32-bit" 32 }
name graphics
group grpSystem
type ITEM_TYPE_SLIDER
text "Brightness:"
cvarfloat "r_gamma" 0.1 0.8 1.3
rect 0 90 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 133
textaligny 17
textscale .25
textscale .25
forecolor 1 1 1 1
visible 0
action { uiScript glCustom ; uiScript update "r_colorbits" }
}
visible 0
}
itemDef {
name graphics
@ -326,38 +341,38 @@ itemDef {
action { uiScript glCustom }
}
itemDef {
name graphics
group grpSystem
type ITEM_TYPE_MULTI
text "Texture Quality:"
cvar "r_texturebits"
cvarFloatList { "Default" 0 "16 bit" 16 "32 bit" 32 }
rect 0 210 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 133
textaligny 17
textscale .25
forecolor 1 1 1 1
visible 0
}
// itemDef {
// name graphics
// group grpSystem
// type ITEM_TYPE_MULTI
// text "Texture Quality:"
// cvar "r_texturebits"
// cvarFloatList { "Default" 0 "16 bit" 16 "32 bit" 32 }
// rect 0 210 256 20
// textalign ITEM_ALIGN_RIGHT
// textalignx 133
// textaligny 17
// textscale .25
// forecolor 1 1 1 1
// visible 0
// }
itemDef {
name graphics
group grpSystem
type ITEM_TYPE_MULTI
text "Texture Filter:"
cvar "r_texturemode"
cvarStrList { "Bilinear", "GL_LINEAR_MIPMAP_NEAREST", "Trilinear", "GL_LINEAR_MIPMAP_LINEAR" }
rect 0 230 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 133
textaligny 17
textscale .25
forecolor 1 1 1 1
visible 0
action { uiScript glCustom }
}
// itemDef {
// name graphics
// group grpSystem
// type ITEM_TYPE_MULTI
// text "Texture Filter:"
// cvar "r_texturemode"
// cvarStrList { "Bilinear", "GL_LINEAR_MIPMAP_NEAREST", "Trilinear", "GL_LINEAR_MIPMAP_LINEAR" }
// rect 0 230 256 20
// textalign ITEM_ALIGN_RIGHT
// textalignx 133
// textaligny 17
// textscale .25
// forecolor 1 1 1 1
// visible 0
// action { uiScript glCustom }
// }
itemDef {
name graphics
@ -365,7 +380,7 @@ itemDef {
type ITEM_TYPE_YESNO
text "Compress Textures:"
cvar "r_ext_compressed_textures"
rect 0 250 256 20
rect 0 210 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 133
textaligny 17

94
android/app/src/main/pakQ3Q/ui/system.menu
View file

@ -130,21 +130,36 @@ itemDef {
visible 1
}
// itemDef {
// name graphics
// group grpSystem
// type ITEM_TYPE_MULTI
// text "Color Depth:"
// cvar "r_colorbits"
// cvarFloatList { "Desktop Default" 0 "16-bit" 16 "32-bit" 32 }
// rect 99 92 256 20
// textalign ITEM_ALIGN_RIGHT
// textalignx 128
// textaligny 20
// textscale .333
// forecolor 1 1 1 1
// visible 0
// action { uiScript glCustom ; uiScript update "r_colorbits" }
// }
itemDef {
name graphics
group grpSystem
type ITEM_TYPE_MULTI
text "Color Depth:"
cvar "r_colorbits"
cvarFloatList { "Desktop Default" 0 "16-bit" 16 "32-bit" 32 }
type ITEM_TYPE_SLIDER
text "Brightness:"
cvarfloat "r_gamma" 0.1 0.8 1.3
rect 99 92 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
textaligny 20
textscale .333
textscale .333
forecolor 1 1 1 1
visible 0
action { uiScript glCustom ; uiScript update "r_colorbits" }
visible 0
}
itemDef {
@ -229,45 +244,46 @@ itemDef {
action { uiScript glCustom }
}
itemDef {
name graphics
group grpSystem
type ITEM_TYPE_MULTI
text "Texture Quality:"
cvar "r_texturebits"
cvarFloatList { "Default" 0 "16 bit" 16 "32 bit" 32 }
rect 99 242 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
textaligny 20
textscale .333
forecolor 1 1 1 1
visible 0
}
// itemDef {
// name graphics
// group grpSystem
// type ITEM_TYPE_MULTI
// text "Texture Quality:"
// cvar "r_texturebits"
// cvarFloatList { "Default" 0 "16 bit" 16 "32 bit" 32 }
// rect 99 242 256 20
// textalign ITEM_ALIGN_RIGHT
// textalignx 128
// textaligny 20
// textscale .333
// forecolor 1 1 1 1
// visible 0
// }
// itemDef {
// name graphics
// group grpSystem
// type ITEM_TYPE_MULTI
// text "Texture Filter:"
// cvar "r_texturemode"
// cvarStrList { "Bilinear", "GL_LINEAR_MIPMAP_NEAREST", "Trilinear", "GL_LINEAR_MIPMAP_LINEAR" }
// rect 99 267 256 20
// textalign ITEM_ALIGN_RIGHT
// textalignx 128
// textaligny 20
// textscale .333
// forecolor 1 1 1 1
// visible 0
// action { uiScript glCustom }
// }
itemDef {
name graphics
group grpSystem
type ITEM_TYPE_MULTI
text "Texture Filter:"
cvar "r_texturemode"
cvarStrList { "Bilinear", "GL_LINEAR_MIPMAP_NEAREST", "Trilinear", "GL_LINEAR_MIPMAP_LINEAR" }
rect 99 267 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
textaligny 20
textscale .333
forecolor 1 1 1 1
visible 0
action { uiScript glCustom }
}
itemDef {
name graphics
group grpSystem
type ITEM_TYPE_YESNO
text "Compress Textures:"
cvar "r_ext_compressed_textures"
rect 99 292 256 20
rect 99 242 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
textaligny 20