|
@ -2248,9 +2248,9 @@ RLAPI Shader LoadShaderFromMemory(const char *vsCode, const char *fsCode) |
|
|
shader.locs[SHADER_LOC_VERTEX_COLOR] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_COLOR); |
|
|
shader.locs[SHADER_LOC_VERTEX_COLOR] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_COLOR); |
|
|
|
|
|
|
|
|
// Get handles to GLSL uniform locations (vertex shader) |
|
|
// Get handles to GLSL uniform locations (vertex shader) |
|
|
shader.locs[SHADER_LOC_MATRIX_MVP] = rlGetLocationUniform(shader.id, "mvp"); |
|
|
|
|
|
shader.locs[SHADER_LOC_MATRIX_PROJECTION] = rlGetLocationUniform(shader.id, "projection"); |
|
|
|
|
|
shader.locs[SHADER_LOC_MATRIX_VIEW] = rlGetLocationUniform(shader.id, "view"); |
|
|
|
|
|
|
|
|
shader.locs[SHADER_LOC_MATRIX_MVP] = rlGetLocationUniform(shader.id, "mvp"); |
|
|
|
|
|
shader.locs[SHADER_LOC_MATRIX_PROJECTION] = rlGetLocationUniform(shader.id, "projection"); |
|
|
|
|
|
shader.locs[SHADER_LOC_MATRIX_VIEW] = rlGetLocationUniform(shader.id, "view"); |
|
|
|
|
|
|
|
|
// Get handles to GLSL uniform locations (fragment shader) |
|
|
// Get handles to GLSL uniform locations (fragment shader) |
|
|
shader.locs[SHADER_LOC_COLOR_DIFFUSE] = rlGetLocationUniform(shader.id, "colDiffuse"); |
|
|
shader.locs[SHADER_LOC_COLOR_DIFFUSE] = rlGetLocationUniform(shader.id, "colDiffuse"); |
|
@ -5193,7 +5193,7 @@ static void AndroidCommandCallback(struct android_app *app, int32_t cmd) |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
CORE.Window.display.width = ANativeWindow_getWidth(CORE.Android.app->window); |
|
|
|
|
|
|
|
|
CORE.Window.display.width = ANativeWindow_getWidth(CORE.Android.app->window); |
|
|
CORE.Window.display.height = ANativeWindow_getHeight(CORE.Android.app->window); |
|
|
CORE.Window.display.height = ANativeWindow_getHeight(CORE.Android.app->window); |
|
|
|
|
|
|
|
|
// Init graphics device (display device and OpenGL context) |
|
|
// Init graphics device (display device and OpenGL context) |
|
@ -6022,7 +6022,7 @@ static void *EventThread(void *arg) |
|
|
// Basic movement |
|
|
// Basic movement |
|
|
if (event.code == ABS_X) |
|
|
if (event.code == ABS_X) |
|
|
{ |
|
|
{ |
|
|
CORE.Input.Mouse.position.x = (event.value - worker->absRange.x)*CORE.Window.screen.width/worker->absRange.width; // Scale acording to absRange |
|
|
|
|
|
|
|
|
CORE.Input.Mouse.position.x = (event.value - worker->absRange.x)*CORE.Window.screen.width/worker->absRange.width; // Scale acording to absRange |
|
|
CORE.Input.Touch.position[0].x = (event.value - worker->absRange.x)*CORE.Window.screen.width/worker->absRange.width; // Scale acording to absRange |
|
|
CORE.Input.Touch.position[0].x = (event.value - worker->absRange.x)*CORE.Window.screen.width/worker->absRange.width; // Scale acording to absRange |
|
|
|
|
|
|
|
|
#if defined(SUPPORT_GESTURES_SYSTEM) |
|
|
#if defined(SUPPORT_GESTURES_SYSTEM) |
|
@ -6033,7 +6033,7 @@ static void *EventThread(void *arg) |
|
|
|
|
|
|
|
|
if (event.code == ABS_Y) |
|
|
if (event.code == ABS_Y) |
|
|
{ |
|
|
{ |
|
|
CORE.Input.Mouse.position.y = (event.value - worker->absRange.y)*CORE.Window.screen.height/worker->absRange.height; // Scale acording to absRange |
|
|
|
|
|
|
|
|
CORE.Input.Mouse.position.y = (event.value - worker->absRange.y)*CORE.Window.screen.height/worker->absRange.height; // Scale acording to absRange |
|
|
CORE.Input.Touch.position[0].y = (event.value - worker->absRange.y)*CORE.Window.screen.height/worker->absRange.height; // Scale acording to absRange |
|
|
CORE.Input.Touch.position[0].y = (event.value - worker->absRange.y)*CORE.Window.screen.height/worker->absRange.height; // Scale acording to absRange |
|
|
|
|
|
|
|
|
#if defined(SUPPORT_GESTURES_SYSTEM) |
|
|
#if defined(SUPPORT_GESTURES_SYSTEM) |
|
|