Skip to content

EngineView can now accept negative pointer positions #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2022
Merged

EngineView can now accept negative pointer positions #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/EngineView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ namespace winrt::BabylonReactNative::implementation {
const auto properties = point.Properties();
const auto deviceType = point.PointerDevice().PointerDeviceType();
const auto position = point.Position();
const uint32_t x = position.X < 0 ? 0 : static_cast<uint32_t>(position.X);
const uint32_t y = position.Y < 0 ? 0 : static_cast<uint32_t>(position.Y);
const int32_t x = static_cast<int32_t>(position.X);
const int32_t y = static_cast<int32_t>(position.Y);
const auto pointerId = point.PointerId();

if (!_inputSource.HasCapture())
Expand Down Expand Up @@ -106,8 +106,8 @@ namespace winrt::BabylonReactNative::implementation {
const auto point = args.CurrentPoint();
const auto deviceType = point.PointerDevice().PointerDeviceType();
const auto position = point.Position();
const uint32_t x = position.X < 0 ? 0 : static_cast<uint32_t>(position.X);
const uint32_t y = position.Y < 0 ? 0 : static_cast<uint32_t>(position.Y);
const int32_t x = static_cast<int32_t>(position.X);
const int32_t y = static_cast<int32_t>(position.Y);

if (deviceType == PointerDeviceType::Mouse)
{
Expand All @@ -126,8 +126,8 @@ namespace winrt::BabylonReactNative::implementation {
const auto properties = point.Properties();
const auto deviceType = point.PointerDevice().PointerDeviceType();
const auto position = point.Position();
const uint32_t x = position.X < 0 ? 0 : static_cast<uint32_t>(position.X);
const uint32_t y = position.Y < 0 ? 0 : static_cast<uint32_t>(position.Y);
const int32_t x = static_cast<int32_t>(position.X);
const int32_t y = static_cast<int32_t>(position.Y);
const auto pointerId = point.PointerId();

_pressedPointers.erase(pointerId);
Expand Down
16 changes: 8 additions & 8 deletions Modules/@babylonjs/react-native/shared/BabylonNative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ namespace BabylonNative
m_isRenderingEnabled = false;
}

void SetMouseButtonState(uint32_t buttonId, bool isDown, uint32_t x, uint32_t y)
void SetMouseButtonState(uint32_t buttonId, bool isDown, int32_t x, int32_t y)
{
if (isDown)
{
Expand All @@ -148,12 +148,12 @@ namespace BabylonNative
}
}

void SetMousePosition(uint32_t x, uint32_t y)
void SetMousePosition(int32_t x, int32_t y)
{
m_nativeInput->MouseMove(x, y);
}

void SetTouchButtonState(uint32_t pointerId, bool isDown, uint32_t x, uint32_t y)
void SetTouchButtonState(uint32_t pointerId, bool isDown, int32_t x, int32_t y)
{
if (isDown)
{
Expand All @@ -165,7 +165,7 @@ namespace BabylonNative
}
}

void SetTouchPosition(uint32_t pointerId, uint32_t x, uint32_t y)
void SetTouchPosition(uint32_t pointerId, int32_t x, int32_t y)
{
m_nativeInput->TouchMove(pointerId, x, y);
}
Expand Down Expand Up @@ -281,31 +281,31 @@ namespace BabylonNative
}
}

void SetMouseButtonState(uint32_t buttonId, bool isDown, uint32_t x, uint32_t y)
void SetMouseButtonState(uint32_t buttonId, bool isDown, int32_t x, int32_t y)
{
if (auto nativeModule{ g_nativeModule.lock() })
{
nativeModule->SetMouseButtonState(buttonId, isDown, x, y);
}
}

void SetMousePosition(uint32_t x, uint32_t y)
void SetMousePosition(int32_t x, int32_t y)
{
if (auto nativeModule{ g_nativeModule.lock() })
{
nativeModule->SetMousePosition(x, y);
}
}

void SetTouchButtonState(uint32_t pointerId, bool isDown, uint32_t x, uint32_t y)
void SetTouchButtonState(uint32_t pointerId, bool isDown, int32_t x, int32_t y)
{
if (auto nativeModule{ g_nativeModule.lock() })
{
nativeModule->SetTouchButtonState(pointerId, isDown, x, y);
}
}

void SetTouchPosition(uint32_t pointerId, uint32_t x, uint32_t y)
void SetTouchPosition(uint32_t pointerId, int32_t x, int32_t y)
{
if (auto nativeModule{ g_nativeModule.lock() })
{
Expand Down
8 changes: 4 additions & 4 deletions Modules/@babylonjs/react-native/shared/BabylonNative.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ namespace BabylonNative

void RenderView();
void ResetView();
void SetMouseButtonState(uint32_t buttonId, bool isDown, uint32_t x, uint32_t y);
void SetMousePosition(uint32_t x, uint32_t y);
void SetTouchButtonState(uint32_t pointerId, bool isDown, uint32_t x, uint32_t y);
void SetTouchPosition(uint32_t pointerId, uint32_t x, uint32_t y);
void SetMouseButtonState(uint32_t buttonId, bool isDown, int32_t x, int32_t y);
void SetMousePosition(int32_t x, int32_t y);
void SetTouchButtonState(uint32_t pointerId, bool isDown, int32_t x, int32_t y);
void SetTouchPosition(uint32_t pointerId, int32_t x, int32_t y);

bool IsXRActive();

Expand Down