twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2026-02-08 07:09:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: twix:428421f21a565b301e24e624fd2ffb4e1727258a
Branches Tags
twix:master
twix:5.5 twix:5.0 twix:4.6-dev twix:4.5.0 twix:4.2.0 twix:4.0.0 twix:3.7.0 twix:3.5.0 twix:3.0.0 twix:2.6.0 twix:2.5.0 twix:2.0.0 twix:1.9.7-dev twix:1.9.4-dev twix:1.8.0 twix:1.7.0 twix:1.6.0 twix:1.5.0 twix:1.4.0 twix:1.3.0 twix:1.2.2 twix:1.1.1 twix:1.0.6 twix:1.0.4
..
compare: twix:12dc0d66758970212eaa323c2e398d8645a229e4
Branches Tags
twix:master
twix:5.5 twix:5.0 twix:4.6-dev twix:4.5.0 twix:4.2.0 twix:4.0.0 twix:3.7.0 twix:3.5.0 twix:3.0.0 twix:2.6.0 twix:2.5.0 twix:2.0.0 twix:1.9.7-dev twix:1.9.4-dev twix:1.8.0 twix:1.7.0 twix:1.6.0 twix:1.5.0 twix:1.4.0 twix:1.3.0 twix:1.2.2 twix:1.1.1 twix:1.0.6 twix:1.0.4

4 Commits
428421f21a ... 12dc0d6675

