Merge branch 'raysan5:master' into cmake-config.h
This commit is contained in:
commit
aa44e01900
5 changed files with 13 additions and 19 deletions
|
@ -13,7 +13,6 @@ Some people ported raylib to other languages in the form of bindings or wrappers
|
||||||
| [Raylib-CsLo](https://github.com/NotNotTech/Raylib-CsLo) | 4.2 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MPL-2.0 |
|
| [Raylib-CsLo](https://github.com/NotNotTech/Raylib-CsLo) | 4.2 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MPL-2.0 |
|
||||||
| [Raylib-CSharp-Vinculum](https://github.com/ZeroElectric/Raylib-CSharp-Vinculum) | **5.0** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MPL-2.0 |
|
| [Raylib-CSharp-Vinculum](https://github.com/ZeroElectric/Raylib-CSharp-Vinculum) | **5.0** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MPL-2.0 |
|
||||||
| [Raylib-CSharp](https://github.com/MrScautHD/Raylib-CSharp) | **5.1-dev** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MIT |
|
| [Raylib-CSharp](https://github.com/MrScautHD/Raylib-CSharp) | **5.1-dev** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MIT |
|
||||||
| [Raylib.NET](https://github.com/Odex64/Raylib.NET) | **5.0** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MIT |
|
|
||||||
| [cl-raylib](https://github.com/longlene/cl-raylib) | 4.0 | [Common Lisp](https://common-lisp.net) | MIT |
|
| [cl-raylib](https://github.com/longlene/cl-raylib) | 4.0 | [Common Lisp](https://common-lisp.net) | MIT |
|
||||||
| [claylib/wrap](https://github.com/defun-games/claylib) | 4.5 | [Common Lisp](https://common-lisp.net) | Zlib |
|
| [claylib/wrap](https://github.com/defun-games/claylib) | 4.5 | [Common Lisp](https://common-lisp.net) | Zlib |
|
||||||
| [claw-raylib](https://github.com/bohonghuang/claw-raylib) | **auto** | [Common Lisp](https://common-lisp.net) | Apache-2.0 |
|
| [claw-raylib](https://github.com/bohonghuang/claw-raylib) | **auto** | [Common Lisp](https://common-lisp.net) | Apache-2.0 |
|
||||||
|
|
|
@ -22,6 +22,7 @@ pub fn addRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
|
||||||
.platform_drm = options.platform_drm,
|
.platform_drm = options.platform_drm,
|
||||||
.shared = options.shared,
|
.shared = options.shared,
|
||||||
.linux_display_backend = options.linux_display_backend,
|
.linux_display_backend = options.linux_display_backend,
|
||||||
|
.opengl_version = options.opengl_version,
|
||||||
});
|
});
|
||||||
const raylib = raylib_dep.artifact("raylib");
|
const raylib = raylib_dep.artifact("raylib");
|
||||||
|
|
||||||
|
|
|
@ -2251,7 +2251,7 @@ bool IsFileNameValid(const char *fileName)
|
||||||
|
|
||||||
if ((fileName != NULL) && (fileName[0] != '\0'))
|
if ((fileName != NULL) && (fileName[0] != '\0'))
|
||||||
{
|
{
|
||||||
int length = strlen(fileName);
|
int length = (int)strlen(fileName);
|
||||||
bool allPeriods = true;
|
bool allPeriods = true;
|
||||||
|
|
||||||
for (int i = 0; i < length; i++)
|
for (int i = 0; i < length; i++)
|
||||||
|
|
|
@ -5772,8 +5772,11 @@ static ModelAnimation *LoadModelAnimationsGLTF(const char *fileName, int *animCo
|
||||||
animDuration = (t > animDuration)? t : animDuration;
|
animDuration = (t > animDuration)? t : animDuration;
|
||||||
}
|
}
|
||||||
|
|
||||||
strncpy(animations[i].name, animData.name, sizeof(animations[i].name));
|
if (animData.name != NULL)
|
||||||
animations[i].name[sizeof(animations[i].name) - 1] = '\0';
|
{
|
||||||
|
strncpy(animations[i].name, animData.name, sizeof(animations[i].name));
|
||||||
|
animations[i].name[sizeof(animations[i].name) - 1] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
animations[i].frameCount = (int)(animDuration*1000.0f/GLTF_ANIMDELAY) + 1;
|
animations[i].frameCount = (int)(animDuration*1000.0f/GLTF_ANIMDELAY) + 1;
|
||||||
animations[i].framePoses = RL_MALLOC(animations[i].frameCount*sizeof(Transform *));
|
animations[i].framePoses = RL_MALLOC(animations[i].frameCount*sizeof(Transform *));
|
||||||
|
@ -5823,7 +5826,7 @@ static ModelAnimation *LoadModelAnimationsGLTF(const char *fileName, int *animCo
|
||||||
BuildPoseFromParentJoints(animations[i].bones, animations[i].boneCount, animations[i].framePoses[j]);
|
BuildPoseFromParentJoints(animations[i].bones, animations[i].boneCount, animations[i].framePoses[j]);
|
||||||
}
|
}
|
||||||
|
|
||||||
TRACELOG(LOG_INFO, "MODEL: [%s] Loaded animation: %s (%d frames, %fs)", fileName, animData.name, animations[i].frameCount, animDuration);
|
TRACELOG(LOG_INFO, "MODEL: [%s] Loaded animation: %s (%d frames, %fs)", fileName, (animData.name != NULL)? animData.name : "NULL", animations[i].frameCount, animDuration);
|
||||||
RL_FREE(boneChannels);
|
RL_FREE(boneChannels);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
19
src/rtext.c
19
src/rtext.c
|
@ -1807,10 +1807,7 @@ const char *TextToSnake(const char *text)
|
||||||
}
|
}
|
||||||
buffer[i] = text[j] + 32;
|
buffer[i] = text[j] + 32;
|
||||||
}
|
}
|
||||||
else
|
else buffer[i] = text[j];
|
||||||
{
|
|
||||||
buffer[i] = text[j];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1827,23 +1824,17 @@ const char *TextToCamel(const char *text)
|
||||||
if (text != NULL)
|
if (text != NULL)
|
||||||
{
|
{
|
||||||
// Lower case first character
|
// Lower case first character
|
||||||
if ((text[0] >= 'A') && (text[0] <= 'Z'))
|
if ((text[0] >= 'A') && (text[0] <= 'Z')) buffer[0] = text[0] + 32;
|
||||||
buffer[0] = text[0] + 32;
|
else buffer[0] = text[0];
|
||||||
else
|
|
||||||
buffer[0] = text[0];
|
|
||||||
|
|
||||||
// Check for next separator to upper case another character
|
// Check for next separator to upper case another character
|
||||||
for (int i = 1, j = 1; (i < MAX_TEXT_BUFFER_LENGTH - 1) && (text[j] != '\0'); i++, j++)
|
for (int i = 1, j = 1; (i < MAX_TEXT_BUFFER_LENGTH - 1) && (text[j] != '\0'); i++, j++)
|
||||||
{
|
{
|
||||||
if (text[j] != '_')
|
if (text[j] != '_') buffer[i] = text[j];
|
||||||
buffer[i] = text[j];
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
j++;
|
j++;
|
||||||
if ((text[j] >= 'a') && (text[j] <= 'z'))
|
if ((text[j] >= 'a') && (text[j] <= 'z')) buffer[i] = text[j] - 32;
|
||||||
{
|
|
||||||
buffer[i] = text[j] - 32;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue