summaryrefslogtreecommitdiffhomepage
path: root/src/core.c
diff options
context:
space:
mode:
authorJoshua Reisenauer <[email protected]>2016-06-01 20:17:39 -0700
committerJoshua Reisenauer <[email protected]>2016-06-01 20:17:39 -0700
commitae6adb173b0a89abd5185436029691ae33c1a727 (patch)
tree1e5932f1df42368983844ca16f2c2ddba9cd4b3d /src/core.c
parent90e1ed2b5e54a9b6c69be3dd2b71d1e4f3632c33 (diff)
parent17878550b1e2dde44fcd1e668c92ca2d96680a28 (diff)
downloadraylib-ae6adb173b0a89abd5185436029691ae33c1a727.tar.gz
raylib-ae6adb173b0a89abd5185436029691ae33c1a727.zip
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/core.c')
-rw-r--r--src/core.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core.c b/src/core.c
index 70dfa7a5..7bd44c81 100644
--- a/src/core.c
+++ b/src/core.c
@@ -2078,10 +2078,10 @@ static void MouseButtonCallback(GLFWwindow *window, int button, int action, int
gestureEvent.position[0] = GetMousePosition();
// Normalize gestureEvent.position[0] for screenWidth and screenHeight
- gestureEvent.position[0].x /= (float)GetScreenWidth();
+ gestureEvent.position[0].x /= (float)GetScreenWidth();
gestureEvent.position[0].y /= (float)GetScreenHeight();
-
- // Gesture data is sent to gestures system for processing
+
+ // Gesture data is sent to gestures system for processing
ProcessGestureEvent(gestureEvent);
#endif
}
@@ -2223,10 +2223,10 @@ static void AndroidCommandCallback(struct android_app *app, int32_t cmd)
// Load default font for convenience
// NOTE: External function (defined in module: text)
LoadDefaultFont();
-
+
// TODO: GPU assets reload in case of lost focus (lost context)
// NOTE: This problem has been solved just unbinding and rebinding context from display
- /*
+ /*
if (assetsReloadRequired)
{
for (int i = 0; i < assetsCount; i++)
@@ -2759,9 +2759,9 @@ static void *GamepadThread(void *arg)
};
// Read gamepad event
- struct js_event gamepadEvent;
+ struct js_event gamepadEvent;
- while (1)
+ while (1)
{
for (int i = 0; i < MAX_GAMEPADS; i++)
{
@@ -2792,8 +2792,8 @@ static void *GamepadThread(void *arg)
}
}
}
- }
-
+ }
+
return NULL;
}
#endif