Author SHA1 Message Date
Jeffery Myers
12dc0d6675 Revert undesired change to rcore and restore correct win32 ifdef and max path (#5297) 
Fixes #5293
also add comment for win32 platform.
 2025-10-23 17:45:33 +02:00
alexgb0
93c5dc3b5f [rlsw] c++ support (#5291) 
* rlsw c++ support

* rslw formatting fixes
 2025-10-23 17:28:00 +02:00
Diogo Hartuiq Debarba
04930c5132 Fix typo in RPI cross-compiler variable name (#5295) 2025-10-23 13:27:28 +02:00
Jeffery Myers
780a7df760 Fix warnings in more examples. (#5292) 2025-10-23 13:25:23 +02:00
5 changed files with 95 additions and 75 deletions
Expand all files Collapse all files

16
examples/core/core_text_file_loading.c
View File

@ -88,16 +88,16 @@ int main(void)
for (int i = 0; i < lineCount; i++) for (int i = 0; i < lineCount; i++)
{ {
Vector2 size = MeasureTextEx(GetFontDefault(), lines[i], fontSize, 2); Vector2 size = MeasureTextEx(GetFontDefault(), lines[i], (float)fontSize, 2);
textHeight += size.y + 10; textHeight += (int)size.y + 10;
} }
// A simple scrollbar on the side to show how far we have red into the file // A simple scrollbar on the side to show how far we have red into the file
Rectangle scrollBar = { Rectangle scrollBar = {
.x = screenWidth - 5, .x = (float)screenWidth - 5,
.y = 0, .y = 0,
.width = 5, .width = 5,
.height = screenHeight*100/(textHeight - screenHeight) // Scrollbar height is just a percentage .height = screenHeight*100.0f/(textHeight - screenHeight) // Scrollbar height is just a percentage
}; };
SetTargetFPS(60); SetTargetFPS(60);
@ -115,10 +115,10 @@ int main(void)
// Ensuring that the camera does not scroll past all text // Ensuring that the camera does not scroll past all text
if (cam.target.y > textHeight - screenHeight + textTop) if (cam.target.y > textHeight - screenHeight + textTop)
cam.target.y = textHeight - screenHeight + textTop; cam.target.y = (float)textHeight - screenHeight + textTop;
// Computing the position of the scrollBar depending on the percentage of text covered // Computing the position of the scrollBar depending on the percentage of text covered
scrollBar.y = Lerp(textTop, screenHeight - scrollBar.height, (cam.target.y - textTop)/(textHeight - screenHeight)); scrollBar.y = Lerp((float)textTop, (float)screenHeight - scrollBar.height, (float)(cam.target.y - textTop)/(textHeight - screenHeight));
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Draw // Draw
@ -132,13 +132,13 @@ int main(void)
for (int i = 0, t = textTop; i < lineCount; i++) for (int i = 0, t = textTop; i < lineCount; i++)
{ {
// Each time we go through and calculate the height of the text to move the cursor appropriately // Each time we go through and calculate the height of the text to move the cursor appropriately
Vector2 size = MeasureTextEx(GetFontDefault(), lines[i], fontSize, 2); Vector2 size = MeasureTextEx(GetFontDefault(), lines[i], (float)fontSize, 2);
DrawText(lines[i], 10, t, fontSize, RED); DrawText(lines[i], 10, t, fontSize, RED);
// Inserting extra space for real newlines, // Inserting extra space for real newlines,
// wrapped lines are rendered closer together // wrapped lines are rendered closer together
t += size.y + 10; t += (int)size.y + 10;
} }
EndMode2D(); EndMode2D();

3
examples/shapes/shapes_clock_of_clocks.c
View File

@ -14,6 +14,9 @@
* Copyright (c) 2025 JP Mortiboys (@themushroompirates) * Copyright (c) 2025 JP Mortiboys (@themushroompirates)
* *
********************************************************************************************/ ********************************************************************************************/
#if defined(WIN32)
#define _CRT_SECURE_NO_WARNINGS
#endif
#include "raylib.h" #include "raylib.h"

2
src/Makefile
View File

@ -283,7 +283,7 @@ ifeq ($(TARGET_PLATFORM),PLATFORM_DESKTOP_GLFW)
endif endif
endif endif
ifeq ($(TARGET_PLATFORM),PLATFORM_DRM) ifeq ($(TARGET_PLATFORM),PLATFORM_DRM)
ifeq ($(USE_RPI_CROSS_COMPILER),TRUE) ifeq ($(USE_RPI_CROSSCOMPILER),TRUE)
# Define RPI cross-compiler # Define RPI cross-compiler
#CC = armv6j-hardfloat-linux-gnueabi-gcc #CC = armv6j-hardfloat-linux-gnueabi-gcc
CC = $(RPI_TOOLCHAIN)/bin/$(RPI_TOOLCHAIN_NAME)-gcc CC = $(RPI_TOOLCHAIN)/bin/$(RPI_TOOLCHAIN_NAME)-gcc

141
src/external/rlsw.h vendored
View File

@ -156,6 +156,12 @@
#define SW_CLIP_EPSILON 1e-4f #define SW_CLIP_EPSILON 1e-4f
#endif #endif
#ifdef __cplusplus
#define CURLY_INIT(name) name
#else
#define CURLY_INIT(name) (name)
#endif
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// OpenGL Compatibility Types // OpenGL Compatibility Types
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
@ -1699,7 +1705,7 @@ static inline void sw_framebuffer_blit_to_##name(
int xSrc, int ySrc, int wSrc, int hSrc, \ int xSrc, int ySrc, int wSrc, int hSrc, \
DST_PTR_T *dst) \ DST_PTR_T *dst) \
{ \ { \
const uint8_t *srcBase = RLSW.framebuffer.color; \ const uint8_t *srcBase = (uint8_t*)RLSW.framebuffer.color; \
int fbWidth = RLSW.framebuffer.width; \ int fbWidth = RLSW.framebuffer.width; \
\ \
uint32_t xScale = ((uint32_t)wSrc << 16)/(uint32_t)wDst; \ uint32_t xScale = ((uint32_t)wSrc << 16)/(uint32_t)wDst; \
@ -1722,7 +1728,7 @@ static inline void sw_framebuffer_blit_to_##name(
int xSrc, int ySrc, int wSrc, int hSrc, \ int xSrc, int ySrc, int wSrc, int hSrc, \
DST_PTR_T *dst) \ DST_PTR_T *dst) \
{ \ { \
const uint8_t *srcBase = RLSW.framebuffer.color; \ const uint8_t *srcBase = (uint8_t *)RLSW.framebuffer.color; \
int fbWidth = RLSW.framebuffer.width; \ int fbWidth = RLSW.framebuffer.width; \
\ \
uint32_t xScale = ((uint32_t)wSrc << 16)/(uint32_t)wDst; \ uint32_t xScale = ((uint32_t)wSrc << 16)/(uint32_t)wDst; \
@ -2583,6 +2589,15 @@ static inline void FUNC_NAME(const sw_texture_t *tex, const sw_vertex_t *start,
/* Scanline rasterization */ \ /* Scanline rasterization */ \
for (int x = xStart; x < xEnd; x++) \ for (int x = xStart; x < xEnd; x++) \
{ \ { \
/* Pixel color computation */ \
float wRcp = 1.0f/w; \
float srcColor[4] = { \
color[0]*wRcp, \
color[1]*wRcp, \
color[2]*wRcp, \
color[3]*wRcp \
}; \
\
/* Test and write depth */ \ /* Test and write depth */ \
if (ENABLE_DEPTH_TEST) \ if (ENABLE_DEPTH_TEST) \
{ \ { \
@ -2593,15 +2608,6 @@ static inline void FUNC_NAME(const sw_texture_t *tex, const sw_vertex_t *start,
\ \
sw_framebuffer_write_depth(dptr, z); \ sw_framebuffer_write_depth(dptr, z); \
\ \
/* Pixel color computation */ \
float wRcp = 1.0f/w; \
float srcColor[4] = { \
color[0]*wRcp, \
color[1]*wRcp, \
color[2]*wRcp, \
color[3]*wRcp \
}; \
\
if (ENABLE_TEXTURE) \ if (ENABLE_TEXTURE) \
{ \ { \
float texColor[4]; \ float texColor[4]; \
@ -3063,6 +3069,14 @@ static inline void FUNC_NAME(void)
/* Scanline rasterization */ \ /* Scanline rasterization */ \
for (int x = xMin; x < xMax; x++) \ for (int x = xMin; x < xMax; x++) \
{ \ { \
/* Pixel color computation */ \
float srcColor[4] = { \
color[0], \
color[1], \
color[2], \
color[3] \
}; \
\
/* Test and write depth */ \ /* Test and write depth */ \
if (ENABLE_DEPTH_TEST) \ if (ENABLE_DEPTH_TEST) \
{ \ { \
@ -3073,14 +3087,6 @@ static inline void FUNC_NAME(void)
\ \
sw_framebuffer_write_depth(dptr, z); \ sw_framebuffer_write_depth(dptr, z); \
\ \
/* Pixel color computation */ \
float srcColor[4] = { \
color[0], \
color[1], \
color[2], \
color[3] \
}; \
\
if (ENABLE_TEXTURE) \ if (ENABLE_TEXTURE) \
{ \ { \
float texColor[4]; \ float texColor[4]; \
@ -3361,6 +3367,7 @@ static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1) \
{ \ { \
int offset = (y1 + i)*fbWidth + (x1 + (j >> 16)); \ int offset = (y1 + i)*fbWidth + (x1 + (j >> 16)); \
void *dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \ void *dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \
void *cptr; \
\ \
if (ENABLE_DEPTH_TEST) \ if (ENABLE_DEPTH_TEST) \
{ \ { \
@ -3370,7 +3377,7 @@ static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1) \
\ \
sw_framebuffer_write_depth(dptr, z); \ sw_framebuffer_write_depth(dptr, z); \
\ \
void *cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \ cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \
\ \
if (ENABLE_COLOR_BLEND) \ if (ENABLE_COLOR_BLEND) \
{ \ { \
@ -3397,6 +3404,7 @@ static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1) \
{ \ { \
int offset = (y1 + (j >> 16))*fbWidth + (x1 + i); \ int offset = (y1 + (j >> 16))*fbWidth + (x1 + i); \
void *dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \ void *dptr = sw_framebuffer_get_depth_addr(dBuffer, offset); \
void *cptr; \
\ \
if (ENABLE_DEPTH_TEST) \ if (ENABLE_DEPTH_TEST) \
{ \ { \
@ -3406,7 +3414,7 @@ static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1) \
\ \
sw_framebuffer_write_depth(dptr, z); \ sw_framebuffer_write_depth(dptr, z); \
\ \
void *cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \ cptr = sw_framebuffer_get_color_addr(cBuffer, offset); \
\ \
if (ENABLE_COLOR_BLEND) \ if (ENABLE_COLOR_BLEND) \
{ \ { \
@ -3687,9 +3695,14 @@ static inline void sw_poly_line_render(void)
const sw_vertex_t *vertices = RLSW.vertexBuffer; const sw_vertex_t *vertices = RLSW.vertexBuffer;
int cm1 = RLSW.vertexCounter - 1; int cm1 = RLSW.vertexCounter - 1;
for (int i = 0; i < cm1; i++) sw_line_render((sw_vertex_t[2]){ vertices[i], vertices[i + 1] }); for (int i = 0; i < cm1; i++)
{
sw_vertex_t verts[2] = { vertices[i], vertices[i + 1] };
sw_line_render(verts);
}
sw_line_render((sw_vertex_t[2]){ vertices[cm1], vertices[0] }); sw_vertex_t verts[2] = { vertices[cm1], vertices[0] };
sw_line_render(verts);
} }
static inline void sw_poly_fill_render(void) static inline void sw_poly_fill_render(void)
@ -3817,10 +3830,10 @@ bool swInit(int w, int h)
swViewport(0, 0, w, h); swViewport(0, 0, w, h);
swScissor(0, 0, w, h); swScissor(0, 0, w, h);
RLSW.loadedTextures = SW_MALLOC(SW_MAX_TEXTURES*sizeof(sw_texture_t)); RLSW.loadedTextures = (sw_texture_t *)SW_MALLOC(SW_MAX_TEXTURES*sizeof(sw_texture_t));
if (RLSW.loadedTextures == NULL) { swClose(); return false; } if (RLSW.loadedTextures == NULL) { swClose(); return false; }
RLSW.freeTextureIds = SW_MALLOC(SW_MAX_TEXTURES*sizeof(uint32_t)); RLSW.freeTextureIds = (uint32_t *)SW_MALLOC(SW_MAX_TEXTURES*sizeof(uint32_t));
if (RLSW.loadedTextures == NULL) { swClose(); return false; } if (RLSW.loadedTextures == NULL) { swClose(); return false; }
RLSW.clearColor[0] = 0.0f; RLSW.clearColor[0] = 0.0f;
@ -3898,7 +3911,7 @@ void swClose(void)
SW_FREE(RLSW.loadedTextures); SW_FREE(RLSW.loadedTextures);
SW_FREE(RLSW.freeTextureIds); SW_FREE(RLSW.freeTextureIds);
RLSW = (sw_context_t) { 0 }; RLSW = CURLY_INIT(sw_context_t) { 0 };
} }
bool swResizeFramebuffer(int w, int h) bool swResizeFramebuffer(int w, int h)
@ -3908,7 +3921,7 @@ bool swResizeFramebuffer(int w, int h)
void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type, void *pixels) void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type, void *pixels)
{ {
sw_pixelformat_t pFormat = sw_get_pixel_format(format, type); sw_pixelformat_t pFormat = (sw_pixelformat_t)sw_get_pixel_format(format, type);
if (w <= 0) if (w <= 0)
{ {
@ -3930,26 +3943,26 @@ void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type,
switch (pFormat) switch (pFormat)
{ {
case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_copy_to_R5G6B5(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_copy_to_R5G6B5(x, y, w, h, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_copy_to_R8G8B8(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_copy_to_R8G8B8(x, y, w, h, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_copy_to_R5G5B5A1(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_copy_to_R5G5B5A1(x, y, w, h, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_copy_to_R4G4B4A4(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_copy_to_R4G4B4A4(x, y, w, h, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_copy_to_R8G8B8A8(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_copy_to_R8G8B8A8(x, y, w, h, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_copy_to_R32(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_copy_to_R32(x, y, w, h, (float *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_copy_to_R32G32B32(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_copy_to_R32G32B32(x, y, w, h, (float *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_copy_to_R32G32B32A32(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_copy_to_R32G32B32A32(x, y, w, h, (float *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_copy_to_R16(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_copy_to_R16(x, y, w, h, (sw_half_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_copy_to_R16G16B16(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_copy_to_R16G16B16(x, y, w, h, (sw_half_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_copy_to_R16G16B16A16(x, y, w, h, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_copy_to_R16G16B16A16(x, y, w, h, (sw_half_t *)pixels); break;
default: RLSW.errCode = SW_INVALID_ENUM; break; default: RLSW.errCode = SW_INVALID_ENUM; break;
} }
} }
void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, int wSrc, int hSrc, SWformat format, SWtype type, void *pixels) void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, int wSrc, int hSrc, SWformat format, SWtype type, void *pixels)
{ {
sw_pixelformat_t pFormat = sw_get_pixel_format(format, type); sw_pixelformat_t pFormat = (sw_pixelformat_t)sw_get_pixel_format(format, type);
if (wSrc <= 0) if (wSrc <= 0)
{ {
@ -3971,19 +3984,19 @@ void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySr
switch (pFormat) switch (pFormat)
{ {
case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_blit_to_R5G6B5(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_blit_to_R5G6B5(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_blit_to_R8G8B8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_blit_to_R8G8B8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_blit_to_R5G5B5A1(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_blit_to_R5G5B5A1(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_blit_to_R4G4B4A4(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_blit_to_R4G4B4A4(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_blit_to_R8G8B8A8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_blit_to_R8G8B8A8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_blit_to_R32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_blit_to_R32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_blit_to_R32G32B32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_blit_to_R32G32B32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (float *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_blit_to_R32G32B32A32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_blit_to_R32G32B32A32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (float*)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_blit_to_R16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_blit_to_R16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (sw_half_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_blit_to_R16G16B16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_blit_to_R16G16B16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (sw_half_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_blit_to_R16G16B16A16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break; case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_blit_to_R16G16B16A16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (sw_half_t *)pixels); break;
default: RLSW.errCode = SW_INVALID_ENUM; break; default: RLSW.errCode = SW_INVALID_ENUM; break;
} }
} }
@ -4553,7 +4566,7 @@ void swBegin(SWdraw mode)
void swEnd(void) void swEnd(void)
{ {
RLSW.drawMode = 0; RLSW.drawMode = (SWdraw)0;
} }
void swVertex2i(int x, int y) void swVertex2i(int x, int y)
@ -4738,9 +4751,9 @@ void swBindArray(SWarray type, void *buffer)
{ {
switch (type) switch (type)
{ {
case SW_VERTEX_ARRAY: RLSW.array.positions = buffer; break; case SW_VERTEX_ARRAY: RLSW.array.positions = (float *)buffer; break;
case SW_TEXTURE_COORD_ARRAY: RLSW.array.texcoords = buffer; break; case SW_TEXTURE_COORD_ARRAY: RLSW.array.texcoords = (float *)buffer; break;
case SW_COLOR_ARRAY: RLSW.array.colors = buffer; break; case SW_COLOR_ARRAY: RLSW.array.colors = (uint8_t *)buffer; break;
default: break; default: break;
} }
} }
@ -4833,7 +4846,7 @@ void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy
if (copy) if (copy)
{ {
int bytes = sw_get_pixel_bytes(pixelFormat); int bytes = sw_get_pixel_bytes((sw_pixelformat_t)pixelFormat);
int size = bytes*width*height; int size = bytes*width*height;
texture->pixels.ptr = SW_MALLOC(size); texture->pixels.ptr = SW_MALLOC(size);
@ -4854,7 +4867,7 @@ void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy
texture->height = height; texture->height = height;
texture->wMinus1 = width - 1; texture->wMinus1 = width - 1;
texture->hMinus1 = height - 1; texture->hMinus1 = height - 1;
texture->format = pixelFormat; texture->format = (sw_pixelformat_t)pixelFormat;
texture->tx = 1.0f/width; texture->tx = 1.0f/width;
texture->ty = 1.0f/height; texture->ty = 1.0f/height;
texture->copy = copy; texture->copy = copy;
@ -4882,7 +4895,7 @@ void swTexParameteri(int param, int value)
return; return;
} }
texture->minFilter = value; texture->minFilter = (SWfilter)value;
} break; } break;
case SW_TEXTURE_MAG_FILTER: case SW_TEXTURE_MAG_FILTER:
{ {
@ -4892,7 +4905,7 @@ void swTexParameteri(int param, int value)
return; return;
} }
texture->magFilter = value; texture->magFilter = (SWfilter)value;
} break; } break;
case SW_TEXTURE_WRAP_S: case SW_TEXTURE_WRAP_S:
{ {
@ -4902,7 +4915,7 @@ void swTexParameteri(int param, int value)
return; return;
} }
texture->sWrap = value; texture->sWrap = (SWwrap)value;
} break; } break;
case SW_TEXTURE_WRAP_T: case SW_TEXTURE_WRAP_T:
{ {
@ -4912,7 +4925,7 @@ void swTexParameteri(int param, int value)
return; return;
} }
texture->tWrap = value; texture->tWrap = (SWwrap)value;
} break; } break;
default: RLSW.errCode = SW_INVALID_ENUM; break; default: RLSW.errCode = SW_INVALID_ENUM; break;
} }

8
src/rcore.c
View File

@ -26,7 +26,8 @@
* - Linux DRM subsystem (KMS mode) * - Linux DRM subsystem (KMS mode)
* > PLATFORM_ANDROID: * > PLATFORM_ANDROID:
* - Android (ARM, ARM64) * - Android (ARM, ARM64)
* * > PLATFORM_DESKTOP_WIN32 (Native Win32):
* - Windows (Win32, Win64)
* CONFIGURATION: * CONFIGURATION:
* #define SUPPORT_DEFAULT_FONT (default) * #define SUPPORT_DEFAULT_FONT (default)
* Default font is loaded on window initialization to be available for the user to render simple text. * Default font is loaded on window initialization to be available for the user to render simple text.
@ -161,7 +162,10 @@
#endif #endif
// Platform specific defines to handle GetApplicationDirectory() // Platform specific defines to handle GetApplicationDirectory()
#if (defined(_WIN32) && !defined(PLATFORM_DESKTOP_RGFW)) || (defined(_MSC_VER) && defined(PLATFORM_DESKTOP_RGFW)) #if defined(_WIN32)
#if !defined(MAX_PATH)
#define MAX_PATH 260
#endif
struct HINSTANCE__; struct HINSTANCE__;
#if defined(__cplusplus) #if defined(__cplusplus)