diff --git a/raylib b/raylib index 79d63e6..41192c6 160000 --- a/raylib +++ b/raylib @@ -1 +1 @@ -Subproject commit 79d63e6ca1a1fa3b9e5e8647c522157e616f023f +Subproject commit 41192c6d4a66b45017af3a285ba3b6a7835b5989 diff --git a/src/raylib.lua b/src/raylib.lua index 550f7be..aa5237f 100644 --- a/src/raylib.lua +++ b/src/raylib.lua @@ -78,23 +78,23 @@ ffi.cdef [[ int format; } Image; - typedef struct Texture2D { + typedef struct Texture { unsigned int id; int width; int height; int mipmaps; int format; - } Texture2D; - typedef Texture2D Texture; - typedef Texture2D TextureCubemap; + } Texture; + typedef Texture Texture2D; + typedef Texture TextureCubemap; - typedef struct RenderTexture2D { + typedef struct RenderTexture { unsigned int id; Texture texture; Texture depth; - } RenderTexture2D; + } RenderTexture; - typedef RenderTexture2D RenderTexture; + typedef RenderTexture RenderTexture2D; typedef enum { OPENGL_11 = 1, OPENGL_21, OPENGL_33, OPENGL_ES_20 } GlVersion; diff --git a/tools/api.h b/tools/api.h index 8644c7d..45d99d0 100644 --- a/tools/api.h +++ b/tools/api.h @@ -128,7 +128,7 @@ Vector2 GetMousePosition(void) void SetMousePosition(int x, int y) void SetMouseOffset(int offsetX, int offsetY) void SetMouseScale(float scaleX, float scaleY) -int GetMouseWheelMove(void) +float GetMouseWheelMove(void) int GetTouchX(void) int GetTouchY(void) Vector2 GetTouchPosition(int index) @@ -375,6 +375,7 @@ Texture2D GetShapesTexture(void) Rectangle GetShapesTextureRec(void) void SetShapesTexture(Texture2D texture, Rectangle source) int GetShaderLocation(Shader shader, const char *uniformName) +int GetShaderLocationAttrib(Shader shader, const char *attribName) void SetShaderValue(Shader shader, int uniformLoc, const void *value, int uniformType) void SetShaderValueV(Shader shader, int uniformLoc, const void *value, int uniformType, int count) void SetShaderValueMatrix(Shader shader, int uniformLoc, Matrix mat) diff --git a/tools/raymath.h b/tools/raymath.h index d12db3a..19944bd 100644 --- a/tools/raymath.h +++ b/tools/raymath.h @@ -18,6 +18,7 @@ Vector2 Vector2Negate(Vector2 v) Vector2 Vector2Divide(Vector2 v1, Vector2 v2) Vector2 Vector2Normalize(Vector2 v) Vector2 Vector2Lerp(Vector2 v1, Vector2 v2, float amount) +Vector2 Vector2Reflect(Vector2 v, Vector2 normal) Vector2 Vector2Rotate(Vector2 v, float degs) Vector2 Vector2MoveTowards(Vector2 v, Vector2 target, float maxDistance) Vector3 Vector3Zero(void) diff --git a/tools/rlgl.h b/tools/rlgl.h index a3d9c69..063493c 100644 --- a/tools/rlgl.h +++ b/tools/rlgl.h @@ -64,5 +64,6 @@ void rlUnloadFramebuffer(unsigned int id) void rlLoadMesh(Mesh *mesh, bool dynamic) void rlUpdateMesh(Mesh mesh, int buffer, int num) void rlUpdateMeshAt(Mesh mesh, int buffer, int num, int index) +void rlDrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int count) void rlDrawMesh(Mesh mesh, Material material, Matrix transform) void rlUnloadMesh(Mesh mesh)