summaryrefslogtreecommitdiffhomepage
path: root/src/rlgl.h
diff options
context:
space:
mode:
authorReece Mackie <[email protected]>2019-04-27 19:33:51 +0100
committerRay <[email protected]>2019-04-27 20:33:51 +0200
commit2de1f318212dbceb71db6be053be995208748f2a (patch)
treea357bfc6e8b825ebfd26098a32bc11efa2c8dc8e /src/rlgl.h
parentf37e55a77bd6177dbaea4d7f484961c09104e104 (diff)
downloadraylib-2de1f318212dbceb71db6be053be995208748f2a.tar.gz
raylib-2de1f318212dbceb71db6be053be995208748f2a.zip
UWP Support Overhaul (#819)
* Working build * Fix build again, stop deleting files * Hotfix crash, needs investigating * Remove VS2015.UWP, I cannot update the project * Lots of UWP work, added keyboard and mouse press support. Still need to finish scroll wheel, mouse position and cursor hiding, plus other stuff that I haven't seen yet. * Implemented a ton more things, added BaseApp.h to provide common code to UWP apps. * Remove constant window dimensions * Enable and Disable cursor support. * Actually use mouse delta * Gamepad Support * Cleaning and small tweaks * Restore original example. * Update comment * Use 'Messages' to handle the cursor functions so code is more portable. * Comment * Comment unused message fields and use vector for mouse pos instead. * Move messages to utils.h and use messages for everything. No more plat-specific code in raylib.h * Working build * Fix build again, stop deleting files * Hotfix crash, needs investigating * Remove VS2015.UWP, I cannot update the project * Lots of UWP work, added keyboard and mouse press support. Still need to finish scroll wheel, mouse position and cursor hiding, plus other stuff that I haven't seen yet. * Implemented a ton more things, added BaseApp.h to provide common code to UWP apps. * Remove constant window dimensions * Enable and Disable cursor support. * Actually use mouse delta * Gamepad Support * Cleaning and small tweaks * Restore original example. * Update comment * Use 'Messages' to handle the cursor functions so code is more portable. * Comment * Comment unused message fields and use vector for mouse pos instead. * Move messages to utils.h and use messages for everything. No more plat-specific code in raylib.h * Tested some desktop stuff and added projection matrix updates for window resizing. * Fixed big bad mouse bug * Fix alt buttons and add hack to combat flickery key presses (far from perfect) * Remove debug code * Final commit * Well, so I thought * Wow, i am bad * Remove packages folder * Remove useless include * Apply requested changes and fix linux build * Try to stop packages folder * Have we fixed the formatting properly? * Third time's the charm? * Where did this come from? * Re-fix * Autoformat is gonna kill * Fixed XBOX ONE Support * Fix tabs
Diffstat (limited to 'src/rlgl.h')
-rw-r--r--src/rlgl.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rlgl.h b/src/rlgl.h
index 71a1dc4b..ae92f149 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -999,17 +999,17 @@ void rlMultMatrixf(float *matf)
}
// Multiply the current matrix by a perspective matrix generated by parameters
-void rlFrustum(double left, double right, double bottom, double top, double near, double far)
+void rlFrustum(double left, double right, double bottom, double top, double znear, double zfar)
{
- Matrix matPerps = MatrixFrustum(left, right, bottom, top, near, far);
+ Matrix matPerps = MatrixFrustum(left, right, bottom, top, znear, zfar);
*currentMatrix = MatrixMultiply(*currentMatrix, matPerps);
}
// Multiply the current matrix by an orthographic matrix generated by parameters
-void rlOrtho(double left, double right, double bottom, double top, double near, double far)
+void rlOrtho(double left, double right, double bottom, double top, double znear, double zfar)
{
- Matrix matOrtho = MatrixOrtho(left, right, bottom, top, near, far);
+ Matrix matOrtho = MatrixOrtho(left, right, bottom, top, znear, zfar);
*currentMatrix = MatrixMultiply(*currentMatrix, matOrtho);
}
@@ -1619,7 +1619,7 @@ void rlglInit(int width, int height)
if (strcmp(extList[i], (const char *)"GL_EXT_debug_marker") == 0) debugMarkerSupported = true;
}
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32) && defined(_MSC_VER) && !defined(PLATFORM_UWP) //is this a hotfix? I may need to find out why this is broken
RL_FREE(extList);
#endif