mirror of
https://github.com/raysan5/raylib.git
synced 2026-04-15 19:49:10 -04:00
Update typos/grammar (#5759)
This commit is contained in:
@ -73,7 +73,7 @@
|
|||||||
#define SUPPORT_RPRAND_GENERATOR 1
|
#define SUPPORT_RPRAND_GENERATOR 1
|
||||||
#endif
|
#endif
|
||||||
#ifndef SUPPORT_MOUSE_GESTURES
|
#ifndef SUPPORT_MOUSE_GESTURES
|
||||||
// Mouse gestures are directly mapped like touches and processed by gestures system
|
// Mouse gestures are directly mapped like touches and processed by the gestures system
|
||||||
#define SUPPORT_MOUSE_GESTURES 1
|
#define SUPPORT_MOUSE_GESTURES 1
|
||||||
#endif
|
#endif
|
||||||
#ifndef SUPPORT_SSH_KEYBOARD_RPI
|
#ifndef SUPPORT_SSH_KEYBOARD_RPI
|
||||||
@ -125,7 +125,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// rcore: Configuration values
|
// rcore: Configuration values
|
||||||
// NOTE: Below values are alread defined inside [rcore.c] so there is no need to be
|
// NOTE: Below values are already defined inside [rcore.c] so there is no need to be
|
||||||
// redefined here, in case it must be done, uncomment the required line and update
|
// redefined here, in case it must be done, uncomment the required line and update
|
||||||
// the value; it can also be done on compilation with -DVALUE_TO_REDEFINE=128
|
// the value; it can also be done on compilation with -DVALUE_TO_REDEFINE=128
|
||||||
//------------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------------
|
||||||
@ -159,7 +159,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// rlgl: Configuration values
|
// rlgl: Configuration values
|
||||||
// NOTE: Below values are alread defined inside [rlgl.h] so there is no need to be
|
// NOTE: Below values are already defined inside [rlgl.h] so there is no need to be
|
||||||
// redefined here, in case it must be done, uncomment the required line and update
|
// redefined here, in case it must be done, uncomment the required line and update
|
||||||
// the value; it can also be done on compilation with -DVALUE_TO_REDEFINE=128
|
// the value; it can also be done on compilation with -DVALUE_TO_REDEFINE=128
|
||||||
//------------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------------
|
||||||
@ -349,7 +349,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// raudio: Configuration values
|
// raudio: Configuration values
|
||||||
// NOTE: Below values are alread defined inside [rlgl.h] so there is no need to be
|
// NOTE: Below values are already defined inside [rlgl.h] so there is no need to be
|
||||||
// redefined here, in case it must be done, uncomment the required line and update
|
// redefined here, in case it must be done, uncomment the required line and update
|
||||||
// the value; it can also be done on compilation with -DVALUE_TO_REDEFINE=128
|
// the value; it can also be done on compilation with -DVALUE_TO_REDEFINE=128
|
||||||
//------------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------------
|
||||||
|
|||||||
20
src/raylib.h
20
src/raylib.h
@ -10,7 +10,7 @@
|
|||||||
* - Software renderer optional, for systems with no GPU: [rlsw]
|
* - Software renderer optional, for systems with no GPU: [rlsw]
|
||||||
* - Custom OpenGL abstraction layer (usable as standalone module): [rlgl]
|
* - Custom OpenGL abstraction layer (usable as standalone module): [rlgl]
|
||||||
* - Multiple Fonts formats supported (TTF, OTF, FNT, BDF, Sprite fonts)
|
* - Multiple Fonts formats supported (TTF, OTF, FNT, BDF, Sprite fonts)
|
||||||
* - Many texture formats supportted, including compressed formats (DXT, ETC, ASTC)
|
* - Many texture formats supported, including compressed formats (DXT, ETC, ASTC)
|
||||||
* - Full 3d support for 3d Shapes, Models, Billboards, Heightmaps and more!
|
* - Full 3d support for 3d Shapes, Models, Billboards, Heightmaps and more!
|
||||||
* - Flexible Materials system, supporting classic maps and PBR maps
|
* - Flexible Materials system, supporting classic maps and PBR maps
|
||||||
* - Animated 3D models supported (skeletal bones animation) (IQM, M3D, GLTF)
|
* - Animated 3D models supported (skeletal bones animation) (IQM, M3D, GLTF)
|
||||||
@ -35,14 +35,14 @@
|
|||||||
* [rcore] sinfl (Micha Mettke) for DEFLATE decompression algorithm
|
* [rcore] sinfl (Micha Mettke) for DEFLATE decompression algorithm
|
||||||
* [rcore] sdefl (Micha Mettke) for DEFLATE compression algorithm
|
* [rcore] sdefl (Micha Mettke) for DEFLATE compression algorithm
|
||||||
* [rcore] rprand (Ramon Santamaria) for pseudo-random numbers generation
|
* [rcore] rprand (Ramon Santamaria) for pseudo-random numbers generation
|
||||||
* [rtextures] qoi (Dominic Szablewski - https://phoboslab.org) for QOI image manage
|
* [rtextures] qoi (Dominic Szablewski - https://phoboslab.org) for QOI image management
|
||||||
* [rtextures] stb_image (Sean Barret) for images loading (BMP, TGA, PNG, JPEG, HDR...)
|
* [rtextures] stb_image (Sean Barrett) for images loading (BMP, TGA, PNG, JPEG, HDR...)
|
||||||
* [rtextures] stb_image_write (Sean Barret) for image writing (BMP, TGA, PNG, JPG)
|
* [rtextures] stb_image_write (Sean Barrett) for image writing (BMP, TGA, PNG, JPG)
|
||||||
* [rtextures] stb_image_resize2 (Sean Barret) for image resizing algorithms
|
* [rtextures] stb_image_resize2 (Sean Barrett) for image resizing algorithms
|
||||||
* [rtextures] stb_perlin (Sean Barret) for Perlin Noise image generation
|
* [rtextures] stb_perlin (Sean Barrett) for Perlin Noise image generation
|
||||||
* [rtextures] rltexgpu (Ramon Santamaria) for GPU-compressed texture formats
|
* [rtextures] rltexgpu (Ramon Santamaria) for GPU-compressed texture formats
|
||||||
* [rtext] stb_truetype (Sean Barret) for ttf fonts loading
|
* [rtext] stb_truetype (Sean Barrett) for ttf fonts loading
|
||||||
* [rtext] stb_rect_pack (Sean Barret) for rectangles packing
|
* [rtext] stb_rect_pack (Sean Barrett) for rectangles packing
|
||||||
* [rmodels] par_shapes (Philip Rideout) for parametric 3d shapes generation
|
* [rmodels] par_shapes (Philip Rideout) for parametric 3d shapes generation
|
||||||
* [rmodels] tinyobj_loader_c (Syoyo Fujita) for models loading (OBJ, MTL)
|
* [rmodels] tinyobj_loader_c (Syoyo Fujita) for models loading (OBJ, MTL)
|
||||||
* [rmodels] cgltf (Johannes Kuhlmann) for models loading (glTF)
|
* [rmodels] cgltf (Johannes Kuhlmann) for models loading (glTF)
|
||||||
@ -51,10 +51,10 @@
|
|||||||
* [raudio] dr_wav (David Reid) for WAV audio file loading
|
* [raudio] dr_wav (David Reid) for WAV audio file loading
|
||||||
* [raudio] dr_flac (David Reid) for FLAC audio file loading
|
* [raudio] dr_flac (David Reid) for FLAC audio file loading
|
||||||
* [raudio] dr_mp3 (David Reid) for MP3 audio file loading
|
* [raudio] dr_mp3 (David Reid) for MP3 audio file loading
|
||||||
* [raudio] stb_vorbis (Sean Barret) for OGG audio loading
|
* [raudio] stb_vorbis (Sean Barrett) for OGG audio loading
|
||||||
* [raudio] jar_xm (Joshua Reisenauer) for XM audio module loading
|
* [raudio] jar_xm (Joshua Reisenauer) for XM audio module loading
|
||||||
* [raudio] jar_mod (Joshua Reisenauer) for MOD audio module loading
|
* [raudio] jar_mod (Joshua Reisenauer) for MOD audio module loading
|
||||||
* [raudio] qoa (Dominic Szablewski - https://phoboslab.org) for QOA audio manage
|
* [raudio] qoa (Dominic Szablewski - https://phoboslab.org) for QOA audio management
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* LICENSE: zlib/libpng
|
* LICENSE: zlib/libpng
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
* - Functions use always a "result" variable for return (except C++ operators)
|
* - Functions use always a "result" variable for return (except C++ operators)
|
||||||
* - Functions are always defined inline
|
* - Functions are always defined inline
|
||||||
* - Angles are always in radians (DEG2RAD/RAD2DEG macros provided for convenience)
|
* - Angles are always in radians (DEG2RAD/RAD2DEG macros provided for convenience)
|
||||||
* - No compound literals used to make sure libray is compatible with C++
|
* - No compound literals used to make sure the library is compatible with C++
|
||||||
*
|
*
|
||||||
* CONFIGURATION:
|
* CONFIGURATION:
|
||||||
* #define RAYMATH_IMPLEMENTATION
|
* #define RAYMATH_IMPLEMENTATION
|
||||||
@ -183,7 +183,7 @@ typedef struct float16 {
|
|||||||
#if RAYMATH_USE_SIMD_INTRINSICS
|
#if RAYMATH_USE_SIMD_INTRINSICS
|
||||||
// SIMD is used on the most costly raymath function MatrixMultiply()
|
// SIMD is used on the most costly raymath function MatrixMultiply()
|
||||||
// NOTE: Only SSE intrinsics support implemented
|
// NOTE: Only SSE intrinsics support implemented
|
||||||
// TODO: Consider support for other SIMD instrinsics:
|
// TODO: Consider support for other SIMD intrinsics:
|
||||||
// - SSEx, AVX, AVX2, FMA, NEON, RVV
|
// - SSEx, AVX, AVX2, FMA, NEON, RVV
|
||||||
/*
|
/*
|
||||||
#if defined(__SSE4_2__)
|
#if defined(__SSE4_2__)
|
||||||
@ -1151,7 +1151,7 @@ RMAPI Vector3 Vector3Unproject(Vector3 source, Matrix projection, Matrix view)
|
|||||||
// Create quaternion from source point
|
// Create quaternion from source point
|
||||||
Quaternion quat = { source.x, source.y, source.z, 1.0f };
|
Quaternion quat = { source.x, source.y, source.z, 1.0f };
|
||||||
|
|
||||||
// Multiply quat point by unprojecte matrix
|
// Multiply quat point by unprojected matrix
|
||||||
Quaternion qtransformed = { // QuaternionTransform(quat, matViewProjInv)
|
Quaternion qtransformed = { // QuaternionTransform(quat, matViewProjInv)
|
||||||
matViewProjInv.m0*quat.x + matViewProjInv.m4*quat.y + matViewProjInv.m8*quat.z + matViewProjInv.m12*quat.w,
|
matViewProjInv.m0*quat.x + matViewProjInv.m4*quat.y + matViewProjInv.m8*quat.z + matViewProjInv.m12*quat.w,
|
||||||
matViewProjInv.m1*quat.x + matViewProjInv.m5*quat.y + matViewProjInv.m9*quat.z + matViewProjInv.m13*quat.w,
|
matViewProjInv.m1*quat.x + matViewProjInv.m5*quat.y + matViewProjInv.m9*quat.z + matViewProjInv.m13*quat.w,
|
||||||
|
|||||||
@ -103,7 +103,7 @@
|
|||||||
Vector3 position; // Camera position
|
Vector3 position; // Camera position
|
||||||
Vector3 target; // Camera target it looks-at
|
Vector3 target; // Camera target it looks-at
|
||||||
Vector3 up; // Camera up vector (rotation over its axis)
|
Vector3 up; // Camera up vector (rotation over its axis)
|
||||||
float fovy; // Camera field-of-view apperture in Y (degrees) in perspective, used as near plane width in orthographic
|
float fovy; // Camera field-of-view aperture in Y (degrees) in perspective, used as near plane width in orthographic
|
||||||
int projection; // Camera projection type: CAMERA_PERSPECTIVE or CAMERA_ORTHOGRAPHIC
|
int projection; // Camera projection type: CAMERA_PERSPECTIVE or CAMERA_ORTHOGRAPHIC
|
||||||
} Camera3D;
|
} Camera3D;
|
||||||
|
|
||||||
@ -352,7 +352,7 @@ void CameraYaw(Camera *camera, float angle, bool rotateAroundTarget)
|
|||||||
// Rotates the camera around its right vector, pitch is "looking up and down"
|
// Rotates the camera around its right vector, pitch is "looking up and down"
|
||||||
// - lockView prevents camera overrotation (aka "somersaults")
|
// - lockView prevents camera overrotation (aka "somersaults")
|
||||||
// - rotateAroundTarget defines if rotation is around target or around its position
|
// - rotateAroundTarget defines if rotation is around target or around its position
|
||||||
// - rotateUp rotates the up direction as well (typically only usefull in CAMERA_FREE)
|
// - rotateUp rotates the up direction as well (typically only useful in CAMERA_FREE)
|
||||||
// NOTE: [angle] must be provided in radians
|
// NOTE: [angle] must be provided in radians
|
||||||
void CameraPitch(Camera *camera, float angle, bool lockView, bool rotateAroundTarget, bool rotateUp)
|
void CameraPitch(Camera *camera, float angle, bool lockView, bool rotateAroundTarget, bool rotateUp)
|
||||||
{
|
{
|
||||||
|
|||||||
14
src/rcore.c
14
src/rcore.c
@ -307,7 +307,7 @@ typedef struct CoreData {
|
|||||||
Size screen; // Screen current width and height
|
Size screen; // Screen current width and height
|
||||||
Point position; // Window current position
|
Point position; // Window current position
|
||||||
Size previousScreen; // Screen previous width and height (required on fullscreen/borderless-windowed toggle)
|
Size previousScreen; // Screen previous width and height (required on fullscreen/borderless-windowed toggle)
|
||||||
Point previousPosition; // Window previous position (required on fullscreeen/borderless-windowed toggle)
|
Point previousPosition; // Window previous position (required on fullscreen/borderless-windowed toggle)
|
||||||
Size render; // Screen framebuffer width and height
|
Size render; // Screen framebuffer width and height
|
||||||
Point renderOffset; // Screen framebuffer render offset (Not required anymore?)
|
Point renderOffset; // Screen framebuffer render offset (Not required anymore?)
|
||||||
Size currentFbo; // Current framebuffer render width and height (depends on active render texture)
|
Size currentFbo; // Current framebuffer render width and height (depends on active render texture)
|
||||||
@ -329,7 +329,7 @@ typedef struct CoreData {
|
|||||||
char currentKeyState[MAX_KEYBOARD_KEYS]; // Registers current frame key state
|
char currentKeyState[MAX_KEYBOARD_KEYS]; // Registers current frame key state
|
||||||
char previousKeyState[MAX_KEYBOARD_KEYS]; // Registers previous frame key state
|
char previousKeyState[MAX_KEYBOARD_KEYS]; // Registers previous frame key state
|
||||||
|
|
||||||
// NOTE: Since key press logic involves comparing previous vs currrent key state,
|
// NOTE: Since key press logic involves comparing previous vs current key state,
|
||||||
// key repeats needs to be handled specially
|
// key repeats needs to be handled specially
|
||||||
char keyRepeatInFrame[MAX_KEYBOARD_KEYS]; // Registers key repeats for current frame
|
char keyRepeatInFrame[MAX_KEYBOARD_KEYS]; // Registers key repeats for current frame
|
||||||
|
|
||||||
@ -714,7 +714,7 @@ void InitWindow(int width, int height, const char *title)
|
|||||||
Rectangle rec = GetFontDefault().recs[95];
|
Rectangle rec = GetFontDefault().recs[95];
|
||||||
if (FLAG_IS_SET(CORE.Window.flags, FLAG_MSAA_4X_HINT))
|
if (FLAG_IS_SET(CORE.Window.flags, FLAG_MSAA_4X_HINT))
|
||||||
{
|
{
|
||||||
// NOTE: Try to maxime rec padding to avoid pixel bleeding on MSAA filtering
|
// NOTE: Try to maximize rec padding to avoid pixel bleeding on MSAA filtering
|
||||||
SetShapesTexture(GetFontDefault().texture, (Rectangle){ rec.x + 2, rec.y + 2, 1, 1 });
|
SetShapesTexture(GetFontDefault().texture, (Rectangle){ rec.x + 2, rec.y + 2, 1, 1 });
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -2514,9 +2514,9 @@ const char *GetFileNameWithoutExt(const char *filePath)
|
|||||||
if (filePath != NULL)
|
if (filePath != NULL)
|
||||||
{
|
{
|
||||||
strncpy(fileName, GetFileName(filePath), MAX_FILENAME_LENGTH - 1); // Get filename.ext without path
|
strncpy(fileName, GetFileName(filePath), MAX_FILENAME_LENGTH - 1); // Get filename.ext without path
|
||||||
int fileNameLenght = (int)strlen(fileName); // Get size in bytes
|
int fileNameLength = (int)strlen(fileName); // Get size in bytes
|
||||||
|
|
||||||
for (int i = fileNameLenght; i > 0; i--) // Reverse search '.'
|
for (int i = fileNameLength; i > 0; i--) // Reverse search '.'
|
||||||
{
|
{
|
||||||
if (fileName[i] == '.')
|
if (fileName[i] == '.')
|
||||||
{
|
{
|
||||||
@ -3039,7 +3039,7 @@ unsigned char *DecompressData(const unsigned char *compData, int compDataSize, i
|
|||||||
char *EncodeDataBase64(const unsigned char *data, int dataSize, int *outputSize)
|
char *EncodeDataBase64(const unsigned char *data, int dataSize, int *outputSize)
|
||||||
{
|
{
|
||||||
// Base64 conversion table from RFC 4648 [0..63]
|
// Base64 conversion table from RFC 4648 [0..63]
|
||||||
// NOTE: They represent 64 values (6 bits), to encode 3 bytes of data into 4 "sixtets" (6bit characters)
|
// NOTE: They represent 64 values (6 bits), to encode 3 bytes of data into 4 "sextets" (6bit characters)
|
||||||
static const char base64EncodeTable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
static const char base64EncodeTable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||||
|
|
||||||
// Compute expected size and padding
|
// Compute expected size and padding
|
||||||
@ -3126,7 +3126,7 @@ unsigned char *DecodeDataBase64(const char *text, int *outputSize)
|
|||||||
int outputCount = 0;
|
int outputCount = 0;
|
||||||
for (int i = 0; i < dataSize;)
|
for (int i = 0; i < dataSize;)
|
||||||
{
|
{
|
||||||
// Every 4 sixtets must generate 3 octets
|
// Every 4 sextets must generate 3 octets
|
||||||
if ((i + 2) >= dataSize)
|
if ((i + 2) >= dataSize)
|
||||||
{
|
{
|
||||||
TRACELOG(LOG_WARNING, "BASE64: Decoding error: Input data size is not valid");
|
TRACELOG(LOG_WARNING, "BASE64: Decoding error: Input data size is not valid");
|
||||||
|
|||||||
@ -124,7 +124,7 @@ void UpdateGestures(void); // Update gestures detec
|
|||||||
|
|
||||||
#if defined(RGESTURES_STANDALONE)
|
#if defined(RGESTURES_STANDALONE)
|
||||||
void SetGesturesEnabled(unsigned int flags); // Enable a set of gestures using flags
|
void SetGesturesEnabled(unsigned int flags); // Enable a set of gestures using flags
|
||||||
bool IsGestureDetected(int gesture); // Check if a gesture have been detected
|
bool IsGestureDetected(int gesture); // Check if a gesture has been detected
|
||||||
int GetGestureDetected(void); // Get latest detected gesture
|
int GetGestureDetected(void); // Get latest detected gesture
|
||||||
|
|
||||||
float GetGestureHoldDuration(void); // Get gesture hold time in seconds
|
float GetGestureHoldDuration(void); // Get gesture hold time in seconds
|
||||||
@ -297,10 +297,10 @@ void ProcessGestureEvent(GestureEvent event)
|
|||||||
}
|
}
|
||||||
else if (event.touchAction == TOUCH_ACTION_UP)
|
else if (event.touchAction == TOUCH_ACTION_UP)
|
||||||
{
|
{
|
||||||
// A swipe can happen while the current gesture is drag, but (specially for web) also hold, so set upPosition for both cases
|
// A swipe can happen while the current gesture is drag, but (especially for web) also hold, so set upPosition for both cases
|
||||||
if (GESTURES.current == GESTURE_DRAG || GESTURES.current == GESTURE_HOLD) GESTURES.Touch.upPosition = event.position[0];
|
if (GESTURES.current == GESTURE_DRAG || GESTURES.current == GESTURE_HOLD) GESTURES.Touch.upPosition = event.position[0];
|
||||||
|
|
||||||
// NOTE: GESTURES.Drag.intensity dependent on the resolution of the screen
|
// NOTE: GESTURES.Drag.intensity is dependent on the resolution of the screen
|
||||||
GESTURES.Drag.distance = rgVector2Distance(GESTURES.Touch.downPositionA, GESTURES.Touch.upPosition);
|
GESTURES.Drag.distance = rgVector2Distance(GESTURES.Touch.downPositionA, GESTURES.Touch.upPosition);
|
||||||
GESTURES.Drag.intensity = GESTURES.Drag.distance/(float)((rgGetCurrentTime() - GESTURES.Swipe.startTime));
|
GESTURES.Drag.intensity = GESTURES.Drag.distance/(float)((rgGetCurrentTime() - GESTURES.Swipe.startTime));
|
||||||
|
|
||||||
|
|||||||
@ -7,10 +7,10 @@
|
|||||||
* that provides a pseudo-OpenGL 1.1 immediate-mode style API (rlVertex, rlTranslate, rlRotate...)
|
* that provides a pseudo-OpenGL 1.1 immediate-mode style API (rlVertex, rlTranslate, rlRotate...)
|
||||||
*
|
*
|
||||||
* ADDITIONAL NOTES:
|
* ADDITIONAL NOTES:
|
||||||
* When choosing an OpenGL backend different than OpenGL 1.1, some internal buffer are
|
* When choosing an OpenGL backend different than OpenGL 1.1, some internal buffers are
|
||||||
* initialized on rlglInit() to accumulate vertex data
|
* initialized on rlglInit() to accumulate vertex data
|
||||||
*
|
*
|
||||||
* When an internal state change is required all the stored vertex data is rendered in batch,
|
* When an internal state change is required all the stored vertex data is rendered in a batch,
|
||||||
* additionally, rlDrawRenderBatchActive() could be called to force flushing of the batch
|
* additionally, rlDrawRenderBatchActive() could be called to force flushing of the batch
|
||||||
*
|
*
|
||||||
* Some resources are also loaded for convenience, here the complete list:
|
* Some resources are also loaded for convenience, here the complete list:
|
||||||
@ -29,7 +29,7 @@
|
|||||||
* #define GRAPHICS_API_OPENGL_ES2
|
* #define GRAPHICS_API_OPENGL_ES2
|
||||||
* #define GRAPHICS_API_OPENGL_ES3
|
* #define GRAPHICS_API_OPENGL_ES3
|
||||||
* Use selected OpenGL graphics backend, should be supported by platform
|
* Use selected OpenGL graphics backend, should be supported by platform
|
||||||
* Those preprocessor defines are only used on rlgl module, if OpenGL version is
|
* Those preprocessor defines are only used on the rlgl module, if OpenGL version is
|
||||||
* required by any other module, use rlGetVersion() to check it
|
* required by any other module, use rlGetVersion() to check it
|
||||||
*
|
*
|
||||||
* #define RLGL_IMPLEMENTATION
|
* #define RLGL_IMPLEMENTATION
|
||||||
@ -49,7 +49,7 @@
|
|||||||
* #define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch elements limits
|
* #define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch elements limits
|
||||||
* #define RL_DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering)
|
* #define RL_DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering)
|
||||||
* #define RL_DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture)
|
* #define RL_DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture)
|
||||||
* #define RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS 4 // Maximum number of textures units that can be activated on batch drawing (SetShaderValueTexture())
|
* #define RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS 4 // Maximum number of texture units that can be activated on batch drawing (SetShaderValueTexture())
|
||||||
*
|
*
|
||||||
* #define RL_MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack
|
* #define RL_MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack
|
||||||
* #define RL_MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported
|
* #define RL_MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported
|
||||||
|
|||||||
@ -6898,7 +6898,7 @@ static Model LoadM3D(const char *fileName)
|
|||||||
mi = m3d->face[i].materialid;
|
mi = m3d->face[i].materialid;
|
||||||
|
|
||||||
// Only allocate colors VertexBuffer if there's a color vertex in the model for this material batch
|
// Only allocate colors VertexBuffer if there's a color vertex in the model for this material batch
|
||||||
// if all colors are fully transparent black for all verteces of this materal, then assuming no vertex colors
|
// if all colors are fully transparent black for all vertices of this material, then assuming no vertex colors
|
||||||
for (j = i, l = vcolor = 0; (j < (int)m3d->numface) && (mi == m3d->face[j].materialid); j++, l++)
|
for (j = i, l = vcolor = 0; (j < (int)m3d->numface) && (mi == m3d->face[j].materialid); j++, l++)
|
||||||
{
|
{
|
||||||
if (!m3d->vertex[m3d->face[j].vertex[0]].color ||
|
if (!m3d->vertex[m3d->face[j].vertex[0]].color ||
|
||||||
|
|||||||
@ -8,11 +8,11 @@
|
|||||||
* are used but QUADS implementation can be selected with SUPPORT_QUADS_DRAW_MODE define
|
* are used but QUADS implementation can be selected with SUPPORT_QUADS_DRAW_MODE define
|
||||||
*
|
*
|
||||||
* Some functions define texture coordinates (rlTexCoord2f()) for the shapes and use a
|
* Some functions define texture coordinates (rlTexCoord2f()) for the shapes and use a
|
||||||
* user-provided texture with SetShapesTexture(), the pourpouse of this implementation
|
* user-provided texture with SetShapesTexture(), the purpose of this implementation
|
||||||
* is allowing to reduce draw calls when combined with a texture-atlas
|
* is allowing to reduce draw calls when combined with a texture-atlas
|
||||||
*
|
*
|
||||||
* By default, raylib sets the default texture and rectangle at InitWindow()[rcore] to one
|
* By default, raylib sets the default texture and rectangle at InitWindow()[rcore] to one
|
||||||
* white character of default font [rtext], this way, raylib text and shapes can be draw with
|
* white character of default font [rtext], this way, raylib text and shapes can be drawn with
|
||||||
* a single draw call and it also allows users to configure it the same way with their own fonts
|
* a single draw call and it also allows users to configure it the same way with their own fonts
|
||||||
*
|
*
|
||||||
* CONFIGURATION:
|
* CONFIGURATION:
|
||||||
|
|||||||
@ -366,7 +366,7 @@ Image LoadImageAnim(const char *fileName, int *frames)
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load animated image data
|
// Load animated image data from memory
|
||||||
// - Image.data buffer includes all frames: [image#0][image#1][image#2][...]
|
// - Image.data buffer includes all frames: [image#0][image#1][image#2][...]
|
||||||
// - Number of frames is returned through 'frames' parameter
|
// - Number of frames is returned through 'frames' parameter
|
||||||
// - All frames are returned in RGBA format
|
// - All frames are returned in RGBA format
|
||||||
@ -1575,7 +1575,7 @@ Image ImageFromChannel(Image image, int selectedChannel)
|
|||||||
// Check for RGBA formats
|
// Check for RGBA formats
|
||||||
if (selectedChannel > 3)
|
if (selectedChannel > 3)
|
||||||
{
|
{
|
||||||
TRACELOG(LOG_WARNING, "ImageFromChannel supports channels 0 to 3 (rgba). Setting channel to alpha.");
|
TRACELOG(LOG_WARNING, "ImageFromChannel supports channels 0 to 3 (RGBA). Setting channel to alpha.");
|
||||||
selectedChannel = 3;
|
selectedChannel = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user