Skip to content

Commit b9cd200

Browse files
authored
Merge branch 'master' into emscripten_example
2 parents ec143f2 + b8420d4 commit b9cd200

23 files changed

+727
-667
lines changed

cmake/LibraryConfigurations.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ if(POLICY CMP0072)
77
cmake_policy(SET CMP0072 NEW)
88
endif()
99

10+
set(RAYLIB_DEPENDENCIES "include(CMakeFindDependencyMacro)")
11+
1012
if (${PLATFORM} MATCHES "Desktop")
1113
set(PLATFORM_CPP "PLATFORM_DESKTOP")
1214

@@ -120,15 +122,17 @@ elseif ("${PLATFORM}" MATCHES "SDL")
120122
find_package(SDL3 QUIET)
121123
if(SDL3_FOUND)
122124
message(STATUS "Found SDL3 via find_package()")
125+
set(LIBS_PUBLIC SDL3::SDL3)
126+
set(RAYLIB_DEPENDENCIES "${RAYLIB_DEPENDENCIES}\nfind_dependency(SDL3 REQUIRED)")
123127
set(PLATFORM_CPP "PLATFORM_DESKTOP_SDL")
124-
set(LIBS_PRIVATE SDL3::SDL3)
125128
add_compile_definitions(USING_SDL3_PACKAGE)
126129
else()
127130
# Fallback to SDL2
128131
find_package(SDL2 REQUIRED)
129132
message(STATUS "Found SDL2 via find_package()")
130133
set(PLATFORM_CPP "PLATFORM_DESKTOP_SDL")
131-
set(LIBS_PRIVATE SDL2::SDL2)
134+
set(LIBS_PUBLIC SDL2::SDL2)
135+
set(RAYLIB_DEPENDENCIES "${RAYLIB_DEPENDENCIES}\nfind_dependency(SDL3 REQUIRED)")
132136
add_compile_definitions(USING_SDL2_PACKAGE)
133137
endif()
134138
endif()

cmake/raylib-config.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
@PACKAGE_INIT@
2+
@RAYLIB_DEPENDENCIES@
3+
24
include("${CMAKE_CURRENT_LIST_DIR}/raylib-targets.cmake")

examples/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ SHADERS = \
633633
shaders/shaders_custom_uniform \
634634
shaders/shaders_deferred_rendering \
635635
shaders/shaders_depth_rendering \
636+
shaders/shaders_depth_writing \
636637
shaders/shaders_eratosthenes_sieve \
637638
shaders/shaders_fog_rendering \
638639
shaders/shaders_hot_reloading \
@@ -655,8 +656,7 @@ SHADERS = \
655656
shaders/shaders_texture_rendering \
656657
shaders/shaders_texture_tiling \
657658
shaders/shaders_texture_waves \
658-
shaders/shaders_vertex_displacement \
659-
shaders/shaders_write_depth
659+
shaders/shaders_vertex_displacement
660660

661661
AUDIO = \
662662
audio/audio_mixed_processor \

examples/Makefile.Web

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ SHADERS = \
633633
shaders/shaders_custom_uniform \
634634
shaders/shaders_deferred_rendering \
635635
shaders/shaders_depth_rendering \
636+
shaders/shaders_depth_writing \
636637
shaders/shaders_eratosthenes_sieve \
637638
shaders/shaders_fog_rendering \
638639
shaders/shaders_hot_reloading \
@@ -655,8 +656,7 @@ SHADERS = \
655656
shaders/shaders_texture_rendering \
656657
shaders/shaders_texture_tiling \
657658
shaders/shaders_texture_waves \
658-
shaders/shaders_vertex_displacement \
659-
shaders/shaders_write_depth
659+
shaders/shaders_vertex_displacement
660660

661661
AUDIO = \
662662
audio/audio_mixed_processor \
@@ -1167,7 +1167,11 @@ shaders/shaders_deferred_rendering: shaders/shaders_deferred_rendering.c
11671167

11681168
shaders/shaders_depth_rendering: shaders/shaders_depth_rendering.c
11691169
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
1170-
--preload-file shaders/resources/shaders/glsl100/depth.fs@resources/shaders/glsl100/depth.fs
1170+
--preload-file shaders/resources/shaders/glsl100/depth_render.fs@resources/shaders/glsl100/depth_render.fs
1171+
1172+
shaders/shaders_depth_writing: shaders/shaders_depth_writing.c
1173+
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
1174+
--preload-file shaders/resources/shaders/glsl100/depth_write.fs@resources/shaders/glsl100/depth_write.fs
11711175

11721176
shaders/shaders_eratosthenes_sieve: shaders/shaders_eratosthenes_sieve.c
11731177
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
@@ -1298,10 +1302,6 @@ shaders/shaders_vertex_displacement: shaders/shaders_vertex_displacement.c
12981302
--preload-file shaders/resources/shaders/glsl100/vertex_displacement.vs@resources/shaders/glsl100/vertex_displacement.vs \
12991303
--preload-file shaders/resources/shaders/glsl100/vertex_displacement.fs@resources/shaders/glsl100/vertex_displacement.fs
13001304

1301-
shaders/shaders_write_depth: shaders/shaders_write_depth.c
1302-
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
1303-
--preload-file shaders/resources/shaders/glsl100/write_depth.fs@resources/shaders/glsl100/write_depth.fs
1304-
13051305
# Compile AUDIO examples
13061306
audio/audio_mixed_processor: audio/audio_mixed_processor.c
13071307
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \

