X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=c91ff6cc555cedcf224827fcd9fac0f0f12437ea;hb=57b20a742f3db73dc84739d11ba35a16a27d5ab6;hp=6dfa778096ff33f616b553c00539c81b542227fd;hpb=ebb13957295d3f50ba51ff5b871310570d0d4dfe;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index 6dfa778..c91ff6c 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *) -{$MODE DELPHI} +{$INCLUDE ../shared/a_modes.inc} unit g_window; interface @@ -39,6 +39,7 @@ function g_Window_SetSize(W, H: Word; FScreen: Boolean): Boolean; var gwin_dump_extensions: Boolean = false; gwin_has_stencil: Boolean = false; + gwin_k8_enable_light_experiments: Boolean = false; implementation @@ -46,7 +47,8 @@ uses {$IFDEF WINDOWS}Windows,{$ENDIF} SDL2, GL, GLExt, e_graphics, e_log, g_main, g_console, SysUtils, e_input, g_options, g_game, - g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net; + g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net, + g_map; var h_Wnd: PSDL_Window; @@ -576,6 +578,8 @@ begin wNeedTimeReset := False; end; + g_Map_ProfilersBegin(); + t := Time_Delta div 28{(27777 div 1000)}; if t > 0 then begin @@ -593,6 +597,8 @@ begin else if NetMode = NET_CLIENT then g_Net_Client_Update(); end; + g_Map_ProfilersEnd(); + if wLoadingQuit then begin g_Game_Free(); @@ -641,7 +647,10 @@ begin SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1); // lights; it is enough to have 1-bit stencil buffer for lighting + if gwin_k8_enable_light_experiments then + begin + SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1); // lights; it is enough to have 1-bit stencil buffer for lighting + end; SDL_GL_SetSwapInterval(v); end; @@ -695,6 +704,17 @@ begin e_NoGraphics := True; {$ENDIF} + for idx := 1 to ParamCount do + begin + if ParamStr(idx) = '--opengl-dump-exts' then gwin_dump_extensions := true; + if ParamStr(idx) = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true; + if ParamStr(idx) = '--jah' then g_profile_history_size := 100; + if ParamStr(idx) = '--sap-draw' then gdbg_map_use_sap_draw := true; + if ParamStr(idx) = '--grid-draw' then gdbg_map_use_sap_draw := false; + if ParamStr(idx) = '--sap-coldet' then gdbg_map_use_sap_coldet := true; + if ParamStr(idx) = '--grid-coldet' then gdbg_map_use_sap_coldet := false; + end; + e_WriteLog('Initializing OpenGL', MSG_NOTIFY); InitOpenGL(gVSync); @@ -707,16 +727,17 @@ begin {EnumDisplayModes();} - for idx := 1 to ParamCount do + if gwin_k8_enable_light_experiments then begin - if ParamStr(idx) = '--opengl-dump-exts' then gwin_dump_extensions := true; + SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, @ltmp); + e_WriteLog(Format('stencil buffer size: %d', [ltmp]), MSG_WARNING); + gwin_has_stencil := (ltmp > 0); + end + else + begin + gwin_has_stencil := false; end; - SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, @ltmp); - e_WriteLog(Format('stencil buffer size: %d', [ltmp]), MSG_WARNING); - - gwin_has_stencil := (ltmp > 0); - if not glHasExtension('GL_ARB_texture_non_power_of_two') then begin e_WriteLog('Driver DID''T advertised NPOT textures support', MSG_WARNING);