Merge branch 'master' of github.com:RobLoach/raylib-cpp into next

RobLoach · RobLoach · commit a0e19c9927d5 · 2023-11-18T12:32:44.000-06:00
diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
@@ -38,10 +38,9 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-
     - name: Install Linux Dependencies
       if: runner.os == 'Linux'
-      run: sudo apt-get install xorg-dev libglu1-mesa-dev -y
+      run: sudo apt-get install libasound2-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libxcursor-dev libxinerama-dev -y
 
     - name: Configure
       run: cmake -B build -S . -DBUILD_TESTING=ON -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic" ${{ matrix.platform.flags }} ${{ matrix.type.flags }} ${{ matrix.config.flags }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.11)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 project (raylib_cpp
-    VERSION 4.6.0
+    VERSION 5.0.0
     DESCRIPTION "raylib-cpp C++ Object Oriented Wrapper for raylib"
     HOMEPAGE_URL "https://github.com/robloach/raylib-cpp"
     LANGUAGES C CXX
diff --git a/clib.json b/clib.json
@@ -1,6 +1,6 @@
 {
   "name": "raylib-cpp",
-  "version": "4.6.0-alpha1",
+  "version": "5.0.0-alpha1",
   "repo": "RobLoach/raylib-cpp",
   "description": "raylib-cpp: C++ Object-Oriented Wrapper for raylib",
   "homepage": "https://github.com/robloach/raylib-cpp",
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -15,7 +15,7 @@ if (NOT raylib_FOUND)
         FetchContent_Declare(
         raylib
         GIT_REPOSITORY https://github.com/raysan5/raylib.git
-        GIT_TAG 334e96d470c5cb09d154e1c849d04adb721a7a8c
+        GIT_TAG ae50bfa2cc569c0f8d5bc4315d39db64005b1b08
     )
     FetchContent_GetProperties(raylib)
     if (NOT raylib_POPULATED) # Have we downloaded raylib yet?
diff --git a/include/AudioStream.hpp b/include/AudioStream.hpp
@@ -194,7 +194,7 @@ class AudioStream : public ::AudioStream {
     /**
      * Retrieve whether or not the audio stream is ready.
      */
-    bool IsReady() {
+    bool IsReady() const {
         return ::IsAudioStreamReady(*this);
     }
 
@@ -211,7 +211,7 @@ class AudioStream : public ::AudioStream {
         }
     }
 
- private:
+ protected:
     void set(const ::AudioStream& stream) {
         buffer = stream.buffer;
         processor = stream.processor;
diff --git a/include/BoundingBox.hpp b/include/BoundingBox.hpp
@@ -70,7 +70,7 @@ class BoundingBox : public ::BoundingBox {
         return GetRayCollisionBox(ray, *this);
     }
 
- private:
+ protected:
     void set(const ::BoundingBox& box) {
         min = box.min;
         max = box.max;
diff --git a/include/Camera2D.hpp b/include/Camera2D.hpp
@@ -60,7 +60,7 @@ class Camera2D : public ::Camera2D {
         return ::GetWorldToScreen2D(position, *this);
     }
 
- private:
+ protected:
     void set(const ::Camera2D& camera) {
         offset = camera.offset;
         target = camera.target;
diff --git a/include/Camera3D.hpp b/include/Camera3D.hpp
@@ -119,7 +119,7 @@ class Camera3D : public ::Camera3D {
         ::DrawBillboardRec(*this, texture, sourceRec, center, size, tint);
     }
 
- private:
+ protected:
     void set(const ::Camera3D& camera) {
         position = camera.position;
         target = camera.target;
diff --git a/include/Color.hpp b/include/Color.hpp
@@ -65,6 +65,14 @@ class Color : public ::Color {
         return ::ColorToInt(*this);
     }
 
+    inline std::string ToString() const {
+        return TextFormat("Color(%d, %d, %d, %d)", r, g, b, a);
+    }
+
+    inline operator std::string() const {
+        return ToString();
+    }
+
     /**
      * Returns color with alpha applied, alpha goes from 0.0f to 1.0f
      */
@@ -257,7 +265,7 @@ class Color : public ::Color {
     inline static Color Magenta() { return MAGENTA; }
     inline static Color RayWhite() { return RAYWHITE; }
 
- private:
+ protected:
     void set(const ::Color& color) {
         r = color.r;
         g = color.g;
diff --git a/include/Font.hpp b/include/Font.hpp
@@ -206,7 +206,7 @@ class Font : public ::Font {
     /**
      * Returns if the font is ready to be used.
      */
-    bool IsReady() {
+    bool IsReady() const {
         return ::IsFontReady(*this);
     }
 
@@ -287,7 +287,7 @@ class Font : public ::Font {
         return ::ImageTextEx(*this, text.c_str(), fontSize, spacing, tint);
     }
 
- private:
+ protected:
     void set(const ::Font& font) {
         baseSize = font.baseSize;
         glyphCount = font.glyphCount;
diff --git a/include/Gamepad.hpp b/include/Gamepad.hpp
@@ -112,7 +112,7 @@ class Gamepad {
         return SetGamepadMappings(mappings.c_str());
     }
 
- private:
+ protected:
     inline void set(int gamepadNumber) {
         number = gamepadNumber;
     }
diff --git a/include/Image.hpp b/include/Image.hpp
@@ -734,7 +734,7 @@ class Image : public ::Image {
         return ::IsImageReady(*this);
     }
 
- private:
+ protected:
     void set(const ::Image& image) {
         data = image.data;
         width = image.width;
diff --git a/include/Material.hpp b/include/Material.hpp
@@ -112,11 +112,11 @@ class Material : public ::Material {
     /**
      * Check if material is ready
      */
-    inline bool IsReady() {
+    inline bool IsReady() const {
         return ::IsMaterialReady(*this);
     }
 
- private:
+ protected:
     void set(const ::Material& material) {
         shader = material.shader;
         maps = material.maps;
diff --git a/include/Matrix.hpp b/include/Matrix.hpp
@@ -205,7 +205,7 @@ class Matrix : public ::Matrix {
 
 #endif
 
- private:
+ protected:
     void set(const ::Matrix& mat) {
         m0 = mat.m0;
         m1 = mat.m1;
diff --git a/include/Mesh.hpp b/include/Mesh.hpp
@@ -266,7 +266,7 @@ class Mesh : public ::Mesh {
         return ::LoadModelFromMesh(*this);
     }
 
- private:
+ protected:
     void set(const ::Mesh& mesh) {
         vertexCount = mesh.vertexCount;
         triangleCount = mesh.triangleCount;
diff --git a/include/Model.hpp b/include/Model.hpp
@@ -5,10 +5,10 @@
 
 #include "./raylib.hpp"
 #include "./raylib-cpp-utils.hpp"
-#include "./Mesh.hpp"
 #include "./RaylibException.hpp"
 
 namespace raylib {
+class Mesh;
 /**
  * Model type
  */
@@ -220,7 +220,7 @@ class Model : public ::Model {
         }
     }
 
- private:
+ protected:
     void set(const ::Model& model) {
         transform = model.transform;
 
diff --git a/include/ModelAnimation.hpp b/include/ModelAnimation.hpp
@@ -96,7 +96,7 @@ class ModelAnimation : public ::ModelAnimation {
         return ::IsModelAnimationValid(model, *this);
     }
 
- private:
+ protected:
     void set(const ::ModelAnimation& model) {
         boneCount = model.boneCount;
         frameCount = model.frameCount;
diff --git a/include/Music.hpp b/include/Music.hpp
@@ -223,7 +223,7 @@ class Music : public ::Music {
         return ::IsMusicReady(*this);
     }
 
- private:
+ protected:
     void set(const ::Music& music) {
         stream = music.stream;
         frameCount = music.frameCount;
diff --git a/include/Ray.hpp b/include/Ray.hpp
@@ -88,7 +88,7 @@ class Ray : public ::Ray {
         return ::GetMouseRay(::GetMousePosition(), camera);
     }
 
- private:
+ protected:
     inline void set(const ::Ray& ray) {
         position = ray.position;
         direction = ray.direction;
diff --git a/include/RayCollision.hpp b/include/RayCollision.hpp
@@ -64,7 +64,7 @@ class RayCollision : public ::RayCollision {
     GETTERSETTER(::Vector3, Position, point)
     GETTERSETTER(::Vector3, Normal, normal)
 
- private:
+ protected:
     void set(const ::RayCollision& ray) {
         hit = ray.hit;
         distance = ray.distance;
diff --git a/include/Rectangle.hpp b/include/Rectangle.hpp
@@ -109,11 +109,11 @@ class Rectangle : public ::Rectangle {
     /**
      * Check collision between circle and rectangle
      */
-    inline bool CheckCollision(::Vector2 center, float radius) {
+    inline bool CheckCollision(::Vector2 center, float radius) const {
         return ::CheckCollisionCircleRec(center, radius, *this);
     }
 
-    inline Vector2 GetSize() {
+    inline Vector2 GetSize() const {
         return {width, height};
     }
 
@@ -132,7 +132,7 @@ class Rectangle : public ::Rectangle {
         return *this;
     }
 
-    inline Vector2 GetPosition() {
+    inline Vector2 GetPosition() const {
         return {x, y};
     }
 
@@ -146,7 +146,7 @@ class Rectangle : public ::Rectangle {
         return SetPosition(position.x, position.y);
     }
 
- private:
+ protected:
     void set(const ::Rectangle& rect) {
         x = rect.x;
         y = rect.y;
diff --git a/include/RenderTexture.hpp b/include/RenderTexture.hpp
@@ -127,7 +127,7 @@ class RenderTexture : public ::RenderTexture {
         return ::IsRenderTextureReady(*this);
     }
 
- private:
+ protected:
     void set(const ::RenderTexture& renderTexture) {
         id = renderTexture.id;
         texture = renderTexture.texture;
diff --git a/include/Shader.hpp b/include/Shader.hpp
@@ -45,6 +45,10 @@ class Shader : public ::Shader {
         return ::LoadShader(vsFileName.c_str(), fsFileName.c_str());
     }
 
+    static ::Shader Load(const char* vsFileName, const char* fsFileName) {
+        return ::LoadShader(vsFileName, fsFileName);
+    }
+
     /**
      * Load a shader from memory.
      *
@@ -54,6 +58,10 @@ class Shader : public ::Shader {
         return ::LoadShaderFromMemory(vsCode.c_str(), fsCode.c_str());
     }
 
+    static ::Shader LoadFromMemory(const char* vsCode, const char* fsCode) {
+        return ::LoadShaderFromMemory(vsCode, fsCode);
+    }
+
     GETTERSETTER(unsigned int, Id, id)
     GETTERSETTER(int*, Locs, locs)
 
@@ -175,7 +183,7 @@ class Shader : public ::Shader {
         return id != 0 && locs != nullptr;
     }
 
- private:
+ protected:
     void set(const ::Shader& shader) {
         id = shader.id;
         locs = shader.locs;
diff --git a/include/Sound.hpp b/include/Sound.hpp
@@ -198,7 +198,7 @@ class Sound : public ::Sound {
         return ::IsSoundReady(*this);
     }
 
- private:
+ protected:
     void set(const ::Sound& sound) {
         frameCount = sound.frameCount;
         stream = sound.stream;
diff --git a/include/Text.hpp b/include/Text.hpp
@@ -121,14 +121,14 @@ class Text {
     /**
      * Measure string width for default font
      */
-    inline int Measure() {
+    inline int Measure() const {
         return ::MeasureText(text.c_str(), static_cast<int>(fontSize));
     }
 
     /**
      * Measure string size for Font
      */
-    inline Vector2 MeasureEx() {
+    inline Vector2 MeasureEx() const {
         return ::MeasureTextEx(font, text.c_str(), fontSize, spacing);
     }
 
diff --git a/include/Vector2.hpp b/include/Vector2.hpp
diff --git a/include/Vector3.hpp b/include/Vector3.hpp
diff --git a/include/Vector4.hpp b/include/Vector4.hpp
diff --git a/include/VrStereoConfig.hpp b/include/VrStereoConfig.hpp
diff --git a/include/Wave.hpp b/include/Wave.hpp
diff --git a/include/Window.hpp b/include/Window.hpp
diff --git a/include/raylib.hpp b/include/raylib.hpp
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "raylib-cpp",`
`3`		`- "version": "4.6.0-alpha1",`
	`3`	`+ "version": "5.0.0-alpha1",`
`4`	`4`	`"repo": "RobLoach/raylib-cpp",`
`5`	`5`	`"description": "raylib-cpp: C++ Object-Oriented Wrapper for raylib",`
`6`	`6`	`"homepage": "https://github.com/robloach/raylib-cpp",`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ if (NOT raylib_FOUND)`
`15`	`15`	`FetchContent_Declare(`
`16`	`16`	`raylib`
`17`	`17`	`GIT_REPOSITORY https://github.com/raysan5/raylib.git`
`18`		`- GIT_TAG 334e96d470c5cb09d154e1c849d04adb721a7a8c`
	`18`	`+ GIT_TAG ae50bfa2cc569c0f8d5bc4315d39db64005b1b08`
`19`	`19`	`)`
`20`	`20`	`FetchContent_GetProperties(raylib)`
`21`	`21`	`if (NOT raylib_POPULATED) # Have we downloaded raylib yet?`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ class AudioStream : public ::AudioStream {`
`194`	`194`	`/**`
`195`	`195`	`* Retrieve whether or not the audio stream is ready.`
`196`	`196`	`*/`
`197`		`- bool IsReady() {`
	`197`	`+ bool IsReady() const {`
`198`	`198`	`return ::IsAudioStreamReady(*this);`
`199`	`199`	`}`
`200`	`200`
`@@ -211,7 +211,7 @@ class AudioStream : public ::AudioStream {`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`
`214`		`- private:`
	`214`	`+ protected:`
`215`	`215`	`void set(const ::AudioStream& stream) {`
`216`	`216`	`buffer = stream.buffer;`
`217`	`217`	`processor = stream.processor;`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class BoundingBox : public ::BoundingBox {`
`70`	`70`	`return GetRayCollisionBox(ray, *this);`
`71`	`71`	`}`
`72`	`72`
`73`		`- private:`
	`73`	`+ protected:`
`74`	`74`	`void set(const ::BoundingBox& box) {`
`75`	`75`	`min = box.min;`
`76`	`76`	`max = box.max;`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class Camera2D : public ::Camera2D {`
`60`	`60`	`return ::GetWorldToScreen2D(position, *this);`
`61`	`61`	`}`
`62`	`62`
`63`		`- private:`
	`63`	`+ protected:`
`64`	`64`	`void set(const ::Camera2D& camera) {`
`65`	`65`	`offset = camera.offset;`
`66`	`66`	`target = camera.target;`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class Camera3D : public ::Camera3D {`
`119`	`119`	`::DrawBillboardRec(*this, texture, sourceRec, center, size, tint);`
`120`	`120`	`}`
`121`	`121`
`122`		`- private:`
	`122`	`+ protected:`
`123`	`123`	`void set(const ::Camera3D& camera) {`
`124`	`124`	`position = camera.position;`
`125`	`125`	`target = camera.target;`