From 36969b6d4ce55e9fc94a241bcbc6f4209761d0bd Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 4 Aug 2009 09:23:31 +0000 Subject: [PATCH] menu cleanup; new effects configs by FruitieX, tooltips git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7318 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 4 +++- data/effects-high.cfg | 15 ++++++------ data/effects-low.cfg | 3 +-- data/effects-med.cfg | 5 ++-- data/effects-normal.cfg | 5 ++-- data/effects-omg.cfg | 3 +-- data/effects-ultimate.cfg | 5 ++-- data/effects-ultra.cfg | 9 ++++---- .../nexuiz/dialog_multiplayer_playersetup.c | 23 +++++++++++++++---- .../menu/nexuiz/dialog_settings_effects.c | 18 ++------------- .../qcsrc/menu/nexuiz/dialog_settings_video.c | 23 +++++++++---------- data/tooltips.db | 2 +- 12 files changed, 54 insertions(+), 61 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index ddf8ba493..7a976e90e 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -234,8 +234,10 @@ cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works i cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02 cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1 cl_rollangle 0 // amount of view tilt when strafing, default is 2.0 -v_kicktime 0 // how long damage kicks of the view last, default is 0.5 seconds +v_kicktime 0.5 // how long damage kicks of the view last, default is 0.5 seconds gl_polyblend 1 // whether to use screen tints, default is 1 +r_motionblur 0 // motion blur value, default is 0 +r_damageblur 0 // motion blur when damaged, default is 0 seta vid_x11_display "" "nexuiz-linux-*.sh will use this to start nexuiz on an other/new X display" // This can have three possible settings: diff --git a/data/effects-high.cfg b/data/effects-high.cfg index f3368bbf0..9d443211b 100644 --- a/data/effects-high.cfg +++ b/data/effects-high.cfg @@ -1,32 +1,31 @@ cl_decals 1 cl_decals_time 4 -cl_nogibs 0 -cl_particles_quality 1 +cl_particles_quality 0.75 gl_flashblend 0 gl_picmip 0 gl_texture_anisotropy 16 mod_q3bsp_nolightmaps 0 r_bloom 1 r_coronas 1 -r_damageblur 0 +r_damageblur 0.4 r_drawdecals_drawdistance 500 r_drawparticles_drawdistance 2000 r_glsl_deluxemapping 1 -r_glsl_offsetmapping 0 +r_glsl_offsetmapping 1 r_glsl_offsetmapping_reliefmapping 0 r_hdr 0 -r_motionblur 0 +r_motionblur 0.7 r_picmipworld 0 r_shadow_gloss 1 r_shadow_realtime_dlight 1 -r_shadow_realtime_dlight_shadows 1 +r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 r_shadow_usenormalmap 1 r_showsurfaces 0 -r_subdivisions_tolerance 4 +r_subdivisions_tolerance 3 r_water 1 r_water_resolutionmultiplier 0.5 -vid_samples 1 +vid_samples 2 menu_sync diff --git a/data/effects-low.cfg b/data/effects-low.cfg index 71b63b659..1ad66fcbe 100644 --- a/data/effects-low.cfg +++ b/data/effects-low.cfg @@ -1,7 +1,6 @@ cl_decals 1 cl_decals_time 2 -cl_nogibs 0 -cl_particles_quality 0.20 +cl_particles_quality 0.2 gl_flashblend 1 gl_picmip 2 gl_texture_anisotropy 1 diff --git a/data/effects-med.cfg b/data/effects-med.cfg index 14c066a7e..3c4ee1f29 100644 --- a/data/effects-med.cfg +++ b/data/effects-med.cfg @@ -1,10 +1,9 @@ cl_decals 1 cl_decals_time 2 -cl_nogibs 0 cl_particles_quality 0.5 gl_flashblend 0 -gl_picmip 2 -gl_texture_anisotropy 1 +gl_picmip 1 +gl_texture_anisotropy 4 mod_q3bsp_nolightmaps 0 r_bloom 0 r_coronas 1 diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg index 43e5618f4..1914f54c7 100644 --- a/data/effects-normal.cfg +++ b/data/effects-normal.cfg @@ -1,10 +1,9 @@ cl_decals 1 cl_decals_time 2 -cl_nogibs 0 cl_particles_quality 0.5 gl_flashblend 0 gl_picmip 1 -gl_texture_anisotropy 1 +gl_texture_anisotropy 8 mod_q3bsp_nolightmaps 0 r_bloom 0 r_coronas 1 @@ -24,7 +23,7 @@ r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 r_shadow_usenormalmap 1 r_showsurfaces 0 -r_subdivisions_tolerance 4 +r_subdivisions_tolerance 3 r_water 0 r_water_resolutionmultiplier 0.5 vid_samples 1 diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg index 5cbc269cc..4bac93de2 100644 --- a/data/effects-omg.cfg +++ b/data/effects-omg.cfg @@ -1,7 +1,6 @@ cl_decals 0 cl_decals_time 2 -cl_nogibs 0 -cl_particles_quality 0.20 +cl_particles_quality 0.2 gl_flashblend 1 gl_picmip 1337 gl_texture_anisotropy 1 diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg index 621907b67..e630fe796 100644 --- a/data/effects-ultimate.cfg +++ b/data/effects-ultimate.cfg @@ -1,6 +1,5 @@ cl_decals 1 cl_decals_time 10 -cl_nogibs 0 cl_particles_quality 1 gl_flashblend 0 gl_picmip 0 @@ -14,7 +13,7 @@ r_drawparticles_drawdistance 2000 r_glsl_deluxemapping 1 r_glsl_offsetmapping 1 r_glsl_offsetmapping_reliefmapping 1 -r_hdr 0 +r_hdr 1 r_motionblur 0.7 r_picmipworld 0 r_shadow_gloss 1 @@ -24,7 +23,7 @@ r_shadow_realtime_world 1 r_shadow_realtime_world_shadows 1 r_shadow_usenormalmap 1 r_showsurfaces 0 -r_subdivisions_tolerance 2 +r_subdivisions_tolerance 1 r_water 1 r_water_resolutionmultiplier 1 vid_samples 4 diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg index 256b30fac..f5099b19f 100644 --- a/data/effects-ultra.cfg +++ b/data/effects-ultra.cfg @@ -1,6 +1,5 @@ cl_decals 1 cl_decals_time 10 -cl_nogibs 0 cl_particles_quality 1 gl_flashblend 0 gl_picmip 0 @@ -8,14 +7,14 @@ gl_texture_anisotropy 16 mod_q3bsp_nolightmaps 0 r_bloom 1 r_coronas 1 -r_damageblur 0 +r_damageblur 0.4 r_drawdecals_drawdistance 500 r_drawparticles_drawdistance 2000 r_glsl_deluxemapping 1 -r_glsl_offsetmapping 0 +r_glsl_offsetmapping 1 r_glsl_offsetmapping_reliefmapping 0 r_hdr 0 -r_motionblur 0 +r_motionblur 0.7 r_picmipworld 0 r_shadow_gloss 1 r_shadow_realtime_dlight 1 @@ -24,7 +23,7 @@ r_shadow_realtime_world 1 r_shadow_realtime_world_shadows 1 r_shadow_usenormalmap 1 r_showsurfaces 0 -r_subdivisions_tolerance 3 +r_subdivisions_tolerance 2 r_water 1 r_water_resolutionmultiplier 0.5 vid_samples 4 diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c index 54fcb484e..ee6995b5e 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c @@ -83,10 +83,14 @@ void fillNexuizPlayerSettingsTab(entity me) me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Field of View:")); me.TD(me, 1, 2, e = makeNexuizSlider(60, 130, 1, "fov")); + me.TR(me); + me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage kick:")); + me.TD(me, 1, 2, e = makeNexuizSlider(0, 0.5, 0.05, "v_kicktime")); me.TR(me); sl = makeNexuizSlider(0.45, 0.75, 0.01, "cl_bobcycle"); me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "View bobbing:")); me.TD(me, 1, 2, sl); + me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Zoom Factor:")); @@ -95,7 +99,6 @@ void fillNexuizPlayerSettingsTab(entity me) sl = makeNexuizSlider(1, 8, 0.5, "cl_zoomspeed"); me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1, 1, sl, "Zoom speed:")); me.TD(me, 1, 2, sl); - me.TR(me); me.TR(me); me.TD(me, 1, 1.5, e = makeNexuizButton("Weapon settings...", '0 0 0')); e.onClick = DialogOpenButton_Click; @@ -143,7 +146,6 @@ void fillNexuizPlayerSettingsTab(entity me) me.TD(me, 1, 2/3, e = makeNexuizRadioButton(1, "crosshair_hittest", "0", "None")); me.TD(me, 1, 2/3, e = makeNexuizRadioButton(1, "crosshair_hittest", "1", "TrueAim")); me.TD(me, 1, 2/3, e = makeNexuizRadioButton(1, "crosshair_hittest", "1.25", "Enemies")); - me.TR(me); me.TR(me); me.TDempty(me, 0.4); me.TD(me, 1, 2.2, e = makeNexuizButton("Radar, HUD & Waypoints...", '0 0 0')); @@ -151,13 +153,24 @@ void fillNexuizPlayerSettingsTab(entity me) e.onClickEntity = main.radarDialog; me.TDempty(me, 0.5); me.TR(me); - me.TR(me); -#ifdef ALLOW_FORCEMODELS + #ifdef ALLOW_FORCEMODELS me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Force Models:")); me.TD(me, 1, 2/3, e = makeNexuizRadioButton(2, string_null, string_null, "None")); me.TD(me, 1, 2/3, e = makeNexuizRadioButton(2, "cl_forceplayermodelsfromnexuiz", string_null, "Custom")); me.TD(me, 1, 2/3, e = makeNexuizRadioButton(2, "cl_forceplayermodels", string_null, "All")); -#endif + #endif + me.TR(me); + me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_gentle", "Disable gore effects")); + me.TR(me); + me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Gibs:")); + me.TD(me, 1, 2, e = makeNexuizTextSlider("cl_nogibs")); + e.addValue(e, "None", "1"); + e.addValue(e, "Few", "0.75"); + e.addValue(e, "Many", "0.5"); + e.addValue(e, "Lots", "0"); + e.configureNexuizTextSliderValues(e); + setDependent(e, "cl_gentle", 0, 0); + me.TR(me); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1;name \"$_cl_name\";sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_shownames;sendcvar cl_forceplayermodelsfromnexuiz;sendcvar cl_forceplayermodels", COMMANDBUTTON_APPLY)); diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c index b43869f04..e4e01740d 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c @@ -52,6 +52,7 @@ void fillNexuizEffectsSettingsTab(entity me) e.addValue(e, "2x", "2"); e.addValue(e, "4x", "4"); e.configureNexuizTextSliderValues(e); + me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Texture quality:")); me.TD(me, 1, 2, e = makeNexuizTextSlider("gl_picmip")); @@ -83,6 +84,7 @@ void fillNexuizEffectsSettingsTab(entity me) me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Particle dist.:")); me.TD(me, 1, 2, e = makeNexuizSlider(500, 2000, 100, "r_drawparticles_drawdistance")); + me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_decals", "Decals")); me.TR(me); @@ -97,21 +99,6 @@ void fillNexuizEffectsSettingsTab(entity me) setDependent(e, "cl_decals", 1, 1); me.TD(me, 1, 2, e = makeNexuizSlider(1, 20, 1, "cl_decals_time")); setDependent(e, "cl_decals", 1, 1); - me.TR(me); - me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_gentle", "Disable gore effects")); // TODO move this away, this is user preference, and preset .cfg files do not change this - - me.TR(me); - me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Gibs:")); - me.TD(me, 1, 2, e = makeNexuizTextSlider("cl_nogibs")); - e.addValue(e, "None", "1"); - e.addValue(e, "Few", "0.75"); - e.addValue(e, "Many", "0.5"); - e.addValue(e, "Lots", "0"); - e.configureNexuizTextSliderValues(e); - - me.TR(me); - me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage kick:")); - me.TD(me, 1, 2, e = makeNexuizSlider(0, 0.5, 0.05, "v_kicktime")); // TODO move this away, this is user preference, and preset .cfg files do not change this me.gotoRC(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 2, e = makeNexuizCheckBox(1, "mod_q3bsp_nolightmaps", "Use lightmaps")); @@ -154,7 +141,6 @@ void fillNexuizEffectsSettingsTab(entity me) setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1); me.TR(me); me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_coronas", "Coronas")); - me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_coronas_occlusionquery", "Use occlusion queries")); // TODO move this away, this is user preference, and preset .cfg files do not change this me.TR(me); me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_bloom", "Bloom")); setDependent(e, "r_hdr", 0, 0); diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_video.c b/data/qcsrc/menu/nexuiz/dialog_settings_video.c index f80115fad..ae9048e69 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_video.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_video.c @@ -27,25 +27,30 @@ void fillNexuizVideoSettingsTab(entity me) me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Color depth:")); me.TD(me, 1, 2, e = makeNexuizSlider(16, 32, 16, "vid_bitsperpixel")); + me.TR(me); + me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Texture compression")); + me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "0", "None")); + me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "1", "Fast")); + me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "2", "Good")); me.TR(me); me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "vid_fullscreen", "Full screen")); - me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "vid_vsync", "Vertical synchronization")); - + me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "vid_vsync", "Vertical Synchronization")); me.TR(me); - me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_glsl", "Use OpenGL 2.0 shaders (GLSL)")); + me.TR(me); + me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_coronas_occlusionquery", "Use Occlusion Queries")); me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Vertex Buffer Objects (VBOs)")); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.9, e = makeNexuizRadioButton(1, "gl_vbo", "0", "Off")); - me.TD(me, 1, 2.1, e = makeNexuizRadioButton(1, "gl_vbo", "1", "Vertex and Triangles")); + me.TD(me, 1, 2.1, e = makeNexuizRadioButton(1, "gl_vbo", "3", "Vertices, some Tris (compatible)")); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 0.9, e = makeNexuizRadioButton(1, "gl_vbo", "2", "Vertex only")); - me.TD(me, 1, 2.1, e = makeNexuizRadioButton(1, "gl_vbo", "3", "Vertex, some Triangles (compatible)")); + me.TD(me, 1, 0.9, e = makeNexuizRadioButton(1, "gl_vbo", "2", "Vertices")); + me.TD(me, 1, 2.1, e = makeNexuizRadioButton(1, "gl_vbo", "1", "Vertices and Triangles")); me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Depth first:")); me.TD(me, 1, 2, e = makeNexuizTextSlider("r_depthfirst")); @@ -53,12 +58,6 @@ void fillNexuizVideoSettingsTab(entity me) e.addValue(e, "World", "1"); e.addValue(e, "All", "2"); e.configureNexuizTextSliderValues(e); - me.TR(me); - me.TR(me); - me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Texture compression")); - me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "0", "None")); - me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "1", "Fast")); - me.TD(me, 1, 0.5, e = makeNexuizRadioButton(2, "gl_texturecompression", "2", "Good")); me.TR(me); if(cvar_type("apple_multithreadedgl") & CVAR_TYPEFLAG_ENGINE) me.TD(me, 1, 3, e = makeNexuizCheckBox(1, "apple_multithreadedgl", "Disable multithreaded OpenGL")); diff --git a/data/tooltips.db b/data/tooltips.db index 990cff4a1..82d2a5339 100644 --- a/data/tooltips.db +++ b/data/tooltips.db @@ -117,7 +117,7 @@ \v_glslgamma\Enable use of GLSL to apply gamma correction, note that it might decrease performance by a lot (default: disabled) \r_ambient\Ambient lighting, if set too high it tends to make light on maps look dull and flat (default: 4) \r_hdr_scenebrightness\Global rendering brightness (default: 1) -\vid_samples\Enable 4x antialiasing, which smooths the edges of 3D geometry. Note that it might decrease performance by quite a lot (default: off) +\vid_samples\Enable antialiasing, which smooths the edges of 3D geometry. Note that it might decrease performance by quite a lot (default: disabled) \v_flipped\Poor man's left handed mode (default: off) \NexuizSettingsDialog/Effects\Effect settings -- 2.39.2