From 2875f4cf117c1f0db2cf841cbf28b983fc980d6e Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 21 Jul 2018 15:44:06 +0200 Subject: [PATCH] Remove VS2017 UWP project Not properly configured, use VS2015.UWP as reference --- projects/VS2017/raylib.App.UWP/App.cpp | 558 ------------------ projects/VS2017/raylib.App.UWP/App.h | 49 -- .../raylib.App.UWP/Assets/Logo.scale-100.png | Bin 801 -> 0 bytes .../Assets/SmallLogo.scale-100.png | Bin 329 -> 0 bytes .../Assets/SplashScreen.scale-100.png | Bin 2146 -> 0 bytes .../Assets/StoreLogo.scale-100.png | Bin 429 -> 0 bytes .../Assets/WideLogo.scale-100.png | Bin 2150 -> 0 bytes .../raylib.App.UWP/Package.appxmanifest | 26 - .../VS2017/raylib.App.UWP/packages.config | 4 - projects/VS2017/raylib.App.UWP/pch.cpp | 1 - projects/VS2017/raylib.App.UWP/pch.h | 16 - .../raylib.App.UWP.TemporaryKey.pfx | Bin 2512 -> 0 bytes .../raylib.App.UWP/raylib.App.UWP.filters | 42 -- .../VS2017/raylib.App.UWP/raylib.App.UWP.user | 4 - 14 files changed, 700 deletions(-) delete mode 100644 projects/VS2017/raylib.App.UWP/App.cpp delete mode 100644 projects/VS2017/raylib.App.UWP/App.h delete mode 100644 projects/VS2017/raylib.App.UWP/Assets/Logo.scale-100.png delete mode 100644 projects/VS2017/raylib.App.UWP/Assets/SmallLogo.scale-100.png delete mode 100644 projects/VS2017/raylib.App.UWP/Assets/SplashScreen.scale-100.png delete mode 100644 projects/VS2017/raylib.App.UWP/Assets/StoreLogo.scale-100.png delete mode 100644 projects/VS2017/raylib.App.UWP/Assets/WideLogo.scale-100.png delete mode 100644 projects/VS2017/raylib.App.UWP/Package.appxmanifest delete mode 100644 projects/VS2017/raylib.App.UWP/packages.config delete mode 100644 projects/VS2017/raylib.App.UWP/pch.cpp delete mode 100644 projects/VS2017/raylib.App.UWP/pch.h delete mode 100644 projects/VS2017/raylib.App.UWP/raylib.App.UWP.TemporaryKey.pfx delete mode 100644 projects/VS2017/raylib.App.UWP/raylib.App.UWP.filters delete mode 100644 projects/VS2017/raylib.App.UWP/raylib.App.UWP.user diff --git a/projects/VS2017/raylib.App.UWP/App.cpp b/projects/VS2017/raylib.App.UWP/App.cpp deleted file mode 100644 index 375b668c0..000000000 --- a/projects/VS2017/raylib.App.UWP/App.cpp +++ /dev/null @@ -1,558 +0,0 @@ -#include "pch.h" -#include "app.h" - -#include "raylib.h" - -using namespace Windows::ApplicationModel::Core; -using namespace Windows::ApplicationModel::Activation; -using namespace Windows::UI::Core; -using namespace Windows::UI::Input; -using namespace Windows::Devices::Input; -using namespace Windows::Foundation; -using namespace Windows::Foundation::Collections; -using namespace Windows::Gaming::Input; -using namespace Windows::Graphics::Display; -using namespace Microsoft::WRL; -using namespace Platform; - -using namespace raylibUWP; - -/* -To-do list - - Cache reference to our CoreWindow? - - Implement gestures -*/ - -/* INPUT CODE */ -// Stand-ins for "core.c" variables -#define MAX_GAMEPADS 4 // Max number of gamepads supported -#define MAX_GAMEPAD_BUTTONS 32 // Max bumber of buttons supported (per gamepad) -#define MAX_GAMEPAD_AXIS 8 // Max number of axis supported (per gamepad) -static bool gamepadReady[MAX_GAMEPADS] = { false }; // Flag to know if gamepad is ready -static float gamepadAxisState[MAX_GAMEPADS][MAX_GAMEPAD_AXIS]; // Gamepad axis state -static char previousGamepadState[MAX_GAMEPADS][MAX_GAMEPAD_BUTTONS]; // Previous gamepad buttons state -static char currentGamepadState[MAX_GAMEPADS][MAX_GAMEPAD_BUTTONS]; // Current gamepad buttons state - -static char previousKeyState[512] = { 0 }; // Contains previous frame keyboard state -static char currentKeyState[512] = { 0 }; // Contains current frame keyboard state - -//... -static char previousMouseState[3] = { 0 }; // Registers previous mouse button state -static char currentMouseState[3] = { 0 }; // Registers current mouse button state -static int previousMouseWheelY = 0; // Registers previous mouse wheel variation -static int currentMouseWheelY = 0; // Registers current mouse wheel variation - -static bool cursorOnScreen = false; // Tracks if cursor is inside client area -static bool cursorHidden = false; // Track if cursor is hidden - -static Vector2 mousePosition; -static Vector2 mouseDelta; // NOTE: Added to keep track of mouse movement while the cursor is locked - no equivalent in "core.c" -static bool toggleCursorLock; - -CoreCursor ^regularCursor = ref new CoreCursor(CoreCursorType::Arrow, 0); // The "visible arrow" cursor type - -// Helper to process key events -void ProcessKeyEvent(Windows::System::VirtualKey key, int action) -{ - using Windows::System::VirtualKey; - switch (key) - { - case VirtualKey::Space: currentKeyState[KEY_SPACE] = action; break; - case VirtualKey::Escape: currentKeyState[KEY_ESCAPE] = action; break; - case VirtualKey::Enter: currentKeyState[KEY_ENTER] = action; break; - case VirtualKey::Delete: currentKeyState[KEY_BACKSPACE] = action; break; - case VirtualKey::Right: currentKeyState[KEY_RIGHT] = action; break; - case VirtualKey::Left: currentKeyState[KEY_LEFT] = action; break; - case VirtualKey::Down: currentKeyState[KEY_DOWN] = action; break; - case VirtualKey::Up: currentKeyState[KEY_UP] = action; break; - case VirtualKey::F1: currentKeyState[KEY_F1] = action; break; - case VirtualKey::F2: currentKeyState[KEY_F2] = action; break; - case VirtualKey::F3: currentKeyState[KEY_F4] = action; break; - case VirtualKey::F4: currentKeyState[KEY_F5] = action; break; - case VirtualKey::F5: currentKeyState[KEY_F6] = action; break; - case VirtualKey::F6: currentKeyState[KEY_F7] = action; break; - case VirtualKey::F7: currentKeyState[KEY_F8] = action; break; - case VirtualKey::F8: currentKeyState[KEY_F9] = action; break; - case VirtualKey::F9: currentKeyState[KEY_F10] = action; break; - case VirtualKey::F10: currentKeyState[KEY_F11] = action; break; - case VirtualKey::F11: currentKeyState[KEY_F12] = action; break; - case VirtualKey::LeftShift: currentKeyState[KEY_LEFT_SHIFT] = action; break; - case VirtualKey::LeftControl: currentKeyState[KEY_LEFT_CONTROL] = action; break; - case VirtualKey::LeftMenu: currentKeyState[KEY_LEFT_ALT] = action; break; // NOTE: Potential UWP bug with Alt key: https://social.msdn.microsoft.com/Forums/windowsapps/en-US/9bebfb0a-7637-400e-8bda-e55620091407/unexpected-behavior-in-windowscoreuicorephysicalkeystatusismenukeydown - case VirtualKey::RightShift: currentKeyState[KEY_RIGHT_SHIFT] = action; break; - case VirtualKey::RightControl: currentKeyState[KEY_RIGHT_CONTROL] = action; break; - case VirtualKey::RightMenu: currentKeyState[KEY_RIGHT_ALT] = action; break; - case VirtualKey::Number0: currentKeyState[KEY_ZERO] = action; break; - case VirtualKey::Number1: currentKeyState[KEY_ONE] = action; break; - case VirtualKey::Number2: currentKeyState[KEY_TWO] = action; break; - case VirtualKey::Number3: currentKeyState[KEY_THREE] = action; break; - case VirtualKey::Number4: currentKeyState[KEY_FOUR] = action; break; - case VirtualKey::Number5: currentKeyState[KEY_FIVE] = action; break; - case VirtualKey::Number6: currentKeyState[KEY_SIX] = action; break; - case VirtualKey::Number7: currentKeyState[KEY_SEVEN] = action; break; - case VirtualKey::Number8: currentKeyState[KEY_EIGHT] = action; break; - case VirtualKey::Number9: currentKeyState[KEY_NINE] = action; break; - case VirtualKey::A: currentKeyState[KEY_A] = action; break; - case VirtualKey::B: currentKeyState[KEY_B] = action; break; - case VirtualKey::C: currentKeyState[KEY_C] = action; break; - case VirtualKey::D: currentKeyState[KEY_D] = action; break; - case VirtualKey::E: currentKeyState[KEY_E] = action; break; - case VirtualKey::F: currentKeyState[KEY_F] = action; break; - case VirtualKey::G: currentKeyState[KEY_G] = action; break; - case VirtualKey::H: currentKeyState[KEY_H] = action; break; - case VirtualKey::I: currentKeyState[KEY_I] = action; break; - case VirtualKey::J: currentKeyState[KEY_J] = action; break; - case VirtualKey::K: currentKeyState[KEY_K] = action; break; - case VirtualKey::L: currentKeyState[KEY_L] = action; break; - case VirtualKey::M: currentKeyState[KEY_M] = action; break; - case VirtualKey::N: currentKeyState[KEY_N] = action; break; - case VirtualKey::O: currentKeyState[KEY_O] = action; break; - case VirtualKey::P: currentKeyState[KEY_P] = action; break; - case VirtualKey::Q: currentKeyState[KEY_Q] = action; break; - case VirtualKey::R: currentKeyState[KEY_R] = action; break; - case VirtualKey::S: currentKeyState[KEY_S] = action; break; - case VirtualKey::T: currentKeyState[KEY_T] = action; break; - case VirtualKey::U: currentKeyState[KEY_U] = action; break; - case VirtualKey::V: currentKeyState[KEY_V] = action; break; - case VirtualKey::W: currentKeyState[KEY_W] = action; break; - case VirtualKey::X: currentKeyState[KEY_X] = action; break; - case VirtualKey::Y: currentKeyState[KEY_Y] = action; break; - case VirtualKey::Z: currentKeyState[KEY_Z] = action; break; - - } -} - -/* CALLBACKS */ -void App::PointerPressed(CoreWindow^ window, PointerEventArgs^ args) -{ - if (args->CurrentPoint->Properties->IsLeftButtonPressed) - { - currentMouseState[MOUSE_LEFT_BUTTON] = 1; - } - if (args->CurrentPoint->Properties->IsRightButtonPressed) - { - currentMouseState[MOUSE_RIGHT_BUTTON] = 1; - } - if (args->CurrentPoint->Properties->IsMiddleButtonPressed) - { - currentMouseState[MOUSE_MIDDLE_BUTTON] = 1; - } -} - -void App::PointerReleased(CoreWindow ^window, PointerEventArgs^ args) -{ - if (!(args->CurrentPoint->Properties->IsLeftButtonPressed)) - { - currentMouseState[MOUSE_LEFT_BUTTON] = 0; - } - if (!(args->CurrentPoint->Properties->IsRightButtonPressed)) - { - currentMouseState[MOUSE_RIGHT_BUTTON] = 0; - } - if (!(args->CurrentPoint->Properties->IsMiddleButtonPressed)) - { - currentMouseState[MOUSE_MIDDLE_BUTTON] = 0; - } -} - -void App::PointerWheelChanged(CoreWindow ^window, PointerEventArgs^ args) -{ - // TODO: Scale the MouseWheelDelta to match GLFW's mouse wheel sensitivity. - currentMouseWheelY += args->CurrentPoint->Properties->MouseWheelDelta; -} - -void App::MouseMoved(Windows::Devices::Input::MouseDevice^ mouseDevice, Windows::Devices::Input::MouseEventArgs^ args) -{ - mouseDelta.x += args->MouseDelta.X; - mouseDelta.y += args->MouseDelta.Y; -} - -void App::OnKeyDown(CoreWindow ^ sender, KeyEventArgs ^ args) -{ - ProcessKeyEvent(args->VirtualKey, 1); -} - -void App::OnKeyUp(CoreWindow ^ sender, KeyEventArgs ^ args) -{ - ProcessKeyEvent(args->VirtualKey, 0); -} - -/* REIMPLEMENTED FROM CORE.C */ -// Get one key state -static bool GetKeyStatus(int key) -{ - return currentKeyState[key]; -} - -// Show mouse cursor -void UWPShowCursor() -{ - CoreWindow::GetForCurrentThread()->PointerCursor = regularCursor; - cursorHidden = false; -} - -// Hides mouse cursor -void UWPHideCursor() -{ - CoreWindow::GetForCurrentThread()->PointerCursor = nullptr; - cursorHidden = true; -} - -// Set mouse position XY -void UWPSetMousePosition(Vector2 position) -{ - CoreWindow ^window = CoreWindow::GetForCurrentThread(); - Point mousePosScreen = Point(position.x + window->Bounds.X, position.y + window->Bounds.Y); - window->PointerPosition = mousePosScreen; - mousePosition = position; -} -// Enables cursor (unlock cursor) -void UWPEnableCursor() -{ - UWPShowCursor(); - UWPSetMousePosition(mousePosition); // The mouse is hidden in the center of the screen - move it to where it should appear - toggleCursorLock = false; -} - -// Disables cursor (lock cursor) -void UWPDisableCursor() -{ - UWPHideCursor(); - toggleCursorLock = true; -} - -// Get one mouse button state -static bool UWPGetMouseButtonStatus(int button) -{ - return currentMouseState[button]; -} - -// Poll (store) all input events -void UWP_PollInput() -{ - // Register previous keyboard state - for (int k = 0; k < 512; k++) previousKeyState[k] = currentKeyState[k]; - - // Process Mouse - { - // Register previous mouse states - for (int i = 0; i < 3; i++) previousMouseState[i] = currentMouseState[i]; - previousMouseWheelY = currentMouseWheelY; - currentMouseWheelY = 0; - - CoreWindow ^window = CoreWindow::GetForCurrentThread(); - if (toggleCursorLock) - { - // Track cursor movement delta, recenter it on the client - mousePosition.x += mouseDelta.x; - mousePosition.y += mouseDelta.y; - - // Why we're not using UWPSetMousePosition here... - // UWPSetMousePosition changes the "mousePosition" variable to match where the cursor actually is. - // Our cursor is locked to the middle of screen, and we don't want that reflected in "mousePosition" - Vector2 centerClient = { (float)(GetScreenWidth() / 2), (float)(GetScreenHeight() / 2) }; - window->PointerPosition = Point(centerClient.x + window->Bounds.X, centerClient.y + window->Bounds.Y); - } - else - { - // Record the cursor's position relative to the client - mousePosition.x = window->PointerPosition.X - window->Bounds.X; - mousePosition.y = window->PointerPosition.Y - window->Bounds.Y; - } - - mouseDelta = { 0 ,0 }; - } - - // Process Gamepads - { - // Check if gamepads are ready - for (int i = 0; i < MAX_GAMEPADS; i++) - { - // HACK: UWP keeps a contiguous list of gamepads. For the interest of time I'm just doing a 1:1 mapping of - // connected gamepads with their spot in the list, but this has serious robustness problems - // e.g. player 1, 2, and 3 are playing a game - if player2 disconnects, p3's controller would now be mapped to p2's character since p3 is now second in the list. - - gamepadReady[i] = (i < Gamepad::Gamepads->Size); - } - - // Get current gamepad state - for (int i = 0; i < MAX_GAMEPADS; i++) - { - if (gamepadReady[i]) - { - // Register previous gamepad states - for (int k = 0; k < MAX_GAMEPAD_BUTTONS; k++) previousGamepadState[i][k] = currentGamepadState[i][k]; - - // Get current gamepad state - auto gamepad = Gamepad::Gamepads->GetAt(i); - GamepadReading reading = gamepad->GetCurrentReading(); - - // NOTE: Maybe it would be wiser to redefine the gamepad button mappings in "raylib.h" for the UWP platform instead of remapping them manually - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_A] = ((reading.Buttons & GamepadButtons::A) == GamepadButtons::A); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_B] = ((reading.Buttons & GamepadButtons::B) == GamepadButtons::B); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_X] = ((reading.Buttons & GamepadButtons::X) == GamepadButtons::X); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_Y] = ((reading.Buttons & GamepadButtons::Y) == GamepadButtons::Y); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_LB] = ((reading.Buttons & GamepadButtons::LeftShoulder) == GamepadButtons::LeftShoulder); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_RB] = ((reading.Buttons & GamepadButtons::RightShoulder) == GamepadButtons::RightShoulder); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_SELECT] = ((reading.Buttons & GamepadButtons::View) == GamepadButtons::View); // Changed for XB1 Controller - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_START] = ((reading.Buttons & GamepadButtons::Menu) == GamepadButtons::Menu); // Changed for XB1 Controller - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_UP] = ((reading.Buttons & GamepadButtons::DPadUp) == GamepadButtons::DPadUp); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_RIGHT] = ((reading.Buttons & GamepadButtons::DPadRight) == GamepadButtons::DPadRight); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_DOWN] = ((reading.Buttons & GamepadButtons::DPadLeft) == GamepadButtons::DPadDown); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_LEFT] = ((reading.Buttons & GamepadButtons::DPadDown) == GamepadButtons::DPadLeft); - currentGamepadState[i][GAMEPAD_XBOX_BUTTON_HOME] = false; // Home button not supported by UWP - - // Get current axis state - gamepadAxisState[i][GAMEPAD_XBOX_AXIS_LEFT_X] = reading.LeftThumbstickX; - gamepadAxisState[i][GAMEPAD_XBOX_AXIS_LEFT_Y] = reading.LeftThumbstickY; - gamepadAxisState[i][GAMEPAD_XBOX_AXIS_RIGHT_X] = reading.RightThumbstickX; - gamepadAxisState[i][GAMEPAD_XBOX_AXIS_RIGHT_Y] = reading.RightThumbstickY; - gamepadAxisState[i][GAMEPAD_XBOX_AXIS_LT] = reading.LeftTrigger; - gamepadAxisState[i][GAMEPAD_XBOX_AXIS_RT] = reading.RightTrigger; - } - } - } - -} - -// The following functions were ripped from core.c and have *no additional work done on them* -// Detect if a key has been pressed once -bool UWPIsKeyPressed(int key) -{ - bool pressed = false; - - if ((currentKeyState[key] != previousKeyState[key]) && (currentKeyState[key] == 1)) - pressed = true; - else pressed = false; - - return pressed; -} - -// Detect if a key is being pressed (key held down) -bool UWPIsKeyDown(int key) -{ - if (GetKeyStatus(key) == 1) return true; - else return false; -} - -// Detect if a key has been released once -bool UWPIsKeyReleased(int key) -{ - bool released = false; - - if ((currentKeyState[key] != previousKeyState[key]) && (currentKeyState[key] == 0)) released = true; - else released = false; - - return released; -} - -// Detect if a key is NOT being pressed (key not held down) -bool UWPIsKeyUp(int key) -{ - if (GetKeyStatus(key) == 0) return true; - else return false; -} - -/* OTHER CODE */ - -// Helper to convert a length in device-independent pixels (DIPs) to a length in physical pixels. -inline float ConvertDipsToPixels(float dips, float dpi) -{ - static const float dipsPerInch = 96.0f; - return floor(dips * dpi / dipsPerInch + 0.5f); // Round to nearest integer. -} - -// Implementation of the IFrameworkViewSource interface, necessary to run our app. -ref class SimpleApplicationSource sealed : Windows::ApplicationModel::Core::IFrameworkViewSource -{ -public: - virtual Windows::ApplicationModel::Core::IFrameworkView^ CreateView() - { - return ref new App(); - } -}; - -// The main function creates an IFrameworkViewSource for our app, and runs the app. -[Platform::MTAThread] -int main(Platform::Array^) -{ - auto simpleApplicationSource = ref new SimpleApplicationSource(); - CoreApplication::Run(simpleApplicationSource); - - return 0; -} - -App::App() : - mWindowClosed(false), - mWindowVisible(true) -{ -} - -// The first method called when the IFrameworkView is being created. -void App::Initialize(CoreApplicationView^ applicationView) -{ - // Register event handlers for app lifecycle. This example includes Activated, so that we - // can make the CoreWindow active and start rendering on the window. - applicationView->Activated += ref new TypedEventHandler(this, &App::OnActivated); - - // Logic for other event handlers could go here. - // Information about the Suspending and Resuming event handlers can be found here: - // http://msdn.microsoft.com/en-us/library/windows/apps/xaml/hh994930.aspx - - CoreApplication::Resuming += ref new EventHandler(this, &App::OnResuming); -} - -// Called when the CoreWindow object is created (or re-created). -void App::SetWindow(CoreWindow^ window) -{ - window->SizeChanged += ref new TypedEventHandler(this, &App::OnWindowSizeChanged); - window->VisibilityChanged += ref new TypedEventHandler(this, &App::OnVisibilityChanged); - window->Closed += ref new TypedEventHandler(this, &App::OnWindowClosed); - - window->PointerPressed += ref new TypedEventHandler(this, &App::PointerPressed); - window->PointerReleased += ref new TypedEventHandler(this, &App::PointerReleased); - window->PointerWheelChanged += ref new TypedEventHandler(this, &App::PointerWheelChanged); - window->KeyDown += ref new TypedEventHandler(this, &App::OnKeyDown); - window->KeyUp += ref new TypedEventHandler(this, &App::OnKeyUp); - - Windows::Devices::Input::MouseDevice::GetForCurrentView()->MouseMoved += ref new TypedEventHandler(this, &App::MouseMoved); - - DisplayInformation^ currentDisplayInformation = DisplayInformation::GetForCurrentView(); - currentDisplayInformation->DpiChanged += ref new TypedEventHandler(this, &App::OnDpiChanged); - currentDisplayInformation->OrientationChanged += ref new TypedEventHandler(this, &App::OnOrientationChanged); - - // The CoreWindow has been created, so EGL can be initialized. - InitWindow(800, 450, (EGLNativeWindowType)window); -} - -// Initializes scene resources -void App::Load(Platform::String^ entryPoint) -{ - // InitWindow() --> rlglInit() -} - -static int posX = 100; -static int posY = 100; -static int time = 0; -// This method is called after the window becomes active. -void App::Run() -{ - while (!mWindowClosed) - { - if (mWindowVisible) - { - // Draw - BeginDrawing(); - - ClearBackground(RAYWHITE); - - - posX += gamepadAxisState[GAMEPAD_PLAYER1][GAMEPAD_XBOX_AXIS_LEFT_X] * 5; - posY += gamepadAxisState[GAMEPAD_PLAYER1][GAMEPAD_XBOX_AXIS_LEFT_Y] * -5; - DrawRectangle(posX, posY, 400, 100, RED); - - DrawLine(0, 0, GetScreenWidth(), GetScreenHeight(), BLUE); - - DrawCircle(mousePosition.x, mousePosition.y, 40, BLUE); - - if(UWPIsKeyDown(KEY_S)) - { - DrawCircle(100, 100, 100, BLUE); - } - - if(UWPIsKeyPressed(KEY_A)) - { - posX -= 50; - UWPEnableCursor(); - } - if (UWPIsKeyPressed(KEY_D)) - { - posX += 50; - - UWPDisableCursor(); - } - - if(currentKeyState[KEY_LEFT_ALT]) - DrawRectangle(250, 250, 20, 20, BLACK); - if (currentKeyState[KEY_BACKSPACE]) - DrawRectangle(280, 250, 20, 20, BLACK); - - if (currentMouseState[MOUSE_LEFT_BUTTON]) - DrawRectangle(280, 250, 20, 20, BLACK); - - static int pos = 0; - pos -= currentMouseWheelY; - DrawRectangle(280, pos + 50, 20, 20, BLACK); - - DrawRectangle(250, 280 + (time++ % 60), 10, 10, PURPLE); - - EndDrawing(); - UWP_PollInput(); - - CoreWindow::GetForCurrentThread()->Dispatcher->ProcessEvents(CoreProcessEventsOption::ProcessAllIfPresent); - } - else - { - CoreWindow::GetForCurrentThread()->Dispatcher->ProcessEvents(CoreProcessEventsOption::ProcessOneAndAllPending); - } - } - - CloseWindow(); -} - -// Terminate events do not cause Uninitialize to be called. It will be called if your IFrameworkView -// class is torn down while the app is in the foreground. -void App::Uninitialize() -{ - // CloseWindow(); -} - -// Application lifecycle event handler. -void App::OnActivated(CoreApplicationView^ applicationView, IActivatedEventArgs^ args) -{ - // Run() won't start until the CoreWindow is activated. - CoreWindow::GetForCurrentThread()->Activate(); -} - -void App::OnResuming(Object^ sender, Object^ args) -{ - // Restore any data or state that was unloaded on suspend. By default, data - // and state are persisted when resuming from suspend. Note that this event - // does not occur if the app was previously terminated. -} - -void App::OnWindowSizeChanged(CoreWindow^ sender, WindowSizeChangedEventArgs^ args) -{ - // TODO: Update window and render area size - //m_deviceResources->SetLogicalSize(Size(sender->Bounds.Width, sender->Bounds.Height)); - //m_main->UpdateForWindowSizeChange(); -} - -// Window event handlers. -void App::OnVisibilityChanged(CoreWindow^ sender, VisibilityChangedEventArgs^ args) -{ - mWindowVisible = args->Visible; - - // raylib core has the variable windowMinimized to register state, - // it should be modifyed by this event... -} - -void App::OnWindowClosed(CoreWindow^ sender, CoreWindowEventArgs^ args) -{ - mWindowClosed = true; - - // raylib core has the variable windowShouldClose to register state, - // it should be modifyed by this event... -} - -void App::OnDpiChanged(DisplayInformation^ sender, Object^ args) -{ - //m_deviceResources->SetDpi(sender->LogicalDpi); - //m_main->UpdateForWindowSizeChange(); -} - -void App::OnOrientationChanged(DisplayInformation^ sender, Object^ args) -{ - //m_deviceResources->SetCurrentOrientation(sender->CurrentOrientation); - //m_main->UpdateForWindowSizeChange(); -} diff --git a/projects/VS2017/raylib.App.UWP/App.h b/projects/VS2017/raylib.App.UWP/App.h deleted file mode 100644 index 5b58528ba..000000000 --- a/projects/VS2017/raylib.App.UWP/App.h +++ /dev/null @@ -1,49 +0,0 @@ -#pragma once - -#include - -#include "pch.h" - -namespace raylibUWP -{ - ref class App sealed : public Windows::ApplicationModel::Core::IFrameworkView - { - public: - App(); - - // IFrameworkView Methods. - virtual void Initialize(Windows::ApplicationModel::Core::CoreApplicationView^ applicationView); - virtual void SetWindow(Windows::UI::Core::CoreWindow^ window); - virtual void Load(Platform::String^ entryPoint); - virtual void Run(); - virtual void Uninitialize(); - - protected: - - // Application lifecycle event handlers. - void OnActivated(Windows::ApplicationModel::Core::CoreApplicationView^ applicationView, Windows::ApplicationModel::Activation::IActivatedEventArgs^ args); - void OnResuming(Platform::Object^ sender, Platform::Object^ args); - - // Window event handlers. - void OnWindowSizeChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::WindowSizeChangedEventArgs^ args); - void OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::VisibilityChangedEventArgs^ args); - void OnWindowClosed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::CoreWindowEventArgs^ args); - - // DisplayInformation event handlers. - void OnDpiChanged(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args); - void OnOrientationChanged(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args); - - // Input event handlers - void PointerPressed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args); - void PointerReleased(Windows::UI::Core::CoreWindow ^sender, Windows::UI::Core::PointerEventArgs^ args); - void PointerWheelChanged(Windows::UI::Core::CoreWindow ^sender, Windows::UI::Core::PointerEventArgs^ args); - void MouseMoved(Windows::Devices::Input::MouseDevice^ mouseDevice, Windows::Devices::Input::MouseEventArgs^ args); - void OnKeyDown(Windows::UI::Core::CoreWindow ^ sender, Windows::UI::Core::KeyEventArgs ^ args); - void OnKeyUp(Windows::UI::Core::CoreWindow ^ sender, Windows::UI::Core::KeyEventArgs ^ args); - - private: - - bool mWindowClosed; - bool mWindowVisible; - }; -} diff --git a/projects/VS2017/raylib.App.UWP/Assets/Logo.scale-100.png b/projects/VS2017/raylib.App.UWP/Assets/Logo.scale-100.png deleted file mode 100644 index e26771cb33a49bbef824aa333737181b0a5b09a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 801 zcmeAS@N?(olHy`uVBq!ia0y~yV3-EN9Bd2>3^t5~j~EyjBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFdg=EaSW-r_2%wgUu8#$hQvKeC6ZGdoyuYz>I5fd zD=cCVTGw#;WJV*C#^Im$BqU!l<@MGW@3y}Geb1#+jk-7IRhn$x_Gh!?@sCcc?j~@s zOgkVHAr!&no#2_ksne+1sJek=8nJ>RyH5AXyMu zC7zPUKdy?gnUnO4V8$neR!%tOJt2)L8_xD-?dqVQ-9w} za}*W2CRLc~EGl+wR>9xaS6bYwE^N5gpsl^?!-i=`rb>o#MR-3r)u+X~#33yiC?y&ms@MYs>e-SYhLYGz_i**Z^eOC zeJDbl>x$kiU|P+(E_=m+tVWR3!>ZrMukP;^h)56hyH*~bQ$N4;*Hq~Z&s@JIKT?a{ zabQ)W))oGV4O^8$p3ZsAtG6L*@vZq4+Dv*I&N-JpTFbHHfR(&xOoFL1t9ZoOfP<`I z#vuibS9wHZ5^5LiTHVXF?#YHzPvji#ZgXG_4~lRP**$H=12490zmNje#;q(`JDLth z35Ax$I2(ohwhT-?X6nEy9`V0F>tcP<*_P}EF1-y_?o&ChGl<3{usTj@E4ojhO{hc-m9E3cS|J`^!QH9JN2zXQG42fN#|}{%2nKyL~^3QpM0V= c*)#DloQf}5saF0GlnEF-UHx3vIVCg!0HVrD82|tP diff --git a/projects/VS2017/raylib.App.UWP/Assets/SmallLogo.scale-100.png b/projects/VS2017/raylib.App.UWP/Assets/SmallLogo.scale-100.png deleted file mode 100644 index 1eb0d9d528c42f132872e8af4dc563081b0b9aff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0y~yV2}f04mJh`25W{(JaZG%Q-e|yQz{EjrrIztFueA3aSW-r_2&9p&cg})< zN_`jqUu$CJOy9#VtocQuMc{C=T4kt*rmiv9bWc;>I+=CfyZ5GZ{|h_Q&fYNH_2m8Y zv-}n1`;4z_G~s!AP%z`kfqPxTE8ZVUt+;B@8nnLW&#J8!;z8zH?-Fdf4=6;!D>RBU|7yi!Z i!T#2rtM4)KFjRke>fjyo{0svF1B0ilpUXO@geCy9j)!aj diff --git a/projects/VS2017/raylib.App.UWP/Assets/SplashScreen.scale-100.png b/projects/VS2017/raylib.App.UWP/Assets/SplashScreen.scale-100.png deleted file mode 100644 index c951e031bdfa0d4ebe68d52647f14caf710ca471..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2146 zcmeAS@N?(olHy`uVBq!ia0y~yV9H@&VASDYV_;yYQ+HfYNX4x;cMbCnIf%FhT7NqB;zr=L39=VA znzVadSi&*wSlPY#mdh6&a*B_LIdE<%j6Ua!ACgRLMvY02qkm<&oJeCc+ zy9EzahasE+GZADj)ENd+($5d=%=>IpFUfp$?dxAZD|XIenRA#+dd}-#e-<)tWaBUs z$W^%Juz_(AFO0)*kZlp~5h)Hchb@ZN;GBfbvooC6nBM1ZNN9d+V}4XLmq$L^tb+|% zF-Vg@F2W>;v1->GHZ*1k=XRKaXy-MZrUE$)8P01Mn|NKMJD?nppu#N|=_Fo(9EDo~ z*-5-C(jdAaf%&4^ErD!>8w?lQB7~tdGmCVG*^yZh%m>*z%#KJY+;G^^38fXUfm{J| zy6=`w(~WFRyaHg`;htRNi|h)4+$7&MjS0*U+hIfknQc5Cgjv%m;;3 zLx!~FEr@f#1}Z=~*CMxcLd{@A7`S$G2G|QOvm=;6Q2^mYr$ZgJ?EzFex&W$M*8*yu zm`pCjI_^HGQ(4_-M}Ym`v>58HgAii`AW9i1Bw}DtDMF^tmr`NZI0>+wXo6zMR%$i`vTz_d~A7Q;cd0EKHV(h4^i{Cc+D zzOrrSx(wz=I&KVKM6%Zl^T=JFCAIFWaPH*G0u3TzHyYk0y*YP>8G<0!fZQgK(*SYWk*Mbor-K4Q;RXYgv(*t2 zP9TRnY+!_Qz<~!61RDVM704h^(1PfO1m+`B$edYFTV`c|0|I0mi=e_MyTi<3 zLt_Lpj02*N%!+UZrL`kc9cG~5a^BKuCXl0W%|{3%3)70M>cy2L7KLjM%D33=I~{zu z{O7M4`wiD?UoLAp`;I+6e$B<(@)LCR)Og=ls&Gjjk*fUv;;^$?iEA#j!SD}W8U1FA$H{D z@@ZnrL<7J6a80)8cxBOas6fz{F;GgmF{AHIkc1|Sw(G+r6~Q+#t3{Q21w5s)4LMpO zzEz7gJ9RAksLCUx7}x*AAmhl*swGmw?C;8%=U?_WU|Hj2Gec4%X^(4WhwulX1`&a{ z#ViUYNwLCGUwIY^Mt$YUR4_4E(&~`xA>4Rmf*Dh*A~y?@a~MY^Po$EHVM_0WLjn98 zoIGEf9we<$XJLPA#Ll+O_Q-->jXx7_uM7Puw@6aS*m%vX+P4ob{|@XwJ!My(%qqzV gj62z%=pSIPF6oWmoxSxF0|Nttr>mdKI;Vst06GV#)c^nh diff --git a/projects/VS2017/raylib.App.UWP/Assets/WideLogo.scale-100.png b/projects/VS2017/raylib.App.UWP/Assets/WideLogo.scale-100.png deleted file mode 100644 index 9dd94b628cc83689319c52e248cc7a705b066c42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2150 zcmeAS@N?(olHy`uVBq!ia0y~yU^HW3V3@|i#=yW3a(&5X1_lPk;vjb?hIQv;UNSH+ zu%tWsIx;Y9?C1WI$jZRLz**oCSR|DNig)We7;j z%q!9Ja}7}_GuAWJGc}1Zsz<$-!#WAEJ?(MC{UKw}3)><T zCj}VPCMz=ds5vvt@M&W(n90MKU_^HX+x{KpE;Tn$a=sDd`%iS`?nXh$L({T8t@pUg z+jBx-Tgc@9!v8*>U31O+>GqZR@4hn`8@1?OebRlkAo~8K`%Ctfz61-cO)ma^Y`a9> zYw1tXefO_@t!|W*Jald2&Z`U(ws)@G{4Cvfe@jh%Jw*T7yLZ;}G)+95JJ<4j-JfYs ztN+!Vd1aU2)wW^l?BA(UE=TSATu0wIH}v#tsHFApze^vTPj0_$l|1ij z#kW-ct)XwX@8X{^NipZ`vvYO#MQ`qSxb57ubenmVKQmXX&Dwvx_P`XL#BB5OZ@>LT zf6jQg?c9`f>v^R=Q&+6bI)4QrsV};}_SeI0=O(3F%`2SfoEuub?j7^86prZKJ2&4? zJ^Frr*^afwPa^x$qx1N-hQ7UtuycRp$1}^N^EQ5$uWWlfb6R-&tySM@?y~!w6xdc) zoW6g5)Wb1cLP4cTM{%?9HmVHMmtNy97{HkqX z2&dQYNb0@Z9=)gfWI*)QYpZ`ZXi6TsmiO+>_javombp8QT2JTQ8k&0+;k5c4No(8N zqiw2Rf;6l}Xb9H2_WMIYceWycMt1s zS`M_HRj&H@&m#G{~UmAN>+MK#9-#_uo%ld*h_@{3Wwi-`aQF zx=|78=j9=9mj8SHyy$!UquMPfGN-k_{d&D4|MRDMjVFtzhu!{Op>Ci8jl|5OcI$b! zewy;|+BchfoIKDp5g)d(T`KGK`pQ4%U;aNU`&p3vTlPIm8#J})uZ;MAE#S9u{r;cd z@5G7iSa2&2Da5Ld-dfMMb=8m0!R^tvmm|`s|JsP}>lTKI{=D24eS0yI`09wyvCeC? z>grDwWWPqr4w|B`Ycp1a9xa~EzkOR7A|&l&HePdfUaK{4f60!mrAQfXVOOc2WLD_M zd#Q)lu8l-WLhB+PUs)I?`aa(1&aEnhQ~xdO`u^W$-BdZbtk8|;ULIb%HWZ=h{kn?p zzYFJ<+zMFT_0>-{FLy2?lIz2dR{Kk4g>HP8d3f#GK!m39@I9YFHocy2bm!J@giYYQ zlDZ=Fs2xB5_HTIzzwD3v_$FUAD|F+1=fi9Fh9gW`A7-<>?Ut09KS=U@dwX;>Qc&iH z*%W85*!$c5&iu&i|2D^WpSwD5Jv=d&M}GXhTqY~@wM^x_-RG~*LrUiHT6Mp#IIqo` ztA4)py5;R+gbV)#yV@nK2whwJ^yfXB{OV)&_m%J8 zz@;}zB~b7BDlfqWr0$P)P&u>m;HtyOtVd()_x+WZUM}l?^JmdKI;Vst E0H^jPGynhq diff --git a/projects/VS2017/raylib.App.UWP/Package.appxmanifest b/projects/VS2017/raylib.App.UWP/Package.appxmanifest deleted file mode 100644 index f0f568628..000000000 --- a/projects/VS2017/raylib.App.UWP/Package.appxmanifest +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - raylibUWP - Alumno - Assets\StoreLogo.png - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/projects/VS2017/raylib.App.UWP/packages.config b/projects/VS2017/raylib.App.UWP/packages.config deleted file mode 100644 index 70c3dea0e..000000000 --- a/projects/VS2017/raylib.App.UWP/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/projects/VS2017/raylib.App.UWP/pch.cpp b/projects/VS2017/raylib.App.UWP/pch.cpp deleted file mode 100644 index bcb5590be..000000000 --- a/projects/VS2017/raylib.App.UWP/pch.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "pch.h" diff --git a/projects/VS2017/raylib.App.UWP/pch.h b/projects/VS2017/raylib.App.UWP/pch.h deleted file mode 100644 index dcbd23785..000000000 --- a/projects/VS2017/raylib.App.UWP/pch.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include -#include - -// OpenGL ES includes -#include -#include - -// EGL includes -#include -#include -#include - -// ANGLE include for Windows Store -#include \ No newline at end of file diff --git a/projects/VS2017/raylib.App.UWP/raylib.App.UWP.TemporaryKey.pfx b/projects/VS2017/raylib.App.UWP/raylib.App.UWP.TemporaryKey.pfx deleted file mode 100644 index 0ada3be0187f9bb2285ade2c7a7200c7401c41bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2512 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 K&WH0s84UpR+H`jS diff --git a/projects/VS2017/raylib.App.UWP/raylib.App.UWP.filters b/projects/VS2017/raylib.App.UWP/raylib.App.UWP.filters deleted file mode 100644 index 4e83c9790..000000000 --- a/projects/VS2017/raylib.App.UWP/raylib.App.UWP.filters +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - - - - - - - - - - - - {d16954bb-de54-472b-ac10-ecab10d3fdc8} - - - \ No newline at end of file diff --git a/projects/VS2017/raylib.App.UWP/raylib.App.UWP.user b/projects/VS2017/raylib.App.UWP/raylib.App.UWP.user deleted file mode 100644 index abe8dd896..000000000 --- a/projects/VS2017/raylib.App.UWP/raylib.App.UWP.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file