aboutsummaryrefslogtreecommitdiff
path: root/src/core.c
diff options
context:
space:
mode:
authorJoshua Reisenauer <kd7tck@msn.com>2016-05-03 14:17:37 -0700
committerJoshua Reisenauer <kd7tck@msn.com>2016-05-03 14:17:37 -0700
commite6607009248e8d17a607b12818581f9a28c40d26 (patch)
tree7661244e012dae5e2e92d28812acb873f7c11fa0 /src/core.c
parentd6feeb14ffc11e54a82f51dbbe899f720d6997e8 (diff)
parentfd67e31f630476980eb09e49177958703db5b3d3 (diff)
downloadraylib-e6607009248e8d17a607b12818581f9a28c40d26.tar.gz
raylib-e6607009248e8d17a607b12818581f9a28c40d26.zip
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/core.c')
-rw-r--r--src/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core.c b/src/core.c
index b27712a7..669010f9 100644
--- a/src/core.c
+++ b/src/core.c
@@ -905,7 +905,7 @@ Ray GetMouseRay(Vector2 mousePosition, Camera camera)
Vector3 farPoint = rlglUnproject((Vector3){ deviceCoords.x, deviceCoords.y, 1.0f }, matProj, matView);
#else // OPTION 2: Compute unprojection directly here
-
+
// Calculate unproject matrix (multiply projection matrix and view matrix) and invert it
Matrix matProjView = MatrixMultiply(matProj, matView);
MatrixInvert(&matProjView);
@@ -935,7 +935,7 @@ Ray GetMouseRay(Vector2 mousePosition, Camera camera)
}
// Returns the screen space position from a 3d world space position
-Vector2 WorldToScreen(Vector3 position, Camera camera)
+Vector2 GetWorldToScreen(Vector3 position, Camera camera)
{
// Calculate projection matrix (from perspective instead of frustum
Matrix matProj = MatrixPerspective(camera.fovy, (double)GetScreenWidth()/(double)GetScreenHeight(), 0.01, 1000.0);