Merge branch 'raysan5:master' into master

Author: hmz-rhl

.github/workflows/update_examples.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout
@@ -22,49 +22,51 @@ jobs:
       with:
         version: 'latest'
         actions-cache-folder: 'emsdk-cache'
-        
-    - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v2
-        
+
     - name: Clone raylib.com repo to update files
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        git clone https://x-access-token:${GITHUB_TOKEN}@github.com/raysan5/raylib.com.git
-      shell: cmd
-        
-    - name: Build and run rexm tool (VS2022 solution)
-      # rexm should update all required files in raylib and even raylib.com repo,
-      # but not sure if it can do that from an Action, maybe it requires manual copy 
       run: |
-        cd tools/rexm/VS2022
-        msbuild.exe rexm.sln /target:rexm /property:Configuration=Release /property:Platform=x64
-        cd ../../..
-        set REXM_EXAMPLES_BASE_PATH="examples"
-        set REXM_EXAMPLES_WEB_PATH="../raylib.com/examples"
-        set REXM_EXAMPLES_TEMPLATE_FILE_PATH="examples/examples_template.c"
-        set REXM_EXAMPLES_TEMPLATE_SCREENSHOT_PATH="examples/examples_template.png"
-        set REXM_EXAMPLES_COLLECTION_FILE_PATH="examples/examples_list.txt"
-        set REXM_EXAMPLES_VS2022_SLN_FILE="projects/VS2022/raylib.sln"
-        set EMSDK_PATH="D:/a/raylib/raylib/emsdk-cache/emsdk-main"
-        .\tools\rexm\VS2022\build\rexm\bin\x64\Release\rexm.exe update
-        cd ../..
-      shell: cmd
-  
-    - name: Commit changes to raylib repo
+        git clone https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/raysan5/raylib.com.git
+      shell: bash
+
+    - name: Build and run rexm tool (requires GNU Makefile)
+      # "rexm update" validates and updates all required examples in raylib and even raylib.com repos,
+      # note that it calls examples/Makefile.Web internally, so it requires [make] tool available
       run: |
-        #git config user.name "github-actions[bot]"
-        #git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-        #git add -A
-        #git commit -m "Update examples collection"
-        #git push
+        sudo apt-get update && sudo apt-get install -y libopengl0 libglu1-mesa libx11-dev libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libgl1-mesa-dev libglu1-mesa-dev
+        cd "${{ github.workspace }}/src"
+        make PLATFORM=PLATFORM_DESKTOP
+        sudo make install
+        make clean
+        make PLATFORM=PLATFORM_WEB
+        cd ../tools/rexm/
+        make
+        export REXM_EXAMPLES_BASE_PATH="${{ github.workspace }}/examples"
+        export REXM_EXAMPLES_WEB_PATH="${{ github.workspace }}/raylib.com/examples"
+        export REXM_EXAMPLES_TEMPLATE_FILE_PATH="${{ github.workspace }}/examples/examples_template.c"
+        export REXM_EXAMPLES_TEMPLATE_SCREENSHOT_PATH="${{ github.workspace }}/examples/examples_template.png"
+        export REXM_EXAMPLES_COLLECTION_FILE_PATH="${{ github.workspace }}/examples/examples_list.txt"
+        export REXM_EXAMPLES_VS2022_SLN_FILE="${{ github.workspace }}/projects/VS2022/raylib.sln"
+        export EMSDK_PATH="${{ github.workspace }}/emsdk-cache/emsdk-main"
+        ./rexm update
+      shell: bash
 
-    - name: Push changes to raylib.com repo
+    - name: Commit changes to raylib repo (DISABLED)
+      if: github.event_name == 'push' && false
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        #git config --global user.name "github-actions[bot]"
-        #git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-        #git add examples
-        #git commit -m "Update web examples"
-        #git push origin
+        git config --global user.name "github-actions[bot]"
+        git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git add -A
+        git commit -m "Update examples collection" || echo "git exited with code 1, nothing changed"
+        git push
+      shell: bash
+
+    - name: Push changes to raylib.com repo (DISABLED)
+      if: github.event_name == 'push' && false
+      run: |
+        cd raylib.com
+        git add -A
+        git commit -m "Update web examples" || echo "git exited with code 1, nothing changed"
+        git push origin
+      shell: bash

.gitignore

@@ -116,3 +116,6 @@ tools/parser/raylib_parser
 tools/rexm/rexm.exe
 tools/rexm/rexm
 
+# CI
+emsdk-cache/
+raylib.com/

build.zig

@@ -99,7 +99,7 @@ const config_h_flags = outer: {
     break :outer flags[0..i].*;
 };
 
-fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, options: Options) !*std.Build.Step.Compile {
+pub fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, options: Options) !*std.Build.Step.Compile {
     var raylib_flags_arr: std.ArrayList([]const u8) = .empty;
     defer raylib_flags_arr.deinit(b.allocator);
 

examples/Makefile

@@ -507,7 +507,7 @@ CORE = \
     core/core_3d_camera_free \
     core/core_3d_camera_mode \
     core/core_3d_camera_split_screen \
-    core/core_3d_fps_controller \
+    core/core_3d_camera_fps \
     core/core_3d_picking \
     core/core_automation_events \
     core/core_basic_screen_manager \
@@ -599,6 +599,7 @@ TEXT = \
     text/text_raylib_fonts \
     text/text_rectangle_bounds \
     text/text_unicode \
+    text/text_unicode_ranges \
     text/text_writing_anim
 
 MODELS = \

examples/Makefile.Web

@@ -507,7 +507,7 @@ CORE = \
     core/core_3d_camera_free \
     core/core_3d_camera_mode \
     core/core_3d_camera_split_screen \
-    core/core_3d_fps_controller \
+    core/core_3d_camera_fps \
     core/core_3d_picking \
     core/core_automation_events \
     core/core_basic_screen_manager \
@@ -599,6 +599,7 @@ TEXT = \
     text/text_raylib_fonts \
     text/text_rectangle_bounds \
     text/text_unicode \
+    text/text_unicode_ranges \
     text/text_writing_anim
 
 MODELS = \
@@ -703,7 +704,7 @@ core/core_3d_camera_mode: core/core_3d_camera_mode.c
 core/core_3d_camera_split_screen: core/core_3d_camera_split_screen.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
 
-core/core_3d_fps_controller: core/core_3d_fps_controller.c
+core/core_3d_camera_fps: core/core_3d_camera_fps.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
 
 core/core_3d_picking: core/core_3d_picking.c
@@ -999,14 +1000,14 @@ text/text_input_box: text/text_input_box.c
 
 text/text_raylib_fonts: text/text_raylib_fonts.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
-    --preload-file text/resources/fonts/alagard.png@resources/fonts/alagard.png \
-    --preload-file text/resources/fonts/pixelplay.png@resources/fonts/pixelplay.png \
-    --preload-file text/resources/fonts/mecha.png@resources/fonts/mecha.png \
-    --preload-file text/resources/fonts/setback.png@resources/fonts/setback.png \
-    --preload-file text/resources/fonts/romulus.png@resources/fonts/romulus.png \
-    --preload-file text/resources/fonts/pixantiqua.png@resources/fonts/pixantiqua.png \
-    --preload-file text/resources/fonts/alpha_beta.png@resources/fonts/alpha_beta.png \
-    --preload-file text/resources/fonts/jupiter_crash.png@resources/fonts/jupiter_crash.png
+    --preload-file text/resources/sprite_fonts/alagard.png@resources/sprite_fonts/alagard.png \
+    --preload-file text/resources/sprite_fonts/pixelplay.png@resources/sprite_fonts/pixelplay.png \
+    --preload-file text/resources/sprite_fonts/mecha.png@resources/sprite_fonts/mecha.png \
+    --preload-file text/resources/sprite_fonts/setback.png@resources/sprite_fonts/setback.png \
+    --preload-file text/resources/sprite_fonts/romulus.png@resources/sprite_fonts/romulus.png \
+    --preload-file text/resources/sprite_fonts/pixantiqua.png@resources/sprite_fonts/pixantiqua.png \
+    --preload-file text/resources/sprite_fonts/alpha_beta.png@resources/sprite_fonts/alpha_beta.png \
+    --preload-file text/resources/sprite_fonts/jupiter_crash.png@resources/sprite_fonts/jupiter_crash.png
 
 text/text_rectangle_bounds: text/text_rectangle_bounds.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
@@ -1017,6 +1018,10 @@ text/text_unicode: text/text_unicode.c
     --preload-file text/resources/noto_cjk.fnt@resources/noto_cjk.fnt \
     --preload-file text/resources/symbola.fnt@resources/symbola.fnt
 
+text/text_unicode_ranges: text/text_unicode_ranges.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
+    --preload-file text/resources/NotoSansTC-Regular.ttf@resources/NotoSansTC-Regular.ttf
+
 text/text_writing_anim: text/text_writing_anim.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
 

examples/README.md

@@ -16,7 +16,7 @@ You may find it easier to use than other toolchains, especially when it comes to
 - `zig build [module]` to compile all examples for a module (e.g. `zig build core`)
 - `zig build [example]` to compile _and run_ a particular example (e.g. `zig build core_basic_window`)
 
-## EXAMPLES COLLECTION [TOTAL: 161]
+## EXAMPLES COLLECTION [TOTAL: 162]
 
 ### category: core [37]
 
@@ -40,7 +40,7 @@ Examples using raylib[core](../src/rcore.c) platform functionality like window c
 | [core_3d_camera_free](core/core_3d_camera_free.c) | <img src="core/core_3d_camera_free.png" alt="core_3d_camera_free" width="80"> | ⭐☆☆☆ | 1.3 | 1.3 | [Ramon Santamaria](https://github.com/raysan5) |
 | [core_3d_camera_first_person](core/core_3d_camera_first_person.c) | <img src="core/core_3d_camera_first_person.png" alt="core_3d_camera_first_person" width="80"> | ⭐⭐☆☆ | 1.3 | 1.3 | [Ramon Santamaria](https://github.com/raysan5) |
 | [core_3d_camera_split_screen](core/core_3d_camera_split_screen.c) | <img src="core/core_3d_camera_split_screen.png" alt="core_3d_camera_split_screen" width="80"> | ⭐⭐⭐☆ | 3.7 | 4.0 | [Jeffery Myers](https://github.com/JeffM2501) |
-| [core_3d_fps_controller](core/core_3d_fps_controller.c) | <img src="core/core_3d_fps_controller.png" alt="core_3d_fps_controller" width="80"> | ⭐⭐⭐☆ | 5.5 | 5.5 | [Agnis Aldins](https://github.com/nezvers) |
+| [core_3d_camera_fps](core/core_3d_camera_fps.c) | <img src="core/core_3d_camera_fps.png" alt="core_3d_camera_fps" width="80"> | ⭐⭐⭐☆ | 5.5 | 5.5 | [Agnis Aldins](https://github.com/nezvers) |
 | [core_3d_picking](core/core_3d_picking.c) | <img src="core/core_3d_picking.png" alt="core_3d_picking" width="80"> | ⭐⭐☆☆ | 1.3 | 4.0 | [Ramon Santamaria](https://github.com/raysan5) |
 | [core_world_screen](core/core_world_screen.c) | <img src="core/core_world_screen.png" alt="core_world_screen" width="80"> | ⭐⭐☆☆ | 1.3 | 1.4 | [Ramon Santamaria](https://github.com/raysan5) |
 | [core_custom_logging](core/core_custom_logging.c) | <img src="core/core_custom_logging.png" alt="core_custom_logging" width="80"> | ⭐⭐⭐☆ | 2.5 | 2.5 | [Pablo Marcos Oltra](https://github.com/pamarcos) |
@@ -122,7 +122,7 @@ Examples using raylib textures functionality, including image/textures loading/g
 | [textures_image_rotate](textures/textures_image_rotate.c) | <img src="textures/textures_image_rotate.png" alt="textures_image_rotate" width="80"> | ⭐⭐☆☆ | 1.0 | 1.0 | [Ramon Santamaria](https://github.com/raysan5) |
 | [textures_textured_curve](textures/textures_textured_curve.c) | <img src="textures/textures_textured_curve.png" alt="textures_textured_curve" width="80"> | ⭐⭐⭐☆ | 4.5 | 4.5 | [Jeffery Myers](https://github.com/JeffM2501) |
 
-### category: text [12]
+### category: text [13]
 
 Examples using raylib text functionality, including sprite fonts loading/generation and text drawing, provided by raylib [text](../src/rtext.c) module.
 
@@ -140,6 +140,7 @@ Examples using raylib text functionality, including sprite fonts loading/generat
 | [text_unicode](text/text_unicode.c) | <img src="text/text_unicode.png" alt="text_unicode" width="80"> | ⭐⭐⭐⭐️ | 2.5 | 4.0 | [Vlad Adrian](https://github.com/demizdor) |
 | [text_draw_3d](text/text_draw_3d.c) | <img src="text/text_draw_3d.png" alt="text_draw_3d" width="80"> | ⭐⭐⭐⭐️ | 3.5 | 4.0 | [Vlad Adrian](https://github.com/demizdor) |
 | [text_codepoints_loading](text/text_codepoints_loading.c) | <img src="text/text_codepoints_loading.png" alt="text_codepoints_loading" width="80"> | ⭐⭐⭐☆ | 4.2 | 4.2 | [Ramon Santamaria](https://github.com/raysan5) |
+| [text_unicode_ranges](text/text_unicode_ranges.c) | <img src="text/text_unicode_ranges.png" alt="text_unicode_ranges" width="80"> | ⭐⭐⭐⭐️ | 2.5 | 4.0 | [Vlad Adrian](https://github.com/demizdor) |
 
 ### category: models [23]
 

examples/audio/audio_mixed_processor.c

@@ -55,7 +55,7 @@ int main(void)
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    InitWindow(screenWidth, screenHeight, "raylib [audio] example - processing mixed output");
+    InitWindow(screenWidth, screenHeight, "raylib [audio] example - mixed audio processing");
 
     InitAudioDevice();              // Initialize audio device
 

examples/audio/audio_module_playing.c

@@ -1,6 +1,6 @@
 /*******************************************************************************************
 *
-*   raylib [audio] example - Module playing (streaming)
+*   raylib [audio] example - module playing (streaming)
 *
 *   Example complexity rating: [★☆☆☆] 1/4
 *

examples/audio/audio_music_stream.c

@@ -1,6 +1,6 @@
 /*******************************************************************************************
 *
-*   raylib [audio] example - Music playing (streaming)
+*   raylib [audio] example - music playing (streaming)
 *
 *   Example complexity rating: [★☆☆☆] 1/4
 *

examples/audio/audio_raw_stream.c

@@ -1,6 +1,6 @@
 /*******************************************************************************************
 *
-*   raylib [audio] example - Raw audio streaming
+*   raylib [audio] example - raw audio streaming
 *
 *   Example complexity rating: [★★★☆] 3/4
 *