diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 7d9ec78b5baffe5a78bb694e1c15008af40eeb53..f5c4618dfc59c9e32de902c998c4f82e87109861 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
gwin_has_stencil: Boolean = false;
gwin_k8_enable_light_experiments: Boolean = false;
+
+// both for but and for bstate
+const
+ MouseLeft = $0001;
+ MouseRight = $0002;
+ MouseMiddle = $0004;
+ MouseWheelUp = $0008;
+ MouseWheelDown = $0010;
+
+type
+ // but=0: motion; but <0: release, do (-but) to get MouseXXX
+ // on press, bstate will contain pressed button; on release it won't
+ TMouseHandler = procedure (x, y, but: Integer; bstate: Integer);
+
+var
+ evMouseCB: TMouseHandler = nil;
+
+
implementation
uses
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_map;
+ g_map, g_gfx, g_monsters;
var
h_Wnd: PSDL_Window;
ticksOverflow: Int64 = -1;
lastTicks: Uint32 = 0; // to detect overflow
{$ENDIF}
+ curMsButState: Integer = 0;
+ curMsX: Integer = 0;
+ curMsY: Integer = 0;
const
// TODO: move this to a separate file
SDL_WINDOWEVENT_MINIMIZED:
begin
+ curMsButState := 0;
if not wMinimized then
begin
e_ResizeWindow(0, 0);
SDL_WINDOWEVENT_RESTORED:
begin
+ curMsButState := 0;
if wMinimized then
begin
e_ResizeWindow(gScreenWidth, gScreenHeight);
begin
wActivate := True;
//e_WriteLog('window gained focus!', MSG_NOTIFY);
+ curMsButState := 0;
end;
SDL_WINDOWEVENT_FOCUS_LOST:
begin
wDeactivate := True;
//e_WriteLog('window lost focus!', MSG_NOTIFY);
+ curMsButState := 0;
end;
end;
key, keychr: Word;
uc: UnicodeChar;
//joy: Integer;
+ but: Integer;
+
+ function buildBut (b: Byte): Integer;
+ begin
+ result := 0;
+ case b of
+ SDL_BUTTON_LEFT: result := result or MouseLeft;
+ SDL_BUTTON_MIDDLE: result := result or MouseMiddle;
+ SDL_BUTTON_RIGHT: result := result or MouseRight;
+ end;
+ end;
+
+ function buildButState (b: Byte): Integer;
+ begin
+ result := 0;
+ case b of
+ SDL_BUTTON_LEFT: result := result or MouseLeft;
+ SDL_BUTTON_MIDDLE: result := result or MouseMiddle;
+ SDL_BUTTON_RIGHT: result := result or MouseRight;
+ end;
+ end;
begin
Result := False;
case ev.type_ of
KeyPress(key);
end;
+ SDL_MOUSEBUTTONDOWN:
+ begin
+ curMsX := ev.button.x;
+ curMsY := ev.button.y;
+ but := buildBut(ev.button.button);
+ if (but <> 0) then
+ begin
+ // ev.button.clicks: Byte
+ curMsButState := curMsButState or but;
+ if assigned(evMouseCB) then evMouseCB(ev.button.x, ev.button.y, but, curMsButState);
+ end;
+ end;
+ SDL_MOUSEBUTTONUP:
+ begin
+ curMsX := ev.button.x;
+ curMsY := ev.button.y;
+ but := buildBut(ev.button.button);
+ if (but <> 0) then
+ begin
+ curMsButState := curMsButState and (not but);
+ if assigned(evMouseCB) then evMouseCB(ev.button.x, ev.button.y, -but, curMsButState);
+ end;
+ end;
+ SDL_MOUSEWHEEL:
+ begin
+ if assigned(evMouseCB) then
+ begin
+ (*
+ if (ev.wheel.direction = SDL_MOUSEWHEEL_FLIPPED) then
+ begin
+ ev.wheel.x := -ev.wheel.x;
+ ev.wheel.y := -ev.wheel.y;
+ end;
+ *)
+ if (ev.wheel.y > 0) then evMouseCB(curMsX, curMsY, MouseWheelUp, curMsButState);
+ if (ev.wheel.y < 0) then evMouseCB(curMsX, curMsY, MouseWheelDown, curMsButState);
+ end;
+ end;
+ SDL_MOUSEMOTION:
+ begin
+ curMsX := ev.motion.x;
+ curMsY := ev.motion.y;
+ if assigned(evMouseCB) then evMouseCB(curMsX, curMsY, 0, curMsButState);
+ end;
+
SDL_TEXTINPUT:
begin
Utf8ToUnicode(@uc, PChar(ev.text.text), 1);
end;
g_Map_ProfilersBegin();
+ g_Mons_ProfilersBegin();
t := Time_Delta div 28{(27777 div 1000)};
if t > 0 then
end;
g_Map_ProfilersEnd();
+ g_Mons_ProfilersEnd();
if wLoadingQuit then
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) = '--tree-draw' then gdbg_map_use_tree_draw := true;
- if ParamStr(idx) = '--grid-draw' then gdbg_map_use_tree_draw := false;
- if ParamStr(idx) = '--tree-coldet' then gdbg_map_use_tree_coldet := true;
- if ParamStr(idx) = '--grid-coldet' then gdbg_map_use_tree_coldet := false;
+ //if ParamStr(idx) = '--tree-draw' then gdbg_map_use_tree_draw := true;
+ //if ParamStr(idx) = '--grid-draw' then gdbg_map_use_tree_draw := false;
+ //if ParamStr(idx) = '--tree-coldet' then gdbg_map_use_tree_coldet := true;
+ //if ParamStr(idx) = '--grid-coldet' then gdbg_map_use_tree_coldet := false;
+ if ParamStr(idx) = '--no-particles' then gpart_dbg_enabled := false;
+ if ParamStr(idx) = '--no-los' then gmon_dbg_los_enabled := false;
+
+ if ParamStr(idx) = '--profile-render' then g_profile_frame_draw := true;
+ if ParamStr(idx) = '--profile-coldet' then g_profile_collision := true;
+ if ParamStr(idx) = '--profile-los' then g_profile_los := true;
+
+ if ParamStr(idx) = '--no-part-phys' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-part-physics' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-particles-phys' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-particles-physics' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-particle-phys' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-particle-physics' then gpart_dbg_phys_enabled := false;
end;
- if gdbg_map_use_tree_draw then e_WriteLog('using TREE renderer', MSG_NOTIFY);
- if not gdbg_map_use_tree_draw then e_WriteLog('using GRID renderer', MSG_NOTIFY);
+ //if gdbg_map_use_tree_draw then e_WriteLog('using TREE renderer', MSG_NOTIFY);
+ //if not gdbg_map_use_tree_draw then e_WriteLog('using GRID renderer', MSG_NOTIFY);
- if gdbg_map_use_tree_coldet then e_WriteLog('using TREE coldet', MSG_NOTIFY);
- if not gdbg_map_use_tree_coldet then e_WriteLog('using GRID coldet', MSG_NOTIFY);
+ //if gdbg_map_use_tree_coldet then e_WriteLog('using TREE coldet', MSG_NOTIFY);
+ //if not gdbg_map_use_tree_coldet then e_WriteLog('using GRID coldet', MSG_NOTIFY);
e_WriteLog('Initializing OpenGL', MSG_NOTIFY);
InitOpenGL(gVSync);