GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor engine to support double-precision vectors

Browse Source
This commit is contained in:
Wojtek Figat
2022-06-13 00:40:32 +02:00
parent f82e370392
commit a881c90b2e
744 changed files with 19062 additions and 12467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Engine/Platform/Mac/MacPlatform.cpp
View File

@@ -74,32 +74,32 @@ CFStringRef MacUtils::ToString(const StringView& str)
return CFStringCreateWithBytes(nullptr, (const UInt8*)str.GetNonTerminatedText(), str.Length() * sizeof(Char), kCFStringEncodingUTF16LE, false);
}
Vector2 MacUtils::PosToCoca(const Vector2& pos)
Float2 MacUtils::PosToCoca(const Float2& pos)
{
// MacOS uses y-coordinate starting at the bottom of the screen
Vector2 result = pos;
Float2 result = pos;
result.Y *= -1;
result += GetScreensOrigin();
return result;
}
Vector2 MacUtils::CocaToPos(const Vector2& pos)
Float2 MacUtils::CocaToPos(const Float2& pos)
{
// MacOS uses y-coordinate starting at the bottom of the screen
Vector2 result = pos;
Float2 result = pos;
result -= GetScreensOrigin();
result.Y *= -1;
return result;
}
Vector2 MacUtils::GetScreensOrigin()
Float2 MacUtils::GetScreensOrigin()
{
Vector2 result = Vector2::Zero;
Float2 result = Float2::Zero;
NSArray* screenArray = [NSScreen screens];
for (NSUInteger i = 0; i < [screenArray count]; i++)
{
NSRect rect = [[screenArray objectAtIndex:i] frame];
Vector2 pos(rect.origin.x, rect.origin.y + rect.size.height);
Float2 pos(rect.origin.x, rect.origin.y + rect.size.height);
if (pos.X < result.X)
result.X = pos.X;
if (pos.Y > result.Y)
@@ -206,7 +206,7 @@ public:
public:
// [Mouse]
void SetMousePosition(const Vector2& newPosition) final override
void SetMousePosition(const Float2& newPosition) final override
{
MacPlatform::SetMousePosition(newPosition);
@@ -532,15 +532,15 @@ void MacPlatform::OpenUrl(const StringView& url)
{
}
Vector2 MacPlatform::GetMousePosition()
Float2 MacPlatform::GetMousePosition()
{
CGEventRef event = CGEventCreate(nullptr);
CGPoint cursor = CGEventGetLocation(event);
CFRelease(event);
return Vector2((float)cursor.x, (float)cursor.y);
return Float2((float)cursor.x, (float)cursor.y);
}
void MacPlatform::SetMousePosition(const Vector2& pos)
void MacPlatform::SetMousePosition(const Float2& pos)
{
CGPoint cursor;
cursor.x = (CGFloat)pos.X;
@@ -548,10 +548,10 @@ void MacPlatform::SetMousePosition(const Vector2& pos)
CGWarpMouseCursorPosition(cursor);
}
Vector2 MacPlatform::GetDesktopSize()
Float2 MacPlatform::GetDesktopSize()
{
CGDirectDisplayID mainDisplay = CGMainDisplayID();
return Vector2((float)CGDisplayPixelsWide(mainDisplay), (float)CGDisplayPixelsHigh(mainDisplay));
return Float2((float)CGDisplayPixelsWide(mainDisplay), (float)CGDisplayPixelsHigh(mainDisplay));
}
Rectangle GetDisplayBounds(CGDirectDisplayID display)
@@ -560,7 +560,7 @@ Rectangle GetDisplayBounds(CGDirectDisplayID display)
return Rectangle(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
}
Rectangle MacPlatform::GetMonitorBounds(const Vector2& screenPos)
Rectangle MacPlatform::GetMonitorBounds(const Float2& screenPos)
{
CGPoint point;
point.x = screenPos.X;
@@ -570,7 +570,7 @@ Rectangle MacPlatform::GetMonitorBounds(const Vector2& screenPos)
CGGetDisplaysWithPoint(point, 1, &display, &count);
if (count == 1)
return GetDisplayBounds(display);
return Rectangle(Vector2::Zero, GetDesktopSize());
return Rectangle(Float2::Zero, GetDesktopSize());
}
Rectangle MacPlatform::GetVirtualDesktopBounds()
@@ -579,7 +579,7 @@ Rectangle MacPlatform::GetVirtualDesktopBounds()
uint32_t count = 0;
CGGetOnlineDisplayList(ARRAY_COUNT(displays), displays, &count);
if (count == 0)
return Rectangle(Vector2::Zero, GetDesktopSize());
return Rectangle(Float2::Zero, GetDesktopSize());
Rectangle result = GetDisplayBounds(displays[0]);
for (uint32_t i = 1; i < count; i++)
result = Rectangle::Union(result, GetDisplayBounds(displays[i]));

8
Source/Engine/Platform/Mac/MacPlatform.h
View File

@@ -93,10 +93,10 @@ public:
static void CreateGuid(Guid& result);
static bool CanOpenUrl(const StringView& url);
static void OpenUrl(const StringView& url);
static Vector2 GetMousePosition();
static void SetMousePosition(const Vector2& pos);
static Rectangle GetMonitorBounds(const Vector2& screenPos);
static Vector2 GetDesktopSize();
static Float2 GetMousePosition();
static void SetMousePosition(const Float2& pos);
static Rectangle GetMonitorBounds(const Float2& screenPos);
static Float2 GetDesktopSize();
static Rectangle GetVirtualDesktopBounds();
static String GetMainDirectory();
static String GetExecutableFilePath();

6
Source/Engine/Platform/Mac/MacUtils.h
View File

@@ -10,7 +10,7 @@ class FLAXENGINE_API MacUtils
public:
static String ToString(CFStringRef str);
static CFStringRef ToString(const StringView& str);
static Vector2 PosToCoca(const Vector2& pos);
static Vector2 CocaToPos(const Vector2& pos);
static Vector2 GetScreensOrigin();
static Float2 PosToCoca(const Float2& pos);
static Float2 CocaToPos(const Float2& pos);
static Float2 GetScreensOrigin();
};

74
Source/Engine/Platform/Mac/MacWindow.cpp
View File

@@ -159,9 +159,9 @@ KeyboardKeys GetKey(NSEvent* event)
}
}
Vector2 GetWindowTitleSize(const MacWindow* window)
Float2 GetWindowTitleSize(const MacWindow* window)
{
Vector2 size = Vector2::Zero;
Float2 size = Float2::Zero;
if (window->GetSettings().HasBorder)
{
NSRect frameStart = [(NSWindow*)window->GetNativePtr() frameRectForContentRect:NSMakeRect(0, 0, 0, 0)];
@@ -170,11 +170,11 @@ Vector2 GetWindowTitleSize(const MacWindow* window)
return size;
}
Vector2 GetMousePosition(MacWindow* window, NSEvent* event)
Float2 GetMousePosition(MacWindow* window, NSEvent* event)
{
NSRect frame = [(NSWindow*)window->GetNativePtr() frame];
NSPoint point = [event locationInWindow];
return Vector2(point.x, frame.size.height - point.y) - GetWindowTitleSize(window);
return Float2(point.x, frame.size.height - point.y) - GetWindowTitleSize(window);
}
class MacDropData : public IGuiData
@@ -198,12 +198,12 @@ public:
}
};
void GetDragDropData(const MacWindow* window, id<NSDraggingInfo> sender, Vector2& mousePos, MacDropData& dropData)
void GetDragDropData(const MacWindow* window, id<NSDraggingInfo> sender, Float2& mousePos, MacDropData& dropData)
{
NSRect frame = [(NSWindow*)window->GetNativePtr() frame];
NSPoint point = [sender draggingLocation];
Vector2 titleSize = GetWindowTitleSize(window);
mousePos = Vector2(point.x, frame.size.height - point.y) - titleSize;
Float2 titleSize = GetWindowTitleSize(window);
mousePos = Float2(point.x, frame.size.height - point.y) - titleSize;
NSPasteboard* pasteboard = [sender draggingPasteboard];
if ([[pasteboard types] containsObject:NSPasteboardTypeString])
{
@@ -372,7 +372,7 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
- (void)scrollWheel:(NSEvent*)event
{
Vector2 mousePos = GetMousePosition(Window, event);
Float2 mousePos = GetMousePosition(Window, event);
double deltaX = [event scrollingDeltaX];
double deltaY = [event scrollingDeltaY];
if ([event hasPreciseScrollingDeltas])
@@ -380,13 +380,13 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
deltaX *= 0.03;
deltaY *= 0.03;
}
// TODO: add support for scroll delta as Vector2 in the engine
// TODO: add support for scroll delta as Float2 in the engine
Input::Mouse->OnMouseWheel(Window->ClientToScreen(mousePos), deltaY, Window);
}
- (void)mouseMoved:(NSEvent*)event
{
Vector2 mousePos = GetMousePosition(Window, event);
Float2 mousePos = GetMousePosition(Window, event);
if (!Window->IsMouseTracking() && !IsMouseOver)
return;
Input::Mouse->OnMouseMove(Window->ClientToScreen(mousePos), Window);
@@ -406,7 +406,7 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
- (void)mouseDown:(NSEvent*)event
{
Vector2 mousePos = GetMousePosition(Window, event);
Float2 mousePos = GetMousePosition(Window, event);
MouseButton mouseButton = MouseButton::Left;
if ([event clickCount] == 2)
Input::Mouse->OnMouseDoubleClick(Window->ClientToScreen(mousePos), mouseButton, Window);
@@ -421,14 +421,14 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
- (void)mouseUp:(NSEvent*)event
{
Vector2 mousePos = GetMousePosition(Window, event);
Float2 mousePos = GetMousePosition(Window, event);
MouseButton mouseButton = MouseButton::Left;
Input::Mouse->OnMouseUp(Window->ClientToScreen(mousePos), mouseButton, Window);
}
- (void)rightMouseDown:(NSEvent*)event
{
Vector2 mousePos = GetMousePosition(Window, event);
Float2 mousePos = GetMousePosition(Window, event);
MouseButton mouseButton = MouseButton::Right;
if ([event clickCount] == 2)
Input::Mouse->OnMouseDoubleClick(Window->ClientToScreen(mousePos), mouseButton, Window);
@@ -443,14 +443,14 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
- (void)rightMouseUp:(NSEvent*)event
{
Vector2 mousePos = GetMousePosition(Window, event);
Float2 mousePos = GetMousePosition(Window, event);
MouseButton mouseButton = MouseButton::Right;
Input::Mouse->OnMouseUp(Window->ClientToScreen(mousePos), mouseButton, Window);
}
- (void)otherMouseDown:(NSEvent*)event
{
Vector2 mousePos = GetMousePosition(Window, event);
Float2 mousePos = GetMousePosition(Window, event);
MouseButton mouseButton;
switch ([event buttonNumber])
{
@@ -479,7 +479,7 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
- (void)otherMouseUp:(NSEvent*)event
{
Vector2 mousePos = GetMousePosition(Window, event);
Float2 mousePos = GetMousePosition(Window, event);
MouseButton mouseButton;
switch ([event buttonNumber])
{
@@ -500,7 +500,7 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender
{
Vector2 mousePos;
Float2 mousePos;
MacDropData dropData;
GetDragDropData(Window, sender, mousePos, dropData);
DragDropEffect dragDropEffect = DragDropEffect::None;
@@ -515,7 +515,7 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
- (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender
{
Vector2 mousePos;
Float2 mousePos;
MacDropData dropData;
GetDragDropData(Window, sender, mousePos, dropData);
DragDropEffect dragDropEffect = DragDropEffect::None;
@@ -525,7 +525,7 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender
{
Vector2 mousePos;
Float2 mousePos;
MacDropData dropData;
GetDragDropData(Window, sender, mousePos, dropData);
DragDropEffect dragDropEffect = DragDropEffect::None;
@@ -543,8 +543,8 @@ NSDragOperation GetDragDropOperation(DragDropEffect dragDropEffect)
MacWindow::MacWindow(const CreateWindowSettings& settings)
: WindowBase(settings)
{
_clientSize = Vector2(settings.Size.X, settings.Size.Y);
Vector2 pos = MacUtils::PosToCoca(settings.Position);
_clientSize = Float2(settings.Size.X, settings.Size.Y);
Float2 pos = MacUtils::PosToCoca(settings.Position);
NSRect frame = NSMakeRect(pos.X, pos.Y - settings.Size.Y, settings.Size.X, settings.Size.Y);
NSUInteger styleMask = NSWindowStyleMaskClosable;
if (settings.IsRegularWindow)
@@ -605,7 +605,7 @@ MacWindow::~MacWindow()
void MacWindow::CheckForResize(float width, float height)
{
const Vector2 clientSize(width, height);
const Float2 clientSize(width, height);
if (clientSize != _clientSize)
{
_clientSize = clientSize;
@@ -736,62 +736,62 @@ void MacWindow::SetClientBounds(const Rectangle& clientArea)
//newRect.origin.x = oldRect.origin.x;
//newRect.origin.y = NSMaxY(oldRect) - newRect.size.height;
Vector2 pos = MacUtils::PosToCoca(clientArea.Location);
Vector2 titleSize = GetWindowTitleSize(this);
Float2 pos = MacUtils::PosToCoca(clientArea.Location);
Float2 titleSize = GetWindowTitleSize(this);
newRect.origin.x = pos.X + titleSize.X;
newRect.origin.y = pos.Y - newRect.size.height + titleSize.Y;
[window setFrame:newRect display:YES];
}
void MacWindow::SetPosition(const Vector2& position)
void MacWindow::SetPosition(const Float2& position)
{
NSWindow* window = (NSWindow*)_window;
if (!window)
return;
Vector2 pos = MacUtils::PosToCoca(position);
Float2 pos = MacUtils::PosToCoca(position);
NSRect rect = [window frame];
[window setFrameOrigin:NSMakePoint(pos.X, pos.Y - rect.size.height)];
}
Vector2 MacWindow::GetPosition() const
Float2 MacWindow::GetPosition() const
{
NSWindow* window = (NSWindow*)_window;
if (!window)
return Vector2::Zero;
return Float2::Zero;
NSRect rect = [window frame];
return MacUtils::CocaToPos(Vector2(rect.origin.x, rect.origin.y + rect.size.height));
return MacUtils::CocaToPos(Float2(rect.origin.x, rect.origin.y + rect.size.height));
}
Vector2 MacWindow::GetSize() const
Float2 MacWindow::GetSize() const
{
NSWindow* window = (NSWindow*)_window;
if (!window)
return Vector2::Zero;
return Float2::Zero;
NSRect rect = [window frame];
return Vector2(rect.size.width, rect.size.height);
return Float2(rect.size.width, rect.size.height);
}
Vector2 MacWindow::GetClientSize() const
Float2 MacWindow::GetClientSize() const
{
return _clientSize;
}
Vector2 MacWindow::ScreenToClient(const Vector2& screenPos) const
Float2 MacWindow::ScreenToClient(const Float2& screenPos) const
{
NSWindow* window = (NSWindow*)_window;
if (!window)
return screenPos;
Vector2 titleSize = GetWindowTitleSize(this);
Float2 titleSize = GetWindowTitleSize(this);
return screenPos - GetPosition() - titleSize;
}
Vector2 MacWindow::ClientToScreen(const Vector2& clientPos) const
Float2 MacWindow::ClientToScreen(const Float2& clientPos) const
{
NSWindow* window = (NSWindow*)_window;
if (!window)
return clientPos;
Vector2 titleSize = GetWindowTitleSize(this);
Float2 titleSize = GetWindowTitleSize(this);
return GetPosition() + titleSize + clientPos;
}

14
Source/Engine/Platform/Mac/MacWindow.h
View File

@@ -14,7 +14,7 @@ class MacWindow : public WindowBase
{
private:
Vector2 _clientSize;
Float2 _clientSize;
void* _window;
bool _isMouseOver = false;
@@ -39,12 +39,12 @@ public:
bool IsForegroundWindow() const override;
void BringToFront(bool force) override;
void SetClientBounds(const Rectangle& clientArea) override;
void SetPosition(const Vector2& position) override;
Vector2 GetPosition() const override;
Vector2 GetSize() const override;
Vector2 GetClientSize() const override;
Vector2 ScreenToClient(const Vector2& screenPos) const override;
Vector2 ClientToScreen(const Vector2& clientPos) const override;
void SetPosition(const Float2& position) override;
Float2 GetPosition() const override;
Float2 GetSize() const override;
Float2 GetClientSize() const override;
Float2 ScreenToClient(const Float2& screenPos) const override;
Float2 ClientToScreen(const Float2& clientPos) const override;
void FlashWindow() override;
void SetIsFullscreen(bool isFullscreen) override;
void SetOpacity(float opacity) override;