Cleaning and small tweaks

This commit is contained in:
Reece Mackie 2019-04-25 19:24:48 +01:00
parent 29e94ef039
commit da79bc0dd4
2 changed files with 250 additions and 268 deletions

View File

@ -3,18 +3,6 @@
#include "raylib.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; using namespace raylibUWP;
/* OTHER CODE */ /* OTHER CODE */

View File

@ -66,10 +66,6 @@ TODO list:
#define MAX_GAMEPADS 4 // Max number of gamepads supported #define MAX_GAMEPADS 4 // Max number of gamepads supported
#define MAX_GAMEPAD_BUTTONS 32 // Max bumber of buttons supported (per gamepad) #define MAX_GAMEPAD_BUTTONS 32 // Max bumber of buttons supported (per gamepad)
#define MAX_GAMEPAD_AXIS 8 // Max number of axis 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
//Mouse cursor locking //Mouse cursor locking
bool cursorLocked = false; bool cursorLocked = false;
@ -119,8 +115,7 @@ void DisableCursor()
cursorLocked = true; cursorLocked = true;
} }
namespace raylibUWP //Base app implementation
{
ref class BaseApp : public Windows::ApplicationModel::Core::IFrameworkView ref class BaseApp : public Windows::ApplicationModel::Core::IFrameworkView
{ {
public: public:
@ -368,7 +363,7 @@ namespace raylibUWP
int height = 450; int height = 450;
}; };
//Application source for creating the program
template<typename AppType> template<typename AppType>
ref class ApplicationSource sealed : Windows::ApplicationModel::Core::IFrameworkViewSource ref class ApplicationSource sealed : Windows::ApplicationModel::Core::IFrameworkViewSource
{ {
@ -378,4 +373,3 @@ namespace raylibUWP
return ref new AppType(); return ref new AppType();
} }
}; };
}