examples/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Examples using raylib shaders functionality, including shaders loading, paramete
203203
| [shaders_texture_tiling](shaders/shaders_texture_tiling.c) | <img src="shaders/shaders_texture_tiling.png" alt="shaders_texture_tiling" width="80"> | ⭐⭐☆☆ | 4.5 | 4.5 | [Luis Almeida](https://github.com/luis605) |
204204
| [shaders_shadowmap_rendering](shaders/shaders_shadowmap_rendering.c) | <img src="shaders/shaders_shadowmap_rendering.png" alt="shaders_shadowmap_rendering" width="80"> | ⭐⭐⭐⭐️ | 5.0 | 5.0 | [TheManTheMythTheGameDev](https://github.com/TheManTheMythTheGameDev) |
205205
| [shaders_vertex_displacement](shaders/shaders_vertex_displacement.c) | <img src="shaders/shaders_vertex_displacement.png" alt="shaders_vertex_displacement" width="80"> | ⭐⭐⭐☆ | 5.0 | 4.5 | [Alex ZH](https://github.com/ZzzhHe) |
206-
| [shaders_write_depth](shaders/shaders_write_depth.c) | <img src="shaders/shaders_write_depth.png" alt="shaders_write_depth" width="80"> | ⭐⭐☆☆ | 4.2 | 4.2 | [Buğra Alptekin Sarı](https://github.com/BugraAlptekinSari) |
206+
| [shaders_depth_writing](shaders/shaders_depth_writing.c) | <img src="shaders/shaders_depth_writing.png" alt="shaders_depth_writing" width="80"> | ⭐⭐☆☆ | 4.2 | 4.2 | [Buğra Alptekin Sarı](https://github.com/BugraAlptekinSari) |
207207
| [shaders_basic_pbr](shaders/shaders_basic_pbr.c) | <img src="shaders/shaders_basic_pbr.png" alt="shaders_basic_pbr" width="80"> | ⭐⭐⭐⭐️ | 5.0 | 5.5 | [Afan OLOVCIC](https://github.com/_DevDad) |
208208
| [shaders_lightmap_rendering](shaders/shaders_lightmap_rendering.c) | <img src="shaders/shaders_lightmap_rendering.png" alt="shaders_lightmap_rendering" width="80"> | ⭐⭐⭐☆ | 4.5 | 4.5 | [Jussi Viitala](https://github.com/nullstare) |
209209
| [shaders_rounded_rectangle](shaders/shaders_rounded_rectangle.c) | <img src="shaders/shaders_rounded_rectangle.png" alt="shaders_rounded_rectangle" width="80"> | ⭐⭐⭐☆ | 5.5 | 5.5 | [Anstro Pleuton](https://github.com/anstropleuton) |

examples/core/core_3d_camera_fps.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,7 @@ static void UpdateCameraFPS(Camera *camera)
261261
Vector3 right = Vector3Normalize(Vector3CrossProduct(yaw, up));
262262

263263
// Rotate view vector around right axis
264-
float pitchAngle = -lookRotation.y -
265-
lean.y;
264+
float pitchAngle = -lookRotation.y - lean.y;
266265
pitchAngle = Clamp(pitchAngle, -PI/2 + 0.0001f, PI/2 - 0.0001f); // Clamp angle so it doesn't go past straight up or straight down
267266
Vector3 pitch = Vector3RotateByAxisAngle(yaw, right, pitchAngle);
268267

examples/examples_list.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ shaders;shaders_hybrid_rendering;★★★★;4.2;4.2;2022;2025;"Buğra Alptekin
150150
shaders;shaders_texture_tiling;★★☆☆;4.5;4.5;2023;2025;"Luis Almeida";@luis605
151151
shaders;shaders_shadowmap_rendering;★★★★;5.0;5.0;2023;2025;"TheManTheMythTheGameDev";@TheManTheMythTheGameDev
152152
shaders;shaders_vertex_displacement;★★★☆;5.0;4.5;2023;2025;"Alex ZH";@ZzzhHe
153-
shaders;shaders_write_depth;★★☆☆;4.2;4.2;2022;2025;"Buğra Alptekin Sarı";@BugraAlptekinSari
153+
shaders;shaders_depth_writing;★★☆☆;4.2;4.2;2022;2025;"Buğra Alptekin Sarı";@BugraAlptekinSari
154154
shaders;shaders_basic_pbr;★★★★;5.0;5.5;2023;2025;"Afan OLOVCIC";@_DevDad
155155
shaders;shaders_lightmap_rendering;★★★☆;4.5;4.5;2019;2025;"Jussi Viitala";@nullstare
156156
shaders;shaders_rounded_rectangle;★★★☆;5.5;5.5;2025;2025;"Anstro Pleuton";@anstropleuton

examples/shaders/resources/shaders/glsl100/depth.fs renamed to examples/shaders/resources/shaders/glsl100/depth_render.fs

File renamed without changes.

examples/shaders/resources/shaders/glsl100/write_depth.fs renamed to examples/shaders/resources/shaders/glsl100/depth_write.fs

File renamed without changes.

examples/shaders/resources/shaders/glsl120/depth.fs renamed to examples/shaders/resources/shaders/glsl120/depth_render.fs

File renamed without changes.

0 commit comments

Comments
 (0)