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

Merge remote-tracking branch 'upstream/master'

Browse Source 
merge with upstream again
This commit is contained in:
Daniel Tasada 2025-12-16 12:39:24 +01:00
commit 832d052465
5 changed files with 10255 additions and 7410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/text/text_words_alignment.c
View File

@ -19,6 +19,8 @@
#include "raymath.h" // Required for: Lerp() #include "raymath.h" // Required for: Lerp()
#include <stdio.h>
typedef enum TextAlignment { typedef enum TextAlignment {
TEXT_ALIGN_LEFT = 0, TEXT_ALIGN_LEFT = 0,
TEXT_ALIGN_TOP = 0, TEXT_ALIGN_TOP = 0,
@ -58,7 +60,7 @@ int main(void)
// And of course the font... // And of course the font...
Font font = GetFontDefault(); Font font = GetFontDefault();
// Intialize the alignment variables // Initialize the alignment variables
TextAlignment hAlign = TEXT_ALIGN_CENTRE; TextAlignment hAlign = TEXT_ALIGN_CENTRE;
TextAlignment vAlign = TEXT_ALIGN_MIDDLE; TextAlignment vAlign = TEXT_ALIGN_MIDDLE;
@ -72,8 +74,7 @@ int main(void)
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
if (IsKeyPressed(KEY_LEFT)) if (IsKeyPressed(KEY_LEFT))
{ {
hAlign = hAlign - 1; if (hAlign > 0) hAlign = hAlign - 1;
if (hAlign < 0) hAlign = 0;
} }
if (IsKeyPressed(KEY_RIGHT)) if (IsKeyPressed(KEY_RIGHT))
@ -84,8 +85,7 @@ int main(void)
if (IsKeyPressed(KEY_UP)) if (IsKeyPressed(KEY_UP))
{ {
vAlign = vAlign - 1; if (vAlign > 0) vAlign = vAlign - 1;
if (vAlign < 0) vAlign = 0;
} }
if (IsKeyPressed(KEY_DOWN)) if (IsKeyPressed(KEY_DOWN))
@ -95,7 +95,8 @@ int main(void)
} }
// One word per second // One word per second
wordIndex = (int)GetTime()%wordCount; if (wordCount > 0) wordIndex = (int)GetTime()%wordCount;
else wordIndex = 0;
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Draw // Draw

17606
src/external/RGFW.h vendored
View File

File diff suppressed because it is too large Load Diff

5
src/platforms/rcore_desktop_rgfw.c
View File

@ -48,11 +48,6 @@
* *
**********************************************************************************************/ **********************************************************************************************/
#ifndef RAYLIB_H /* this should never actually happen, it's only here for IDEs */
#include "raylib.h"
#include "../rcore.c"
#endif
#if defined(PLATFORM_WEB_RGFW) #if defined(PLATFORM_WEB_RGFW)
#define RGFW_NO_GL_HEADER #define RGFW_NO_GL_HEADER
#endif #endif

8
src/rlgl.h
View File

@ -1762,11 +1762,6 @@ void rlTextureParameters(unsigned int id, int param, int value)
{ {
glBindTexture(GL_TEXTURE_2D, id); glBindTexture(GL_TEXTURE_2D, id);
#if !defined(GRAPHICS_API_OPENGL_11)
// Reset anisotropy filter, in case it was set
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0f);
#endif
switch (param) switch (param)
{ {
case RL_TEXTURE_WRAP_S: case RL_TEXTURE_WRAP_S:
@ -1786,6 +1781,9 @@ void rlTextureParameters(unsigned int id, int param, int value)
case RL_TEXTURE_FILTER_ANISOTROPIC: case RL_TEXTURE_FILTER_ANISOTROPIC:
{ {
#if !defined(GRAPHICS_API_OPENGL_11) #if !defined(GRAPHICS_API_OPENGL_11)
// Reset anisotropy filter, in case it was set
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0f);
if (value <= RLGL.ExtSupported.maxAnisotropyLevel) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)value); if (value <= RLGL.ExtSupported.maxAnisotropyLevel) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)value);
else if (RLGL.ExtSupported.maxAnisotropyLevel > 0.0f) else if (RLGL.ExtSupported.maxAnisotropyLevel > 0.0f)
{ {

7
src/rmodels.c
View File

@ -127,10 +127,13 @@
// Defines and Macros // Defines and Macros
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
#ifndef MAX_MATERIAL_MAPS #ifndef MAX_MATERIAL_MAPS
#define MAX_MATERIAL_MAPS 12 // Maximum number of maps supported #define MAX_MATERIAL_MAPS 12 // Maximum number of maps supported
#endif #endif
#ifndef MAX_MESH_VERTEX_BUFFERS #ifndef MAX_MESH_VERTEX_BUFFERS
#define MAX_MESH_VERTEX_BUFFERS 9 // Maximum vertex buffers (VBO) per mesh #define MAX_MESH_VERTEX_BUFFERS 9 // Maximum vertex buffers (VBO) per mesh
#endif
#ifndef MAX_FILEPATH_LENGTH
#define MAX_FILEPATH_LENGTH 4096 // Maximum length for filepaths (Linux PATH_MAX default value)
#endif #endif
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------