diff --git a/assets/raylib_small.png b/assets/raylib_small.png new file mode 100644 index 0000000..f3a9405 Binary files /dev/null and b/assets/raylib_small.png differ diff --git a/raygui b/raygui index fa8b958..3e61557 160000 --- a/raygui +++ b/raygui @@ -1 +1 @@ -Subproject commit fa8b958a91f63e13ebcfd0ff33b7eaaa2bcefa64 +Subproject commit 3e61557f251c5c64ed002081870434e9dbaa7ba7 diff --git a/raylib b/raylib index 485d28c..4f56981 160000 --- a/raylib +++ b/raylib @@ -1 +1 @@ -Subproject commit 485d28c43d6de12ddec3eeda2dcd23bd1346e6a5 +Subproject commit 4f569813d2906b09edfd97e6617e6900caa4d1bb diff --git a/src/raylib.lua b/src/raylib.lua index 28a037c..ff09fb2 100644 --- a/src/raylib.lua +++ b/src/raylib.lua @@ -249,8 +249,8 @@ ffi.cdef [[ int ctxType; void *ctxData; + bool looping; unsigned int sampleCount; - unsigned int loopCount; AudioStream stream; } Music; @@ -562,7 +562,8 @@ ffi.cdef [[ typedef enum { BLEND_ALPHA = 0, BLEND_ADDITIVE, - BLEND_MULTIPLIED + BLEND_MULTIPLIED, + BLEND_ADD_COLORS } BlendMode; typedef enum { diff --git a/src/raylua.lua b/src/raylua.lua index bc36579..3b2acec 100644 --- a/src/raylua.lua +++ b/src/raylua.lua @@ -16,7 +16,7 @@ local load = loadstring -raylua.version = "v3.0c" +raylua.version = "v3.0d" function raylua.repl() print("> raylua " .. raylua.version .. " <") diff --git a/tools/api.h b/tools/api.h index 31157ee..4c25adb 100644 --- a/tools/api.h +++ b/tools/api.h @@ -34,6 +34,7 @@ void HideCursor(void) bool IsCursorHidden(void) void EnableCursor(void) void DisableCursor(void) +bool IsCursorOnScreen(void) void ClearBackground(Color color) void BeginDrawing(void) void EndDrawing(void) @@ -214,7 +215,7 @@ void ImageResizeNN(Image *image, int newWidth,int newHeight) void ImageResizeCanvas(Image *image, int newWidth, int newHeight, int offsetX, int offsetY, Color color) void ImageMipmaps(Image *image) void ImageDither(Image *image, int rBpp, int gBpp, int bBpp, int aBpp) -Color *ImageExtractPalette(Image image, int maxPaletteSize, int *extractCount) +Color *GetImagePalette(Image image, int maxPaletteSize, int *extractCount) Image ImageText(const char *text, int fontSize, Color color) Image ImageTextEx(Font font, const char *text, float fontSize, float spacing, Color tint) void ImageDraw(Image *dst, Image src, Rectangle srcRec, Rectangle dstRec, Color tint) @@ -424,7 +425,6 @@ void ResumeMusicStream(Music music) bool IsMusicPlaying(Music music) void SetMusicVolume(Music music, float volume) void SetMusicPitch(Music music, float pitch) -void SetMusicLoopCount(Music music, int count) float GetMusicTimeLength(Music music) float GetMusicTimePlayed(Music music) AudioStream InitAudioStream(unsigned int sampleRate, unsigned int sampleSize, unsigned int channels) diff --git a/tools/raymath.h b/tools/raymath.h index 981bffd..e9b5274 100644 --- a/tools/raymath.h +++ b/tools/raymath.h @@ -1,5 +1,7 @@ float Clamp(float value, float min, float max) float Lerp(float start, float end, float amount) +float Normalize(float value, float start, float end) +float Remap(float value, float inputStart, float inputEnd, float outputStart, float outputEnd) Vector2 Vector2Zero(void) Vector2 Vector2One(void) Vector2 Vector2Add(Vector2 v1, Vector2 v2)