|
|
@@ -5,6 +5,8 @@
|
|
|
#include "app.h"
|
|
|
|
|
|
#include "main/main.h"
|
|
|
+#include "core/os/dir_access.h"
|
|
|
+#include "core/os/file_access.h"
|
|
|
|
|
|
using namespace Windows::ApplicationModel::Core;
|
|
|
using namespace Windows::ApplicationModel::Activation;
|
|
|
@@ -70,8 +72,9 @@ void App::Initialize(CoreApplicationView^ applicationView)
|
|
|
}
|
|
|
|
|
|
// Called when the CoreWindow object is created (or re-created).
|
|
|
-void App::SetWindow(CoreWindow^ window)
|
|
|
+void App::SetWindow(CoreWindow^ p_window)
|
|
|
{
|
|
|
+ window = p_window;
|
|
|
window->VisibilityChanged +=
|
|
|
ref new TypedEventHandler<CoreWindow^, VisibilityChangedEventArgs^>(this, &App::OnVisibilityChanged);
|
|
|
|
|
|
@@ -89,23 +92,230 @@ void App::SetWindow(CoreWindow^ window)
|
|
|
pointerVisualizationSettings->IsBarrelButtonFeedbackEnabled = false;
|
|
|
#endif
|
|
|
|
|
|
- // The CoreWindow has been created, so EGL can be initialized.
|
|
|
+
|
|
|
+ window->PointerPressed +=
|
|
|
+ ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &App::OnPointerPressed);
|
|
|
+
|
|
|
+ window->PointerMoved +=
|
|
|
+ ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &App::OnPointerMoved);
|
|
|
+
|
|
|
+ window->PointerReleased +=
|
|
|
+ ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &App::OnPointerReleased);
|
|
|
+
|
|
|
+ //window->PointerWheelChanged +=
|
|
|
+ // ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &App::OnPointerWheelChanged);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ char* args[] = {"-path", "game", NULL};
|
|
|
+ Main::setup("winrt", 2, args, false);
|
|
|
+
|
|
|
+ // The CoreWindow has been created, so EGL can be initialized.
|
|
|
ContextEGL* context = memnew(ContextEGL(window));
|
|
|
os->set_gl_context(context);
|
|
|
- UpdateWindowSize(Size(window->Bounds.Width, window->Bounds.Height));
|
|
|
+ UpdateWindowSize(Size(window->Bounds.Width, window->Bounds.Height));
|
|
|
+
|
|
|
+ Main::setup2();
|
|
|
+}
|
|
|
+
|
|
|
+static int _get_button(Windows::UI::Input::PointerPoint ^pt) {
|
|
|
+
|
|
|
+ using namespace Windows::UI::Input;
|
|
|
+
|
|
|
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
|
|
|
+ return BUTTON_LEFT;
|
|
|
+#else
|
|
|
+ switch (pt->Properties->PointerUpdateKind)
|
|
|
+ {
|
|
|
+ case PointerUpdateKind::LeftButtonPressed:
|
|
|
+ case PointerUpdateKind::LeftButtonReleased:
|
|
|
+ return BUTTON_LEFT;
|
|
|
+
|
|
|
+ case PointerUpdateKind::RightButtonPressed:
|
|
|
+ case PointerUpdateKind::RightButtonReleased:
|
|
|
+ return BUTTON_RIGHT;
|
|
|
+
|
|
|
+ case PointerUpdateKind::MiddleButtonPressed:
|
|
|
+ case PointerUpdateKind::MiddleButtonReleased:
|
|
|
+ return BUTTON_MIDDLE;
|
|
|
+
|
|
|
+ case PointerUpdateKind::XButton1Pressed:
|
|
|
+ case PointerUpdateKind::XButton1Released:
|
|
|
+ return BUTTON_WHEEL_UP;
|
|
|
+
|
|
|
+ case PointerUpdateKind::XButton2Pressed:
|
|
|
+ case PointerUpdateKind::XButton2Released:
|
|
|
+ return BUTTON_WHEEL_DOWN;
|
|
|
+
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+#endif
|
|
|
+
|
|
|
+ return 0;
|
|
|
+};
|
|
|
+
|
|
|
+static bool _is_touch(Windows::UI::Input::PointerPoint ^pointerPoint) {
|
|
|
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
|
|
|
+ return true;
|
|
|
+#else
|
|
|
+ using namespace Windows::Devices::Input;
|
|
|
+ switch (pointerPoint->PointerDevice->PointerDeviceType) {
|
|
|
+ case PointerDeviceType::Touch:
|
|
|
+ case PointerDeviceType::Pen:
|
|
|
+ return true;
|
|
|
+ default:
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+#endif
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+static Windows::Foundation::Point _get_pixel_position(CoreWindow^ window, Windows::Foundation::Point rawPosition, OS* os) {
|
|
|
+
|
|
|
+ Windows::Foundation::Point outputPosition;
|
|
|
+
|
|
|
+ // Compute coordinates normalized from 0..1.
|
|
|
+ // If the coordinates need to be sized to the SDL window,
|
|
|
+ // we'll do that after.
|
|
|
+ #if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
|
|
|
+ outputPosition.X = rawPosition.X / window->Bounds.Width;
|
|
|
+ outputPosition.Y = rawPosition.Y / window->Bounds.Height;
|
|
|
+ #else
|
|
|
+ switch (DisplayProperties::CurrentOrientation)
|
|
|
+ {
|
|
|
+ case DisplayOrientations::Portrait:
|
|
|
+ outputPosition.X = rawPosition.X / window->Bounds.Width;
|
|
|
+ outputPosition.Y = rawPosition.Y / window->Bounds.Height;
|
|
|
+ break;
|
|
|
+ case DisplayOrientations::PortraitFlipped:
|
|
|
+ outputPosition.X = 1.0f - (rawPosition.X / window->Bounds.Width);
|
|
|
+ outputPosition.Y = 1.0f - (rawPosition.Y / window->Bounds.Height);
|
|
|
+ break;
|
|
|
+ case DisplayOrientations::Landscape:
|
|
|
+ outputPosition.X = rawPosition.Y / window->Bounds.Height;
|
|
|
+ outputPosition.Y = 1.0f - (rawPosition.X / window->Bounds.Width);
|
|
|
+ break;
|
|
|
+ case DisplayOrientations::LandscapeFlipped:
|
|
|
+ outputPosition.X = 1.0f - (rawPosition.Y / window->Bounds.Height);
|
|
|
+ outputPosition.Y = rawPosition.X / window->Bounds.Width;
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ #endif
|
|
|
+
|
|
|
+ OS::VideoMode vm = os->get_video_mode();
|
|
|
+ outputPosition.X *= vm.width;
|
|
|
+ outputPosition.Y *= vm.height;
|
|
|
+
|
|
|
+ return outputPosition;
|
|
|
+};
|
|
|
+
|
|
|
+static int _get_finger(uint32_t p_touch_id) {
|
|
|
+
|
|
|
+ return p_touch_id % 31; // for now
|
|
|
+};
|
|
|
+
|
|
|
+void App::pointer_event(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args, bool p_pressed) {
|
|
|
+
|
|
|
+ Windows::UI::Input::PointerPoint ^point = args->CurrentPoint;
|
|
|
+ Windows::Foundation::Point pos = _get_pixel_position(window, point->Position, os);
|
|
|
+ int but = _get_button(point);
|
|
|
+ if (_is_touch(point)) {
|
|
|
+
|
|
|
+ InputEvent event;
|
|
|
+ event.type = InputEvent::SCREEN_TOUCH;
|
|
|
+ event.device = 0;
|
|
|
+ event.screen_touch.pressed = p_pressed;
|
|
|
+ event.screen_touch.x = pos.X;
|
|
|
+ event.screen_touch.y = pos.Y;
|
|
|
+ event.screen_touch.index = _get_finger(point->PointerId);
|
|
|
+
|
|
|
+ last_touch_x[event.screen_touch.index] = pos.X;
|
|
|
+ last_touch_y[event.screen_touch.index] = pos.Y;
|
|
|
+
|
|
|
+ os->input_event(event);
|
|
|
+ if (event.screen_touch.index != 0)
|
|
|
+ return;
|
|
|
+
|
|
|
+ }; // fallthrought of sorts
|
|
|
+
|
|
|
+ InputEvent event;
|
|
|
+ event.type = InputEvent::MOUSE_BUTTON;
|
|
|
+ event.device = 0;
|
|
|
+ event.mouse_button.pressed = p_pressed;
|
|
|
+ event.mouse_button.button_index = but;
|
|
|
+ event.mouse_button.x = pos.X;
|
|
|
+ event.mouse_button.y = pos.Y;
|
|
|
+ event.mouse_button.global_x = pos.X;
|
|
|
+ event.mouse_button.global_y = pos.Y;
|
|
|
+
|
|
|
+ last_touch_x[31] = pos.X;
|
|
|
+ last_touch_y[31] = pos.Y;
|
|
|
+
|
|
|
+ os->input_event(event);
|
|
|
+};
|
|
|
+
|
|
|
+
|
|
|
+void App::OnPointerPressed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args) {
|
|
|
+
|
|
|
+ pointer_event(sender, args, true);
|
|
|
+};
|
|
|
+
|
|
|
+
|
|
|
+void App::OnPointerReleased(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args) {
|
|
|
+
|
|
|
+ pointer_event(sender, args, false);
|
|
|
+};
|
|
|
+
|
|
|
+void App::OnPointerMoved(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args) {
|
|
|
+
|
|
|
+ Windows::UI::Input::PointerPoint ^point = args->CurrentPoint;
|
|
|
+ Windows::Foundation::Point pos = _get_pixel_position(window, point->Position, os);
|
|
|
+
|
|
|
+ if (_is_touch(point)) {
|
|
|
+
|
|
|
+ InputEvent event;
|
|
|
+ event.type = InputEvent::SCREEN_DRAG;
|
|
|
+ event.device = 0;
|
|
|
+ event.screen_drag.x = pos.X;
|
|
|
+ event.screen_drag.y = pos.Y;
|
|
|
+ event.screen_drag.index = _get_finger(point->PointerId);
|
|
|
+ event.screen_drag.relative_x = event.screen_drag.x - last_touch_x[event.screen_drag.index];
|
|
|
+ event.screen_drag.relative_y = event.screen_drag.y - last_touch_y[event.screen_drag.index];
|
|
|
+
|
|
|
+ os->input_event(event);
|
|
|
+ if (event.screen_drag.index != 0)
|
|
|
+ return;
|
|
|
+
|
|
|
+ }; // fallthrought of sorts
|
|
|
+
|
|
|
+ InputEvent event;
|
|
|
+ event.type = InputEvent::MOUSE_MOTION;
|
|
|
+ event.device = 0;
|
|
|
+ event.mouse_motion.x = pos.X;
|
|
|
+ event.mouse_motion.y = pos.Y;
|
|
|
+ event.mouse_motion.global_x = pos.X;
|
|
|
+ event.mouse_motion.global_y = pos.Y;
|
|
|
+ event.mouse_motion.relative_x = pos.X - last_touch_x[31];
|
|
|
+ event.mouse_motion.relative_y = pos.Y - last_touch_y[31];
|
|
|
+
|
|
|
+ os->input_event(event);
|
|
|
+
|
|
|
+};
|
|
|
+
|
|
|
+
|
|
|
// Initializes scene resources
|
|
|
void App::Load(Platform::String^ entryPoint)
|
|
|
{
|
|
|
- char** args = {NULL};
|
|
|
- Main::setup("winrt", 0, args);
|
|
|
+ //char* args[] = {"-test", "render", NULL};
|
|
|
+ //Main::setup("winrt", 2, args);
|
|
|
}
|
|
|
|
|
|
// This method is called after the window becomes active.
|
|
|
void App::Run()
|
|
|
{
|
|
|
-
|
|
|
if (Main::start())
|
|
|
os->run();
|
|
|
}
|
Juan Linietsky