From a8b4eb0711175339d1c2aed05664225ef747529e Mon Sep 17 00:00:00 2001 From: skyjake Date: Mon, 7 May 2012 06:40:11 +0300 Subject: [PATCH] Added|Control Panel: Graphics quality options FSAA and Vsync The vid-fsaa and vid-vsync cvars can now be toggled in the control panel. --- doomsday/engine/portable/src/ui_panel.c | 47 ++++++++++++++----------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/doomsday/engine/portable/src/ui_panel.c b/doomsday/engine/portable/src/ui_panel.c index 5f5ae965ac..b4203454f3 100644 --- a/doomsday/engine/portable/src/ui_panel.c +++ b/doomsday/engine/portable/src/ui_panel.c @@ -117,6 +117,8 @@ cvarbutton_t cvarbuttons[] = { {0, "sound-16bit"}, {0, "sound-3d"}, {0, "sound-info"}, + {0, "vid-vsync", "VSync on", "VSync off"}, + {0, "vid-fsaa", "Antialias", "No antialias"}, {0, "rend-particle"}, {0, "rend-camera-smooth"}, {0, "rend-mobj-smooth-turn"}, @@ -370,27 +372,30 @@ ui_object_t ob_panel[] = { UI_META, 2 }, { UI_TEXT, 0, 0, 280, 0, 0, 50, "Video Options", UIText_BrightDrawer }, - { UI_TEXT, 0, UIF_FADE_AWAY, 300, 70, 0, 55, "Gamma correction", UIText_Drawer }, - { UI_SLIDER, 0, UIF_FADE_AWAY, 680, 70, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_vid_gamma }, - { UI_TEXT, 0, UIF_FADE_AWAY, 300, 130, 0, 55, "Display contrast", UIText_Drawer }, - { UI_SLIDER, 0, UIF_FADE_AWAY, 680, 130, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_vid_contrast }, - { UI_TEXT, 0, UIF_FADE_AWAY, 300, 190, 0, 55, "Display brightness", UIText_Drawer }, - { UI_SLIDER, 0, UIF_FADE_AWAY, 680, 190, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_vid_bright }, - { UI_TEXT, 0, 0, 300, 250, 0, 55, "Current video mode", UIText_Drawer }, - { UI_BOX, 0, 0, 680, 250, 0, 60, "current", CP_VideoModeInfo }, - { UI_TEXT, 0, 0, 300, 310, 0, 55, "Resolution", UIText_Drawer }, - { UI_LIST, 0, CPID_RES_LIST, 680, 310, 300, 175, "", UIList_Drawer, UIList_Responder, UIList_Ticker, CP_ResolutionList, &lst_resolution }, - { UI_TEXT, 0, 0, 300, 490, 0, 55, "Custom resolution", UIText_Drawer }, - { UI_EDIT, 0, CPID_RES_X, 680, 490, 130, 55, "", UIEdit_Drawer, UIEdit_Responder, 0, CP_VidModeChanged, &ed_res_x }, - { UI_TEXT, 0, 0, 826, 490, 0, 55, "x", UIText_Drawer }, - { UI_EDIT, 0, CPID_RES_Y, 850, 490, 130, 55, "", UIEdit_Drawer, UIEdit_Responder, 0, CP_VidModeChanged, &ed_res_y }, - { UI_TEXT, 0, 0, 300, 550, 0, 55, "Fullscreen", UIText_Drawer }, - { UI_BUTTON2EX, 0, 0, 680, 550, 130, 55, "", UIButton_Drawer, UIButton_Responder, 0, CP_VidModeChanged, &btn_fullscreen }, - { UI_TEXT, 0, 0, 300, 610, 0, 55, "Color depth", UIText_Drawer }, - { UI_BUTTON2EX, 0, 0, 680, 610, 130, 55, "", UIButton_Drawer, UIButton_Responder, 0, CP_VidModeChanged, &btn_bpp }, - { UI_TEXT, 0, 0, 300, 670, 0, 55, "Default video mode", UIText_Drawer }, - { UI_BOX, 0, 0, 680, 670, 0, 55, "default", CP_VideoModeInfo }, - { UI_BUTTON, 0, 0, 680, 730, 170, 60, "Set Default", UIButton_Drawer, UIButton_Responder, 0, CP_SetDefaultVidMode }, + { UI_TEXT, 0, 0, 300, 70, 0, 55, "Quality", UIText_Drawer }, + { UI_BUTTON2, 0, 0, 680, 70, 145, 55, "vid-fsaa", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, + { UI_BUTTON2, 0, 0, 830, 70, 145, 55, "vid-vsync", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 130, 0, 55, "Gamma correction", UIText_Drawer }, + { UI_SLIDER, 0, UIF_FADE_AWAY, 680, 130, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_vid_gamma }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 190, 0, 55, "Display contrast", UIText_Drawer }, + { UI_SLIDER, 0, UIF_FADE_AWAY, 680, 190, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_vid_contrast }, + { UI_TEXT, 0, UIF_FADE_AWAY, 300, 250, 0, 55, "Display brightness", UIText_Drawer }, + { UI_SLIDER, 0, UIF_FADE_AWAY, 680, 250, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_vid_bright }, + { UI_TEXT, 0, 0, 300, 310, 0, 55, "Current video mode", UIText_Drawer }, + { UI_BOX, 0, 0, 680, 310, 0, 60, "current", CP_VideoModeInfo }, + { UI_TEXT, 0, 0, 300, 370, 0, 55, "Resolution", UIText_Drawer }, + { UI_LIST, 0, CPID_RES_LIST, 680, 370, 300, 175, "", UIList_Drawer, UIList_Responder, UIList_Ticker, CP_ResolutionList, &lst_resolution }, + { UI_TEXT, 0, 0, 300, 550, 0, 55, "Custom resolution", UIText_Drawer }, + { UI_EDIT, 0, CPID_RES_X, 680, 550, 130, 55, "", UIEdit_Drawer, UIEdit_Responder, 0, CP_VidModeChanged, &ed_res_x }, + { UI_TEXT, 0, 0, 826, 550, 0, 55, "x", UIText_Drawer }, + { UI_EDIT, 0, CPID_RES_Y, 850, 550, 130, 55, "", UIEdit_Drawer, UIEdit_Responder, 0, CP_VidModeChanged, &ed_res_y }, + { UI_TEXT, 0, 0, 300, 610, 0, 55, "Fullscreen", UIText_Drawer }, + { UI_BUTTON2EX, 0, 0, 680, 610, 130, 55, "", UIButton_Drawer, UIButton_Responder, 0, CP_VidModeChanged, &btn_fullscreen }, + { UI_TEXT, 0, 0, 300, 670, 0, 55, "Color depth", UIText_Drawer }, + { UI_BUTTON2EX, 0, 0, 680, 670, 130, 55, "", UIButton_Drawer, UIButton_Responder, 0, CP_VidModeChanged, &btn_bpp }, + { UI_TEXT, 0, 0, 300, 730, 0, 55, "Default video mode", UIText_Drawer }, + { UI_BOX, 0, 0, 680, 730, 0, 55, "default", CP_VideoModeInfo }, + { UI_BUTTON, 0, 0, 680, 790, 170, 60, "Set Default", UIButton_Drawer, UIButton_Responder, 0, CP_SetDefaultVidMode }, { UI_TEXT, 0, 0, 300, 910, 0, 55, "Change to", UIText_Drawer }, { UI_BUTTON, 0, CPID_SET_RES, 680, 910, 300, 60, "", UIButton_Drawer, UIButton_Responder, 0, CP_SetVidMode },