From b91ca3fe0dd0f3474d8f7991ec18bae6888b4ee3 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 6 Nov 2008 14:02:52 +0000 Subject: [PATCH] two more rows in settings, flashblend git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5000 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/menu/nexuiz/dialog_settings.c | 2 +- .../qcsrc/menu/nexuiz/dialog_settings_audio.c | 2 +- data/qcsrc/menu/nexuiz/dialog_settings_demo.c | 2 +- .../menu/nexuiz/dialog_settings_effects.c | 13 +++++++--- .../qcsrc/menu/nexuiz/dialog_settings_input.c | 2 +- data/qcsrc/menu/nexuiz/dialog_settings_misc.c | 2 +- .../qcsrc/menu/nexuiz/dialog_settings_video.c | 25 +++++++++++-------- 7 files changed, 28 insertions(+), 20 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_settings.c b/data/qcsrc/menu/nexuiz/dialog_settings.c index b7dfc2ef4..e3e8112a8 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings.c @@ -4,7 +4,7 @@ CLASS(NexuizSettingsDialog) EXTENDS(NexuizDialog) ATTRIB(NexuizSettingsDialog, title, string, "Settings") ATTRIB(NexuizSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS) ATTRIB(NexuizSettingsDialog, intendedWidth, float, 0.96) - ATTRIB(NexuizSettingsDialog, rows, float, 17) + ATTRIB(NexuizSettingsDialog, rows, float, 19) ATTRIB(NexuizSettingsDialog, columns, float, 6) ENDCLASS(NexuizSettingsDialog) #endif diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_audio.c b/data/qcsrc/menu/nexuiz/dialog_settings_audio.c index be90c8b23..d313998c3 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_audio.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_audio.c @@ -3,7 +3,7 @@ CLASS(NexuizAudioSettingsTab) EXTENDS(NexuizTab) METHOD(NexuizAudioSettingsTab, fill, void(entity)) ATTRIB(NexuizAudioSettingsTab, title, string, "Audio") ATTRIB(NexuizAudioSettingsTab, intendedWidth, float, 0.9) - ATTRIB(NexuizAudioSettingsTab, rows, float, 15) + ATTRIB(NexuizAudioSettingsTab, rows, float, 17) ATTRIB(NexuizAudioSettingsTab, columns, float, 6.5) ENDCLASS(NexuizAudioSettingsTab) entity makeNexuizAudioSettingsTab(); diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_demo.c b/data/qcsrc/menu/nexuiz/dialog_settings_demo.c index 154bba273..27eae2e9d 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_demo.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_demo.c @@ -3,7 +3,7 @@ CLASS(NexuizDemoSettingsTab) EXTENDS(NexuizTab) METHOD(NexuizDemoSettingsTab, fill, void(entity)) ATTRIB(NexuizDemoSettingsTab, title, string, "Demo") ATTRIB(NexuizDemoSettingsTab, intendedWidth, float, 0.9) - ATTRIB(NexuizDemoSettingsTab, rows, float, 15) + ATTRIB(NexuizDemoSettingsTab, rows, float, 17) ATTRIB(NexuizDemoSettingsTab, columns, float, 6.5) ATTRIB(NexuizDemoSettingsTab, name, string, "DemoBroswer") ENDCLASS(NexuizDemoSettingsTab) diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c index de1b5c399..34dd4f60a 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c @@ -3,7 +3,7 @@ CLASS(NexuizEffectsSettingsTab) EXTENDS(NexuizTab) METHOD(NexuizEffectsSettingsTab, fill, void(entity)) ATTRIB(NexuizEffectsSettingsTab, title, string, "Effects") ATTRIB(NexuizEffectsSettingsTab, intendedWidth, float, 0.9) - ATTRIB(NexuizEffectsSettingsTab, rows, float, 15) + ATTRIB(NexuizEffectsSettingsTab, rows, float, 17) ATTRIB(NexuizEffectsSettingsTab, columns, float, 6.5) ENDCLASS(NexuizEffectsSettingsTab) entity makeNexuizEffectsSettingsTab(); @@ -113,8 +113,10 @@ void fillNexuizEffectsSettingsTab(entity me) e.addValue(e, "Lots", "0"); e.configureNexuizTextSliderValues(e); + me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_coronas", "Coronas")); + me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_bloom", "Bloom")); setDependent(e, "r_hdr", 0, 0); @@ -138,7 +140,11 @@ void fillNexuizEffectsSettingsTab(entity me) me.TR(me); me.TR(me); - me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_shadow_realtime_dlight", "Realtime dynamic lighting")); + me.TD(me, 1, 3, e = makeNexuizRadioButton(1, string_null, string_null, "No dynamic lighting")); + me.TR(me); + me.TD(me, 1, 3, e = makeNexuizRadioButton(1, "gl_flashblend", string_null, "Flash blend approximation")); + me.TR(me); + me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "r_shadow_realtime_dlight", string_null, "Realtime dynamic lighting")); me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_shadow_realtime_dlight_shadows", "Shadows")); setDependent(e, "r_shadow_realtime_dlight", 1, 1); @@ -153,7 +159,6 @@ void fillNexuizEffectsSettingsTab(entity me) setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1); me.TR(me); - me.TR(me); me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping")); setDependent(e, "r_glsl", 1, 1); @@ -183,7 +188,7 @@ void fillNexuizEffectsSettingsTab(entity me) me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_showsurfaces", "Show surfaces")); me.gotoRC(me, me.rows - 1, 0); - me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "sendcvar cl_nogibs; gl_flashblend_update; r_restart", COMMANDBUTTON_APPLY)); + me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "sendcvar cl_nogibs; r_restart", COMMANDBUTTON_APPLY)); } /* * [X] depth first world [X] depth first models (?????) diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_input.c b/data/qcsrc/menu/nexuiz/dialog_settings_input.c index e68305148..b215d25cb 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_input.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_input.c @@ -3,7 +3,7 @@ CLASS(NexuizInputSettingsTab) EXTENDS(NexuizTab) METHOD(NexuizInputSettingsTab, fill, void(entity)) ATTRIB(NexuizInputSettingsTab, title, string, "Input") ATTRIB(NexuizInputSettingsTab, intendedWidth, float, 0.9) - ATTRIB(NexuizInputSettingsTab, rows, float, 15) + ATTRIB(NexuizInputSettingsTab, rows, float, 17) ATTRIB(NexuizInputSettingsTab, columns, float, 6.5) ENDCLASS(NexuizInputSettingsTab) entity makeNexuizInputSettingsTab(); diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_misc.c b/data/qcsrc/menu/nexuiz/dialog_settings_misc.c index b06d51029..8c246e518 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_misc.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_misc.c @@ -3,7 +3,7 @@ CLASS(NexuizMiscSettingsTab) EXTENDS(NexuizTab) METHOD(NexuizMiscSettingsTab, fill, void(entity)) ATTRIB(NexuizMiscSettingsTab, title, string, "Misc") ATTRIB(NexuizMiscSettingsTab, intendedWidth, float, 0.9) - ATTRIB(NexuizMiscSettingsTab, rows, float, 15) + ATTRIB(NexuizMiscSettingsTab, rows, float, 17) ATTRIB(NexuizMiscSettingsTab, columns, float, 6.5) ENDCLASS(NexuizMiscSettingsTab) entity makeNexuizMiscSettingsTab(); diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_video.c b/data/qcsrc/menu/nexuiz/dialog_settings_video.c index b071b817c..53320f73b 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_video.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_video.c @@ -3,7 +3,7 @@ CLASS(NexuizVideoSettingsTab) EXTENDS(NexuizTab) METHOD(NexuizVideoSettingsTab, fill, void(entity)) ATTRIB(NexuizVideoSettingsTab, title, string, "Video") ATTRIB(NexuizVideoSettingsTab, intendedWidth, float, 0.9) - ATTRIB(NexuizVideoSettingsTab, rows, float, 15) + ATTRIB(NexuizVideoSettingsTab, rows, float, 17) ATTRIB(NexuizVideoSettingsTab, columns, float, 6.5) ENDCLASS(NexuizVideoSettingsTab) entity makeNexuizVideoSettingsTab(); @@ -35,6 +35,7 @@ void fillNexuizVideoSettingsTab(entity me) me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_glsl", "Use OpenGL 2.0 shaders (GLSL)")); + me.TR(me); me.TR(me); me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Vertex Buffer Objects (VBOs)")); me.TR(me); @@ -45,18 +46,23 @@ void fillNexuizVideoSettingsTab(entity 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.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); - me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(4, 1, "vid_samples", "Use 4x multisampling")); - + me.TR(me); + me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Depth first:")); + me.TD(me, 1, 2, e = makeNexuizTextSlider("r_depthfirst")); + e.addValue(e, "Disabled", "0"); + e.addValue(e, "World", "1"); + e.addValue(e, "All", "2"); + e.configureNexuizTextSliderValues(e); me.TR(me); if(cvar_type("apple_multithreadedgl") & CVAR_TYPEFLAG_ENGINE) me.TD(me, 1, 3, e = makeNexuizCheckBox(1, "apple_multithreadedgl", "Disable multithreaded OpenGL")); - me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "gl_finish", "Wait for GPU to finish each frame")); @@ -82,15 +88,12 @@ void fillNexuizVideoSettingsTab(entity me) me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Scene brightness:")); me.TD(me, 1, 2, e = makeNexuizSlider(0.5, 2.0, 0.05, "r_hdr_scenebrightness")); - me.TR(me); me.TR(me); - me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Depth first:")); - me.TD(me, 1, 2, e = makeNexuizTextSlider("r_depthfirst")); - e.addValue(e, "Disabled", "0"); - e.addValue(e, "World", "1"); - e.addValue(e, "All", "2"); - e.configureNexuizTextSliderValues(e); + me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(4, 1, "vid_samples", "Use 4x multisampling")); + me.TR(me); + me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(4, 1, "v_flipped", "Left handed mode")); + me.TR(me); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY)); -- 2.39.2