Merge branch 'master' of https://github.com/raysan5/raylib

# Conflicts:
#	examples/models/models_magicavoxel_loading.c
#	src/external/vox_loader.h
#	src/rmodels.c

.github/workflows/linux.yml

@@ -55,7 +55,7 @@ jobs:
     - name: Build Library
       run: |
         cd src
-        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" CFLAGS="-m32"
+        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" CFLAGS="-m32" -B
         # make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       if: matrix.bits == 32
@@ -63,7 +63,7 @@ jobs:
     - name: Build Library
       run: |
         cd src
-        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       if: matrix.bits == 64

.github/workflows/macos.yml

@@ -40,12 +40,12 @@ jobs:
       run: |
         cd src
         clang --version
-        make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" CFLAGS="-target x86_64-apple-macos10.12 -DGL_SILENCE_DEPRECATION"
+        make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" CFLAGS="-target x86_64-apple-macos10.12 -DGL_SILENCE_DEPRECATION" -B
         # make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=STATIC RAYLIB_LIB_NAME=raylib_x86_64 CFLAGS="-target x86_64-apple-macos10.12 -DGL_SILENCE_DEPRECATION"
         # make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=STATIC RAYLIB_LIB_NAME=raylib_arm64 CFLAGS="-target arm64-apple-macos11 -DGL_SILENCE_DEPRECATION" -B
         # lipo -create -output ../build/${{ env.RELEASE_NAME }}/lib/libraylib.a libraylib_x86_64.a libraylib_arm64.a
         make clean
-        make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" CFLAGS="-target x86_64-apple-macos10.12 -DGL_SILENCE_DEPRECATION"
+        make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" CFLAGS="-target x86_64-apple-macos10.12 -DGL_SILENCE_DEPRECATION" -B
         # make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_LIB_NAME=raylib_x86_64 CFLAGS="-target x86_64-apple-macos10.12 -DGL_SILENCE_DEPRECATION" -B
         # make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_LIB_NAME=raylib_arm64 CFLAGS="-target i686-apple-macos -DGL_SILENCE_DEPRECATION" -B
         # lipo -create -output ../build/${{ env.RELEASE_NAME }}/lib/libraylib.3.1.0.dylib libraylib_x86_64.3.1.0.dylib libraylib_arm64.3.1.0.dylib

.github/workflows/webassembly.yml

@@ -43,7 +43,7 @@ jobs:
       run: |
         cd src
         emcc -v
-        make PLATFORM=PLATFORM_WEB EMSDK_PATH="D:/a/raylib/raylib/emsdk-cache/emsdk-master" RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_WEB EMSDK_PATH="D:/a/raylib/raylib/emsdk-cache/emsdk-master" RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
   
     - name: Generate Artifacts

.gitignore

@@ -45,6 +45,7 @@ ipch/
 *.db
 *.opendb
 packages/
+!examples/models/resources/models/obj/
 
 # Ignore compiled binaries
 *.o
@@ -93,3 +94,10 @@ build
 GPATH
 GRTAGS
 GTAGS
+
+# Zig programming language
+zig-cache/
+zig-out/
+build/
+build-*/
+docgen_tmp/

BINDINGS.md

@@ -8,84 +8,101 @@ Some people ported raylib to other languages in form of bindings or wrappers to
 |:------------------:|:-------------: | :--------:|----------------------------------------------------------------------|
 | raylib             | **3.7** | [C/C++](https://en.wikipedia.org/wiki/C_(programming_language))    | https://github.com/raysan5/raylib    |
 | Raylib-cs          | 3.7 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language))       | https://github.com/ChrisDill/Raylib-cs      |
