MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'raysan5:master' into master

Browse Source
This commit is contained in:
RealDoigt 2023-02-28 09:45:19 -05:00 committed by GitHub
commit b69e9e4e80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rlgl.h
View File

@ -298,6 +298,8 @@
// GL blending functions/equations // GL blending functions/equations
#define RL_FUNC_ADD 0x8006 // GL_FUNC_ADD #define RL_FUNC_ADD 0x8006 // GL_FUNC_ADD
#define RL_MIN 0x8007 // GL_MIN
#define RL_MAX 0x8008 // GL_MAX
#define RL_FUNC_SUBTRACT 0x800A // GL_FUNC_SUBTRACT #define RL_FUNC_SUBTRACT 0x800A // GL_FUNC_SUBTRACT
#define RL_FUNC_REVERSE_SUBTRACT 0x800B // GL_FUNC_REVERSE_SUBTRACT #define RL_FUNC_REVERSE_SUBTRACT 0x800B // GL_FUNC_REVERSE_SUBTRACT
#define RL_BLEND_EQUATION 0x8009 // GL_BLEND_EQUATION #define RL_BLEND_EQUATION 0x8009 // GL_BLEND_EQUATION

8
src/rtextures.c
View File

@ -296,7 +296,7 @@ Image LoadImageRaw(const char *fileName, int width, int height, int format, int
Image LoadImageAnim(const char *fileName, int *frames) Image LoadImageAnim(const char *fileName, int *frames)
{ {
Image image = { 0 }; Image image = { 0 };
int frameCount = 1; int frameCount = 0;
#if defined(SUPPORT_FILEFORMAT_GIF) #if defined(SUPPORT_FILEFORMAT_GIF)
if (IsFileExtension(fileName, ".gif")) if (IsFileExtension(fileName, ".gif"))
@ -320,7 +320,11 @@ Image LoadImageAnim(const char *fileName, int *frames)
#else #else
if (false) { } if (false) { }
#endif #endif
else image = LoadImage(fileName); else
{
image = LoadImage(fileName);
frameCount = 1;
}
// TODO: Support APNG animated images // TODO: Support APNG animated images