X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=5689ceb04d822cf81896f28629ec50ee6a58f23f;hb=843ef00143d2dd922eaa56362d4afbeb41aa54bf;hp=47963bdfbd2b2864de7d14fd08040be1d3897e1a;hpb=f4fc3b435118e5d9e4085da37014436d2e063259;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index 47963bd..5689ceb 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -1,4 +1,4 @@ - (* Copyright (C) Doom 2D: Forever Developers +(* Copyright (C) Doom 2D: Forever Developers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -51,17 +51,16 @@ implementation uses {$IFDEF WINDOWS}Windows,{$ENDIF} -{$IFDEF USE_NANOGL} - nanoGL, -{$ELSE} - GL, GLExt, +{$INCLUDE ../nogl/noGLuses.inc} +{$IFDEF ENABLE_HOLMES} + g_holmes, sdlcarcass, fui_ctls, {$ENDIF} SysUtils, Classes, MAPDEF, SDL2, e_graphics, e_log, e_texture, g_main, g_console, e_input, g_options, g_game, g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net, - g_map, g_gfx, g_monsters, g_holmes, xprofiler, - sdlcarcass, fui_ctls; + g_map, g_gfx, g_monsters, xprofiler, + g_touch; const @@ -85,17 +84,25 @@ var ticksOverflow: Int64 = -1; lastTicks: Uint32 = 0; // to detect overflow {$ENDIF} - + JoystickHatState: array [0..e_MaxJoyHats, HAT_LEFT..HAT_DOWN] of Boolean; procedure KillGLWindow (preserveGL: Boolean); begin +{$IFDEF ENABLE_HOLMES} if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglDeinitCB)) then oglDeinitCB(); end; +{$ENDIF} if (h_Wnd <> nil) then SDL_DestroyWindow(h_Wnd); if (h_GL <> nil) and (not preserveGL) then begin - {$IFDEF USE_NANOGL} - nanoGL_Destroy; - {$ENDIF USE_NANOGL} + +{$IFDEF USE_NANOGL} + nanoGL_Destroy; +{$ENDIF} + +{$IFDEF USE_NOGL} + nogl_Quit; +{$ENDIF} + SDL_GL_DeleteContext(h_GL); end; h_Wnd := nil; @@ -181,9 +188,12 @@ begin e_WriteLog('SDL: fullscreen window got invalid size: '+IntToStr(nw)+'x'+IntToStr(nh), TMsgType.Notify); end; end; - fuiScrWdt := gScreenWidth; - fuiScrHgt := gScreenHeight; - if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglInitCB)) then oglInitCB(); end; + + {$IFDEF ENABLE_HOLMES} + fuiScrWdt := gScreenWidth; + fuiScrHgt := gScreenHeight; + if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglInitCB)) then oglInitCB(); end; + {$ENDIF} {$ENDIF} result := true; @@ -224,17 +234,25 @@ begin end; -procedure ChangeWindowSize (); +procedure ChangeWindowSize (requested: Boolean); begin e_LogWritefln(' ChangeWindowSize: (ws=%dx%d) (ss=%dx%d)', [gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight]); gWinSizeX := gScreenWidth; gWinSizeY := gScreenHeight; {$IF not DEFINED(HEADLESS)} - fuiScrWdt := gScreenWidth; - fuiScrHgt := gScreenHeight; + {$IFDEF ENABLE_HOLMES} + fuiScrWdt := gScreenWidth; + fuiScrHgt := gScreenHeight; + {$ENDIF} e_ResizeWindow(gScreenWidth, gScreenHeight); g_Game_SetupScreenSize(); - g_Menu_Reset(); + {$IF DEFINED(ANDROID)} + (* This will fix menu reset on keyboard showing *) + if requested then + g_Menu_Reset; + {$ELSE} + g_Menu_Reset; + {$ENDIF} g_Game_ClearLoading(); {$ENDIF} end; @@ -269,7 +287,7 @@ begin if result then begin g_Window_SetDisplay(preserve); - ChangeWindowSize(); + ChangeWindowSize(true); end; {$ENDIF} end; @@ -325,7 +343,7 @@ begin gScreenWidth := ev.data1; gScreenHeight := ev.data2; end; - ChangeWindowSize(); + ChangeWindowSize(false); SwapBuffers(); if g_debug_WinMsgs then begin @@ -410,7 +428,9 @@ begin gWinActive := false; - if assigned(winBlurCB) then winBlurCB(); + {$IFDEF ENABLE_HOLMES} + if assigned(winBlurCB) then winBlurCB(); + {$ENDIF} end; end else if wActivate then @@ -433,7 +453,10 @@ begin end; gWinActive := true; - if assigned(winFocusCB) then winFocusCB(); + + {$IFDEF ENABLE_HOLMES} + if assigned(winFocusCB) then winFocusCB(); + {$ENDIF} end; end; end; @@ -444,6 +467,8 @@ var key, keychr: Word; uc: UnicodeChar; down: Boolean; + i: Integer; + hat: array [HAT_LEFT..HAT_DOWN] of Boolean; begin result := false; @@ -471,8 +496,10 @@ begin SDL_KEYDOWN, SDL_KEYUP: begin key := ev.key.keysym.scancode; + if key = SDL_SCANCODE_AC_BACK then + key := SDL_SCANCODE_ESCAPE; down := (ev.type_ = SDL_KEYDOWN); - {$IF not DEFINED(HEADLESS)} + {$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)} if fuiOnSDLEvent(ev) then begin // event eaten, but... @@ -480,11 +507,66 @@ begin exit; end; {$ENDIF} + if ev.key._repeat = 0 then + begin + e_KeyUpDown(key, down); + g_Console_ProcessBind(key, down) + end; if down then KeyPress(key); + end; + + SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP: + if (ev.jbutton.which < e_MaxJoys) and (ev.jbutton.button < e_MaxJoyBtns) then + begin + key := e_JoyButtonToKey(ev.jbutton.which, ev.jbutton.button); + down := ev.type_ = SDL_JOYBUTTONDOWN; e_KeyUpDown(key, down); + g_Console_ProcessBind(key, down); + if down then KeyPress(key) + end; + + SDL_JOYAXISMOTION: + if (ev.jaxis.which < e_MaxJoys) and (ev.jaxis.axis < e_MaxJoyAxes) then + begin + down := ev.jaxis.value <> Joysticks[ev.jaxis.which].AxisZero[ev.jaxis.axis]; + if ev.jaxis.value < Joysticks[ev.jaxis.which].AxisZero[ev.jaxis.axis] - e_JoystickDeadzones[ev.jaxis.which] then + key := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_MINUS) + else + key := e_JoyAxisToKey(ev.jaxis.which, ev.jaxis.axis, AX_PLUS); + e_KeyUpDown(key, down); + g_Console_ProcessBind(key, down); + if down then KeyPress(key) + end; + + SDL_JOYHATMOTION: + if (ev.jhat.which < e_MaxJoys) and (ev.jhat.hat < e_MaxJoyHats) then + begin + hat[HAT_UP] := LongBool(ev.jhat.value and SDL_HAT_UP); + hat[HAT_DOWN] := LongBool(ev.jhat.value and SDL_HAT_DOWN); + hat[HAT_LEFT] := LongBool(ev.jhat.value and SDL_HAT_LEFT); + hat[HAT_RIGHT] := LongBool(ev.jhat.value and SDL_HAT_RIGHT); + for i := HAT_LEFT to HAT_DOWN do + begin + if JoystickHatState[ev.jhat.which, i] <> hat[i] then + begin + down := hat[i]; + key := e_JoyHatToKey(ev.jhat.which, ev.jhat.hat, i); + e_KeyUpDown(key, down); + g_Console_ProcessBind(key, down); + if down then KeyPress(key) + end + end; + JoystickHatState[ev.jhat.which] := hat end; - {$IF not DEFINED(HEADLESS)} +(* + SDL_JOYDEVICEADDED, SDL_JOYDEVICEREMOVED: + begin + // TODO update menu here + end +*) + + {$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)} SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION: fuiOnSDLEvent(ev); {$ENDIF} @@ -497,6 +579,9 @@ begin if (keychr > 0) and (keychr <= 255) then CharPress(AnsiChar(keychr)); end; + SDL_FINGERMOTION, SDL_FINGERDOWN, SDL_FINGERUP: + g_Touch_HandleEvent(ev.tfinger); + // other key presses and joysticks are handled in e_input end; end; @@ -532,8 +617,10 @@ begin {$IF not DEFINED(HEADLESS)} h_GL := SDL_GL_CreateContext(h_Wnd); if (h_GL = nil) then exit; - fuiScrWdt := gScreenWidth; - fuiScrHgt := gScreenHeight; + {$IFDEF ENABLE_HOLMES} + fuiScrWdt := gScreenWidth; + fuiScrHgt := gScreenHeight; + {$ENDIF} SDL_GL_MakeCurrent(h_Wnd, h_GL); {$IFDEF USE_NANOGL} if nanoGL_Init() = 0 then @@ -542,8 +629,13 @@ begin e_WriteLog('nanoGL initialization error', TMsgType.Fatal); exit; end; -{$ENDIF USE_NANOGL} - if (assigned(oglInitCB)) then oglInitCB(); +{$ENDIF} +{$IFDEF USE_NOGL} + nogl_Init; +{$ENDIF} + {$IFDEF ENABLE_HOLMES} + if (assigned(oglInitCB)) then oglInitCB(); + {$ENDIF} if (h_GL <> nil) then g_SetVSync(gVSync); {$ENDIF} @@ -624,7 +716,7 @@ begin EventHandler(ev); if (ev.type_ = SDL_QUITEV) then break; end; - e_PollJoysticks(); + //e_PollJoysticks(); if (ev.type_ = SDL_QUITEV) or (gExit = EXIT_QUIT) then begin @@ -691,7 +783,7 @@ begin result := EventHandler(ev); if (ev.type_ = SDL_QUITEV) then exit; end; - e_PollJoysticks(); + //e_PollJoysticks(); end; @@ -795,7 +887,7 @@ end; procedure InitOpenGL (); begin {$IF not DEFINED(HEADLESS)} - {$IFDEF USE_NANOGL} + {$IFDEF USE_GLES1} SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); @@ -806,9 +898,9 @@ begin SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8); 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, 8); // lights; it is enough to have 1-bit stencil buffer for lighting, but... {$ENDIF} - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); {$ENDIF} end; @@ -863,17 +955,21 @@ var {$ENDIF} arg: AnsiString; mdfo: TStream; + {$IFDEF ENABLE_HOLMES} itmp: Integer; valres: Word; + {$ENDIF} begin {$IFDEF HEADLESS} e_NoGraphics := true; {$ELSE} - if (not g_holmes_imfunctional) then - begin - uiInitialize(); - uiContext.font := 'win14'; - end; + {$IFDEF ENABLE_HOLMES} + if (not g_holmes_imfunctional) then + begin + uiInitialize(); + uiContext.font := 'win14'; + end; + {$ENDIF} {$ENDIF} idx := 1; @@ -902,6 +998,7 @@ begin if arg = '--aimline' then g_dbg_aimline_on := true; {.$ENDIF} +{$IFDEF ENABLE_HOLMES} if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end; if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then @@ -936,6 +1033,7 @@ begin Inc(idx); end; end; +{$ENDIF} if (arg = '--game-scale') or (arg = '-game-scale') then begin @@ -978,15 +1076,16 @@ begin e_LogWritefln('stencil buffer size: %s', [ltmp]); gwin_has_stencil := (ltmp > 0); - if not glHasExtension('GL_ARB_texture_non_power_of_two') then + if glHasExtension('GL_ARB_texture_non_power_of_two') or + glHasExtension('GL_OES_texture_npot') then begin - e_WriteLog('NPOT textures: NO', TMsgType.Warning); - glLegacyNPOT := true; + e_WriteLog('NPOT textures: YES', TMsgType.Notify); + glLegacyNPOT := false; end else begin - e_WriteLog('NPOT textures: YES', TMsgType.Notify); - glLegacyNPOT := false; + e_WriteLog('NPOT textures: NO', TMsgType.Warning); + glLegacyNPOT := true; end; gwin_dump_extensions := false; {$ENDIF}