Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 21:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundant Point struct and SceneViewport improvements

Browse Source 
- Keyboard shortcuts for Gizmo control
- Improved mousepick-blocking
This commit is contained in:
Simon Lübeß
2022-06-02 12:17:57 +02:00
parent e41645e12a
commit a80018e80c
10 changed files with 136 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Platform/Windows/WindowsInput.bf
+8 -8
View File
@@ -17,8 +17,8 @@ namespace GlitchyEngine
struct WindowsInputState
{
public int8[256] KeyStates;
public Point CursorPosition;
public Point CursorPositionDifference;
public Int2 CursorPosition;
public Int2 CursorPositionDifference;
}
static WindowsInputState[2] IputStates;
@@ -119,7 +119,7 @@ namespace GlitchyEngine
return state >= 0;
}
public override static Point GetMousePosition() => CurrentState.CursorPosition;
public override static Int2 GetMousePosition() => CurrentState.CursorPosition;
public override static int32 GetMouseX() => CurrentState.CursorPosition.X;
@@ -140,7 +140,7 @@ namespace GlitchyEngine
return state >= 0;
}
public override static Point GetLastMousePosition() => LastState.CursorPosition;
public override static Int2 GetLastMousePosition() => LastState.CursorPosition;
public override static int32 GetLastMouseX() => LastState.CursorPosition.X;
@@ -153,18 +153,18 @@ namespace GlitchyEngine
public override static bool IsMouseButtonReleasing(MouseButton button) => IsMouseButtonReleased(button) && WasMouseButtonPressed(button);
public override static Point GetMouseMovement() => CurrentState.CursorPositionDifference;
public override static Int2 GetMouseMovement() => CurrentState.CursorPositionDifference;
public override static void SetMousePosition(Point pos) => SetCursorPos(pos.X, pos.Y);
public override static void SetMousePosition(Int2 pos) => SetCursorPos(pos.X, pos.Y);
//[CLink, CallingConvention(.Stdcall)]
//static extern int16 GetKeyState(int32 keycode);
[CLink, CallingConvention(.Stdcall)]
static extern IntBool GetCursorPos(out Point p);
static extern IntBool GetCursorPos(out Int2 p);
[CLink, CallingConvention(.Stdcall)]
static extern IntBool SetCursorPos(c_int x, c_int y);
[CLink, CallingConvention(.Stdcall)]
static extern IntBool ScreenToClient(HWnd hWnd, ref Point p);
static extern IntBool ScreenToClient(HWnd hWnd, ref Int2 p);
public override static void NewFrame()
{
GlitchyEngine/src/Platform/Windows/WindowsWindow.bf
+6 -6
View File
@@ -66,13 +66,13 @@ namespace GlitchyEngine
//
// Size
//
public override Point Size
public override Int2 Size
{
get => *(Point*)&_clientRect.Width;
get => *(Int2*)&_clientRect.Width;
set
{
*(Point*)&_clientRect.Width = value;
*(Int2*)&_clientRect.Width = value;
ApplyRectangle();
}
}
@@ -102,13 +102,13 @@ namespace GlitchyEngine
//
// Position
//
public override Point Position
public override Int2 Position
{
get => *(Point*)&_clientRect;
get => *(Int2*)&_clientRect;
set
{
*(Point*)&_clientRect = value;
*(Int2*)&_clientRect = value;
ApplyRectangle();
}
}