summaryrefslogtreecommitdiffhomepage
path: root/src/core.c
diff options
context:
space:
mode:
authorraysan5 <[email protected]>2017-11-12 11:45:35 +0100
committerraysan5 <[email protected]>2017-11-12 11:45:35 +0100
commit24b12e5e2380584b1668e864f2af5bed0db38487 (patch)
tree8282e54000b860622079638e19706068ef7aa40a /src/core.c
parent02dd4d32b5ed7586e6691a6cdae03a658127c7be (diff)
downloadraylib-24b12e5e2380584b1668e864f2af5bed0db38487.tar.gz
raylib-24b12e5e2380584b1668e864f2af5bed0db38487.zip
Remove PLATFORM_ checks from raylib header
Now header is truly multiplatform... Actually still a small pending check on XBOX gamepad controls that hopefully will be removed with next GLFW 3.3
Diffstat (limited to 'src/core.c')
-rw-r--r--src/core.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/core.c b/src/core.c
index 0ca2f3e1..97d8a74c 100644
--- a/src/core.c
+++ b/src/core.c
@@ -279,10 +279,11 @@ static int renderOffsetY = 0; // Offset Y from render area (must b
static bool fullscreen = false; // Fullscreen mode (useful only for PLATFORM_DESKTOP)
static Matrix downscaleView; // Matrix to downscale view (in case screen size bigger than display size)
+static bool cursorHidden = false; // Track if cursor is hidden
+
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI) || defined(PLATFORM_WEB)
-static const char *windowTitle; // Window text title...
+static const char *windowTitle = NULL; // Window text title...
static bool cursorOnScreen = false; // Tracks if cursor is inside client area
-static bool cursorHidden = false; // Track if cursor is hidden
static int screenshotCounter = 0; // Screenshots counter
// Register mouse states
@@ -409,12 +410,13 @@ static void *GamepadThread(void *arg); // Mouse reading thread
//----------------------------------------------------------------------------------
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI) || defined(PLATFORM_WEB)
// Initialize window and OpenGL context
-void InitWindow(int width, int height, const char *title)
+// NOTE: data parameter could be used to pass any kind of required data to the initialization
+void InitWindow(int width, int height, void *data)
{
TraceLog(LOG_INFO, "Initializing raylib (v1.8.0)");
- // Store window title (could be useful...)
- windowTitle = title;
+ // Input data is window title char data
+ windowTitle = (char *)data;
// Init graphics device (display device and OpenGL context)
InitGraphicsDevice(width, height);
@@ -471,15 +473,17 @@ void InitWindow(int width, int height, const char *title)
#endif
#if defined(PLATFORM_ANDROID)
-// Initialize Android activity
-void InitWindow(int width, int height, void *state)
+// Initialize window and OpenGL context (and Android activity)
+// NOTE: data parameter could be used to pass any kind of required data to the initialization
+void InitWindow(int width, int height, void *data)
{
TraceLog(LOG_INFO, "Initializing raylib (v1.8.0)");
screenWidth = width;
screenHeight = height;
- app = (struct android_app *)state;
+ // Input data is android app pointer
+ app = (struct android_app *)data;
internalDataPath = app->activity->internalDataPath;
// Set desired windows flags before initializing anything
@@ -508,7 +512,6 @@ void InitWindow(int width, int height, void *state)
//AConfiguration_getScreenSize(app->config);
//AConfiguration_getScreenLong(app->config);
- //state->userData = &engine;
app->onAppCmd = AndroidCommandCallback;
app->onInputEvent = AndroidInputCallback;
@@ -709,7 +712,6 @@ int GetScreenHeight(void)
return screenHeight;
}
-#if !defined(PLATFORM_ANDROID)
// Show mouse cursor
void ShowCursor()
{
@@ -772,7 +774,6 @@ void DisableCursor()
#endif
cursorHidden = true;
}
-#endif // !defined(PLATFORM_ANDROID)
// Set background color (framebuffer clear color)
void ClearBackground(Color color)