From 8b9b037215b31f498a07b62eefda7fce8e2deefa Mon Sep 17 00:00:00 2001 From: danij Date: Tue, 17 Aug 2010 01:24:07 +0100 Subject: [PATCH] Added the UIF_FADE_AWAY flag to most of the sliders controlling graphical settings in the UI. --- doomsday/engine/portable/src/ui_panel.c | 62 ++++++++++++------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/doomsday/engine/portable/src/ui_panel.c b/doomsday/engine/portable/src/ui_panel.c index 02e38b65f4..ff99c56f30 100644 --- a/doomsday/engine/portable/src/ui_panel.c +++ b/doomsday/engine/portable/src/ui_panel.c @@ -441,19 +441,19 @@ ui_object_t ob_panel[] = { UI_TEXT, 0, 0, 300, 255, 0, 55, "Mirror player weapon models", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 255, 70, 55, "rend-model-mirror-hud", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, { UI_META, 5, 0, 0, 60 }, - { UI_TEXT, 0, 0, 300, 255, 0, 55, "Sky sphere radius", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 255, 0, 55, "Sky sphere radius", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 255, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_sky_distance }, { UI_TEXT, 0, 0, 300, 315, 0, 55, "Objects cast shadows", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 315, 70, 55, "rend-shadow", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, - { UI_TEXT, 0, 0, 300, 375, 0, 55, "Shadow darkness factor", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 375, 0, 55, "Shadow darkness factor", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 375, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_shadow_dark }, - { UI_TEXT, 0, 0, 300, 435, 0, 55, "Shadow visible distance", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 435, 0, 55, "Shadow visible distance", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 435, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_shadow_far }, - { UI_TEXT, 0, 0, 300, 495, 0, 55, "Maximum shadow radius", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 495, 0, 55, "Maximum shadow radius", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 495, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_shadow_radmax }, { UI_TEXT, 0, 0, 300, 555, 0, 55, "Simulate radiosity", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 555, 70, 55, "rend-fakeradio", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, - { UI_TEXT, 0, 0, 300, 615, 0, 55, "Radiosity shadow darkness", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 615, 0, 55, "Radiosity shadow darkness", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 615, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_fakeradio_dark }, { UI_META, 6 }, @@ -462,13 +462,13 @@ ui_object_t ob_panel[] = { UI_BUTTON2, 0, 0, 680, 70, 70, 55, "rend-light", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, { UI_TEXT, 0, 0, 300, 130, 0, 55, "Blending mode", UIText_Drawer }, { UI_LIST, 0, 0, 680, 130, 300, 115, "", UIList_Drawer, UIList_Responder, UIList_Ticker, CP_CvarList, &lst_blend }, - { UI_TEXT, 0, 0, 300, 250, 0, 55, "Dynamic light brightness", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 250, 0, 55, "Dynamic light brightness", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 250, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_light_bright }, - { UI_TEXT, 0, 0, 300, 310, 0, 55, "Dynamic light radius factor", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 310, 0, 55, "Dynamic light radius factor", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 310, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_light_scale }, - { UI_TEXT, 0, 0, 300, 370, 0, 55, "Maximum dynamic light radius", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 370, 0, 55, "Maximum dynamic light radius", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 370, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_light_radmax }, - { UI_TEXT, 0, 0, 300, 430, 0, 55, "Maximum number of dynamic lights", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 430, 0, 55, "Maximum number of dynamic lights", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 430, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_light_max }, { UI_META, 6, 0, 0, -120 }, { UI_TEXT, 0, UIF_FADE_AWAY, 300, 610, 0, 55, "Ambient light level", UIText_Drawer }, @@ -479,37 +479,37 @@ ui_object_t ob_panel[] = { UI_BUTTON2, 0, 0, 680, 730, 70, 55, "rend-glow", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, { UI_TEXT, 0, 0, 300, 790, 0, 55, "Floor/ceiling glow on walls", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 790, 70, 55, "rend-glow-wall", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, - { UI_TEXT, 0, 0, 300, 850, 0, 55, "Maximum floor/ceiling glow height", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 850, 0, 55, "Maximum floor/ceiling glow height", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 850, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_glow_height }, - { UI_TEXT, 0, 0, 300, 910, 0, 55, "Floor/ceiling glow height factor", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 910, 0, 55, "Floor/ceiling glow height factor", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 910, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_glow_scale }, - { UI_TEXT, 0, 0, 300, 970, 0, 55, "Glow brightness in fog", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 970, 0, 55, "Glow brightness in fog", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 970, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_light_fog_bright }, { UI_TEXT, 0, 0, 300, 1030, 0, 55, "Enable decorations", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 1030, 70, 55, "rend-light-decor", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, { UI_META, 7 }, { UI_TEXT, 0, 0, 280, 0, 0, 50, "Graphics Options: Halos", UIText_BrightDrawer }, - { UI_TEXT, 0, 0, 300, 70, 0, 55, "Number of flares per halo", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 70, 0, 55, "Number of flares per halo", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 70, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo }, { UI_TEXT, 0, 0, 300, 130, 0, 55, "Use realistic halos", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 130, 70, 55, "rend-halo-realistic", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, { UI_META, 7, 0, 0, 60 }, - { UI_TEXT, 0, 0, 300, 130, 0, 55, "Halo brightness", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 130, 0, 55, "Halo brightness", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 130, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_bright }, - { UI_TEXT, 0, 0, 300, 190, 0, 55, "Halo size factor", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 190, 0, 55, "Halo size factor", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 190, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_size }, - { UI_TEXT, 0, 0, 300, 250, 0, 55, "Occlusion fade speed", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 250, 0, 55, "Occlusion fade speed", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 250, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_occlusion }, - { UI_TEXT, 0, 0, 300, 310, 0, 55, "Minimum halo radius", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 310, 0, 55, "Minimum halo radius", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 310, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_radmin }, - { UI_TEXT, 0, 0, 300, 370, 0, 55, "Flare visibility limitation", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 370, 0, 55, "Flare visibility limitation", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 370, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_seclimit }, - { UI_TEXT, 0, 0, 300, 430, 0, 55, "Halo fading start", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 430, 0, 55, "Halo fading start", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 430, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_dimnear }, - { UI_TEXT, 0, 0, 300, 490, 0, 55, "Halo fading end", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 490, 0, 55, "Halo fading end", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 490, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_dimfar }, - { UI_TEXT, 0, 0, 300, 550, 0, 55, "Z magnification divisor", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 550, 0, 55, "Z magnification divisor", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 550, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_zmagdiv }, { UI_META, 8 }, @@ -538,9 +538,9 @@ ui_object_t ob_panel[] = { UI_SLIDER, 0, UIF_FADE_AWAY, 680, 430, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_tex_aniso }, { UI_TEXT, 0, 0, 300, 490, 0, 55, "Enable detail textures", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 490, 70, 55, "rend-tex-detail", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, - { UI_TEXT, 0, 0, 300, 550, 0, 55, "Detail texture scaling factor", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 550, 0, 55, "Detail texture scaling factor", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 550, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_detail_scale }, - { UI_TEXT, 0, 0, 300, 610, 0, 55, "Detail texture contrast", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 610, 0, 55, "Detail texture contrast", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 610, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_detail_strength }, { UI_META, 9 }, @@ -549,13 +549,13 @@ ui_object_t ob_panel[] = { UI_BUTTON2, 0, 0, 680, 70, 70, 55, "rend-model", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, { UI_TEXT, 0, 0, 300, 130, 0, 55, "Interpolate between frames", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 130, 70, 55, "rend-model-inter", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, - { UI_TEXT, 0, 0, 300, 190, 0, 55, "3D model visibility limit", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 190, 0, 55, "3D model visibility limit", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 190, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_model_far }, { UI_TEXT, 0, 0, 300, 250, 0, 55, "Precache 3D models", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 250, 70, 55, "rend-model-precache", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, - { UI_TEXT, 0, 0, 300, 310, 0, 55, "Max dynamic lights on 3D models", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 310, 0, 55, "Max dynamic lights on 3D models", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 310, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_model_lights }, - { UI_TEXT, 0, 0, 300, 370, 0, 55, "LOD level zero distance", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 370, 0, 55, "LOD level zero distance", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 370, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_model_lod }, { UI_TEXT, 0, 0, 300, 430, 0, 55, "Precache sprites (slow)", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 430, 70, 55, "rend-sprite-precache", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, @@ -563,7 +563,7 @@ ui_object_t ob_panel[] = { UI_BUTTON2, 0, 0, 680, 490, 70, 55, "rend-sprite-noz", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, { UI_TEXT, 0, 0, 300, 550, 0, 55, "Additive blending for sprites", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 550, 70, 55, "rend-sprite-blend", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, - { UI_TEXT, 0, 0, 300, 610, 0, 55, "Max dynamic lights on sprites", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 610, 0, 55, "Max dynamic lights on sprites", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 610, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_sprite_lights }, { UI_TEXT, 0, 0, 300, 670, 0, 55, "Align sprites to...", UIText_Drawer }, { UI_LIST, 0, 0, 680, 670, 300, 115, "", UIList_Drawer, UIList_Responder, UIList_Ticker, CP_CvarList, &lst_sprite_align }, @@ -576,13 +576,13 @@ ui_object_t ob_panel[] = { UI_TEXT, 0, 0, 280, 0, 0, 50, "Graphics Options: Particles", UIText_BrightDrawer }, { UI_TEXT, 0, 0, 300, 70, 0, 55, "Enable particle effects", UIText_Drawer }, { UI_BUTTON2, 0, 0, 680, 70, 70, 55, "rend-particle", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, - { UI_TEXT, 0, 0, 300, 130, 0, 55, "Maximum number of particles", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 130, 0, 55, "Maximum number of particles", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 130, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_particle_max }, - { UI_TEXT, 0, 0, 300, 190, 0, 55, "Spawn rate factor", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 190, 0, 55, "Spawn rate factor", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 190, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_particle_rate }, - { UI_TEXT, 0, 0, 300, 250, 0, 55, "Near diffusion factor", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 250, 0, 55, "Near diffusion factor", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 250, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_particle_diffuse }, - { UI_TEXT, 0, 0, 300, 310, 0, 55, "Near clip distance", UIText_Drawer }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 310, 0, 55, "Near clip distance", UIText_Drawer }, { UI_SLIDER, 0, 0, 680, 310, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_particle_visnear }, { UI_META, 11 },