-| raylib-cppsharp    | 2.5 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language))       | https://github.com/phxvyper/raylib-cppsharp |
 | raylib-boo         | 3.7 | [Boo](http://boo-language.github.io/) | https://github.com/Rabios/raylib-boo          |
+| dray               | 3.5 | [D](https://dlang.org/)               | https://github.com/xdrie/dray       |
+| raylib-go          | 4.0-dev | [Go](https://golang.org/)             | https://github.com/gen2brain/raylib-go  |
+| raylib-rs          | 3.5 | [Rust](https://www.rust-lang.org/)    | https://github.com/deltaphc/raylib-rs     |
+| raylib-lua         | 3.7 | [Lua](http://www.lua.org/)            | https://github.com/TSnake41/raylib-lua       |
+| raylua             | 3.7 | [Lua](http://www.lua.org/)            | https://github.com/Rabios/raylua          |
+| nelua-raylib       | 3.7 | [nelua](https://nelua.io/)            | https://github.com/AKDev21/nelua-raylib |
+| NimraylibNow!      | 3.7 | [Nim](https://nim-lang.org/)          | https://github.com/greenfork/nimraylib_now        |
+| raylib-Forever     | auto | [Nim](https://nim-lang.org/)          | https://github.com/Guevara-chan/Raylib-Forever    |
+| Ray4Laz            | 3.7 | [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language))         | https://github.com/GuvaCode/Ray4Laz      |
+| pyraylib          | 3.7 | [Python](https://www.python.org/)        |   https://github.com/Ho011/pyraylib       |
+| raylib-python-cffi | 3.7 | [Python](https://www.python.org/)        | https://github.com/electronstudio/raylib-python-cffi    |
+| jaylib             | 3.7 | [Java](https://en.wikipedia.org/wiki/Java_(programming_language))           | https://github.com/electronstudio/jaylib/   |
+| node-raylib        | 3.5 | [Node.js](https://nodejs.org/en/)        | https://github.com/RobLoach/node-raylib     |
+| raylib-v7          | 3.5 | [JavaScript (v7)](https://en.wikipedia.org/wiki/JavaScript)      | https://github.com/Rabios/raylib-v7        |
+| raylib-php         | 3.5 | [PHP](https://en.wikipedia.org/wiki/PHP)      | https://github.com/joseph-montanez/raylib-php   |
+| raylib-phpcpp      | 3.5 | [PHP](https://en.wikipedia.org/wiki/PHP)      | https://github.com/oraoto/raylib-phpcpp      |
+| raylib-factor      | 3.5 | [Factor](https://factorcode.org/)        | https://github.com/ArnautDaniel/raylib-factor   |
+| gforth-raylib      | 3.5 | [Gforth](https://gforth.org/)            | https://github.com/ArnautDaniel/gforth-raylib   |
+| hxRaylib           | 3.7 | [Haxe](https://haxe.org/)                | https://github.com/ForeignSasquatch/hxRaylib    |
+| raylib-wren        | 3.7 | [Wren](http://wren.io/)           | https://github.com/TSnake41/raylib-wren           |
+| raylib_odin_bindings | 4.0-dev | [Odin](https://odin-lang.org/)            | https://github.com/Deathbat2190/raylib_odin_bindings     |
+| raylib.v           | 3.7 | [V](https://vlang.io/)                    | https://github.com/irishgreencitrus/raylib.v |
+| raylib-ocaml       | 3.7 | [OCaml](https://ocaml.org/)               | https://github.com/tjammer/raylib-ocaml   |
+| raylib-swift       | 3.7 | [Swift](https://swift.org/)                | https://github.com/STREGAsGate/Raylib |
+| hb-raylib          | 3.5 | [Harbour](https://harbour.github.io)                 | https://github.com/MarcosLeonardoMendezGerencir/hb-raylib |
+| Relib              | 3.5 | [ReCT](https://github.com/RedCubeDev-ByteSpace/ReCT) | https://github.com/RedCubeDev-ByteSpace/Relib |
+| rayex              | 3.7 | [elixir](https://elixir-lang.org/)         | https://github.com/shiryel/rayex |
+| kaylib             | 3.7 | [Kotlin/native](https://kotlinlang.org) | https://github.com/electronstudio/kaylib |
+| s48-raylib         | 3.7 | [Scheme48](https://s48.org)             | https://github.com/rc-05/s48-raylib |
+
+### Utility Wrapers
+These are utility wrappers for specific languages, they are not required to use raylib in the language but may adapt the raylib API to be more inline with the language's pardigm.
+|  name              | raylib version | language  | repo                                                                 |
+|:------------------:|:-------------: | :--------:|----------------------------------------------------------------------|
+| raylib-cpp         | 3.7 | [C++](https://en.wikipedia.org/wiki/C%2B%2B)     | https://github.com/robloach/raylib-cpp      |
+
+### Older or Unmaintained Language Bindings
+These are older raylib bindings that are more than 2 versions old or have not been maintained.
+|  name              | raylib version | language  | repo                                                                 |
+|:------------------:|:-------------: | :--------:|----------------------------------------------------------------------|
+| raylib-cppsharp    | 2.5 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language))       | https://github.com/phxvyper/raylib-cppsharp |
 | RaylibFS           | 2.5 | [F#](https://fsharp.org/)             | https://github.com/dallinbeutler/RaylibFS     |
 | raylib_d           | 2.5 | [D](https://dlang.org/)               | https://github.com/Sepheus/raylib_d     |
 | raylib-d           | 3.0 | [D](https://dlang.org/)               | https://github.com/onroundit/raylib-d     |
 | bindbc-raylib      | 3.0 | [D](https://dlang.org/)               | https://github.com/o3o/bindbc-raylib   |
-| dray               | 3.5 | [D](https://dlang.org/)               | https://github.com/xdrie/dray       |
+| go-raylib          | 3.5 | [Go](https://golang.org/)       | https://github.com/chunqian/go-raylib  |
-| raylib-go          | 3.8-dev | [Go](https://golang.org/)             | https://github.com/gen2brain/raylib-go  |
 | raylib-goplus      | 2.6-dev | [Go](https://golang.org/)             | https://github.com/Lachee/raylib-goplus         |
 | ray-go             | 2.6-dev | [Go](https://golang.org/)             | https://github.com/hecate-tech/ray-go     |
-| go-raylib          | 3.5 | [Go](https://golang.org/)       | https://github.com/chunqian/go-raylib  |
-| raylib-rs          | 3.5 | [Rust](https://www.rust-lang.org/)    | https://github.com/deltaphc/raylib-rs     |
-| raylib-lua         | 1.7 | [Lua](http://www.lua.org/)            | https://github.com/raysan5/raylib-lua       |
-| raylib-lua-ffi     | 2.0 | [Lua](http://www.lua.org/)            | https://github.com/raysan5/raylib/issues/693    |
-| raylib-lua-sol     | 2.5 | [Lua](http://www.lua.org/)          | https://github.com/RobLoach/raylib-lua-sol     |
-| raylib-lua         | 3.7 | [Lua](http://www.lua.org/)            | https://github.com/TSnake41/raylib-lua       |
 | raylib-luamore     | 3.0 | [Lua](http://www.lua.org/)            | https://github.com/HDPLocust/raylib-luamore    |
-| raylua             | 3.7 | [Lua](http://www.lua.org/)            | https://github.com/Rabios/raylua          |
 | LuaJIT-Raylib      | 2.6 | [Lua](http://www.lua.org/)            | https://github.com/Bambofy/LuaJIT-Raylib    |
-| raylib-nelua       | 3.7 | [nelua](https://nelua.io/)            | https://github.com/edubart/nelua-decl/tree/main/libs/raylib       |
+| raylib-lua-sol     | 2.5 | [Lua](http://www.lua.org/)          | https://github.com/RobLoach/raylib-lua-sol     |
+| raylib-lua-ffi     | 2.0 | [Lua](http://www.lua.org/)            | https://github.com/raysan5/raylib/issues/693    |
+| raylib-lua         | 1.7 | [Lua](http://www.lua.org/)            | https://github.com/raysan5/raylib-lua       |
 | raylib-nelua       | 3.0 | [Nelua](https://nelua.io/)            | https://github.com/Andre-LA/raylib-nelua     |
-| raylib-Nim         | 1.7 | [Nim](https://nim-lang.org/)          | https://gitlab.com/define-private-public/raylib-Nim     |
 | raylib-nim         | 2.0 | [Nim](https://nim-lang.org/)          | https://github.com/Skrylar/raylib-nim                  |
-| raylib-Forever     | 3.1-dev | [Nim](https://nim-lang.org/)          | https://github.com/Guevara-chan/Raylib-Forever    |
+| raylib-Nim         | 1.7 | [Nim](https://nim-lang.org/)          | https://gitlab.com/define-private-public/raylib-Nim     |
 | nim-raylib         | 3.1-dev | [Nim](https://nim-lang.org/)          | https://github.com/tomc1998/nim-raylib            |
-| NimraylibNow!      | 3.7 | [Nim](https://nim-lang.org/)          | https://github.com/greenfork/nimraylib_now        |
 | raylib-haskell     | 2.0 | [Haskell](https://www.haskell.org/)   | https://github.com/DevJac/raylib-haskell |
 | raylib-cr          | 2.5-dev | [Crystal](https://crystal-lang.org/)  | https://github.com/AregevDev/raylib-cr      |
-| cray               | 1.8 | [Crystal](https://crystal-lang.org/)  | https://gitlab.com/Zatherz/cray           |
 | raylib.cr          | 2.0 | [Crystal](https://crystal-lang.org/)  | https://github.com/sam0x17/raylib.cr     |
-| raylib-pascal      | 2.0 | [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language))         | https://github.com/drezgames/raylib-pascal    |
+| cray               | 1.8 | [Crystal](https://crystal-lang.org/)  | https://gitlab.com/Zatherz/cray           |
 | raylib-pas         | 3.0 | [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language))         | https://github.com/tazdij/raylib-pas      |
-| Ray4Laz            | 3.7 | [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language))         | https://github.com/GuvaCode/Ray4Laz      | 
+| raylib-pascal      | 2.0 | [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language))         | https://github.com/drezgames/raylib-pascal    |
 | Graphics-Raylib    | 1.4 | [Perl](https://www.perl.org/)            | https://github.com/athreef/Graphics-Raylib      |
-| raylib-ruby-ffi    | 2.0 | [Ruby](https://www.ruby-lang.org/en/)    | https://github.com/D3nX/raylib-ruby-ffi      |
 | raylib-ruby        | 2.6 | [Ruby](https://www.ruby-lang.org/en/)    | https://github.com/a0/raylib-ruby        |
+| raylib-ruby-ffi    | 2.0 | [Ruby](https://www.ruby-lang.org/en/)    | https://github.com/D3nX/raylib-ruby-ffi      |
 | raylib-mruby       | 2.5-dev | [mruby](https://github.com/mruby/mruby)  | https://github.com/lihaochen910/raylib-mruby    |
-| pyraylib          | 3.7 | [Python](https://www.python.org/)        |   https://github.com/Ho011/pyraylib       |
-| raylib-py          | 2.0 | [Python](https://www.python.org/)        | https://github.com/overdev/raylib-py       |
-| raylib-python-cffi | 3.7 | [Python](https://www.python.org/)        | https://github.com/electronstudio/raylib-python-cffi    |
 | raylib-py-ctbg     | 2.6 | [Python](https://www.python.org/)        | https://github.com/overdev/raylib-py-ctbg                |
-| jaylib             | 3.7 | [Java](https://en.wikipedia.org/wiki/Java_(programming_language))           | https://github.com/electronstudio/jaylib/   |
+| raylib-py          | 2.0 | [Python](https://www.python.org/)        | https://github.com/overdev/raylib-py       |
 | raylib-java        | 2.0 | [Java](https://en.wikipedia.org/wiki/Java_(programming_language))           | https://github.com/XoanaIO/raylib-java   |
 | raylib-j           | 3.5 | [Java](https://en.wikipedia.org/wiki/Java_(programming_language))           | https://github.com/CreedVI/Raylib-J   |
 | clj-raylib         | 3.0 | [Clojure](https://clojure.org/)          | https://github.com/lsevero/clj-raylib       |
-| node-raylib        | 3.5 | [Node.js](https://nodejs.org/en/)        | https://github.com/RobLoach/node-raylib     |
 | QuickJS-raylib     | 3.0 | [QuickJS](https://bellard.org/quickjs/)  | https://github.com/sntg-p/QuickJS-raylib    |
 | raylib-duktape     | 2.6 | [JavaScript (Duktape)](https://en.wikipedia.org/wiki/JavaScript) | https://github.com/RobLoach/raylib-duktape |
-| raylib-v7          | 3.5 | [JavaScript (v7)](https://en.wikipedia.org/wiki/JavaScript)      | https://github.com/Rabios/raylib-v7        |
 | raylib-chaiscript  | 2.6 | [ChaiScript](http://chaiscript.com/)     | https://github.com/RobLoach/raylib-chaiscript        |
 | raylib-squirrel    | 2.5 | [Squirrel](http://www.squirrel-lang.org/)     | https://github.com/RobLoach/raylib-squirrel    |
 | racket-raylib-2d   | 2.5 | [Racket](https://racket-lang.org/)       | https://github.com/arvyy/racket-raylib-2d           |
-| raylib-php         | 3.5 | [PHP](https://en.wikipedia.org/wiki/PHP)      | https://github.com/joseph-montanez/raylib-php   |
 | raylib-php-ffi     | 2.4-dev | [PHP](https://en.wikipedia.org/wiki/PHP)      | https://github.com/oraoto/raylib-php-ffi      |
-| raylib-phpcpp      | 3.5 | [PHP](https://en.wikipedia.org/wiki/PHP)      | https://github.com/oraoto/raylib-phpcpp      |
-| raylib-factor      | 3.5 | [Factor](https://factorcode.org/)        | https://github.com/ArnautDaniel/raylib-factor   |
-| gforth-raylib      | 3.5 | [Gforth](https://gforth.org/)            | https://github.com/ArnautDaniel/gforth-raylib   |
 | raylib-haxe        | 2.4 | [Haxe](https://haxe.org/)                | https://github.com/ibilon/raylib-haxe           |
-| hxRaylib           | 3.7 | [Haxe](https://haxe.org/)                | https://github.com/ForeignSasquatch/hxRaylib    |
 | ringraylib         | 2.6 | [Ring](http://ring-lang.sourceforge.net/)  | https://github.com/ringpackages/ringraylib     |
 | cl-raylib          | 3.0 | [Common Lisp](https://common-lisp.net/)    | https://github.com/longlene/cl-raylib    |
 | raylib-scm         | 2.5 | [Chicken Scheme](https://www.call-cc.org/) | https://github.com/yashrk/raylib-scm     |
 | raylib-chibi       | 2.5 | [Chibi-Scheme](https://github.com/ashinn/chibi-scheme)   | https://github.com/VincentToups/raylib-chibi  |
 | raylib-gambit-scheme | 3.1-dev | [Gambit Scheme](https://github.com/gambit/gambit)   | https://github.com/georgjz/raylib-gambit-scheme  |
 | Euraylib           | 3.0 | [Euphoria](https://openeuphoria.org/)  | https://github.com/gAndy50/Euraylib          |
-| raylib-wren        | 3.7 | [Wren](http://wren.io/)           | https://github.com/TSnake41/raylib-wren           |
 | raylib-odin        | 3.0 | [Odin](https://odin-lang.org/)            | https://github.com/kevinw/raylib-odin     |
-| raylib_odin_bindings | 3.8+ | [Odin](https://odin-lang.org/)            | https://github.com/Deathbat2190/raylib_odin_bindings     |
+| vraylib            | 3.5 | [V](https://vlang.io/)                    | https://github.com/waotzi/vraylib      |
 | raylib-zig         | 3.0 | [Zig](https://ziglang.org/)               | https://github.com/Not-Nik/raylib-zig     |
 | raylib-jai         | 3.1-dev | [Jai](https://github.com/BSVino/JaiPrimer/blob/master/JaiPrimer.md)  | https://github.com/kevinw/raylib-jai   |
 | ray.zig            | 2.5 | [Zig](https://ziglang.org/)               | https://github.com/BitPuffin/zig-raylib-experiments |
 | raylib-Ada         | 3.0 | [Ada](https://www.adacore.com/about-ada)  | https://github.com/mimo/raylib-Ada        |
 | jaylib             | 3.0 | [Janet](https://janet-lang.org/)          | https://github.com/janet-lang/jaylib      |
 | raykit             | ? | [Kit](https://www.kitlang.org/)           | https://github.com/Gamerfiend/raykit      |
-| vraylib            | 3.5 | [V](https://vlang.io/)                    | https://github.com/waotzi/vraylib      |
-| raylib.v           | 3.7 | [V](https://vlang.io/)                    | https://github.com/irishgreencitrus/raylib.v |
 | ray.mod            | 3.0 | [BlitzMax](https://blitzmax.org/)         | https://github.com/bmx-ng/ray.mod         |
-| raylib-ocaml       | 3.7 | [OCaml](https://ocaml.org/)               | https://github.com/tjammer/raylib-ocaml   |
 | raylib-mosaic      | 3.0 | [Mosaic](https://github.com/sal55/langs/tree/master/Mosaic)     | https://github.com/pluckyporcupine/raylib-mosaic   |
 | raylib-xdpw        | 2.6 | [XD Pascal](https://github.com/vtereshkov/xdpw)     | https://github.com/vtereshkov/raylib-xdpw   |
 | raylib-carp        | 3.0 | [Carp](https://github.com/carp-lang/Carp)           | https://github.com/pluckyporcupine/raylib-carp   |
@@ -94,18 +111,10 @@ Some people ported raylib to other languages in form of bindings or wrappers to
 | raylib-smallBasic  | 3.1-dev | [SmallBASIC](https://github.com/smallbasic/SmallBASIC) | https://github.com/smallbasic/smallbasic.plugins/tree/master/raylib |
 | raylib-ats2        | 3.0 | [ATS2](http://www.ats-lang.org/)           | https://github.com/mephistopheles-8/raylib-ats2      |
 | raylib-beef        | 3.0 | [Beef](https://www.beeflang.org/)          | https://github.com/M0n7y5/raylib-beef    |
-| raylib-swift       | 3.5 | [Swift](https://swift.org/)                | https://github.com/conifer-dev/raylib-swift |
 | raylib-never       | 3.0 | [Never](https://github.com/never-lang/never) | https://github.com/never-lang/raylib-never |
-| hb-raylib          | 3.5 | [Harbour](https://harbour.github.io)                 | https://github.com/MarcosLeonardoMendezGerencir/hb-raylib |
-| Relib              | 3.5 | [ReCT](https://github.com/RedCubeDev-ByteSpace/ReCT) | https://github.com/RedCubeDev-ByteSpace/Relib |
-| rayex              | 3.7 | [elixir](https://elixir-lang.org/)         | https://github.com/shiryel/rayex |
 | raylib.cbl         | 2.0 | [COBOL](https://en.wikipedia.org/wiki/COBOL)        | *[code examples](https://github.com/Martinfx/Cobol/tree/master/OpenCobol/Games/raylib)* |
 
-### Utility Wrapers
 
-|  name              | raylib version | language  | repo                                                                 |
-|:------------------:|:-------------: | :--------:|----------------------------------------------------------------------|
-| raylib-cpp         | 3.7 | [C++](https://en.wikipedia.org/wiki/C%2B%2B)     | https://github.com/robloach/raylib-cpp      |
 
 Missing some language or wrapper? Feel free to create a new one! :)
 

CHANGELOG

@@ -12,7 +12,127 @@ KEY CHANGES:
  - 
  
 Detailed changes:
-
+[core] ADDED: Support canvas resizing on web (#1840) by @skylersaleh
+[core] ADDED: GetMouseDelta() (#1832) by @adricoin2010
+[core] ADDED: Support additional mouse buttons (#1753) by @lambertwang
+[core] ADDED: SetRandomSeed() (#1994) by @TommiSinivuo
+[core] ADDED: GetTouchPointId() #1972
+[core] RENAMED: SwapBuffers() to SwapScreenBuffer()
+[core] RENAMED: Wait() to WaitTime()
+[core] RENAMED: RayHitInfo to RayCollision (#1781)
+[core] RENAMED: GetRayCollisionGround() to GetRayCollisionQuad() (#1781)
+[core] REVIEWED: Support mouse wheel on x-axis (#1948)
+[core] REVIEWED: DisableCursor() on web by registering an empty mouse click event function in emscripten (#1900) by @grenappels
+[core] REVIEWED: LoadShader() and default locations and descriptions
+[core] REVIEWED: LoadShaderFromMemory() (#1851) by @Ruminant
+[core] REVIEWED: WaitTime(), avoid global variables dependency to make the function is self-contained (#1841)
+[core] REVIEWED: SetWindowSize() to work on web (#1847) by @nikki93
+[core] REVIEWED: Raspberry RPI/DRM keyboard blocking render loop (#1879) @luizpestana
+[core] REVIEWED: Android multi-touch (#1869) by @humbe
+[core] REVIEWED: Implemented GetGamepadName() for emscripten by @nbarkhina
+[core] REVIEWED: HighDPI support (#1987) by @ArnaudValensi
+[rlgl] ADDED: rlUpdateVertexBufferElements() (#1915)
+[rlgl] ADDED: rlActiveDrawBuffers() (#1911)
+[rlgl] ADDED: rlEnableColorBlend()/rlDisableColorBlend()
+[rlgl] ADDED: rlGetPixelFormatName()
+[rlgl] REVIEWED: rlUpdateVertexBuffer (#1914) by @630Studios
+[rlgl] REVIEWED: rlDrawVertexArrayElements() (#1891)
+[rlgl] REVIEWED: Wrong normal matrix calculation (#1870)
+[raymath] ADDED: Vector3Angle()
+[raymath] REVIEWED: QuaternionFromAxisAngle() (#1892)
+[raymath] REVIEWED: QuaternionToMatrix() returning transposed result. (#1793) by @object71
+[shapes] ADDED: RenderPolyLinesEx() (#1758) by @lambertwang
+[shapes] ADDED: DrawLineBezierCubic() (#2021) by @SAOMDVN
+[textures] ADDED: GetImageColor() #2024
+[textures] REMOVED: GenImagePerlinNoise() 
+[textures] RENAMED: GetTextureData() to LoadImageFromTexture()
+[textures] RENAMED: GetScreenData() to LoadImageFromScreen()
+[textures] REVIEWED: ExportImage() to use SaveFileData() (#1779)
+[textures] REVIEWED: LoadImageAnim() #2005
+[text] ADDED: Security check in case of not valid font
+[text] ADDED: `GetGlyphInfo()` to get glyph info for a specific codepoint
+[text] ADDED: `GetGlyphAtlasRec()` to get glyph rectangle within the generated font atlas
+[text] ADDED: DrawTextPro() with text rotation support, WARNING: DrawTextPro() requires including `rlgl.h`, before it was only dependant on `textures` module.
+[text] ADDED: UnloadCodepoints() to safely free loaded codepoints
+[text] REMOVED: DrawTextRec() and DrawTextRecEx(), moved to example, those functions could be very specific depending on user needs so it's better to give the user the full source in case of special requirements instead of allowing a function with +10 input parameters.
+[text] RENAMED: struct `CharInfo` to `GlyphInfo`, actually that's the correct naming for the data contained. It contains the character glyph metrics and the glyph image; in the past it also contained rectangle within the font atlas but that data has been moved to `Font` struct directly, so, `GlyphInfo` is a more correct name.
+[text] RENAMED: `CodepointToUtf8()` to `CodepointToUTF8()`, capitalization of UTF-8 is the correct form, it would also require de hyphen but it can be omitted in this case.
+[text] RENAMED: `TextToUtf8()` to `TextCodepointsToUTF8` for consistency and more detail on the functionality.
+[text] RENAMED: GetCodepoints() to LoadCodepoints(), now codepoint array data is loaded dynamically instead of reusing a limited static buffer.
+[text] RENAMED: GetNextCodepoint() to GetCodepoint()
+[models] ADDED: MagikaVoxel VOX models loading
+[models] ADDED: GenMeshCone() (#1903)
+[models] ADDED: GetModelBoundingBox()
+[models] ADDED: DrawBillboardPro() (#1759) by @nobytesgiven
+[models] ADDED: DrawCubeTextureRec() (#2001) by @tdgroot
+[models] ADDED: DrawCylinderEx() and DrawCylinderWiresEx() (#2049) by @Horrowind
+[models] REMOVED: DrawBillboardEx()
+[models] RENAMED: MeshBoundingBox() to GetMeshBoundingBox()
+[models] RENAMED: MeshTangents() to GenMeshTangents()
+[models] RENAMED: MeshBinormals() to GenMeshBinormals()
+[models] REVIEWED: GenMeshTangents() (#1877) by @630Studios
+[models] REVIEWED: CheckCollisionBoxSphere() by @Crydsch
+[models] REVIEWED: GetRayCollisionQuad() by @Crydsch
+[models] REVIEWED: LoadGLTF(), fixed missing transformations and nonroot skinning by @MrDiver
+[models] REVIEWED: Decouple DrawMesh() and DrawMeshInstanced() (#1958)
+[models] REVIEWED: Support vertex color attribute for GLTF and IQM (#1790) by @object71
+[models] REVIEWED: DrawBillboardPro() (#1941) by @GithubPrankster
+[models] REDESIGNED: Major review of glTF loading functionality (#1849) by @object71
+[audio] ADDED: SeekMusicStream() (#2006) by @GithubPrankster
+[audio] REMOVED: GetAudioStreamBufferSizeDefault()
+[audio] RENAMED: InitAudioStream() to LoadAudioStream()
+[audio] RENAMED: CloseAudioStream() to UnloadAudioStream()
+[audio] RENAMED: IsMusicPlaying() to IsMusicStreamPlaying()
+[audio] REVIEWED: ExportWaveAsCode()
+[audio] REDESIGNED: Use frameCount on audio instead of sampleCount
+[utils] REVIEWED: exit() on LOG_FATAL instead of LOG_ERROR (#1796)
+[examples] ADDED: core_custom_frame_control
+[examples] ADDED: core_basic_screen_manager
+[examples] ADDED: core_split_screen (#1806) by @JeffM2501
+[examples] ADDED: core_smooth_pixelperfect (#1771) by @NotManyIdeasDev
+[examples] ADDED: shaders_texture_outline (#1883) by @GoldenThumbs
+[examples] ADDED: models_loading_vox (#1940) by @procfxgen
+[examples] REMOVED: models_material_pbr
+[examples] REMOVED: models_gltf_animation
+[examples] REVIEWED: core_3d_picking
+[examples] REVIEWED: core_input_mouse
+[examples] REVIEWED: core_vr_simulator, RenderTexture usage
+[examples] REVIEWED: core_window_letterbox, RenderTexture usage
+[examples] REVIEWED: shapes_basic_shapes
+[examples] REVIEWED: shapes_logo_raylib_anim
+[examples] REVIEWED: textures_to_image
+[examples] REVIEWED: text_rectangle_bounds
+[examples] REVIEWED: text_unicode
+[examples] REVIEWED: text_draw_3d
+[examples] REVIEWED: models_loading
+[examples] REVIEWED: models_skybox (#1792) (#1778)
+[examples] REVIEWED: models_mesh_picking
+[examples] REVIEWED: models_material_pbr
+[examples] REVIEWED: models_rlgl_solar_system
+[examples] REVIEWED: shaders_custom_uniform, RenderTexture usage
+[examples] REVIEWED: shaders_eratosthenes, RenderTexture usage
+[examples] REVIEWED: shaders_julia_set, RenderTexture usage
+[examples] REVIEWED: shaders_postprocessing, RenderTexture usage
+[examples] REVIEWED: shaders_basic_lighting, simplified (#1865)
+[examples] REVIEWED: audio_raw_stream.c
+[examples] REVIEWED: raudio_standalone
+[examples] REVIEWED: raylib_opengl_interop
+[examples] REVIEWED: rlgl_standalone.c
+[examples] REVIEWED: Resources licenses
+[examples] REVIEWED: models resources reorganization
+[build] ADDED: Zig build file (#2014) by @TommiSinivuo
+[build] ADDED: Android VS2019 solution (#2013) by @Kronka
+[build] REMOVED: VS2017 project, outdated
+[build] RENAMED: All raylib modules prefixed with 'r' (core -> rcore)
+[build] RENAMED: SUPPORT_MOUSE_CURSOR_NATIVE to SUPPORT_MOUSE_CURSOR_POINT
+[build] REVIEWED: examples/examples_template.c
+[build] REVIEWED: Makefile to latest Emscripten SDK r23
+[build] REVIEWED: Makefile for latest Android NDK r32 LTS
+[build] REVIEWED: raylib resource files
+[build] Moved some extra raylib libraries to /extras/ directory
+[*] UPDATED: Multiple bindings to latest version
+[*] UPDATED: All external libraries to latest versions
+[*] Multiple code improvements and fixes by multiple contributors!
 
 -------------------------------------------------------------------------
 Release:     raylib 3.7 (26 April 2021)

CMakeOptions.txt

@@ -27,9 +27,9 @@ endif()
 option(INCLUDE_EVERYTHING "Include everything disabled by default (for CI usage" OFF)
 set(OFF ${INCLUDE_EVERYTHING} CACHE INTERNAL "Replace any OFF by default with \${OFF} to have it covered by this option")
 
-# core.c
+# rcore.c
-cmake_dependent_option(SUPPORT_CAMERA_SYSTEM "Provide camera module (camera.h) with multiple predefined cameras: free, 1st/3rd person, orbital" ON CUSTOMIZE_BUILD ON)
+cmake_dependent_option(SUPPORT_CAMERA_SYSTEM "Provide camera module (rcamera.h) with multiple predefined cameras: free, 1st/3rd person, orbital" ON CUSTOMIZE_BUILD ON)
-cmake_dependent_option(SUPPORT_GESTURES_SYSTEM "Gestures module is included (gestures.h) to support gestures detection: tap, hold, swipe, drag" ON CUSTOMIZE_BUILD ON)
+cmake_dependent_option(SUPPORT_GESTURES_SYSTEM "Gestures module is included (rgestures.h) to support gestures detection: tap, hold, swipe, drag" ON CUSTOMIZE_BUILD ON)
 cmake_dependent_option(SUPPORT_MOUSE_GESTURES "Mouse gestures are directly mapped like touches and processed by gestures system" ON CUSTOMIZE_BUILD ON)
 cmake_dependent_option(SUPPORT_SSH_KEYBOARD_RPI "Reconfigure standard input to receive key inputs, works with SSH connection" OFF CUSTOMIZE_BUILD OFF)
 cmake_dependent_option(SUPPORT_DEFAULT_FONT "Default font is loaded on window initialization to be available for the user to render simple text. If enabled, uses external module functions to load default raylib font (module: text)" ON CUSTOMIZE_BUILD ON)
@@ -41,10 +41,10 @@ cmake_dependent_option(SUPPORT_WINMM_HIGHRES_TIMER "Setting a higher resolution
 cmake_dependent_option(SUPPORT_DATA_STORAGE "Support for persistent data storage" ON CUSTOMIZE_BUILD ON)
 cmake_dependent_option(SUPPORT_COMPRESSION_API "Support for compression API" ON CUSTOMIZE_BUILD ON)
 
-# shapes.c
+# rshapes.c
 cmake_dependent_option(SUPPORT_QUADS_DRAW_MODE "Use QUADS instead of TRIANGLES for drawing when possible. Some lines-based shapes could still use lines" ON CUSTOMIZE_BUILD ON)
 
-# textures.c
+# rtextures.c
 cmake_dependent_option(SUPPORT_IMAGE_EXPORT "Support image exporting to file" ON CUSTOMIZE_BUILD ON)
 cmake_dependent_option(SUPPORT_IMAGE_GENERATION "Support procedural image generation functionality (gradient, spot, perlin-noise, cellular)" ON CUSTOMIZE_BUILD ON)
 cmake_dependent_option(SUPPORT_IMAGE_MANIPULATION "Support multiple image editing functions to scale, adjust colors, flip, draw on images, crop... If not defined only three image editing functions supported: ImageFormat(), ImageAlphaMask(), ImageToPOT()" ON CUSTOMIZE_BUILD ON)
@@ -61,12 +61,12 @@ cmake_dependent_option(SUPPORT_FILEFORMAT_PSD "Support loading PSD as textures"
 cmake_dependent_option(SUPPORT_FILEFORMAT_PKM "Support loading PKM as textures" ${OFF} CUSTOMIZE_BUILD OFF)
 cmake_dependent_option(SUPPORT_FILEFORMAT_PVR "Support loading PVR as textures" ${OFF} CUSTOMIZE_BUILD OFF)
 
-# text.c
+# rtext.c
 cmake_dependent_option(SUPPORT_FILEFORMAT_FNT "Support loading fonts in FNT format" ON CUSTOMIZE_BUILD ON)
 cmake_dependent_option(SUPPORT_FILEFORMAT_TTF "Support loading font in TTF/OTF format" ON CUSTOMIZE_BUILD ON)
 cmake_dependent_option(SUPPORT_TEXT_MANIPULATION "Support text manipulation functions" ON CUSTOMIZE_BUILD ON)
 
-# models.c
+# rmodels.c
 cmake_dependent_option(SUPPORT_MESH_GENERATION "Support procedural mesh generation functions, uses external par_shapes.h library. NOTE: Some generated meshes DO NOT include generated texture coordinates" ON CUSTOMIZE_BUILD ON)
 cmake_dependent_option(SUPPORT_FILEFORMAT_OBJ "Support loading OBJ file format" ON CUSTOMIZE_BUILD ON)
 cmake_dependent_option(SUPPORT_FILEFORMAT_MTL "Support loading MTL file format" ON CUSTOMIZE_BUILD ON)

HISTORY.md

@@ -33,7 +33,7 @@ Lots of code changes and lot of testing have concluded in this amazing new rayli
 notes on raylib 1.2
 -------------------
 
-On September 2014, after 5 month of raylib 1.1 release, it comes raylib 1.2. Again, this version presents a complete internal redesign of [core](https://github.com/raysan5/raylib/blob/master/src/core.c) module to support two new platforms: [Android](http://www.android.com/) and [Raspberry Pi](http://www.raspberrypi.org/).
+On September 2014, after 5 month of raylib 1.1 release, it comes raylib 1.2. Again, this version presents a complete internal redesign of [core](https://github.com/raysan5/raylib/blob/master/src/rcore.c) module to support two new platforms: [Android](http://www.android.com/) and [Raspberry Pi](http://www.raspberrypi.org/).
 
 It's been some month of really hard work to accomodate raylib to those new platforms while keeping it easy for the users. On Android, raylib manages internally the activity cicle, as well as the inputs; on Raspberry Pi, a complete raw input system has been written from scratch.
 
@@ -54,9 +54,9 @@ On September 2015, after 1 year of raylib 1.2 release, arrives raylib 1.3. This
 
  - Textures module has grown to support most of the internal texture formats available in OpenGL (RGB565, RGB888, RGBA5551, RGBA4444, etc.), including compressed texture formats (DXT, ETC1, ETC2, ASTC, PVRT); raylib 1.3 can load .dds, .pkm, .ktx, .astc and .pvr files. 
 
- - A brand new [camera](https://github.com/raysan5/raylib/blob/master/src/camera.c) module offers to the user multiple preconfigured ready-to-use camera systems (free camera, 1st person, 3rd person). Camera modes are very easy to use, just check examples: [core_3d_camera_free.c](https://github.com/raysan5/raylib/blob/master/examples/core_3d_camera_free.c) and [core_3d_camera_first_person.c](https://github.com/raysan5/raylib/blob/master/examples/core_3d_camera_first_person.c).
+ - A brand new [camera](https://github.com/raysan5/raylib/blob/master/src/rcamera.c) module offers to the user multiple preconfigured ready-to-use camera systems (free camera, 1st person, 3rd person). Camera modes are very easy to use, just check examples: [core_3d_camera_free.c](https://github.com/raysan5/raylib/blob/master/examples/core_3d_camera_free.c) and [core_3d_camera_first_person.c](https://github.com/raysan5/raylib/blob/master/examples/core_3d_camera_first_person.c).
 
- - New [gestures](https://github.com/raysan5/raylib/blob/master/src/gestures.h) module simplifies gestures detection on Android and HTML5 programs.
+ - New [gestures](https://github.com/raysan5/raylib/blob/master/src/rgestures.h) module simplifies gestures detection on Android and HTML5 programs.
 
  - [raygui](https://github.com/raysan5/raylib/blob/master/src/raygui.h), the new immediate-mode GUI module offers a set of functions to create simple user interfaces, primary intended for tools development. It's still in experimental state but already fully functional.
 
@@ -77,7 +77,7 @@ On February 2016, after 4 months of raylib 1.3 release, it comes raylib 1.4. For
 
  - [raymath](https://github.com/raysan5/raylib/blob/master/src/raymath.h) module has been reviewed; some bugs have been solved and the module has been converted to a header-only file for easier portability, optionally, functions can also be used as inline. 
 
- - [gestures](https://github.com/raysan5/raylib/blob/master/src/gestures.c) module has redesigned and simplified, now it can process touch events from any source, including mouse. This way, gestures system can be used on any platform providing an unified way to work with inputs and allowing the user to create multiplatform games with only one source code.
+ - [gestures](https://github.com/raysan5/raylib/blob/master/src/rgestures.c) module has redesigned and simplified, now it can process touch events from any source, including mouse. This way, gestures system can be used on any platform providing an unified way to work with inputs and allowing the user to create multiplatform games with only one source code.
 
  - Raspberry Pi input system has been redesigned to better read raw inputs using generic Linux event handlers (keyboard:`stdin`, mouse:`/dev/input/mouse0`, gamepad:`/dev/input/js0`). Gamepad support has also been added (experimental).
 
@@ -106,7 +106,7 @@ On July 2016, after 5 months of raylib 1.4 release, arrives raylib 1.5. This new
 
  - Audio chiptunese support and mixing channels: Added support for module audio music (.xm, .mod) loading and playing. Multiple mixing channels are now also supported. All this features thanks to the amazing work of @kd7tck.
 
-Other additions include a [2D camera system](https://github.com/raysan5/raylib/blob/master/examples/core_2d_camera.c), render textures for offline render (and most comprehensive [postprocessing](https://github.com/raysan5/raylib/blob/master/examples/shaders_postprocessing.c)) or support for legacy OpenGL 2.1 on desktop platforms.
+Other additions include a [2D camera system](https://github.com/raysan5/raylib/blob/master/examples/core_2d_rcamera.c), render textures for offline render (and most comprehensive [postprocessing](https://github.com/raysan5/raylib/blob/master/examples/shaders_postprocessing.c)) or support for legacy OpenGL 2.1 on desktop platforms.
 
 This new version is so massive that is difficult to list all the improvements, most of raylib modules have been reviewed and [rlgl](https://github.com/raysan5/raylib/blob/master/src/rlgl.c) module has been completely redesigned to accomodate to new material-lighting systems and stereo rendering. You can check [CHANGELOG](https://github.com/raysan5/raylib/blob/master/CHANGELOG) file for a more detailed list of changes.
 

README.md

@@ -4,7 +4,7 @@
 
 raylib is highly inspired by Borland BGI graphics lib and by XNA framework and it's specially well suited for prototyping, tooling, graphical applications, embedded systems and education.
 
-*NOTE for ADVENTURERS: raylib is a programming library to enjoy videogames programming; no fancy interface, no visual helpers, no auto-debugging... just coding in the most pure spartan-programmers way.*
+*NOTE for ADVENTURERS: raylib is a programming library to enjoy videogames programming; no fancy interface, no visual helpers, no debug button... just coding in the most pure spartan-programmers way.*
 
 Ready to learn? Jump to [code examples!](http://www.raylib.com/examples.html)
 

SPONSORS.md

@@ -4,18 +4,11 @@
 
 The following people is currently [**sponsoring raylib**](https://github.com/sponsors/raysan5) with a generous donation to allow improving and growing the project!
 
-Note that Sponsors donations vary between sponsors, I just decided not to make any distinction while listing them.
-
  - Eric J. ([@ProfJski](https://github.com/ProfJski))
- - devdad ([@devdad](https://github.com/devdad))
  - Zach Geis ([@zacgeis](https://github.com/zacgeis))
  - minirop ([@minirop](https://github.com/minirop))
  - Daniel Gómez ([@Koocachookies](https://github.com/Koocachookies))
- - Sergio ([@anidealgift](https://github.com/anidealgift))
  - Marc Agüera ([@maguera93](https://github.com/maguera93))
- - Pau Fernández ([@pauek](https://github.com/pauek))
- - Snowminx ([@Gamerfiend](https://github.com/Gamerfiend))
- - NimbusFox ([@NimbusFox](https://github.com/NimbusFox))
  - Robin Mattheussen ([@romatthe](https://github.com/romatthe))
  - Grant Haywood ([@cinterloper](https://github.com/cinterloper))
  - Terry Nguyen ([@terrehbyte](https://github.com/terrehbyte))
@@ -25,10 +18,17 @@ Note that Sponsors donations vary between sponsors, I just decided not to make a
  - cob ([@majorcob](https://github.com/majorcob))
  - Samuel Batista ([@gamedevsam](https://github.com/gamedevsam))
  - Merlyn Morgan-Graham ([@kavika13](https://github.com/kavika13))
- - Toby4213 ([@Toby4213](https://github.com/Toby4213))
  - linus ([@hochbaum](https://github.com/hochbaum))
  - Nawarian ([@nawarian](https://github.com/nawarian) - [thephp.website](https://thephp.website/))
-
+ - kenzie ([@sme-ek](https://github.com/sme-ek))
+ - Allan Regush ([@AllanRegush](https://github.com/AllanRegush))
+ - Jeffery Myers ([@JeffM2501](https://github.com/ProfJski))
+ - Ryan Roden-Corrent ([@rcorre](https://github.com/ProfJski))
+ - michaelfiber ([@michaelfiber](https://github.com/ProfJski))
+ - Nikhilesh S ([@nikki93](https://github.com/ProfJski))
+ - kevinabraun ([@kevinabraun](https://github.com/ProfJski))
+ - Matthew Owens ([@MatthewOwens](https://github.com/ProfJski))
+ - Tim Eilers ([@eilerstim](https://github.com/ProfJski))
 
 ### Past raylib GitHub Sponsors
 
@@ -49,10 +49,20 @@ The following people has **sponsored raylib** in the past, allowing the project
  - James Ghawaly ([@jghawaly](https://github.com/jghawaly))
  - jack ([@Jack-Ji](https://github.com/Jack-Ji))
  - Guido Offermans ([@jghawaly](https://github.com/GuidoOffermans))
+ - devdad ([@devdad](https://github.com/devdad))
+ - Pau Fernández ([@pauek](https://github.com/pauek))
+ - Sergio ([@anidealgift](https://github.com/anidealgift))
+ - Snowminx ([@Gamerfiend](https://github.com/Gamerfiend))
+ - NimbusFox ([@NimbusFox](https://github.com/NimbusFox))
+ - Shylie ([@Shylie](https://github.com/Shylie))
+ - Livio Dal Maso ([@Humeur](https://github.com/Humeur))
+ - Diego Vaccher ([@denny0754](https://github.com/denny0754))
+ - Ricardo Alcantara ([@ricardoalcantara](https://github.com/ricardoalcantara))
+ - Toby4213 ([@Toby4213](https://github.com/Toby4213))
 
 ### Notes for Current/Past raylib Sponsor
 
- - **If you are not on the list, feel free to send a PR to add you if desired.**
+ - If you are not on the list, feel free to send a PR to be added (if desired).
- - **If you want your personal webpage listed along your GitHub account, feel free to send a PR to add it.**
+ - If you want your personal webpage or project listed, feel free to send a PR to be added.
- - **If you prefer not to listed in this list, feel free to send a PR to remove it.**
+ - If you prefer not to be in this list, feel free to send a PR to be remove.
 

cmake/LibraryConfigurations.cmake

@@ -14,7 +14,8 @@ if (${PLATFORM} MATCHES "Desktop")
         endif ()
     elseif (WIN32)
         add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-        set(LIBS_PRIVATE ${LIBS_PRIVATE} winmm)
+        find_package(OpenGL QUIET)
+        set(LIBS_PRIVATE ${OPENGL_LIBRARIES} winmm)
     else ()
         find_library(pthread NAMES pthread)
         find_package(OpenGL QUIET)

examples/CMakeLists.txt

@@ -73,7 +73,6 @@ if (${PLATFORM} MATCHES "Android")
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/core/core_world_screen.c)
     
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_mesh_picking.c)
-    list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_material_pbr.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_cubicmap.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_skybox.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_mesh_picking.c)

examples/Makefile

@@ -25,7 +25,7 @@
 
 # Define required raylib variables
 PROJECT_NAME       ?= raylib_examples
-RAYLIB_VERSION     ?= 3.8.0
+RAYLIB_VERSION     ?= 4.0.0
 RAYLIB_PATH        ?= ..
 
 # Define default options
@@ -185,6 +185,12 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         MAKE = mingw32-make
     endif
 endif
+ifeq ($(PLATFORM),PLATFORM_ANDROID)
+    MAKE = mingw32-make
+endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    MAKE = mingw32-make
+endif
 
 # Define compiler flags:
 #  -O1                  defines optimization level
@@ -229,32 +235,6 @@ endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     CFLAGS += -std=gnu99 -DEGL_NO_X11
 endif
-ifeq ($(PLATFORM),PLATFORM_WEB)
-    # -Os                        # size optimization
-    # -O2                        # optimization level 2, if used, also set --memory-init-file 0
-    # -s USE_GLFW=3              # Use glfw3 library (context/input management)
-    # -s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing -> WARNING: Audio buffers could FAIL!
-    # -s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
-    # -s USE_PTHREADS=1          # multithreading support
-    # -s WASM=0                  # disable Web Assembly, emitted by default
-    # -s ASYNCIFY                # lets synchronous C/C++ code interact with asynchronous JS
-    # -s FORCE_FILESYSTEM=1      # force filesystem to load/save files data
-    # -s ASSERTIONS=1            # enable runtime checks for common memory allocation errors (-O1 and above turn it off)
-    # --profiling                # include information for code profiling
-    # --memory-init-file 0       # to avoid an external memory initialization code file (.mem)
-    # --preload-file resources   # specify a resources folder for data compilation
-    # --source-map-base          # allow debugging in browser with source map
-    CFLAGS += -s USE_GLFW=3 -s ASYNCIFY -s TOTAL_MEMORY=67108864 -s FORCE_FILESYSTEM=1 --preload-file $(dir $<)resources@resources
-
-    # NOTE: Simple raylib examples are compiled to be interpreter with asyncify, that way,
-    # we can compile same code for ALL platforms with no change required, but, working on bigger
-    # projects, code needs to be refactored to avoid a blocking while() loop, moving Update and Draw
-    # logic to a self contained function: UpdateDrawFrame(), check core_basic_window_web.c for reference.
-
-    # Define a custom shell .html and output extension
-    CFLAGS += --shell-file $(RAYLIB_PATH)/src/shell.html
-    EXT = .html
-endif
 
 # Define include paths for required headers
 # NOTE: Some external/extras libraries could be required (stb, physac, easings...)
@@ -303,7 +283,32 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         LDFLAGS = -L. -L$(RAYLIB_INSTALL_PATH) -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)
     endif
 endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    # -Os                        # size optimization
+    # -O2                        # optimization level 2, if used, also set --memory-init-file 0
+    # -s USE_GLFW=3              # Use glfw3 library (context/input management)
+    # -s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing -> WARNING: Audio buffers could FAIL!
+    # -s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB) (67108864 = 64MB)
+    # -s USE_PTHREADS=1          # multithreading support
+    # -s WASM=0                  # disable Web Assembly, emitted by default
+    # -s ASYNCIFY                # lets synchronous C/C++ code interact with asynchronous JS
+    # -s FORCE_FILESYSTEM=1      # force filesystem to load/save files data
+    # -s ASSERTIONS=1            # enable runtime checks for common memory allocation errors (-O1 and above turn it off)
+    # --profiling                # include information for code profiling
+    # --memory-init-file 0       # to avoid an external memory initialization code file (.mem)
+    # --preload-file resources   # specify a resources folder for data compilation
+    # --source-map-base          # allow debugging in browser with source map
+    LDFLAGS += -s USE_GLFW=3 -s ASYNCIFY -s TOTAL_MEMORY=67108864 -s FORCE_FILESYSTEM=1 --preload-file $(dir $<)resources@resources
 
+    # NOTE: Simple raylib examples are compiled to be interpreter with asyncify, that way,
+    # we can compile same code for ALL platforms with no change required, but, working on bigger
+    # projects, code needs to be refactored to avoid a blocking while() loop, moving Update and Draw
+    # logic to a self contained function: UpdateDrawFrame(), check core_basic_window_web.c for reference.
+
+    # Define a custom shell .html and output extension
+    LDFLAGS += --shell-file $(RAYLIB_PATH)/src/shell.html
+    EXT = .html
+endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
     LDFLAGS += -L/opt/vc/lib
 endif
@@ -373,6 +378,7 @@ endif
 # Define all object files required
 CORE = \
     core/core_basic_window \
+    core/core_basic_screen_manager \
     core/core_input_keys \
     core/core_input_mouse \
     core/core_input_mouse_wheel \
@@ -396,7 +402,9 @@ CORE = \
     core/core_loading_thread \
     core/core_quat_conversion \
     core/core_window_flags \
-    core/core_split_screen
+    core/core_split_screen \
+    core/core_smooth_pixelperfect \
+    core/core_custom_frame_control
 
 SHAPES = \
     shapes/shapes_basic_shapes \
@@ -435,7 +443,7 @@ TEXTURES = \
     textures/textures_bunnymark \
     textures/textures_blend_modes \
     textures/textures_draw_tiled \
-    textures/textures_poly
+    textures/textures_polygon
 
 TEXT = \
     text/text_raylib_fonts \
@@ -457,17 +465,17 @@ MODELS = \
     models/models_cubicmap \
     models/models_first_person_maze \
     models/models_geometric_shapes \
-    models/models_material_pbr \
     models/models_mesh_generation \
     models/models_mesh_picking \
     models/models_loading \
+    models/models_loading_vox \
+    models/models_loading_gltf \
     models/models_orthographic_projection \
     models/models_rlgl_solar_system \
     models/models_skybox \
     models/models_yaw_pitch_roll \
     models/models_heightmap \
-    models/models_waving_cubes \
+    models/models_waving_cubes
-	models/models_magicavoxel_loading
 
 SHADERS = \
     shaders/shaders_model_shader \
@@ -478,6 +486,7 @@ SHADERS = \
     shaders/shaders_raymarching \
     shaders/shaders_texture_drawing \
     shaders/shaders_texture_waves \
+    shaders/shaders_texture_outline \
     shaders/shaders_julia_set \
     shaders/shaders_eratosthenes \
     shaders/shaders_basic_lighting \

examples/README.md

@@ -1,3 +1,21 @@
+## Building the Examples
+
+The examples assume you have already built the `raylib` library in `../src`.
+
+### With GNU make
+
+- `make` builds all examples
+- `make [module]` builds all examples for a particular module (e.g `make core`)
+
+### With Zig
+
+The [Zig](https://ziglang.org/) toolchain can compile `C` and `C++` in addition to `Zig`.
+You may find it easier to use than other toolchains, especially when it comes to cross-compiling.
+
+- `zig build` to compile all examples
+- `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 LIST
 
 ### category: core
@@ -110,7 +128,7 @@ Examples using raylib models functionality, including models loading/generation
 | 72 | [models_cubicmap](models/models_cubicmap.c)                               | <img src="models/models_cubicmap.png" alt="models_cubicmap" width="200">                               | ray                                              |        |
 | 73 | [models_first_person_maze](models/models_first_person_maze.c)             | <img src="models/models_first_person_maze.png" alt="models_first_person_maze" width="200">             | ray                                              |        |
 | 74 | [models_geometric_shapes](models/models_geometric_shapes.c)               | <img src="models/models_geometric_shapes.png" alt="models_geometric_shapes" width="200">               | ray                                              |        |
-| 75 | [models_material_pbr](models/models_material_pbr.c)                       | <img src="models/models_material_pbr.png" alt="models_material_pbr" width="200">                       | ray                                              |        |
+| 75 | [...]()                       |                        | ray                                              |        |
 | 76 | [models_mesh_generation](models/models_mesh_generation.c)                 | <img src="models/models_mesh_generation.png" alt="models_mesh_generation" width="200">                 | ray                                              |        |
 | 77 | [models_mesh_picking](models/models_mesh_picking.c)                       | <img src="models/models_mesh_picking.png" alt="models_mesh_picking" width="200">                       | [Joel Davis](https://github.com/joeld42)         |        |
 | 78 | [models_loading](models/models_loading.c)                                 | <img src="models/models_loading.png" alt="models_loading" width="200">                                 | ray                                              |        |

examples/build.zig

@@ -0,0 +1,86 @@
+const std = @import("std");
+const builtin = @import("builtin");
+
+fn add_module(comptime module: []const u8, b: *std.build.Builder, target: std.zig.CrossTarget) !*std.build.Step {
+    // Standard release options allow the person running `zig build` to select
+    // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
+    const mode = b.standardReleaseOptions();
+
+    const all = b.step(module, "All " ++ module ++ " examples");
+    const dir = try std.fs.cwd().openDir(
+        module,
+        .{ .iterate = true },
+    );
+    var iter = dir.iterate();
+    while (try iter.next()) |entry| {
+        if (entry.kind != .File) continue;
+        const extension_idx = std.mem.lastIndexOf(u8, entry.name, ".c") orelse continue;
+        const name = entry.name[0..extension_idx];
+        const path = try std.fs.path.join(b.allocator, &.{ module, entry.name });
+
+        // zig's mingw headers do not include pthread.h
+        if (std.mem.eql(u8, "core_loading_thread", name) and target.getOsTag() == .windows) continue;
+
+        const exe = b.addExecutable(name, path);
+        exe.setTarget(target);
+        exe.setBuildMode(mode);
+        exe.linkLibC();
+        exe.addObjectFile(switch (target.getOsTag()) {
+            .windows => "../src/raylib.lib",
+            .linux => "../src/libraylib.a",
+            else => @panic("Unsupported OS"),
+        });
+
+        exe.addIncludeDir("../src");
+        exe.addIncludeDir("../src/external");
+        exe.addIncludeDir("../src/external/glfw/include");
+
+        switch (exe.target.toTarget().os.tag) {
+            .windows => {
+                exe.linkSystemLibrary("winmm");
+                exe.linkSystemLibrary("gdi32");
+                exe.linkSystemLibrary("opengl32");
+                exe.addIncludeDir("external/glfw/deps/mingw");
+            },
+            .linux => {
+                exe.linkSystemLibrary("GL");
+                exe.linkSystemLibrary("rt");
+                exe.linkSystemLibrary("dl");
+                exe.linkSystemLibrary("m");
+                exe.linkSystemLibrary("X11");
+            },
+            else => {
+                @panic("Unsupported OS");
+            },
+        }
+
+        exe.setOutputDir(module);
+
+        var run = exe.run();
+        run.step.dependOn(&b.addInstallArtifact(exe).step);
+        run.cwd = module;
+        b.step(name, name).dependOn(&run.step);
+        all.dependOn(&exe.step);
+    }
+    return all;
+}
+
+pub fn build(b: *std.build.Builder) !void {
+    // Standard target options allows the person running `zig build` to choose
+    // what target to build for. Here we do not override the defaults, which
+    // means any target is allowed, and the default is native. Other options
+    // for restricting supported target set are available.
+    const target = b.standardTargetOptions(.{});
+
+    const all = b.getInstallStep();
+
+    all.dependOn(try add_module("audio", b, target));
+    all.dependOn(try add_module("core", b, target));
+    all.dependOn(try add_module("models", b, target));
+    all.dependOn(try add_module("others", b, target));
+    all.dependOn(try add_module("physics", b, target));
+    all.dependOn(try add_module("shaders", b, target));
+    all.dependOn(try add_module("shapes", b, target));
+    all.dependOn(try add_module("text", b, target));
+    all.dependOn(try add_module("textures", b, target));
+}

examples/core/core_quat_conversion.c

@@ -10,7 +10,7 @@
 *
 *   Example contributed by Chris Camacho (@chriscamacho) and reviewed by Ramon Santamaria (@raysan5)
 *
-*   Copyright (c) 2020 Chris Camacho (@chriscamacho) and Ramon Santamaria (@raysan5)
+*   Copyright (c) 2020-2021 Chris Camacho (@chriscamacho) and Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 
@@ -34,13 +34,21 @@ int main(void)
     camera.fovy = 45.0f;                                // Camera field-of-view Y
     camera.projection = CAMERA_PERSPECTIVE;             // Camera mode type
 
-    Mesh mesh = GenMeshCylinder(0.2f, 1.0f, 32);
+    // Load a cylinder model for testing
-    Model model = LoadModelFromMesh(mesh);
+    Model model = LoadModelFromMesh(GenMeshCylinder(0.2f, 1.0f, 32));
 
-    // Some required variables
+    // Generic quaternion for operations
     Quaternion q1 = { 0 };
-    Matrix m1 = { 0 }, m2 = { 0 }, m3 = { 0 }, m4 = { 0 };
+
-    Vector3 v1 = { 0 }, v2 = { 0 };
+    // Transform matrices required to draw 4 cylinders
+    Matrix m1 = { 0 };
+    Matrix m2 = { 0 };
+    Matrix m3 = { 0 };
+    Matrix m4 = { 0 };
+
+    // Generic vectors for rotations
+    Vector3 v1 = { 0 };
+    Vector3 v2 = { 0 };
 
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
@@ -50,6 +58,10 @@ int main(void)
     {
         // Update
         //--------------------------------------------------------------------------------------
+        if (v2.x < 0) v2.x += PI*2;
+        if (v2.y < 0) v2.y += PI*2;
+        if (v2.z < 0) v2.z += PI*2;
+
         if (!IsKeyDown(KEY_SPACE))
         {
             v1.x += 0.01f;
@@ -68,10 +80,7 @@ int main(void)
         q1 = QuaternionFromMatrix(m1);
         m3 = QuaternionToMatrix(q1);
 
-        v2 = QuaternionToEuler(q1);
+        v2 = QuaternionToEuler(q1);     // Angles returned in radians
-        v2.x *= DEG2RAD;
-        v2.y *= DEG2RAD;
-        v2.z *= DEG2RAD;
 
         m4 = MatrixRotateZYX(v2);
         //--------------------------------------------------------------------------------------
@@ -86,10 +95,13 @@ int main(void)
 
                 model.transform = m1;
                 DrawModel(model, (Vector3){ -1, 0, 0 }, 1.0f, RED);
+
                 model.transform = m2;
                 DrawModel(model, (Vector3){ 1, 0, 0 }, 1.0f, RED);
+
                 model.transform = m3;
                 DrawModel(model, (Vector3){ 0, 0, 0 }, 1.0f, RED);
+
                 model.transform = m4;
                 DrawModel(model, (Vector3){ 0, 0, -1 }, 1.0f, RED);
 
@@ -97,23 +109,13 @@ int main(void)
 
             EndMode3D();
 
-            if (v2.x < 0) v2.x += PI*2;
+            DrawText(TextFormat("%2.3f", v1.x), 20, 20, 20, (v1.x == v2.x)? GREEN: BLACK);
-            if (v2.y < 0) v2.y += PI*2;
+            DrawText(TextFormat("%2.3f", v1.y), 20, 40, 20, (v1.y == v2.y)? GREEN: BLACK);
-            if (v2.z < 0) v2.z += PI*2;
+            DrawText(TextFormat("%2.3f", v1.z), 20, 60, 20, (v1.z == v2.z)? GREEN: BLACK);
 
-            Color cx,cy,cz;
+            DrawText(TextFormat("%2.3f", v2.x), 200, 20, 20, (v1.x == v2.x)? GREEN: BLACK);
-            cx = cy = cz = BLACK;
+            DrawText(TextFormat("%2.3f", v2.y), 200, 40, 20, (v1.y == v2.y)? GREEN: BLACK);
-            if (v1.x == v2.x) cx = GREEN;
+            DrawText(TextFormat("%2.3f", v2.z), 200, 60, 20, (v1.z == v2.z)? GREEN: BLACK);
-            if (v1.y == v2.y) cy = GREEN;
-            if (v1.z == v2.z) cz = GREEN;
-
-            DrawText(TextFormat("%2.3f", v1.x), 20, 20, 20, cx);
-            DrawText(TextFormat("%2.3f", v1.y), 20, 40, 20, cy);
-            DrawText(TextFormat("%2.3f", v1.z), 20, 60, 20, cz);
-
-            DrawText(TextFormat("%2.3f", v2.x), 200, 20, 20, cx);
-            DrawText(TextFormat("%2.3f", v2.y), 200, 40, 20, cy);
-            DrawText(TextFormat("%2.3f", v2.z), 200, 60, 20, cz);
 
         EndDrawing();
         //----------------------------------------------------------------------------------

examples/core/core_random_values.c

@@ -20,10 +20,12 @@ int main(void)
 
     InitWindow(screenWidth, screenHeight, "raylib [core] example - generate random values");
 
-    int framesCounter = 0;          // Variable used to count frames
+    // SetRandomSeed(0xaabbccff);   // Set a custom random seed if desired, by default: "time(NULL)"
 
     int randValue = GetRandomValue(-8, 5);   // Get a random integer number between -8 and 5 (both included)
     
+    int framesCounter = 0;          // Variable used to count frames
+    
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
 

examples/core/core_smooth_pixelperfect.c

@@ -78,7 +78,6 @@ int main(void)
         worldSpaceCamera.target.y = (int)screenSpaceCamera.target.y;
         screenSpaceCamera.target.y -= worldSpaceCamera.target.y;
         screenSpaceCamera.target.y *= virtualRatio;
-
         //----------------------------------------------------------------------------------
 
         // Draw

examples/core/core_split_screen.c

@@ -122,7 +122,7 @@ int main(void)
             BeginMode3D(cameraPlayer1);
                 DrawScene();
             EndMode3D();
-            DrawText("PLAYER1 W/S to move", 0, 0, 20, RED);
+            DrawText("PLAYER1 W/S to move", 10, 10, 20, RED);
         EndTextureMode();
 
         // Draw Player2 view to the render texture
@@ -131,7 +131,7 @@ int main(void)
             BeginMode3D(cameraPlayer2);
                 DrawScene();
             EndMode3D();
-            DrawText("PLAYER2 UP/DOWN to move", 0, 0, 20, BLUE);
+            DrawText("PLAYER2 UP/DOWN to move", 10, 10, 20, BLUE);
         EndTextureMode();
 
         // Draw both views render textures to the screen side by side

examples/models/models_animation.c

@@ -39,15 +39,15 @@ int main(void)
     camera.fovy = 45.0f;                                // Camera field-of-view Y
     camera.projection = CAMERA_PERSPECTIVE;             // Camera mode type
 
-    Model model = LoadModel("resources/guy/guy.iqm");               // Load the animated model mesh and basic data
+    Model model = LoadModel("resources/models/iqm/guy.iqm");                    // Load the animated model mesh and basic data
-    Texture2D texture = LoadTexture("resources/guy/guytex.png");    // Load model texture and set material
+    Texture2D texture = LoadTexture("resources/models/iqm/guytex.png");         // Load model texture and set material
     SetMaterialTexture(&model.materials[0], MATERIAL_MAP_DIFFUSE, texture);     // Set model material map texture
 
     Vector3 position = { 0.0f, 0.0f, 0.0f };            // Set model position
 
     // Load animation data
-    int animsCount = 0;
+    unsigned int animsCount = 0;
-    ModelAnimation *anims = LoadModelAnimations("resources/guy/guyanim.iqm", &animsCount);
+    ModelAnimation *anims = LoadModelAnimations("resources/models/iqm/guyanim.iqm", &animsCount);
     int animFrameCounter = 0;
 
     SetCameraMode(camera, CAMERA_FREE); // Set free camera mode

examples/models/models_gltf_animation.c

@@ -1,122 +0,0 @@
-/*******************************************************************************************
-*
-*   raylib [models] example - Load 3d gltf model with animations and play them
-*
-*   This example has been created using raylib 3.5 (www.raylib.com)
-*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
-*
-*   Example contributed by Hristo Stamenov (@object71) and reviewed by Ramon Santamaria (@raysan5)
-*
-*   Copyright (c) 2021 Hristo Stamenov (@object71) and Ramon Santamaria (@raysan5)
-*
-********************************************************************************************
-*
-* To export a model from blender, make sure it is not posed, the vertices need to be in the
-* same position as they would be in edit mode.
-* and that the scale of your models is set to 0. Scaling can be done from the export menu.
-*
-********************************************************************************************/
-
-#include "raylib.h"
-
-#include <stdlib.h>
-
-
-int main(void)
-{
-    // Initialization
-    //--------------------------------------------------------------------------------------
-    const int screenWidth = 800;
-    const int screenHeight = 450;
-
-    InitWindow(screenWidth, screenHeight, "raylib [models] example - model animation");
-
-    // Define the camera to look into our 3d world
-    Camera camera = { 0 };
-    camera.position = (Vector3){ 10.0f, 10.0f, 10.0f }; // Camera position
-    camera.target = (Vector3){ 0.0f, 0.0f, 0.0f };      // Camera looking at point
-    camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
-    camera.fovy = 45.0f;                                // Camera field-of-view Y
-    camera.projection = CAMERA_PERSPECTIVE;                   // Camera mode type
-
-    Model model = LoadModel("resources/gltf/rigged_figure.glb");               // Load the animated model mesh and
-    // basic data
-//    Texture2D texture = LoadTexture("resources/guy/guytex.png");    // Load model texture and set material
-//    SetMaterialTexture(&model.materials[0], MAP_DIFFUSE, texture);  // Set model material map texture
-
-    Vector3 position = { 0.0f, 0.0f, 0.0f };            // Set model position
-
-    // Load animation data
-    int animsCount = 0;
-    ModelAnimation *anims = LoadModelAnimations("resources/gltf/rigged_figure.glb", &animsCount);
-    int animFrameCounter = 0;
-    int animationDirection = 1;
-
-    SetCameraMode(camera, CAMERA_FREE); // Set free camera mode
-
-    SetTargetFPS(30);                   // Set our game to run at 60 frames-per-second
-    //--------------------------------------------------------------------------------------
-
-    // Main game loop
-    while (!WindowShouldClose())        // Detect window close button or ESC key
-    {
-        // Update
-        //----------------------------------------------------------------------------------
-        UpdateCamera(&camera);
-
-        // Play animation when spacebar is held down
-        if (IsKeyDown(KEY_SPACE))
-        {
-            animFrameCounter += animationDirection;
-
-            if (animFrameCounter >= anims[0].frameCount || animFrameCounter <= 0)
-            {
-                animationDirection *= -1;
-                animFrameCounter += animationDirection;
-            }
-
-            UpdateModelAnimation(model, anims[0], animFrameCounter);
-        }
-        //----------------------------------------------------------------------------------
-
-        // Draw
-        //----------------------------------------------------------------------------------
-        BeginDrawing();
-
-             ClearBackground(RAYWHITE);
-
-            BeginMode3D(camera);
-
-                DrawModelEx(model, position, (Vector3){ 1.0f, 0.0f, 0.0f }, -90.0f, (Vector3){ 1.0f, 1.0f, 1.0f }, WHITE);
-
-                for (int i = 0; i < model.boneCount; i++)
-                {
-                    DrawSphere(anims[0].framePoses[animFrameCounter][i].translation, 0.01f, RED);
-                }
-
-                DrawGrid(10, 1.0f);         // Draw a grid
-
-            EndMode3D();
-
-            DrawText("PRESS SPACE to PLAY MODEL ANIMATION", 10, 10, 20, MAROON);
-            DrawText("(cc4) Rigged Figure by @Cesium", screenWidth - 200, screenHeight - 20, 10, GRAY);
-
-        EndDrawing();
-        //----------------------------------------------------------------------------------
-    }
-
-    // De-Initialization
-    //--------------------------------------------------------------------------------------
-//    UnloadTexture(texture);     // Unload texture
-
-    // Unload model animations data
-    for (int i = 0; i < animsCount; i++) UnloadModelAnimation(anims[i]);
-    RL_FREE(anims);
-
-    UnloadModel(model);         // Unload model
-
-    CloseWindow();              // Close window and OpenGL context
-    //--------------------------------------------------------------------------------------
-
-    return 0;
-}

examples/models/models_loading.c

@@ -4,17 +4,19 @@
 *
 *   raylib supports multiple models file formats:
 *
-*     - OBJ > Text file, must include vertex position-texcoords-normals information,
+*     - OBJ  > Text file format. Must include vertex position-texcoords-normals information,
-*             if files references some .mtl materials file, it will be loaded (or try to)
+*              if files references some .mtl materials file, it will be loaded (or try to).
-*     - GLTF > Modern text/binary file format, includes lot of information and it could
+*     - GLTF > Text/binary file format. Includes lot of information and it could
-*              also reference external files, raylib will try loading mesh and materials data
+*              also reference external files, raylib will try loading mesh and materials data.
-*     - IQM > Binary file format including mesh vertex data but also animation data,
+*     - IQM  > Binary file format. Includes mesh vertex data but also animation data,
 *              raylib can load .iqm animations.
+*     - VOX  > Binary file format. MagikaVoxel mesh format:
+*              https://github.com/ephtracy/voxel-model/blob/master/MagicaVoxel-file-format-vox.txt
 *
-*   This example has been created using raylib 2.6 (www.raylib.com)
+*   This example has been created using raylib 4.0 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Copyright (c) 2014-2019 Ramon Santamaria (@raysan5)
+*   Copyright (c) 2014-2021 Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 
@@ -37,8 +39,8 @@ int main(void)
     camera.fovy = 45.0f;                                // Camera field-of-view Y
     camera.projection = CAMERA_PERSPECTIVE;                   // Camera mode type
 
-    Model model = LoadModel("resources/models/castle.obj");                 // Load model
+    Model model = LoadModel("resources/models/obj/castle.obj");                 // Load model
-    Texture2D texture = LoadTexture("resources/models/castle_diffuse.png"); // Load model texture
+    Texture2D texture = LoadTexture("resources/models/obj/castle_diffuse.png"); // Load model texture
     model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture;            // Set map diffuse texture
 
     Vector3 position = { 0.0f, 0.0f, 0.0f };                    // Set model position

examples/models/models_loading_gltf.c

@@ -1,27 +1,24 @@
 /*******************************************************************************************
 *
-*   raylib [models] example - Load 3d gltf model
+*   raylib [models] example - Load models gltf
 *
 *   This example has been created using raylib 3.5 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
+*   NOTE: To export a model from Blender, make sure it is not posed, the vertices need to be
+*   in the same position as they would be in edit mode.
+*   Also make sure the scale parameter of your models is set to 0.0,
+*   scaling can be applied from the export menu.
+*
 *   Example contributed by Hristo Stamenov (@object71) and reviewed by Ramon Santamaria (@raysan5)
 *
 *   Copyright (c) 2021 Hristo Stamenov (@object71) and Ramon Santamaria (@raysan5)
 *
-********************************************************************************************
-*
-* To export a model from blender, make sure it is not posed, the vertices need to be in the
-* same position as they would be in edit mode.
-* and that the scale of your models is set to 0. Scaling can be done from the export menu.
-*
 ********************************************************************************************/
 
 #include "raylib.h"
 
-#include <stdlib.h>
+#define MAX_GLTF_MODELS  8
-
-#define MAX_MODELS  8
 
 int main(void)
 {
@@ -40,16 +37,16 @@ int main(void)
     camera.fovy = 45.0f;                                // Camera field-of-view Y
     camera.projection = CAMERA_PERSPECTIVE;             // Camera mode type
 
-    Model model[MAX_MODELS] = { 0 };
+    // Load some models
-
+    Model model[MAX_GLTF_MODELS] = { 0 };
-    model[0] = LoadModel("resources/gltf/raylib_32x32.glb");
+    model[0] = LoadModel("resources/models/gltf/raylib_32x32.glb");
-    model[1] = LoadModel("resources/gltf/rigged_figure.glb");
+    model[1] = LoadModel("resources/models/gltf/rigged_figure.glb");
-    model[2] = LoadModel("resources/gltf/GearboxAssy.glb");
+    model[2] = LoadModel("resources/models/gltf/GearboxAssy.glb");
-    model[3] = LoadModel("resources/gltf/BoxAnimated.glb");
+    model[3] = LoadModel("resources/models/gltf/BoxAnimated.glb");
-    model[4] = LoadModel("resources/gltf/AnimatedTriangle.gltf");
+    model[4] = LoadModel("resources/models/gltf/AnimatedTriangle.gltf");
-    model[5] = LoadModel("resources/gltf/AnimatedMorphCube.glb");
+    model[5] = LoadModel("resources/models/gltf/AnimatedMorphCube.glb");
-    model[6] = LoadModel("resources/gltf/vertex_colored_object.glb");
+    model[6] = LoadModel("resources/models/gltf/vertex_colored_object.glb");
-    model[7] = LoadModel("resources/gltf/girl.glb");
+    model[7] = LoadModel("resources/models/gltf/girl.glb");
 
     int currentModel = 0;
 
@@ -65,19 +62,20 @@ int main(void)
     {
         // Update
         //----------------------------------------------------------------------------------
-        UpdateCamera(&camera);
+        UpdateCamera(&camera);          // Update our camera with inputs
 
         if (IsKeyReleased(KEY_RIGHT))
         {
             currentModel++;
-            if (currentModel == MAX_MODELS) currentModel = 0;
+            if (currentModel == MAX_GLTF_MODELS) currentModel = 0;
         }
 
         if (IsKeyReleased(KEY_LEFT))
         {
             currentModel--;
-            if (currentModel < 0) currentModel = MAX_MODELS - 1;
+            if (currentModel < 0) currentModel = MAX_GLTF_MODELS - 1;
         }
+        //----------------------------------------------------------------------------------
 
         // Draw
         //----------------------------------------------------------------------------------
@@ -87,8 +85,7 @@ int main(void)
 
             BeginMode3D(camera);
 
-                DrawModelEx(model[currentModel], position, (Vector3){ 0.0f, 1.0f, 0.0f }, 180.0f, (Vector3){ 2.0f, 2.0f, 2.0f }, WHITE);
+                DrawModel(model[currentModel], position, 1.0f, WHITE);
-
                 DrawGrid(10, 1.0f);         // Draw a grid
 
             EndMode3D();
@@ -99,7 +96,7 @@ int main(void)
 
     // De-Initialization
     //--------------------------------------------------------------------------------------
-    for (int i = 0; i < MAX_MODELS; i++) UnloadModel(model[i]);  // Unload models
+    for (int i = 0; i < MAX_GLTF_MODELS; i++) UnloadModel(model[i]);  // Unload models
 
     CloseWindow();              // Close window and OpenGL context
     //--------------------------------------------------------------------------------------

examples/models/models_loading_vox.c

@@ -0,0 +1,130 @@
+/*******************************************************************************************
+*
+*   raylib [models] example - Load models vox (MagicaVoxel)
+*
+*   This example has been created using raylib 4.0 (www.raylib.com)
+*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*
+*   Example contributed by Johann Nadalutti (@procfxgen) and reviewed by Ramon Santamaria (@raysan5)
+*
+*   Copyright (c) 2021 Johann Nadalutti (@procfxgen) and Ramon Santamaria (@raysan5)
+*
+********************************************************************************************/
+
+#include "raylib.h"
+
+#include "raymath.h"        // Required for: MatrixTranslate()
+
+#define MAX_VOX_FILES  3
+
+int main(void)
+{
+	// Initialization
+	//--------------------------------------------------------------------------------------
+	const int screenWidth = 800;
+	const int screenHeight = 450;
+
+    const char *voxFileNames[] = {
+        "resources/models/vox/chr_knight.vox",
+        "resources/models/vox/chr_sword.vox",
+        "resources/models/vox/monu9.vox"
+    };
+
+	InitWindow(screenWidth, screenHeight, "raylib [models] example - magicavoxel loading");
+
+    // Define the camera to look into our 3d world
+    Camera camera = { 0 };
+    camera.position = (Vector3){ 10.0f, 10.0f, 10.0f }; // Camera position
+    camera.target = (Vector3){ 0.0f, 0.0f, 0.0f };      // Camera looking at point
+    camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
+    camera.fovy = 45.0f;                                // Camera field-of-view Y
+    camera.projection = CAMERA_PERSPECTIVE;             // Camera mode type
+
+	// Load MagicaVoxel files
+	Model models[MAX_VOX_FILES] = { 0 };
+
+	for (int i = 0; i < MAX_VOX_FILES; i++)
+	{
+        // Load VOX file and measure time
+		double t0 = GetTime()*1000.0;
+		models[i] = LoadModel(voxFileNames[i]);
+		double t1 = GetTime()*1000.0;
+		
+        TraceLog(LOG_WARNING, TextFormat("[%s] File loaded in %.3f ms", voxFileNames[i], t1 - t0));
+
+		// Compute model translation matrix to center model on draw position (0, 0 , 0)
+		BoundingBox bb = GetModelBoundingBox(models[i]);
+		Vector3 center = { 0 };
+		center.x = bb.min.x  + (((bb.max.x - bb.min.x)/2));
+		center.z = bb.min.z  + (((bb.max.z - bb.min.z)/2));
+
+		Matrix matTranslate = MatrixTranslate(-center.x, 0, -center.z);
+		models[i].transform = matTranslate;
+	}
+
+	int currentModel = 0;
+
+	SetCameraMode(camera, CAMERA_ORBITAL);  // Set a orbital camera mode
+
+	SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
+	//--------------------------------------------------------------------------------------
+
+	// Main game loop
+	while (!WindowShouldClose())    // Detect window close button or ESC key
+	{
+		// Update
+		//----------------------------------------------------------------------------------
+		UpdateCamera(&camera);      // Update our camera to orbit
+
+        // Cycle between models on mouse click
+		if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) currentModel = (currentModel + 1)%MAX_VOX_FILES;
+
+        // Cycle between models on key pressed
+		if (IsKeyPressed(KEY_RIGHT))
+		{
+			currentModel++;
+			if (currentModel >= MAX_VOX_FILES) currentModel = 0;
+		}
+		else if (IsKeyPressed(KEY_LEFT))
+		{
+			currentModel--;
+			if (currentModel < 0) currentModel = MAX_VOX_FILES - 1;
+		}
+		//----------------------------------------------------------------------------------
+
+		// Draw
+		//----------------------------------------------------------------------------------
+		BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            // Draw 3D model
+            BeginMode3D(camera);
+
+                DrawModel(models[currentModel], (Vector3){ 0, 0, 0 }, 1.0f, WHITE);
+                DrawGrid(10, 1.0);
+
+            EndMode3D();
+
+            // Display info
+            DrawRectangle(10, 400, 310, 30, Fade(SKYBLUE, 0.5f));
+            DrawRectangleLines(10, 400, 310, 30, Fade(DARKBLUE, 0.5f));
+            DrawText("MOUSE LEFT BUTTON to CYCLE VOX MODELS", 40, 410, 10, BLUE);
+            DrawText(TextFormat("File: %s", GetFileName(voxFileNames[currentModel])), 10, 10, 20, GRAY);
+
+		EndDrawing();
+		//----------------------------------------------------------------------------------
+	}
+
+	// De-Initialization
+	//--------------------------------------------------------------------------------------
+	// Unload models data (GPU VRAM)
+	for (int i = 0; i < MAX_VOX_FILES; i++) UnloadModel(models[i]);
+
+	CloseWindow();          // Close window and OpenGL context
+	//--------------------------------------------------------------------------------------
+
+	return 0;
+}
+
+

examples/models/models_magicavoxel_loading.c

@@ -1,151 +0,0 @@
-/*******************************************************************************************
-*
-*   raylib [models] example - magicavoxel loader and viewer
-*
-*   This example has been created using raylib 3.8 (www.raylib.com)
-*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
-*
-*   Example contributed by Johann Nadalutti 
-*
-*   Copyright (c) 2021 Johann Nadalutti 
-*
-********************************************************************************************/
-
-#include "raylib.h"
-#include "raymath.h"
-
-#include <string.h>
-
-
-// VOX Files to load and view
-
-#define NUM_VOX_FILES  3
-
-const char* szVoxFiles[] = {
-	"resources/vox/chr_knight.vox",
-	"resources/vox/chr_sword.vox",
-	"resources/vox/monu9.vox"
-};
-
-
-int main(void)
-{
-	// Initialization
-	//--------------------------------------------------------------------------------------
-	const int screenWidth = 800;
-	const int screenHeight = 450;
-
-	InitWindow(screenWidth, screenHeight, "raylib [models] example - magicavoxel loading");
-
-	// Load MagicaVoxel files
-	Model models[NUM_VOX_FILES] = { 0 };
-
-	for (int i = 0; i < NUM_VOX_FILES; i++)
-	{
-		// Load MagicaVoxel File and build model
-		double t0, t1;
-		t0 = GetTime() * 1000.0;
-
-		models[i] = LoadModel(szVoxFiles[i]);
-
-		t1 = GetTime() * 1000.0;
-		TraceLog(LOG_INFO, TextFormat("Vox <%s> loaded in %f ms", GetFileName(szVoxFiles[i]), t1 - t0));
-
-		//Compute model's center matrix 
-		BoundingBox  bb = GetModelBoundingBox(models[i]);
-		Vector3 center;
-		center.x = bb.min.x  + (((bb.max.x - bb.min.x) / 2));
-		center.z = bb.min.z  + (((bb.max.z - bb.min.z) / 2));
-
-		Matrix matP = MatrixTranslate(-center.x, 0, -center.z);
-		models[i].transform = matP;
-
-
-	}
-
-
-	// Define the camera to look into our 3d world
-	Camera camera = { { 0.0f, 10.0f, 10.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f, 0 };
-
-	// Model drawing position
-	Vector3 position = { 0.0f, 0.0f, 0.0f };
-
-	int currentModel = 0;
-
-
-
-	SetCameraMode(camera, CAMERA_ORBITAL);  // Set a orbital camera mode
-
-	SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
-
-	//--------------------------------------------------------------------------------------
-	// Main game loop
-	//--------------------------------------------------------------------------------------
-	while (!WindowShouldClose())    // Detect window close button or ESC key
-	{
-		//--------------------------------------------------------------------------------------
-		// Update
-		//----------------------------------------------------------------------------------
-		UpdateCamera(&camera);      // Update internal camera and our camera
-
-		if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT))
-		{
-			currentModel = (currentModel + 1) % NUM_VOX_FILES; // Cycle between models
-		}
-
-		if (IsKeyPressed(KEY_RIGHT))
-		{
-			currentModel++;
-			if (currentModel >= NUM_VOX_FILES) currentModel = 0;
-		}
-		else if (IsKeyPressed(KEY_LEFT))
-		{
-			currentModel--;
-			if (currentModel < 0) currentModel = NUM_VOX_FILES - 1;
-		}
-
-		//----------------------------------------------------------------------------------
-		// Draw
-		//----------------------------------------------------------------------------------
-		BeginDrawing();
-
-		ClearBackground(RAYWHITE);
-
-		//Display model
-		BeginMode3D(camera);
-
-		Vector3 rotAxis = { 1,0,0 };
-		Vector3 scale = { 1,1,1 };
-
-
-		DrawModelEx(models[currentModel], position, rotAxis, 0, scale, WHITE);
-		//DrawModelWiresEx(models[currentModel], position, rotAxis, -90.0f, scale, BLACK);
-
-		DrawGrid(10, 1.0);
-
-		EndMode3D();
-
-		//Display debug infos
-		DrawRectangle(30, 400, 310, 30, Fade(SKYBLUE, 0.5f));
-		DrawRectangleLines(30, 400, 310, 30, Fade(DARKBLUE, 0.5f));
-		DrawText("MOUSE LEFT BUTTON to CYCLE VOX MODELS", 40, 410, 10, BLUE);
-
-		DrawText(GetFileName(szVoxFiles[currentModel]), 100, 10, 20, DARKBLUE);
-
-		EndDrawing();
-		//----------------------------------------------------------------------------------
-	}
-
-	// De-Initialization
-	//--------------------------------------------------------------------------------------
-
-	// Unload models data (GPU VRAM)
-	for (int i = 0; i < NUM_VOX_FILES; i++) UnloadModel(models[i]);
-
-	CloseWindow();          // Close window and OpenGL context
-	//--------------------------------------------------------------------------------------
-
-	return 0;
-}
-
-

examples/models/models_material_pbr.c

@@ -1,543 +0,0 @@
-/*******************************************************************************************
-*
-*   raylib [models] example - PBR material
-*
-*   NOTE: This example requires raylib OpenGL 3.3 for shaders support and only #version 330
-*         is currently supported. OpenGL ES 2.0 platforms are not supported at the moment.
-*
-*   This example has been created using raylib 1.8 (www.raylib.com)
-*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
-*
-*   Copyright (c) 2017 Ramon Santamaria (@raysan5)
-*
-********************************************************************************************/
-
-#include "raylib.h"
-#include "raymath.h"
-#include "rlgl.h"
-
-#include <stdio.h>
-
-#define RLIGHTS_IMPLEMENTATION
-#include "rlights.h"
-
-#if defined(PLATFORM_DESKTOP)
-    #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
-    #define GLSL_VERSION            100
-#endif
-
-#define CUBEMAP_SIZE        1024        // Cubemap texture size
-#define IRRADIANCE_SIZE       32        // Irradiance texture size
-#define PREFILTERED_SIZE     256        // Prefiltered HDR environment texture size
-#define BRDF_SIZE            512        // BRDF LUT texture size
-#define LIGHT_DISTANCE      1000.0f
-#define LIGHT_HEIGHT           1.0f
-
-// PBR texture maps generation
-static TextureCubemap GenTextureCubemap(Shader shader, Texture2D panorama, int size, int format); // Generate cubemap (6 faces) from equirectangular (panorama) texture
-static TextureCubemap GenTextureIrradiance(Shader shader, TextureCubemap cubemap, int size);      // Generate irradiance cubemap using cubemap texture
-static TextureCubemap GenTexturePrefilter(Shader shader, TextureCubemap cubemap, int size);       // Generate prefilter cubemap using cubemap texture
-static Texture2D GenTextureBRDF(Shader shader, int size);              // Generate a generic BRDF texture
-
-// PBR material loading
-static Material LoadMaterialPBR(Color albedo, float metalness, float roughness);
-
-int main(void)
-{
-    // Initialization
-    //--------------------------------------------------------------------------------------
-    const int screenWidth = 800;
-    const int screenHeight = 450;
-
-    SetConfigFlags(FLAG_MSAA_4X_HINT);  // Enable Multi Sampling Anti Aliasing 4x (if available)
-    InitWindow(screenWidth, screenHeight, "raylib [models] example - pbr material");
-
-    // Define the camera to look into our 3d world
-    Camera camera = { 0 };
-    camera.position = (Vector3){ 4.0f, 4.0f, 4.0f };    // Camera position
-    camera.target = (Vector3){ 0.0f, 0.5f, 0.0f };      // Camera looking at point
-    camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
-    camera.fovy = 45.0f;                                // Camera field-of-view Y
-    camera.projection = CAMERA_PERSPECTIVE;                   // Camera mode type
-
-    // Load model and PBR material
-    Model model = LoadModel("resources/pbr/trooper.obj");
-
-    // Mesh tangents are generated... and uploaded to GPU
-    // NOTE: New VBO for tangents is generated at default location and also binded to mesh VAO
-    //MeshTangents(&model.meshes[0]);
-
-    model.materials[0] = LoadMaterialPBR((Color){ 255, 255, 255, 255 }, 1.0f, 1.0f);
-
-    // Create lights
-    // NOTE: Lights are added to an internal lights pool automatically
-    CreateLight(LIGHT_POINT, (Vector3){ LIGHT_DISTANCE, LIGHT_HEIGHT, 0.0f }, (Vector3){ 0.0f, 0.0f, 0.0f }, (Color){ 255, 0, 0, 255 }, model.materials[0].shader);
-    CreateLight(LIGHT_POINT, (Vector3){ 0.0f, LIGHT_HEIGHT, LIGHT_DISTANCE }, (Vector3){ 0.0f, 0.0f, 0.0f }, (Color){ 0, 255, 0, 255 }, model.materials[0].shader);
-    CreateLight(LIGHT_POINT, (Vector3){ -LIGHT_DISTANCE, LIGHT_HEIGHT, 0.0f }, (Vector3){ 0.0f, 0.0f, 0.0f }, (Color){ 0, 0, 255, 255 }, model.materials[0].shader);
-    CreateLight(LIGHT_DIRECTIONAL, (Vector3){ 0.0f, LIGHT_HEIGHT*2.0f, -LIGHT_DISTANCE }, (Vector3){ 0.0f, 0.0f, 0.0f }, (Color){ 255, 0, 255, 255 }, model.materials[0].shader);
-
-    SetCameraMode(camera, CAMERA_ORBITAL);  // Set an orbital camera mode
-
-    SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second
-    //--------------------------------------------------------------------------------------
-
-    // Main game loop
-    while (!WindowShouldClose())            // Detect window close button or ESC key
-    {
-        // Update
-        //----------------------------------------------------------------------------------
-        UpdateCamera(&camera);              // Update camera
-
-        // Send to material PBR shader camera view position
-        float cameraPos[3] = { camera.position.x, camera.position.y, camera.position.z };
-        SetShaderValue(model.materials[0].shader, model.materials[0].shader.locs[SHADER_LOC_VECTOR_VIEW], cameraPos, SHADER_UNIFORM_VEC3);
-        //----------------------------------------------------------------------------------
-
-        // Draw
-        //----------------------------------------------------------------------------------
-        BeginDrawing();
-
-            ClearBackground(RAYWHITE);
-
-            BeginMode3D(camera);
-
-                DrawModel(model, Vector3Zero(), 1.0f, WHITE);
-
-                DrawGrid(10, 1.0f);
-
-            EndMode3D();
-
-            DrawFPS(10, 10);
-
-        EndDrawing();
-        //----------------------------------------------------------------------------------
-    }
-
-    // De-Initialization
-    //--------------------------------------------------------------------------------------
-    UnloadMaterial(model.materials[0]); // Unload material: shader and textures
-
-    UnloadModel(model);         // Unload model
-
-    CloseWindow();              // Close window and OpenGL context
-    //--------------------------------------------------------------------------------------
-
-    return 0;
-}
-
-// Load PBR material (Supports: ALBEDO, NORMAL, METALNESS, ROUGHNESS, AO, EMMISIVE, HEIGHT maps)
-// NOTE: PBR shader is loaded inside this function
-static Material LoadMaterialPBR(Color albedo, float metalness, float roughness)
-{
-    Material mat = LoadMaterialDefault();   // Initialize material to default
-
-    // Load PBR shader (requires several maps)
-    mat.shader = LoadShader(TextFormat("resources/shaders/glsl%i/pbr.vs", GLSL_VERSION),
-                            TextFormat("resources/shaders/glsl%i/pbr.fs", GLSL_VERSION));
-
-    // Get required locations points for PBR material
-    // NOTE: Those location names must be available and used in the shader code
-    mat.shader.locs[SHADER_LOC_MAP_ALBEDO] = GetShaderLocation(mat.shader, "albedo.sampler");
-    mat.shader.locs[SHADER_LOC_MAP_METALNESS] = GetShaderLocation(mat.shader, "metalness.sampler");
-    mat.shader.locs[SHADER_LOC_MAP_NORMAL] = GetShaderLocation(mat.shader, "normals.sampler");
-    mat.shader.locs[SHADER_LOC_MAP_ROUGHNESS] = GetShaderLocation(mat.shader, "roughness.sampler");
-    mat.shader.locs[SHADER_LOC_MAP_OCCLUSION] = GetShaderLocation(mat.shader, "occlusion.sampler");
-    //mat.shader.locs[SHADER_LOC_MAP_EMISSION] = GetShaderLocation(mat.shader, "emission.sampler");
-    //mat.shader.locs[SHADER_LOC_MAP_HEIGHT] = GetShaderLocation(mat.shader, "height.sampler");
-    mat.shader.locs[SHADER_LOC_MAP_IRRADIANCE] = GetShaderLocation(mat.shader, "irradianceMap");
-    mat.shader.locs[SHADER_LOC_MAP_PREFILTER] = GetShaderLocation(mat.shader, "prefilterMap");
-    mat.shader.locs[SHADER_LOC_MAP_BRDF] = GetShaderLocation(mat.shader, "brdfLUT");
-
-    // Set view matrix location
-    mat.shader.locs[SHADER_LOC_MATRIX_MODEL] = GetShaderLocation(mat.shader, "matModel");
-    //mat.shader.locs[SHADER_LOC_MATRIX_VIEW] = GetShaderLocation(mat.shader, "view");
-    mat.shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(mat.shader, "viewPos");
-
-    // Set PBR standard maps
-    mat.maps[MATERIAL_MAP_ALBEDO].texture = LoadTexture("resources/pbr/trooper_albedo.png");
-    mat.maps[MATERIAL_MAP_NORMAL].texture = LoadTexture("resources/pbr/trooper_normals.png");
-    mat.maps[MATERIAL_MAP_METALNESS].texture = LoadTexture("resources/pbr/trooper_metalness.png");
-    mat.maps[MATERIAL_MAP_ROUGHNESS].texture = LoadTexture("resources/pbr/trooper_roughness.png");
-    mat.maps[MATERIAL_MAP_OCCLUSION].texture = LoadTexture("resources/pbr/trooper_ao.png");
-
-    // Set textures filtering for better quality
-    SetTextureFilter(mat.maps[MATERIAL_MAP_ALBEDO].texture, TEXTURE_FILTER_BILINEAR);
-    SetTextureFilter(mat.maps[MATERIAL_MAP_NORMAL].texture, TEXTURE_FILTER_BILINEAR);
-    SetTextureFilter(mat.maps[MATERIAL_MAP_METALNESS].texture, TEXTURE_FILTER_BILINEAR);
-    SetTextureFilter(mat.maps[MATERIAL_MAP_ROUGHNESS].texture, TEXTURE_FILTER_BILINEAR);
-    SetTextureFilter(mat.maps[MATERIAL_MAP_OCCLUSION].texture, TEXTURE_FILTER_BILINEAR);
-
-    // Enable sample usage in shader for assigned textures
-    SetShaderValue(mat.shader, GetShaderLocation(mat.shader, "albedo.useSampler"), (int[1]){ 1 }, SHADER_UNIFORM_INT);
-    SetShaderValue(mat.shader, GetShaderLocation(mat.shader, "normals.useSampler"), (int[1]){ 1 }, SHADER_UNIFORM_INT);
-    SetShaderValue(mat.shader, GetShaderLocation(mat.shader, "metalness.useSampler"), (int[1]){ 1 }, SHADER_UNIFORM_INT);
-    SetShaderValue(mat.shader, GetShaderLocation(mat.shader, "roughness.useSampler"), (int[1]){ 1 }, SHADER_UNIFORM_INT);
-    SetShaderValue(mat.shader, GetShaderLocation(mat.shader, "occlusion.useSampler"), (int[1]){ 1 }, SHADER_UNIFORM_INT);
-
-    int renderModeLoc = GetShaderLocation(mat.shader, "renderMode");
-    SetShaderValue(mat.shader, renderModeLoc, (int[1]){ 0 }, SHADER_UNIFORM_INT);
-
-    // Set up material properties color
-    mat.maps[MATERIAL_MAP_ALBEDO].color = albedo;
-    mat.maps[MATERIAL_MAP_NORMAL].color = (Color){ 128, 128, 255, 255 };
-    mat.maps[MATERIAL_MAP_METALNESS].value = metalness;
-    mat.maps[MATERIAL_MAP_ROUGHNESS].value = roughness;
-    mat.maps[MATERIAL_MAP_OCCLUSION].value = 1.0f;
-    mat.maps[MATERIAL_MAP_EMISSION].value = 0.5f;
-    mat.maps[MATERIAL_MAP_HEIGHT].value = 0.5f;
-
-    // Generate cubemap from panorama texture
-    //--------------------------------------------------------------------------------------------------------
-    Texture2D panorama = LoadTexture("resources/dresden_square_2k.hdr");
-
-    // Load equirectangular to cubemap shader
-    Shader shdrCubemap = LoadShader(TextFormat("resources/shaders/glsl%i/pbr.vs", GLSL_VERSION),
-                                    TextFormat("resources/shaders/glsl%i/pbr.fs", GLSL_VERSION));
-
-    SetShaderValue(shdrCubemap, GetShaderLocation(shdrCubemap, "equirectangularMap"), (int[1]){ 0 }, SHADER_UNIFORM_INT);
-    TextureCubemap cubemap = GenTextureCubemap(shdrCubemap, panorama, CUBEMAP_SIZE, PIXELFORMAT_UNCOMPRESSED_R32G32B32);
-    UnloadTexture(panorama);
-    UnloadShader(shdrCubemap);
-    //--------------------------------------------------------------------------------------------------------
-
-    // Generate irradiance map from cubemap texture
-    //--------------------------------------------------------------------------------------------------------
-    // Load irradiance (GI) calculation shader
-    Shader shdrIrradiance = LoadShader(TextFormat("resources/shaders/glsl%i/skybox.vs", GLSL_VERSION),
-                                       TextFormat("resources/shaders/glsl%i/irradiance.fs", GLSL_VERSION));
-
-    SetShaderValue(shdrIrradiance, GetShaderLocation(shdrIrradiance, "environmentMap"), (int[1]){ 0 }, SHADER_UNIFORM_INT);
-    mat.maps[MATERIAL_MAP_IRRADIANCE].texture = GenTextureIrradiance(shdrIrradiance, cubemap, IRRADIANCE_SIZE);
-    UnloadShader(shdrIrradiance);
-    //--------------------------------------------------------------------------------------------------------
-
-    // Generate prefilter map from cubemap texture
-    //--------------------------------------------------------------------------------------------------------
-    // Load reflection prefilter calculation shader
-    Shader shdrPrefilter = LoadShader(TextFormat("resources/shaders/glsl%i/skybox.vs", GLSL_VERSION),
-                                      TextFormat("resources/shaders/glsl%i/prefilter.fs", GLSL_VERSION));
-
-    SetShaderValue(shdrPrefilter, GetShaderLocation(shdrPrefilter, "environmentMap"), (int[1]){ 0 }, SHADER_UNIFORM_INT);
-    mat.maps[MATERIAL_MAP_PREFILTER].texture = GenTexturePrefilter(shdrPrefilter, cubemap, PREFILTERED_SIZE);
-    UnloadTexture(cubemap);
-    UnloadShader(shdrPrefilter);
-    //--------------------------------------------------------------------------------------------------------
-
-    // Generate BRDF (bidirectional reflectance distribution function) texture (using shader)
-    //--------------------------------------------------------------------------------------------------------
-    Shader shdrBRDF = LoadShader(TextFormat("resources/shaders/glsl%i/brdf.vs", GLSL_VERSION),
-                                 TextFormat("resources/shaders/glsl%i/brdf.fs", GLSL_VERSION));
-
-    mat.maps[MATERIAL_MAP_BRDG].texture = GenTextureBRDF(shdrBRDF, BRDF_SIZE);
-    UnloadShader(shdrBRDF);
-    //--------------------------------------------------------------------------------------------------------
-
-    return mat;
-}
-
-// Texture maps generation (PBR)
-//-------------------------------------------------------------------------------------------
-// Generate cubemap texture from HDR texture
-static TextureCubemap GenTextureCubemap(Shader shader, Texture2D panorama, int size, int format)
-{
-    TextureCubemap cubemap = { 0 };
-
-    rlDisableBackfaceCulling();     // Disable backface culling to render inside the cube
-
-    // STEP 1: Setup framebuffer
-    //------------------------------------------------------------------------------------------
-    unsigned int rbo = rlLoadTextureDepth(size, size, true);
-    cubemap.id = rlLoadTextureCubemap(NULL, size, format);
-
-    unsigned int fbo = rlLoadFramebuffer(size, size);
-    rlFramebufferAttach(fbo, rbo, RL_ATTACHMENT_DEPTH, RL_ATTACHMENT_RENDERBUFFER, 0);
-    rlFramebufferAttach(fbo, cubemap.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_CUBEMAP_POSITIVE_X, 0);
-
-    // Check if framebuffer is complete with attachments (valid)
-    if (rlFramebufferComplete(fbo)) TraceLog(LOG_INFO, "FBO: [ID %i] Framebuffer object created successfully", fbo);
-    //------------------------------------------------------------------------------------------
-
-    // STEP 2: Draw to framebuffer
-    //------------------------------------------------------------------------------------------
-    // NOTE: Shader is used to convert HDR equirectangular environment map to cubemap equivalent (6 faces)
-    rlEnableShader(shader.id);
-
-    // Define projection matrix and send it to shader
-    Matrix matFboProjection = MatrixPerspective(90.0*DEG2RAD, 1.0, RL_CULL_DISTANCE_NEAR, RL_CULL_DISTANCE_FAR);
-    rlSetUniformMatrix(shader.locs[SHADER_LOC_MATRIX_PROJECTION], matFboProjection);
-
-    // Define view matrix for every side of the cubemap
-    Matrix fboViews[6] = {
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  1.0f,  0.0f,  0.0f }, (Vector3){ 0.0f, -1.0f,  0.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){ -1.0f,  0.0f,  0.0f }, (Vector3){ 0.0f, -1.0f,  0.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f,  1.0f,  0.0f }, (Vector3){ 0.0f,  0.0f,  1.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f, -1.0f,  0.0f }, (Vector3){ 0.0f,  0.0f, -1.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f,  0.0f,  1.0f }, (Vector3){ 0.0f, -1.0f,  0.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f,  0.0f, -1.0f }, (Vector3){ 0.0f, -1.0f,  0.0f })
-    };
-
-    rlViewport(0, 0, size, size);   // Set viewport to current fbo dimensions
-
-    // Activate and enable texture for drawing to cubemap faces
-    rlActiveTextureSlot(0);
-    rlEnableTexture(panorama.id);
-
-    for (int i = 0; i < 6; i++)
-    {
-        // Set the view matrix for the current cube face
-        rlSetUniformMatrix(shader.locs[SHADER_LOC_MATRIX_VIEW], fboViews[i]);
-        
-        // Select the current cubemap face attachment for the fbo
-        // WARNING: This function by default enables->attach->disables fbo!!!
-        rlFramebufferAttach(fbo, cubemap.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_CUBEMAP_POSITIVE_X + i, 0);
-        rlEnableFramebuffer(fbo);
-
-        // Load and draw a cube, it uses the current enabled texture
-        rlClearScreenBuffers();
-        rlLoadDrawCube();
-        
-        // ALTERNATIVE: Try to use internal batch system to draw the cube instead of rlLoadDrawCube
-        // for some reason this method does not work, maybe due to cube triangles definition? normals pointing out?
-        // TODO: Investigate this issue...
-        //rlSetTexture(panorama.id); // WARNING: It must be called after enabling current framebuffer if using internal batch system!
-        //rlClearScreenBuffers();
-        //DrawCubeV(Vector3Zero(), Vector3One(), WHITE);
-        //rlDrawRenderBatchActive();
-    }
-    //------------------------------------------------------------------------------------------
-
-    // STEP 3: Unload framebuffer and reset state
-    //------------------------------------------------------------------------------------------
-    rlDisableShader();          // Unbind shader
-    rlDisableTexture();         // Unbind texture
-    rlDisableFramebuffer();     // Unbind framebuffer
-    rlUnloadFramebuffer(fbo);   // Unload framebuffer (and automatically attached depth texture/renderbuffer)
-
-    // Reset viewport dimensions to default
-    rlViewport(0, 0, rlGetFramebufferWidth(), rlGetFramebufferHeight());
-    rlEnableBackfaceCulling();
-    //------------------------------------------------------------------------------------------
-
-    cubemap.width = size;
-    cubemap.height = size;
-    cubemap.mipmaps = 1;
-    cubemap.format = PIXELFORMAT_UNCOMPRESSED_R32G32B32;
-
-    return cubemap;
-}
-
-// Generate irradiance texture using cubemap data
-static TextureCubemap GenTextureIrradiance(Shader shader, TextureCubemap cubemap, int size)
-{
-    TextureCubemap irradiance = { 0 };
-
-    rlDisableBackfaceCulling();     // Disable backface culling to render inside the cube
-
-    // STEP 1: Setup framebuffer
-    //------------------------------------------------------------------------------------------
-    unsigned int rbo = rlLoadTextureDepth(size, size, true);
-    irradiance.id = rlLoadTextureCubemap(NULL, size, PIXELFORMAT_UNCOMPRESSED_R32G32B32);
-
-    unsigned int fbo = rlLoadFramebuffer(size, size);
-    rlFramebufferAttach(fbo, rbo, RL_ATTACHMENT_DEPTH, RL_ATTACHMENT_RENDERBUFFER, 0);
-    rlFramebufferAttach(fbo, cubemap.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_CUBEMAP_POSITIVE_X, 0);
-    //------------------------------------------------------------------------------------------
-
-    // STEP 2: Draw to framebuffer
-    //------------------------------------------------------------------------------------------
-    // NOTE: Shader is used to solve diffuse integral by convolution to create an irradiance cubemap
-    rlEnableShader(shader.id);
-
-    // Define projection matrix and send it to shader
-    Matrix matFboProjection = MatrixPerspective(90.0*DEG2RAD, 1.0, RL_CULL_DISTANCE_NEAR, RL_CULL_DISTANCE_FAR);
-    rlSetUniformMatrix(shader.locs[SHADER_LOC_MATRIX_PROJECTION], matFboProjection);
-
-    // Define view matrix for every side of the cubemap
-    Matrix fboViews[6] = {
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  1.0f,  0.0f,  0.0f }, (Vector3){ 0.0f, -1.0f,  0.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){ -1.0f,  0.0f,  0.0f }, (Vector3){ 0.0f, -1.0f,  0.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f,  1.0f,  0.0f }, (Vector3){ 0.0f,  0.0f,  1.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f, -1.0f,  0.0f }, (Vector3){ 0.0f,  0.0f, -1.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f,  0.0f,  1.0f }, (Vector3){ 0.0f, -1.0f,  0.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f,  0.0f, -1.0f }, (Vector3){ 0.0f, -1.0f,  0.0f })
-    };
-
-    rlActiveTextureSlot(0);
-    rlEnableTextureCubemap(cubemap.id);
-
-    rlViewport(0, 0, size, size);   // Set viewport to current fbo dimensions
-
-    for (int i = 0; i < 6; i++)
-    {
-        rlSetUniformMatrix(shader.locs[SHADER_LOC_MATRIX_VIEW], fboViews[i]);
-        rlFramebufferAttach(fbo, irradiance.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_CUBEMAP_POSITIVE_X + i, 0);
-
-        rlEnableFramebuffer(fbo);
-        rlClearScreenBuffers();
-        rlLoadDrawCube();
-    }
-    //------------------------------------------------------------------------------------------
-
-    // STEP 3: Unload framebuffer and reset state
-    //------------------------------------------------------------------------------------------
-    rlDisableShader();          // Unbind shader
-    rlDisableTexture();         // Unbind texture
-    rlDisableFramebuffer();     // Unbind framebuffer
-    rlUnloadFramebuffer(fbo);   // Unload framebuffer (and automatically attached depth texture/renderbuffer)
-
-    // Reset viewport dimensions to default
-    rlViewport(0, 0, rlGetFramebufferWidth(), rlGetFramebufferHeight());
-    rlEnableBackfaceCulling();
-    //------------------------------------------------------------------------------------------
-
-    irradiance.width = size;
-    irradiance.height = size;
-    irradiance.mipmaps = 1;
-    irradiance.format = PIXELFORMAT_UNCOMPRESSED_R32G32B32;
-
-    return irradiance;
-}
-
-// Generate prefilter texture using cubemap data
-static TextureCubemap GenTexturePrefilter(Shader shader, TextureCubemap cubemap, int size)
-{
-    TextureCubemap prefilter = { 0 };
-
-    rlDisableBackfaceCulling();     // Disable backface culling to render inside the cube
-
-    // STEP 1: Setup framebuffer
-    //------------------------------------------------------------------------------------------
-    unsigned int rbo = rlLoadTextureDepth(size, size, true);
-    prefilter.id = rlLoadTextureCubemap(NULL, size, PIXELFORMAT_UNCOMPRESSED_R32G32B32);
-    rlTextureParameters(prefilter.id, RL_TEXTURE_MIN_FILTER, RL_TEXTURE_FILTER_MIP_LINEAR);
-
-    unsigned int fbo = rlLoadFramebuffer(size, size);
-    rlFramebufferAttach(fbo, rbo, RL_ATTACHMENT_DEPTH, RL_ATTACHMENT_RENDERBUFFER, 0);
-    rlFramebufferAttach(fbo, cubemap.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_CUBEMAP_POSITIVE_X, 0);
-    //------------------------------------------------------------------------------------------
-
-    // Generate mipmaps for the prefiltered HDR texture
-    //glGenerateMipmap(GL_TEXTURE_CUBE_MAP);    // TODO!
-
-    // STEP 2: Draw to framebuffer
-    //------------------------------------------------------------------------------------------
-    // NOTE: Shader is used to prefilter HDR and store data into mipmap levels
-
-    // Define projection matrix and send it to shader
-    Matrix fboProjection = MatrixPerspective(90.0*DEG2RAD, 1.0, RL_CULL_DISTANCE_NEAR, RL_CULL_DISTANCE_FAR);
-    rlEnableShader(shader.id);
-    rlSetUniformMatrix(shader.locs[SHADER_LOC_MATRIX_PROJECTION], fboProjection);
-
-    // Define view matrix for every side of the cubemap
-    Matrix fboViews[6] = {
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  1.0f,  0.0f,  0.0f }, (Vector3){ 0.0f, -1.0f,  0.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){ -1.0f,  0.0f,  0.0f }, (Vector3){ 0.0f, -1.0f,  0.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f,  1.0f,  0.0f }, (Vector3){ 0.0f,  0.0f,  1.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f, -1.0f,  0.0f }, (Vector3){ 0.0f,  0.0f, -1.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f,  0.0f,  1.0f }, (Vector3){ 0.0f, -1.0f,  0.0f }),
-        MatrixLookAt((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector3){  0.0f,  0.0f, -1.0f }, (Vector3){ 0.0f, -1.0f,  0.0f })
-    };
-
-    rlActiveTextureSlot(0);
-    rlEnableTextureCubemap(cubemap.id);
-
-    // TODO: Locations should be taken out of this function... too shader dependant...
-    int roughnessLoc = rlGetLocationUniform(shader.id, "roughness");
-
-    rlEnableFramebuffer(fbo);
-
-    #define MAX_MIPMAP_LEVELS   5   // Max number of prefilter texture mipmaps
-
-    for (int mip = 0; mip < MAX_MIPMAP_LEVELS; mip++)
-    {
-        // Resize framebuffer according to mip-level size.
-        unsigned int mipWidth  = size*(int)powf(0.5f, (float)mip);
-        unsigned int mipHeight = size*(int)powf(0.5f, (float)mip);
-
-        rlViewport(0, 0, mipWidth, mipHeight);
-
-        //glBindRenderbuffer(GL_RENDERBUFFER, rbo);
-        //glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, mipWidth, mipHeight);
-
-        float roughness = (float)mip/(float)(MAX_MIPMAP_LEVELS - 1);
-        rlSetUniform(roughnessLoc, &roughness, SHADER_UNIFORM_FLOAT, 1);
-
-        for (int i = 0; i < 6; i++)
-        {
-            rlSetUniformMatrix(shader.locs[SHADER_LOC_MATRIX_VIEW], fboViews[i]);
-            rlFramebufferAttach(fbo, prefilter.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_CUBEMAP_POSITIVE_X + i, mip);
-
-            rlClearScreenBuffers();
-            rlLoadDrawCube();
-        }
-    }
-    //------------------------------------------------------------------------------------------
-
-    // STEP 3: Unload framebuffer and reset state
-    //------------------------------------------------------------------------------------------
-    rlDisableShader();          // Unbind shader
-    rlDisableTexture();         // Unbind texture
-    rlDisableFramebuffer();     // Unbind framebuffer
-    rlUnloadFramebuffer(fbo);   // Unload framebuffer (and automatically attached depth texture/renderbuffer)
-
-    // Reset viewport dimensions to default
-    rlViewport(0, 0, rlGetFramebufferWidth(), rlGetFramebufferHeight());
-    rlEnableBackfaceCulling();
-    //------------------------------------------------------------------------------------------
-
-    prefilter.width = size;
-    prefilter.height = size;
-    prefilter.mipmaps = MAX_MIPMAP_LEVELS;
-    prefilter.format = PIXELFORMAT_UNCOMPRESSED_R32G32B32;
-
-    return prefilter;
-}
-
-// Generate BRDF texture using cubemap data
-// TODO: Review implementation: https://github.com/HectorMF/BRDFGenerator
-static Texture2D GenTextureBRDF(Shader shader, int size)
-{
-    Texture2D brdf = { 0 };
-
-    // STEP 1: Setup framebuffer
-    //------------------------------------------------------------------------------------------
-    unsigned int rbo = rlLoadTextureDepth(size, size, true);
-    brdf.id = rlLoadTexture(NULL, size, size, PIXELFORMAT_UNCOMPRESSED_R32G32B32, 1);
-
-    unsigned int fbo = rlLoadFramebuffer(size, size);
-    rlFramebufferAttach(fbo, rbo, RL_ATTACHMENT_DEPTH, RL_ATTACHMENT_RENDERBUFFER, 0);
-    rlFramebufferAttach(fbo, brdf.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_TEXTURE2D, 0);
-    //------------------------------------------------------------------------------------------
-
-    // STEP 2: Draw to framebuffer
-    //------------------------------------------------------------------------------------------
-    // NOTE: Render BRDF LUT into a quad using FBO
-    rlEnableShader(shader.id);
-
-    rlViewport(0, 0, size, size);
-
-    rlEnableFramebuffer(fbo);
-    rlClearScreenBuffers();
-
-    rlLoadDrawQuad();
-    //------------------------------------------------------------------------------------------
-
-    // STEP 3: Unload framebuffer and reset state
-    //------------------------------------------------------------------------------------------
-    rlDisableShader();          // Unbind shader
-    rlDisableTexture();         // Unbind texture
-    rlDisableFramebuffer();     // Unbind framebuffer
-    rlUnloadFramebuffer(fbo);   // Unload framebuffer (and automatically attached depth texture/renderbuffer)
-
-    // Reset viewport dimensions to default
-    rlViewport(0, 0, rlGetFramebufferWidth(), rlGetFramebufferHeight());
-    //------------------------------------------------------------------------------------------
-
-    brdf.width = size;
-    brdf.height = size;
-    brdf.mipmaps = 1;
-    brdf.format = PIXELFORMAT_UNCOMPRESSED_R32G32B32;
-
-    return brdf;
-}

examples/models/models_mesh_picking.c

@@ -35,8 +35,8 @@ int main(void)
 
     Ray ray = { 0 };        // Picking ray
 
-    Model tower = LoadModel("resources/models/turret.obj");                 // Load OBJ model
+    Model tower = LoadModel("resources/models/obj/turret.obj");                 // Load OBJ model
-    Texture2D texture = LoadTexture("resources/models/turret_diffuse.png"); // Load model texture
+    Texture2D texture = LoadTexture("resources/models/obj/turret_diffuse.png"); // Load model texture
     tower.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture;            // Set model diffuse texture
 
     Vector3 towerPos = { 0.0f, 0.0f, 0.0f };                        // Set model position

examples/models/models_rlgl_solar_system.c

@@ -88,7 +88,6 @@ int main(void)
                 rlPushMatrix();
                     rlRotatef(earthOrbitRotation, 0.0f, 1.0f, 0.0f);    // Rotation for Earth orbit around Sun
                     rlTranslatef(earthOrbitRadius, 0.0f, 0.0f);         // Translation for Earth orbit
-                    rlRotatef(-earthOrbitRotation, 0.0f, 1.0f, 0.0f);   // Rotation for Earth orbit around Sun inverted
 
                     rlPushMatrix();
                         rlRotatef(earthRotation, 0.25, 1.0, 0.0);       // Rotation for Earth itself
@@ -99,7 +98,6 @@ int main(void)
 
                     rlRotatef(moonOrbitRotation, 0.0f, 1.0f, 0.0f);     // Rotation for Moon orbit around Earth
                     rlTranslatef(moonOrbitRadius, 0.0f, 0.0f);          // Translation for Moon orbit
-                    rlRotatef(-moonOrbitRotation, 0.0f, 1.0f, 0.0f);    // Rotation for Moon orbit around Earth inverted
                     rlRotatef(moonRotation, 0.0f, 1.0f, 0.0f);          // Rotation for Moon itself
                     rlScalef(moonRadius, moonRadius, moonRadius);       // Scale Moon
 

examples/models/models_skybox.c

@@ -10,8 +10,9 @@
 ********************************************************************************************/
 
 #include "raylib.h"
+
 #include "rlgl.h"
-#include "raymath.h"
+#include "raymath.h"      // Required for: MatrixPerspective(), MatrixLookAt()
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330

examples/models/models_yaw_pitch_roll.c

@@ -7,12 +7,13 @@
 *
 *   Example contributed by Berni (@Berni8k) and reviewed by Ramon Santamaria (@raysan5)
 *
-*   Copyright (c) 2017 Berni (@Berni8k) and Ramon Santamaria (@raysan5)
+*   Copyright (c) 2017-2021 Berni (@Berni8k) and Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 
 #include "raylib.h"
-#include "raymath.h"
+
+#include "raymath.h"        // Required for: MatrixRotateXYZ()
 
 int main(void)
 {
@@ -33,7 +34,7 @@ int main(void)
 
     // Model loading
     // NOTE: Diffuse map loaded automatically
-    Model model = LoadModel("resources/plane/plane.gltf");
+    Model model = LoadModel("resources/models/gltf/plane/plane.gltf");
 
     float pitch = 0.0f;
     float roll = 0.0f;
@@ -78,7 +79,6 @@ int main(void)
         model.transform = MatrixRotateXYZ((Vector3){ DEG2RAD*pitch, DEG2RAD*yaw, DEG2RAD*roll });
         //----------------------------------------------------------------------------------
 
-
         // Draw
         //----------------------------------------------------------------------------------
         BeginDrawing();

examples/models/resources/LICENSE.md

@@ -1,13 +1,19 @@
 | resource             | author      | licence | notes |
 | :------------------- | :---------: | :------ | :---- |
-| models/castle.obj,<br> models/castle_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/castle.obj,<br>models/castle_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/bridge.obj,<br> models/bridge_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/bridge.obj,<br>models/bridge_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/house.obj,<br> models/house_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode)  | - |
+| models/obj/house.obj,<br>models/house_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode)  | - |
-| models/market.obj,<br> models/market_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode)  | - |
+| models/obj/market.obj,<br>models/market_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode)  | - |
-| models/turret.obj,<br> models/turret_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/turret.obj,<br>models/turret_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/well.obj,<br> models/well_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/well.obj,<br>models/well_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/cube.obj,<br> models/cube_diffuse.png | [@raysan5](https://github.com/raysan5)    | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
+| models/obj/cube.obj,<br>models/cube_diffuse.png | [@raysan5](https://github.com/raysan5)    | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
-| models/vertex_colored_object.iqm |  ❔         | ❔     | - |
+| models/iqm/guy.iqm,<br>models/iqm/guyanim.iqm,<br>models/iqm/guytex.png,<br>models/iqm/guy.blend | [@culacant](https://github.com/culacant)  | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
+| models/iqm/vertex_colored_object.iqm |  ❔         | ❔     | - |
+| models/gltf/plane/plane.gltf,<br>models/gltf/plane/plane.bin,<br>models/gltf/plane/plane_diffuse.png | [GiaHanLam](https://sketchfab.com/GiaHanLam)  | [CC-BY](https://creativecommons.org/licenses/by/4.0/)  | Used by: [`models_yaw_pitch_roll.c`](https://github.com/raysan5/raylib/blob/master/examples/models/models_yaw_pitch_roll.c)
+| models/gltf/... | _various_ | Check [LICENSE](https://github.com/raysan5/raylib/blob/master/examples/models/resources/models/gltf/LICENSE) | - |
+| models/vox/chr_knight.vox |  ❔         | ❔     | - |
+| models/vox/chr_sword.vox |  ❔         | ❔     | - |
+| models/vox/monu9.vox |  ❔         | ❔     | - |
 | billboard.png                  | [@emegeme](https://github.com/emegeme)    | [CC0](https://creativecommons.org/publicdomain/zero/1.0/)     | - |
 | cubicmap.png                  | [@raysan5](https://github.com/raysan5)    | [CC0](https://creativecommons.org/publicdomain/zero/1.0/)     | - |
 | cubicmap_atlas.png             | [@emegeme](https://github.com/emegeme)    | [CC0](https://creativecommons.org/publicdomain/zero/1.0/)     | - |
@@ -15,6 +21,3 @@
 | dresden_square_1k.hdr             | [HDRIHaven](https://hdrihaven.com/hdri/?h=dresden_square) | [CC0](https://hdrihaven.com/p/license.php) | - |
 | dresden_square_2k.hdr             | [HDRIHaven](https://hdrihaven.com/hdri/?h=dresden_square) | [CC0](https://hdrihaven.com/p/license.php) | - |
 | skybox.png             | ❔         | ❔     | - |
-| **guy/...**                | [@culacant](https://github.com/culacant)   | [CC0](https://creativecommons.org/publicdomain/zero/1.0/)    |
-| **plane/...**     | [GiaHanLam](https://sketchfab.com/GiaHanLam)           | [CC-BY](https://creativecommons.org/licenses/by/4.0/)       | Used by: [`models_yaw_pitch_roll.c`](https://github.com/raysan5/raylib/blob/master/examples/models/models_yaw_pitch_roll.c)
-| **gltf/...**        | _various_          | [LICENSE](https://github.com/raysan5/raylib/blob/master/examples/models/resources/gltf/LICENSE)      |  - |

examples/models/resources/models/vox/LICENSE

@@ -0,0 +1,9 @@
+The following models are provided by the official github repo of voxel-model format by MagikaVoxel developer @ephtracy
+
+GitHub official repo: https://github.com/ephtracy/voxel-model
+
+ - chr_knight.vox - https://github.com/ephtracy/voxel-model/blob/master/vox/character/chr_knight.vox
+ - chr_sword.vox - https://github.com/ephtracy/voxel-model/blob/master/vox/character/chr_sword.vox
+ - monu9.vox - https://github.com/ephtracy/voxel-model/blob/master/vox/monument/monu9.vox
+ 
+Worth mentioning there is no license specified for the models yet: https://github.com/ephtracy/voxel-model/issues/22

examples/models/resources/shaders/glsl330/brdf.fs

@@ -1,124 +0,0 @@
-#version 330
-
-// Input vertex attributes (from vertex shader)
-in vec2 fragTexCoord;
-
-// Constant values
-const float PI = 3.14159265359;
-const uint MAX_SAMPLES = 1024u;
-
-// Output fragment color
-out vec4 finalColor;
-
-vec2 Hammersley(uint i, uint N);
-float RadicalInverseVdC(uint bits);
-float GeometrySchlickGGX(float NdotV, float roughness);
-float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness);
-vec3 ImportanceSampleGGX(vec2 Xi, vec3 N, float roughness);
-vec2 IntegrateBRDF(float NdotV, float roughness);
-
-float RadicalInverseVdC(uint bits)
-{
-    bits = (bits << 16u) | (bits >> 16u);
-    bits = ((bits & 0x55555555u) << 1u) | ((bits & 0xAAAAAAAAu) >> 1u);
-    bits = ((bits & 0x33333333u) << 2u) | ((bits & 0xCCCCCCCCu) >> 2u);
-    bits = ((bits & 0x0F0F0F0Fu) << 4u) | ((bits & 0xF0F0F0F0u) >> 4u);
-    bits = ((bits & 0x00FF00FFu) << 8u) | ((bits & 0xFF00FF00u) >> 8u);
-    return float(bits) * 2.3283064365386963e-10; // / 0x100000000
-}
-
-// Compute Hammersley coordinates
-vec2 Hammersley(uint i, uint N)
-{
-    return vec2(float(i)/float(N), RadicalInverseVdC(i));
-}
-
-// Integrate number of importance samples for (roughness and NoV)
-vec3 ImportanceSampleGGX(vec2 Xi, vec3 N, float roughness)
-{
-    float a = roughness*roughness;
-    float phi = 2.0 * PI * Xi.x;
-    float cosTheta = sqrt((1.0 - Xi.y)/(1.0 + (a*a - 1.0)*Xi.y));
-    float sinTheta = sqrt(1.0 - cosTheta*cosTheta);
-
-    // Transform from spherical coordinates to cartesian coordinates (halfway vector)
-    vec3 H = vec3(cos(phi)*sinTheta, sin(phi)*sinTheta, cosTheta);
-
-    // Transform from tangent space H vector to world space sample vector
-    vec3 up = ((abs(N.z) < 0.999) ? vec3(0.0, 0.0, 1.0) : vec3(1.0, 0.0, 0.0));
-    vec3 tangent = normalize(cross(up, N));
-    vec3 bitangent = cross(N, tangent);
-    vec3 sampleVec = tangent*H.x + bitangent*H.y + N*H.z;
-
-    return normalize(sampleVec);
-}
-
-float GeometrySchlickGGX(float NdotV, float roughness)
-{
-    // For IBL k is calculated different
-    float k = (roughness*roughness)/2.0;
-
-    float nom = NdotV;
-    float denom = NdotV*(1.0 - k) + k;
-
-    return nom/denom;
-}
-
-// Compute the geometry term for the BRDF given roughness squared, NoV, NoL
-float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
-{
-    float NdotV = max(dot(N, V), 0.0);
-    float NdotL = max(dot(N, L), 0.0);
-    float ggx2 = GeometrySchlickGGX(NdotV, roughness);
-    float ggx1 = GeometrySchlickGGX(NdotL, roughness);
-
-    return ggx1*ggx2;
-}
-
-// Bidirectional reflectance distribution function
-// Ref: https://github.com/HectorMF/BRDFGenerator
-vec2 IntegrateBRDF(float NdotV, float roughness)
-{
-    float A = 0.0;
-    float B = 0.0;
-    vec3 V = vec3(sqrt(1.0 - NdotV*NdotV), 0.0, NdotV);
-    vec3 N = vec3(0.0, 0.0, 1.0);
-
-    for (uint i = 0u; i < MAX_SAMPLES; i++)
-    {
-        // Generate a sample vector that's biased towards the preferred alignment direction (importance sampling)
-        
-        vec2 Xi = Hammersley(i, MAX_SAMPLES);       // Compute a Hammersely coordinate
-        vec3 H = ImportanceSampleGGX(Xi, N, roughness); // Integrate number of importance samples for (roughness and NoV)
-        vec3 L = normalize(2.0*dot(V, H)*H - V);    // Compute reflection vector L
-        
-        float NdotL = max(L.z, 0.0);                // Compute normal dot light
-        float NdotH = max(H.z, 0.0);                // Compute normal dot half
-        float VdotH = max(dot(V, H), 0.0);          // Compute view dot half
-
-        if (NdotL > 0.0)
-        {
-            float G = GeometrySmith(N, V, L, roughness);    // Compute the geometry term for the BRDF given roughness squared, NoV, NoL
-            float GVis = (G*VdotH)/(NdotH*NdotV);   // Compute the visibility term given G, VoH, NoH, NoV, NoL
-            float Fc = pow(1.0 - VdotH, 5.0);       // Compute the fresnel term given VoH
-
-            A += (1.0 - Fc)*GVis;                   // Sum the result given fresnel, geometry, visibility
-            B += Fc*GVis;
-        }
-    }
-
-    // Calculate brdf average sample
-    A /= float(MAX_SAMPLES);
-    B /= float(MAX_SAMPLES);
-
-    return vec2(A, B);
-}
-
-void main()
-{
-    // Calculate brdf based on texture coordinates
-    vec2 brdf = IntegrateBRDF(fragTexCoord.x, fragTexCoord.y);
-
-    // Calculate final fragment color
-    finalColor = vec4(brdf.r, brdf.g, 0.0, 1.0);
-}

examples/models/resources/shaders/glsl330/brdf.vs

@@ -1,17 +0,0 @@
-#version 330
-
-// Input vertex attributes
-in vec3 vertexPosition;
-in vec2 vertexTexCoord;
-
-// Output vertex attributes (to fragment shader)
-out vec2 fragTexCoord;
-
-void main()
-{
-    // Calculate fragment position based on model transformations
-    fragTexCoord = vertexTexCoord;
-
-    // Calculate final vertex position
-    gl_Position = vec4(vertexPosition, 1.0);
-}

examples/models/resources/shaders/glsl330/irradiance.fs

@@ -1,50 +0,0 @@
-#version 330
-
-// Input vertex attributes (from vertex shader)
-in vec3 fragPosition;
-
-// Input uniform values
-uniform samplerCube environmentMap;
-
-// Constant values
-const float PI = 3.14159265359;
-
-// Output fragment color
-out vec4 finalColor;
-
-void main()
-{
-    // The sample direction equals the hemisphere's orientation
-    vec3 normal = normalize(fragPosition);
-
-    vec3 irradiance = vec3(0.0);  
-
-    vec3 up = vec3(0.0, 1.0, 0.0);
-    vec3 right = cross(up, normal);
-    up = cross(normal, right);
-
-    float sampleDelta = 0.025;
-    float nrSamples = 0.0; 
-
-    for (float phi = 0.0; phi < 2.0*PI; phi += sampleDelta)
-    {
-        for (float theta = 0.0; theta < 0.5*PI; theta += sampleDelta)
-        {
-            // Spherical to cartesian (in tangent space)
-            vec3 tangentSample = vec3(sin(theta)*cos(phi), sin(theta)*sin(phi), cos(theta));
-            
-            // tangent space to world
-            vec3 sampleVec = tangentSample.x*right + tangentSample.y*up + tangentSample.z*normal; 
-
-            // Fetch color from environment cubemap
-            irradiance += texture(environmentMap, sampleVec).rgb*cos(theta)*sin(theta);
-            nrSamples++;
-        }
-    }
-
-    // Calculate irradiance average value from samples
-    irradiance = PI*irradiance*(1.0/float(nrSamples));
-
-    // Calculate final fragment color
-    finalColor = vec4(irradiance, 1.0);
-}

examples/models/resources/shaders/glsl330/pbr.fs

@@ -1,292 +0,0 @@
-#version 330
-
-#define     MAX_REFLECTION_LOD      4.0
-#define     MAX_DEPTH_LAYER         20
-#define     MIN_DEPTH_LAYER         10
-
-#define     MAX_LIGHTS              4
-#define     LIGHT_DIRECTIONAL       0
-#define     LIGHT_POINT             1
-
-struct MaterialProperty {
-    vec3 color;
-    int useSampler;
-    sampler2D sampler;
-};
-
-struct Light {
-    int enabled;
-    int type;
-    vec3 position;
-    vec3 target;
-    vec4 color;
-};
-
-// Input vertex attributes (from vertex shader)
-in vec3 fragPosition;
-in vec2 fragTexCoord;
-in vec3 fragNormal;
-in vec3 fragTangent;
-in vec3 fragBinormal;
-
-// Input material values
-uniform MaterialProperty albedo;
-uniform MaterialProperty normals;
-uniform MaterialProperty metalness;
-uniform MaterialProperty roughness;
-uniform MaterialProperty occlusion;
-uniform MaterialProperty emission;
-uniform MaterialProperty height;
-
-// Input uniform values
-uniform samplerCube irradianceMap;
-uniform samplerCube prefilterMap;
-uniform sampler2D brdfLUT;
-
-// Input lighting values
-uniform Light lights[MAX_LIGHTS];
-
-// Other uniform values
-uniform int renderMode;
-uniform vec3 viewPos;
-vec2 texCoord;
-
-// Constant values
-const float PI = 3.14159265359;
-
-// Output fragment color
-out vec4 finalColor;
-
-vec3 ComputeMaterialProperty(MaterialProperty property);
-float DistributionGGX(vec3 N, vec3 H, float roughness);
-float GeometrySchlickGGX(float NdotV, float roughness);
-float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness);
-vec3 fresnelSchlick(float cosTheta, vec3 F0);
-vec3 fresnelSchlickRoughness(float cosTheta, vec3 F0, float roughness);
-vec2 ParallaxMapping(vec2 texCoords, vec3 viewDir);
-
-// WARNING: There is some weird behaviour with this function, always returns black!
-// Yes, I even tried: return texture(property.sampler, texCoord).rgb;
-vec3 ComputeMaterialProperty(MaterialProperty property)
-{
-    vec3 result = vec3(0.0, 0.0, 0.0);
-
-    if (property.useSampler == 1) result = texture(property.sampler, texCoord).rgb;
-    else result = property.color;
-
-    return result;
-}
-
-float DistributionGGX(vec3 N, vec3 H, float roughness)
-{
-    float a = roughness*roughness;
-    float a2 = a*a;
-    float NdotH = max(dot(N, H), 0.0);
-    float NdotH2 = NdotH*NdotH;
-
-    float nom = a2;
-    float denom = (NdotH2*(a2 - 1.0) + 1.0);
-    denom = PI*denom*denom;
-
-    return nom/denom;
-}
-
-float GeometrySchlickGGX(float NdotV, float roughness)
-{
-    float r = (roughness + 1.0);
-    float k = r*r/8.0;
-
-    float nom = NdotV;
-    float denom = NdotV*(1.0 - k) + k;
-
-    return nom/denom;
-}
-float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
-{
-    float NdotV = max(dot(N, V), 0.0);
-    float NdotL = max(dot(N, L), 0.0);
-    float ggx2 = GeometrySchlickGGX(NdotV, roughness);
-    float ggx1 = GeometrySchlickGGX(NdotL, roughness);
-
-    return ggx1*ggx2;
-}
-
-vec3 fresnelSchlick(float cosTheta, vec3 F0)
-{
-    return F0 + (1.0 - F0)*pow(1.0 - cosTheta, 5.0);
-}
-
-vec3 fresnelSchlickRoughness(float cosTheta, vec3 F0, float roughness)
-{
-    return F0 + (max(vec3(1.0 - roughness), F0) - F0)*pow(1.0 - cosTheta, 5.0);
-}
-
-vec2 ParallaxMapping(vec2 texCoords, vec3 viewDir)
-{
-    // Calculate the number of depth layers and calculate the size of each layer
-    float numLayers = mix(MAX_DEPTH_LAYER, MIN_DEPTH_LAYER, abs(dot(vec3(0.0, 0.0, 1.0), viewDir)));  
-    float layerDepth = 1.0/numLayers;
-
-    // Calculate depth of current layer
-    float currentLayerDepth = 0.0;
-
-    // Calculate the amount to shift the texture coordinates per layer (from vector P)
-    // Note: height amount is stored in height material attribute color R channel (sampler use is independent)
-    vec2 P = viewDir.xy*height.color.r; 
-    vec2 deltaTexCoords = P/numLayers;
-
-    // Store initial texture coordinates and depth values
-    vec2 currentTexCoords = texCoords;
-    float currentDepthMapValue = texture(height.sampler, currentTexCoords).r;
-
-    while (currentLayerDepth < currentDepthMapValue)
-    {
-        // Shift texture coordinates along direction of P
-        currentTexCoords -= deltaTexCoords;
-
-        // Get depth map value at current texture coordinates
-        currentDepthMapValue = texture(height.sampler, currentTexCoords).r;
-
-        // Get depth of next layer
-        currentLayerDepth += layerDepth;  
-    }
-
-    // Get texture coordinates before collision (reverse operations)
-    vec2 prevTexCoords = currentTexCoords + deltaTexCoords;
-
-    // Get depth after and before collision for linear interpolation
-    float afterDepth = currentDepthMapValue - currentLayerDepth;
-    float beforeDepth = texture(height.sampler, prevTexCoords).r - currentLayerDepth + layerDepth;
-
-    // Interpolation of texture coordinates
-    float weight = afterDepth/(afterDepth - beforeDepth);
-    vec2 finalTexCoords = prevTexCoords*weight + currentTexCoords*(1.0 - weight);
-
-    return finalTexCoords;
-}
-
-void main()
-{
-    // Calculate TBN and RM matrices
-    mat3 TBN = transpose(mat3(fragTangent, fragBinormal, fragNormal));
-
-    // Calculate lighting required attributes
-    vec3 normal = normalize(fragNormal);
-    vec3 view = normalize(viewPos - fragPosition);
-    vec3 refl = reflect(-view, normal);
-
-    // Check if parallax mapping is enabled and calculate texture coordinates to use based on height map
-    // NOTE: remember that 'texCoord' variable must be assigned before calling any ComputeMaterialProperty() function
-    if (height.useSampler == 1) texCoord = ParallaxMapping(fragTexCoord, view);
-    else texCoord = fragTexCoord;   // Use default texture coordinates
-
-    // Fetch material values from texture sampler or color attributes
-    vec3 color = texture(albedo.sampler, texCoord).rgb; //ComputeMaterialProperty(albedo);
-    vec3 metal = texture(metalness.sampler, texCoord).rgb; //ComputeMaterialProperty(metalness);
-    vec3 rough = texture(roughness.sampler, texCoord).rgb; //ComputeMaterialProperty(roughness);
-    vec3 emiss = texture(emission.sampler, texCoord).rgb; //ComputeMaterialProperty(emission);
-    vec3 ao = texture(occlusion.sampler, texCoord).rgb; //ComputeMaterialProperty(occlusion);
-
-    // Check if normal mapping is enabled
-    if (normals.useSampler == 1)
-    {
-        // Fetch normal map color and transform lighting values to tangent space
-        normal = texture(normals.sampler, texCoord).rgb; //ComputeMaterialProperty(normals);
-        normal = normalize(normal*2.0 - 1.0);
-        normal = normalize(normal*TBN);
-
-        // Convert tangent space normal to world space due to cubemap reflection calculations
-        refl = normalize(reflect(-view, normal));
-    }
-
-    // Calculate reflectance at normal incidence
-    vec3 F0 = vec3(0.04);
-    F0 = mix(F0, color, metal.r);
-
-    // Calculate lighting for all lights
-    vec3 Lo = vec3(0.0);
-    vec3 lightDot = vec3(0.0);
-
-    for (int i = 0; i < MAX_LIGHTS; i++)
-    {
-        if (lights[i].enabled == 1)
-        {
-            // Calculate per-light radiance
-            vec3 light = vec3(0.0);
-            vec3 radiance = lights[i].color.rgb;
-            if (lights[i].type == LIGHT_DIRECTIONAL) light = -normalize(lights[i].target - lights[i].position);
-            else if (lights[i].type == LIGHT_POINT)
-            {
-                light = normalize(lights[i].position - fragPosition);
-                float distance = length(lights[i].position - fragPosition);
-                float attenuation = 1.0/(distance*distance);
-                radiance *= attenuation;
-            }
-
-            // Cook-torrance BRDF
-            vec3 high = normalize(view + light);
-            float NDF = DistributionGGX(normal, high, rough.r);
-            float G = GeometrySmith(normal, view, light, rough.r);
-            vec3 F = fresnelSchlick(max(dot(high, view), 0.0), F0);
-            vec3 nominator = NDF*G*F;
-            float denominator = 4*max(dot(normal, view), 0.0)*max(dot(normal, light), 0.0) + 0.001;
-            vec3 brdf = nominator/denominator;
-
-            // Store to kS the fresnel value and calculate energy conservation
-            vec3 kS = F;
-            vec3 kD = vec3(1.0) - kS;
-
-            // Multiply kD by the inverse metalness such that only non-metals have diffuse lighting
-            kD *= 1.0 - metal.r;
-
-            // Scale light by dot product between normal and light direction
-            float NdotL = max(dot(normal, light), 0.0);
-
-            // Add to outgoing radiance Lo
-            // Note: BRDF is already multiplied by the Fresnel so it doesn't need to be multiplied again
-            Lo += (kD*color/PI + brdf)*radiance*NdotL*lights[i].color.a;
-            lightDot += radiance*NdotL + brdf*lights[i].color.a;
-        }
-    }
-
-    // Calculate ambient lighting using IBL
-    vec3 F = fresnelSchlickRoughness(max(dot(normal, view), 0.0), F0, rough.r);
-    vec3 kS = F;
-    vec3 kD = 1.0 - kS;
-    kD *= 1.0 - metal.r;
-
-    // Calculate indirect diffuse
-    vec3 irradiance = texture(irradianceMap, fragNormal).rgb;
-    vec3 diffuse = color*irradiance;
-
-    // Sample both the prefilter map and the BRDF lut and combine them together as per the Split-Sum approximation
-    vec3 prefilterColor = textureLod(prefilterMap, refl, rough.r*MAX_REFLECTION_LOD).rgb;
-    vec2 brdf = texture(brdfLUT, vec2(max(dot(normal, view), 0.0), rough.r)).rg;
-    vec3 reflection = prefilterColor*(F*brdf.x + brdf.y);
-
-    // Calculate final lighting
-    vec3 ambient = (kD*diffuse + reflection)*ao;
-
-    // Calculate fragment color based on render mode
-    vec3 fragmentColor = ambient + Lo + emiss;                              // Physically Based Rendering
-
-    if (renderMode == 1) fragmentColor = color;                             // Albedo
-    else if (renderMode == 2) fragmentColor = normal;                       // Normals
-    else if (renderMode == 3) fragmentColor = metal;                        // Metalness
-    else if (renderMode == 4) fragmentColor = rough;                        // Roughness
-    else if (renderMode == 5) fragmentColor = ao;                           // Ambient Occlusion
-    else if (renderMode == 6) fragmentColor = emiss;                        // Emission
-    else if (renderMode == 7) fragmentColor = lightDot;                     // Lighting
-    else if (renderMode == 8) fragmentColor = kS;                           // Fresnel
-    else if (renderMode == 9) fragmentColor = irradiance;                   // Irradiance
-    else if (renderMode == 10) fragmentColor = reflection;                  // Reflection
-
-    // Apply HDR tonemapping
-    fragmentColor = fragmentColor/(fragmentColor + vec3(1.0));
-
-    // Apply gamma correction
-    fragmentColor = pow(fragmentColor, vec3(1.0/2.2));
-
-    // Calculate final fragment color
-    finalColor = vec4(fragmentColor, 1.0);
-}

examples/models/resources/shaders/glsl330/pbr.vs

@@ -1,41 +0,0 @@
-#version 330
-
-// Input vertex attributes
-in vec3 vertexPosition;
-in vec2 vertexTexCoord;
-in vec3 vertexNormal;
-in vec4 vertexTangent;
-
-// Input uniform values
-uniform mat4 mvp;
-uniform mat4 matModel;
-
-// Output vertex attributes (to fragment shader)
-out vec3 fragPosition;
-out vec2 fragTexCoord;
-out vec3 fragNormal;
-out vec3 fragTangent;
-out vec3 fragBinormal;
-
-void main()
-{
-    // Calculate binormal from vertex normal and tangent
-    vec3 vertexBinormal = cross(vertexNormal, vec3(vertexTangent));
-
-    // Calculate fragment normal based on normal transformations
-    mat3 normalMatrix = transpose(inverse(mat3(matModel)));
-
-    // Calculate fragment position based on model transformations
-    fragPosition = vec3(matModel*vec4(vertexPosition, 1.0));
-
-    // Send vertex attributes to fragment shader
-    fragTexCoord = vertexTexCoord;
-    fragNormal = normalize(normalMatrix*vertexNormal);
-    fragTangent = normalize(normalMatrix*vec3(vertexTangent));
-    fragTangent = normalize(fragTangent - dot(fragTangent, fragNormal)*fragNormal);
-    fragBinormal = normalize(normalMatrix*vertexBinormal);
-    fragBinormal = cross(fragNormal, fragTangent);
-
-    // Calculate final vertex position
-    gl_Position = mvp*vec4(vertexPosition, 1.0);
-}

examples/models/resources/shaders/glsl330/prefilter.fs

@@ -1,113 +0,0 @@
-#version 330
-
-#define MAX_SAMPLES          1024u
-#define CUBEMAP_RESOLUTION   1024.0
-
-// Input vertex attributes (from vertex shader)
-in vec3 fragPosition;
-
-// Input uniform values
-uniform samplerCube environmentMap;
-uniform float roughness;
-
-// Constant values
-const float PI = 3.14159265359;
-
-// Output fragment color
-out vec4 finalColor;
-
-float DistributionGGX(vec3 N, vec3 H, float roughness);
-float RadicalInverse_VdC(uint bits);
-vec2 Hammersley(uint i, uint N);
-vec3 ImportanceSampleGGX(vec2 Xi, vec3 N, float roughness);
-
-float DistributionGGX(vec3 N, vec3 H, float roughness)
-{
-    float a = roughness*roughness;
-    float a2 = a*a;
-    float NdotH = max(dot(N, H), 0.0);
-    float NdotH2 = NdotH*NdotH;
-
-    float nom = a2;
-    float denom = (NdotH2*(a2 - 1.0) + 1.0);
-    denom = PI*denom*denom;
-
-    return nom/denom;
-}
-
-float RadicalInverse_VdC(uint bits)
-{
-     bits = (bits << 16u) | (bits >> 16u);
-     bits = ((bits & 0x55555555u) << 1u) | ((bits & 0xAAAAAAAAu) >> 1u);
-     bits = ((bits & 0x33333333u) << 2u) | ((bits & 0xCCCCCCCCu) >> 2u);
-     bits = ((bits & 0x0F0F0F0Fu) << 4u) | ((bits & 0xF0F0F0F0u) >> 4u);
-     bits = ((bits & 0x00FF00FFu) << 8u) | ((bits & 0xFF00FF00u) >> 8u);
-     return float(bits)*2.3283064365386963e-10; // / 0x100000000
-}
-
-vec2 Hammersley(uint i, uint N)
-{
-    return vec2(float(i)/float(N), RadicalInverse_VdC(i));
-}
-
-vec3 ImportanceSampleGGX(vec2 Xi, vec3 N, float roughness)
-{
-    float a = roughness*roughness;
-    float phi = 2.0*PI*Xi.x;
-    float cosTheta = sqrt((1.0 - Xi.y)/(1.0 + (a*a - 1.0)*Xi.y));
-    float sinTheta = sqrt(1.0 - cosTheta*cosTheta);
-
-    // Transform from spherical coordinates to cartesian coordinates (halfway vector)
-    vec3 H = vec3(cos(phi)*sinTheta, sin(phi)*sinTheta, cosTheta);
-
-    // Transform from tangent space H vector to world space sample vector
-    vec3 up = ((abs(N.z) < 0.999) ? vec3(0.0, 0.0, 1.0) : vec3(1.0, 0.0, 0.0));
-    vec3 tangent = normalize(cross(up, N));
-    vec3 bitangent = cross(N, tangent);
-    vec3 sampleVec = tangent*H.x + bitangent*H.y + N*H.z;
-
-    return normalize(sampleVec);
-}
-
-void main()
-{
-    // Make the simplyfying assumption that V equals R equals the normal 
-    vec3 N = normalize(fragPosition);
-    vec3 R = N;
-    vec3 V = R;
-
-    vec3 prefilteredColor = vec3(0.0);
-    float totalWeight = 0.0;
-
-    for (uint i = 0u; i < MAX_SAMPLES; i++)
-    {
-        // Generate a sample vector that's biased towards the preferred alignment direction (importance sampling)
-        vec2 Xi = Hammersley(i, MAX_SAMPLES);
-        vec3 H = ImportanceSampleGGX(Xi, N, roughness);
-        vec3 L  = normalize(2.0*dot(V, H)*H - V);
-
-        float NdotL = max(dot(N, L), 0.0);
-        if(NdotL > 0.0)
-        {
-            // Sample from the environment's mip level based on roughness/pdf
-            float D = DistributionGGX(N, H, roughness);
-            float NdotH = max(dot(N, H), 0.0);
-            float HdotV = max(dot(H, V), 0.0);
-            float pdf = D*NdotH/(4.0*HdotV) + 0.0001; 
-
-            float resolution = CUBEMAP_RESOLUTION;
-            float saTexel  = 4.0*PI/(6.0*resolution*resolution);
-            float saSample = 1.0/(float(MAX_SAMPLES)*pdf + 0.0001);
-            float mipLevel = ((roughness == 0.0) ? 0.0 : 0.5*log2(saSample/saTexel)); 
-
-            prefilteredColor += textureLod(environmentMap, L, mipLevel).rgb*NdotL;
-            totalWeight += NdotL;
-        }
-    }
-
-    // Calculate prefilter average color
-    prefilteredColor = prefilteredColor/totalWeight;
-
-    // Calculate final fragment color
-    finalColor = vec4(prefilteredColor, 1.0);
-}

examples/others/raylib_opengl_interop.c

@@ -24,8 +24,14 @@
 ********************************************************************************************/
 
 #include "raylib.h"
+
 #include "rlgl.h"           // Required for: rlDrawRenderBatchActive(), rlGetMatrixModelview(), rlGetMatrixProjection()
-#include "glad.h"           // Required for: OpenGL functionality 
+#if defined(__APPLE__)
+    #include <OpenGL/gl3.h>     // OpenGL 3 library for OSX
+    #include <OpenGL/gl3ext.h>  // OpenGL 3 extensions library for OSX
+#else
+    #include "glad.h"       // Required for: OpenGL functionality 
+#endif
 #include "raymath.h"        // Required for: MatrixMultiply(), MatrixToFloat()
 
 #if defined(PLATFORM_DESKTOP)

examples/shaders/resources/LICENSE.md

@@ -9,5 +9,3 @@
 | raysan.png         | [@raysan5](https://github.com/raysan5)      | [CC0](https://creativecommons.org/publicdomain/zero/1.0/)   | - |
 | space.png          | ❔             | ❔       | - |
 | texel_checker.png  | [@raysan5](https://github.com/raysan5)      | [CC0](https://creativecommons.org/publicdomain/zero/1.0/)   | Made with [UV Checker Map Maker](http://uvchecker.byvalle.com/) |
-| egg.png            | [@GoldenThumbs](https://github.com/GoldenThumbs) |
-| torus.png          | [@GoldenThumbs](https://github.com/GoldenThumbs) |

examples/shaders/resources/shaders/glsl100/outline.fs

@@ -9,27 +9,29 @@ varying vec4 fragColor;
 // Input uniform values
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
-uniform vec2 texScale;
 
-// Function for drawing outlines on alpha-blended textures
+uniform vec2 textureSize;
-vec4 DrawOutline(sampler2D tex, vec2 uv, vec2 lineScale, vec3 lineCol)
+uniform float outlineSize;
-{
+uniform vec4 outlineColor;
-	vec2 texelScale = 1.0 / lineScale;
-	vec4 center = texture2D(tex, uv); // We sample the center texel, (with all color data)
-	// Next we sample four corner texels, but only for the alpha channel (this is for the outline)
-	vec4 corners;
-	corners.x = texture2D(tex, uv+vec2( texelScale.x, texelScale.y)).a;
-	corners.y = texture2D(tex, uv+vec2( texelScale.x,-texelScale.y)).a;
-	corners.z = texture2D(tex, uv+vec2(-texelScale.x, texelScale.y)).a;
-	corners.w = texture2D(tex, uv+vec2(-texelScale.x,-texelScale.y)).a;
 
-	float outline = min(dot(corners, vec4(1.0)), 1.0);
+// Output fragment color
-	vec4 col = mix(vec4(0.0), vec4(lineCol, 1.0), outline);
+out vec4 finalColor;
-	col = mix(col, center, center.a);
-	return col;
-}
 
 void main()
 {
-	gl_FragColor = DrawOutline(texture0, fragTexCoord, texScale, vec3(0.0));
+	vec4 texel = texture2D(texture0, fragTexCoord);   // Get texel color
+	vec2 texelScale = vec2(0.0);
+    texelScale.x = outlineSize/textureSize.x;
+    texelScale.y = outlineSize/textureSize.y;
+
+	// We sample four corner texels, but only for the alpha channel (this is for the outline)
+	vec4 corners = vec4(0.0);
+	corners.x = texture2D(texture0, fragTexCoord + vec2(texelScale.x, texelScale.y)).a;
+	corners.y = texture2D(texture0, fragTexCoord + vec2(texelScale.x, -texelScale.y)).a;
+	corners.z = texture2D(texture0, fragTexCoord + vec2(-texelScale.x, texelScale.y)).a;
+	corners.w = texture2D(texture0, fragTexCoord + vec2(-texelScale.x, -texelScale.y)).a;
+	
+	float outline = min(dot(corners, vec4(1.0)), 1.0);
+	vec4 color = mix(vec4(0.0), outlineColor, outline);
+	gl_FragColor = mix(color, texel, texel.a);
 }

examples/shaders/resources/shaders/glsl330/outline.fs

@@ -7,30 +7,29 @@ in vec4 fragColor;
 // Input uniform values
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
-uniform vec2 texScale;
+
+uniform vec2 textureSize;
+uniform float outlineSize;
+uniform vec4 outlineColor;
 
 // Output fragment color
 out vec4 finalColor;
 
-// Function for drawing outlines on alpha-blended textures
-vec4 DrawOutline(sampler2D tex, vec2 uv, vec2 lineScale, vec3 lineCol)
-{
-	vec2 texelScale = 1.0 / lineScale;
-	vec4 center = texture(tex, uv); // We sample the center texel, (with all color data)
-	// Next we sample four corner texels, but only for the alpha channel (this is for the outline)
-	vec4 corners;
-	corners.x = texture(tex, uv+vec2( texelScale.x, texelScale.y)).a;
-	corners.y = texture(tex, uv+vec2( texelScale.x,-texelScale.y)).a;
-	corners.z = texture(tex, uv+vec2(-texelScale.x, texelScale.y)).a;
-	corners.w = texture(tex, uv+vec2(-texelScale.x,-texelScale.y)).a;
-	
-	float outline = min(dot(corners, vec4(1.0)), 1.0);
-	vec4 col = mix(vec4(0.0), vec4(lineCol, 1.0), outline);
-	col = mix(col, center, center.a);
-	return col;
-}
-
 void main()
 {
-	finalColor = DrawOutline(texture0, fragTexCoord, texScale, vec3(0.0));
+	vec4 texel = texture(texture0, fragTexCoord);   // Get texel color
+	vec2 texelScale = vec2(0.0);
+    texelScale.x = outlineSize/textureSize.x;
+    texelScale.y = outlineSize/textureSize.y;
+
+	// We sample four corner texels, but only for the alpha channel (this is for the outline)
+	vec4 corners = vec4(0.0);
+	corners.x = texture(texture0, fragTexCoord + vec2(texelScale.x, texelScale.y)).a;
+	corners.y = texture(texture0, fragTexCoord + vec2(texelScale.x, -texelScale.y)).a;
+	corners.z = texture(texture0, fragTexCoord + vec2(-texelScale.x, texelScale.y)).a;
+	corners.w = texture(texture0, fragTexCoord + vec2(-texelScale.x, -texelScale.y)).a;
+	
+	float outline = min(dot(corners, vec4(1.0)), 1.0);
+	vec4 color = mix(vec4(0.0), outlineColor, outline);
+	finalColor = mix(color, texel, texel.a);
 }

examples/shaders/shaders_texture_outline.c

@@ -5,12 +5,10 @@
 *   NOTE: This example requires raylib OpenGL 3.3 or ES2 versions for shaders support,
 *         OpenGL 1.1 does not support shaders, recompile raylib to OpenGL 3.3 version.
 *
-*   NOTE: Shaders used in this example are #version 330 (OpenGL 3.3).
-*
 *   This example has been created using raylib 3.8 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Example contributed by Samuel Skiff (@GoldenThumbs)
+*   Example contributed by Samuel Skiff (@GoldenThumbs) and reviewed by Ramon Santamaria (@raysan5)
 *
 *   Copyright (c) 2021 Samuel SKiff (@GoldenThumbs) and Ramon Santamaria (@raysan5)
 *
@@ -33,13 +31,23 @@ int main(void)
 
     InitWindow(screenWidth, screenHeight, "raylib [shaders] example - Apply an outline to a texture");
 
-    Texture2D egg = LoadTexture("resources/egg.png");
+    Texture2D texture = LoadTexture("resources/fudesumi.png");
-    Texture2D torus = LoadTexture("resources/torus.png");
+    
     Shader shdrOutline = LoadShader(0, TextFormat("resources/shaders/glsl%i/outline.fs", GLSL_VERSION));
 
-    float outlineScale = 16.0f;
+    float outlineSize = 2.0f;
-    float textureScale[2] = { 16.0f*4, 16.0f*4 };
+    float outlineColor[4] = { 1.0f, 0.0f, 0.0f, 1.0f };     // Normalized RED color 
-    SetShaderValue(shdrOutline, GetShaderLocation(shdrOutline, "texScale"), textureScale, SHADER_UNIFORM_VEC2);
+    float textureSize[2] = { (float)texture.width, (float)texture.height };
+    
+    // Get shader locations
+    int outlineSizeLoc = GetShaderLocation(shdrOutline, "outlineSize");
+    int outlineColorLoc = GetShaderLocation(shdrOutline, "outlineColor");
+    int textureSizeLoc = GetShaderLocation(shdrOutline, "textureSize");
+    
+    // Set shader values (they can be changed later)
+    SetShaderValue(shdrOutline, outlineSizeLoc, &outlineSize, SHADER_UNIFORM_FLOAT);
+    SetShaderValue(shdrOutline, outlineColorLoc, outlineColor, SHADER_UNIFORM_VEC4);
+    SetShaderValue(shdrOutline, textureSizeLoc, textureSize, SHADER_UNIFORM_VEC2);
 
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
@@ -49,7 +57,10 @@ int main(void)
     {
         // Update
         //----------------------------------------------------------------------------------
-        // TODO: Update your variables here
+        outlineSize += GetMouseWheelMove();
+        if (outlineSize < 1.0f) outlineSize = 1.0f;
+        
+        SetShaderValue(shdrOutline, outlineSizeLoc, &outlineSize, SHADER_UNIFORM_FLOAT);
         //----------------------------------------------------------------------------------
 
         // Draw
@@ -59,11 +70,14 @@ int main(void)
             ClearBackground(RAYWHITE);
 
             BeginShaderMode(shdrOutline);
-                DrawTextureEx(egg, (Vector2){ 0, 230 }, 0.0, outlineScale, WHITE);
+            
-                DrawTextureEx(torus, (Vector2){ 544, 230 }, 0.0, outlineScale, WHITE);
+                DrawTexture(texture, GetScreenWidth()/2 - texture.width/2, -30, WHITE);
+                
             EndShaderMode();
 
-            DrawText("Shader-based outlines for textures", 190, 200, 20, LIGHTGRAY);
+            DrawText("Shader-based\ntexture\noutline", 10, 10, 20, GRAY);
+            
+            DrawText(TextFormat("Outline size: %i px", (int)outlineSize), 10, 120, 20, MAROON);
 
             DrawFPS(710, 10);
 
@@ -73,8 +87,7 @@ int main(void)
 
     // De-Initialization
     //--------------------------------------------------------------------------------------
-    UnloadTexture(egg);
+    UnloadTexture(texture);
-    UnloadTexture(torus);
     UnloadShader(shdrOutline);
 
     CloseWindow();        // Close window and OpenGL context

examples/text/resources/shaders/glsl100/alpha_discard.fs

@@ -0,0 +1,20 @@
+#version 100
+
+precision mediump float;
+
+// Input vertex attributes (from vertex shader)
+varying vec2 fragTexCoord;
+varying vec4 fragColor;
+
+// Input uniform values
+uniform sampler2D texture0;
+uniform vec4 colDiffuse;
+
+void main()
+{
+    vec4 texelColor = texture2D(texture0, fragTexCoord);
+    
+    if (texelColor.a == 0.0) discard;
+    
+    gl_FragColor = texelColor*fragColor*colDiffuse;
+}

examples/text/resources/shaders/glsl100/sdf.fs

@@ -1,5 +1,7 @@
 #version 100
 
+precision mediump float;
+
 // Input vertex attributes (from vertex shader)
 varying vec2 fragTexCoord;
 varying vec4 fragColor;

examples/textures/textures_image_generation.c

@@ -5,13 +5,13 @@
 *   This example has been created using raylib 1.8 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Copyright (c) 2O17 Wilhem Barbier (@nounoursheureux)
+*   Copyright (c) 2O17-2021 Wilhem Barbier (@nounoursheureux) and Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 
 #include "raylib.h"
 
-#define NUM_TEXTURES  7      // Currently we have 7 generation algorithms
+#define NUM_TEXTURES  6      // Currently we have 7 generation algorithms
 
 int main(void)
 {
@@ -27,7 +27,6 @@ int main(void)
     Image radialGradient = GenImageGradientRadial(screenWidth, screenHeight, 0.0f, WHITE, BLACK);
     Image checked = GenImageChecked(screenWidth, screenHeight, 32, 32, RED, BLUE);
     Image whiteNoise = GenImageWhiteNoise(screenWidth, screenHeight, 0.5f);
-    Image perlinNoise = GenImagePerlinNoise(screenWidth, screenHeight, 50, 50, 4.0f);
     Image cellular = GenImageCellular(screenWidth, screenHeight, 32);
 
     Texture2D textures[NUM_TEXTURES] = { 0 };
@@ -37,8 +36,7 @@ int main(void)
     textures[2] = LoadTextureFromImage(radialGradient);
     textures[3] = LoadTextureFromImage(checked);
     textures[4] = LoadTextureFromImage(whiteNoise);
-    textures[5] = LoadTextureFromImage(perlinNoise);
+    textures[5] = LoadTextureFromImage(cellular);
-    textures[6] = LoadTextureFromImage(cellular);
 
     // Unload image data (CPU RAM)
     UnloadImage(verticalGradient);
@@ -46,7 +44,6 @@ int main(void)
     UnloadImage(radialGradient);
     UnloadImage(checked);
     UnloadImage(whiteNoise);
-    UnloadImage(perlinNoise);
     UnloadImage(cellular);
 
     int currentTexture = 0;
@@ -84,8 +81,7 @@ int main(void)
                 case 2: DrawText("RADIAL GRADIENT", 580, 10, 20, LIGHTGRAY); break;
                 case 3: DrawText("CHECKED", 680, 10, 20, RAYWHITE); break;
                 case 4: DrawText("WHITE NOISE", 640, 10, 20, RED); break;
-                case 5: DrawText("PERLIN NOISE", 630, 10, 20, RAYWHITE); break;
+                case 5: DrawText("CELLULAR", 670, 10, 20, RAYWHITE); break;
-                case 6: DrawText("CELLULAR", 670, 10, 20, RAYWHITE); break;
                 default: break;
             }
 

examples/textures/textures_polygon.c

@@ -24,6 +24,9 @@ int main(void)
     const int screenWidth = 800;
     const int screenHeight = 450;
     
+    InitWindow(screenWidth, screenHeight, "raylib [textures] example - textured polygon");
+
+    // Define texture coordinates to map our texture to poly
     Vector2 texcoords[MAX_POINTS] = {
         (Vector2){ 0.75f, 0.0f },
         (Vector2){ 0.25f, 0.0f },
@@ -38,22 +41,24 @@ int main(void)
         (Vector2){ 0.75f, 0.0f}  // Close the poly
     };
 
+    // Define the base poly vertices from the UV's
+    // NOTE: They can be specified in any other way
     Vector2 points[MAX_POINTS] = { 0 };
-
-    // Create the poly coords from the UV's
-    // you don't have to do this you can specify
-    // them however you want
     for (int i = 0; i < MAX_POINTS; i++)
     {
         points[i].x = (texcoords[i].x - 0.5f)*256.0f;
         points[i].y = (texcoords[i].y - 0.5f)*256.0f;
     }
     
-    InitWindow(screenWidth, screenHeight, "raylib [textures] example - textured polygon");
+    // Define the vertices drawing position
+    // NOTE: Initially same as points but updated every frame
+    Vector2 positions[MAX_POINTS] = { 0 };
+    for (int i = 0; i < MAX_POINTS; i++) positions[i] = points[i];
 
+    // Load texture to be mapped to poly
     Texture texture = LoadTexture("resources/cat.png");
 
-    float ang = 0;
+    float angle = 0.0f;             // Rotation angle (in degrees)
 
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
@@ -63,11 +68,10 @@ int main(void)
     {
         // Update
         //----------------------------------------------------------------------------------
-        ang++;
+        // Update points rotation with an angle transform
-
+        // NOTE: Base points position are not modified
-        Vector2 positions[MAX_POINTS] = { 0 };
+        angle++;
-
+        for (int i = 0; i < MAX_POINTS; i++) positions[i] = Vector2Rotate(points[i], angle*DEG2RAD);
-        for (int i = 0; i < MAX_POINTS; i++) positions[i] = Vector2Rotate(points[i], ang);
         //----------------------------------------------------------------------------------
 
         // Draw

parser/raylib_api.json

@@ -1870,7 +1870,7 @@
           "description": ""
         },
         {
-          "name": "MATERIAL_MAP_BRDG",
+          "name": "MATERIAL_MAP_BRDF",
           "value": 10,
           "description": ""
         }