summaryrefslogtreecommitdiffhomepage
path: root/src/rlgl.h
diff options
context:
space:
mode:
authorvictorfisac <[email protected]>2016-02-26 14:28:05 +0100
committervictorfisac <[email protected]>2016-02-26 14:28:05 +0100
commit68088bc5be39beff4f9997fe0966ce30054f67c1 (patch)
treeef7a773a5cd69193abce4e635dc1555cbd9ad9b7 /src/rlgl.h
parent233f7611da96ea6bc0b7c62f6a06dacef707f9d7 (diff)
parent0dfc7fffff68b0bfafd30a86fb322073daf7fc0e (diff)
downloadraylib-68088bc5be39beff4f9997fe0966ce30054f67c1.tar.gz
raylib-68088bc5be39beff4f9997fe0966ce30054f67c1.zip
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/rlgl.h')
-rw-r--r--src/rlgl.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/rlgl.h b/src/rlgl.h
index 76cae987..9e0aaaaa 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -167,9 +167,6 @@ typedef enum { OPENGL_11 = 1, OPENGL_33, OPENGL_ES_20 } GlVersion;
// Uniforms
int mvpLoc; // ModelView-Projection matrix uniform location point (vertex shader)
-
- int modelLoc; // Model transformation matrix uniform location point (vertex shader)
- int viewLoc; // View transformation matrix uniform location point (vertex shader)
int tintColorLoc; // Color uniform location point (fragment shader)
int mapDiffuseLoc; // Diffuse map texture uniform location point (fragment shader)
@@ -265,7 +262,7 @@ void rlglInitPostpro(void); // Initialize postprocessing sys
void rlglDrawPostpro(void); // Draw with postprocessing shader
Model rlglLoadModel(Mesh mesh); // Upload vertex data into GPU and provided VAO/VBO ids
-void rlglDrawModel(Model model, Vector3 position, float rotationAngle, Vector3 rotationAxis, Vector3 scale, Color color, bool wires);
+void rlglDrawModel(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color color, bool wires);
Vector3 rlglUnproject(Vector3 source, Matrix proj, Matrix view); // Get world coordinates from screen coordinates