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

Merge branch 'uwp_fixes' of git://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-uwp_fixes

Browse Source
This commit is contained in:
Wojtek Figat
2021-06-09 13:31:47 +02:00
parent c38b81d682 474add9d12
commit ba7332f55c
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Engine/Platform/UWP/UWPWindow.cpp
View File

@@ -325,7 +325,7 @@ UWPWindow::UWPWindow(const CreateWindowSettings& settings, UWPWindowImpl* impl)
_dpiScale = _dpi / 96.0f; _dpiScale = _dpi / 96.0f;
float x, y; float x, y;
_impl->GetBounds(&x, &y, &_logicalSize.X, &_logicalSize.Y); _impl->GetBounds(&x, &y, &_logicalSize.X, &_logicalSize.Y);
_impl->GetMousePosition(&Impl::Mouse.MousePosition.X, &Impl::Mouse.MousePosition.Y); _impl->GetMousePosition(&Impl::Mouse->MousePosition.X, &Impl::Mouse->MousePosition.Y);
OnSizeChange(); OnSizeChange();
} }
@@ -502,7 +502,7 @@ void UWPWindow::onKeyDown(int key)
if (key < 7) if (key < 7)
return; return;
Impl::Keyboard.onKeyDown(key); Impl::Keyboard->onKeyDown(key);
} }
void UWPWindow::onKeyUp(int key) void UWPWindow::onKeyUp(int key)
@@ -510,17 +510,17 @@ void UWPWindow::onKeyUp(int key)
if (key < 7) if (key < 7)
return; return;
Impl::Keyboard.onKeyUp(key); Impl::Keyboard->onKeyUp(key);
} }
void UWPWindow::onCharacterReceived(int key) void UWPWindow::onCharacterReceived(int key)
{ {
Impl::Keyboard.onCharacterReceived(key); Impl::Keyboard->onCharacterReceived(key);
} }
void UWPWindow::onMouseMoved(float x, float y) void UWPWindow::onMouseMoved(float x, float y)
{ {
Impl::Mouse.onMouseMoved(x * _dpiScale, y * _dpiScale); Impl::Mouse->onMouseMoved(x * _dpiScale, y * _dpiScale);
} }
void UWPWindow::onPointerPressed(UWPWindowImpl::PointerData* pointer) void UWPWindow::onPointerPressed(UWPWindowImpl::PointerData* pointer)
@@ -529,7 +529,7 @@ void UWPWindow::onPointerPressed(UWPWindowImpl::PointerData* pointer)
{ {
pointer->PositionX *= _dpiScale; pointer->PositionX *= _dpiScale;
pointer->PositionY *= _dpiScale; pointer->PositionY *= _dpiScale;
Impl::Mouse.onPointerPressed(pointer); Impl::Mouse->onPointerPressed(pointer);
} }
// TODO: impl mobile touch support // TODO: impl mobile touch support
@@ -541,7 +541,7 @@ void UWPWindow::onPointerMoved(UWPWindowImpl::PointerData* pointer)
{ {
pointer->PositionX *= _dpiScale; pointer->PositionX *= _dpiScale;
pointer->PositionY *= _dpiScale; pointer->PositionY *= _dpiScale;
Impl::Mouse.onPointerMoved(pointer); Impl::Mouse->onPointerMoved(pointer);
} }
// TODO: impl mobile touch support // TODO: impl mobile touch support
@@ -553,7 +553,7 @@ void UWPWindow::onPointerWheelChanged(UWPWindowImpl::PointerData* pointer)
{ {
pointer->PositionX *= _dpiScale; pointer->PositionX *= _dpiScale;
pointer->PositionY *= _dpiScale; pointer->PositionY *= _dpiScale;
Impl::Mouse.onPointerWheelChanged(pointer); Impl::Mouse->onPointerWheelChanged(pointer);
} }
} }
@@ -563,7 +563,7 @@ void UWPWindow::onPointerReleased(UWPWindowImpl::PointerData* pointer)
{ {
pointer->PositionX *= _dpiScale; pointer->PositionX *= _dpiScale;
pointer->PositionY *= _dpiScale; pointer->PositionY *= _dpiScale;
Impl::Mouse.onPointerReleased(pointer); Impl::Mouse->onPointerReleased(pointer);
} }
// TODO: impl mobile touch support // TODO: impl mobile touch support
@@ -575,7 +575,7 @@ void UWPWindow::onPointerExited(UWPWindowImpl::PointerData* pointer)
{ {
pointer->PositionX *= _dpiScale; pointer->PositionX *= _dpiScale;
pointer->PositionY *= _dpiScale; pointer->PositionY *= _dpiScale;
Impl::Mouse.onPointerExited(pointer); Impl::Mouse->onPointerExited(pointer);
} }
// TODO: impl mobile touch support // TODO: impl mobile touch support

7
Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
View File

@@ -367,8 +367,11 @@ namespace Flax.Build.Platforms
var vcToolChainDir = toolsets[Toolset]; var vcToolChainDir = toolsets[Toolset];
switch (Toolset) switch (Toolset)
{ {
case WindowsPlatformToolset.v141: return Path.Combine(vcToolChainDir, "lib", "x86", "store", "references"); case WindowsPlatformToolset.v142:
case WindowsPlatformToolset.v140: return Path.Combine(vcToolChainDir, "lib", "store", "references"); case WindowsPlatformToolset.v141:
return Path.Combine(vcToolChainDir, "lib", "x86", "store", "references");
case WindowsPlatformToolset.v140:
return Path.Combine(vcToolChainDir, "lib", "store", "references");
default: return null; default: return null;
} }
} }