Remove duplicate operator statements (#338)

RobLoach · web-flow · commit 3a6e7bbdd373 · 2024-11-14T13:33:56.000-05:00
* Remove duplicate operator statements

* Make raylib not introduce the operators
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 9b3d019
+        GIT_TAG 5e6cdf3
         GIT_SHALLOW 1
     )
     FetchContent_GetProperties(raylib)
diff --git a/include/AudioStream.hpp b/include/AudioStream.hpp
@@ -88,7 +88,7 @@ class AudioStream : public ::AudioStream {
      * Unload audio stream and free memory
      */
     void Unload() {
-        if (IsReady()) {
+        if (IsValid()) {
             ::UnloadAudioStream(*this);
         }
     }
@@ -182,7 +182,7 @@ class AudioStream : public ::AudioStream {
     /**
      * Retrieve whether or not the audio stream is ready.
      */
-    bool IsReady() const { return ::IsAudioStreamReady(*this); }
+    bool IsValid() const { return ::IsAudioStreamValid(*this); }
 
     /**
      * Load audio stream (to stream raw audio pcm data)
@@ -192,7 +192,7 @@ class AudioStream : public ::AudioStream {
     void Load(unsigned int SampleRate, unsigned int SampleSize, unsigned int Channels = 2) {
         Unload();
         set(::LoadAudioStream(SampleRate, SampleSize, Channels));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load audio stream");
         }
     }
diff --git a/include/AutomationEventList.hpp b/include/AutomationEventList.hpp
@@ -71,7 +71,7 @@ class AutomationEventList : public ::AutomationEventList {
     void Load(const char* fileName) {
         Unload();
         set(::LoadAutomationEventList(fileName));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load automation event list");
         }
     }
@@ -80,7 +80,7 @@ class AutomationEventList : public ::AutomationEventList {
      * Update audio stream buffers with data
      */
     void Unload() {
-        if (!IsReady()) {
+        if (!IsValid()) {
             return;
         }
 
@@ -96,7 +96,7 @@ class AutomationEventList : public ::AutomationEventList {
 #endif
     }
 
-    bool IsReady() { return events != nullptr; }
+    bool IsValid() { return events != nullptr; }
 
     bool Export(const char* fileName) { return ::ExportAutomationEventList(*this, fileName); }
 
diff --git a/include/Font.hpp b/include/Font.hpp
@@ -158,7 +158,7 @@ class Font : public ::Font {
      */
     void Load(const std::string& fileName) {
         set(::LoadFont(fileName.c_str()));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Font with from file: " + fileName);
         }
     }
@@ -175,14 +175,14 @@ class Font : public ::Font {
      */
     void Load(const std::string& fileName, int fontSize, int* fontChars, int charCount) {
         set(::LoadFontEx(fileName.c_str(), fontSize, fontChars, charCount));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Font with from file with font size: " + fileName);
         }
     }
 
     void Load(const ::Image& image, ::Color key, int firstChar) {
         set(::LoadFontFromImage(image, key, firstChar));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Font with from image");
         }
     }
@@ -195,15 +195,15 @@ class Font : public ::Font {
         int* fontChars,
         int charsCount) {
         set(::LoadFontFromMemory(fileType.c_str(), fileData, dataSize, fontSize, fontChars, charsCount));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Font " + fileType + " with from file data");
         }
     }
 
     /**
      * Returns if the font is ready to be used.
      */
-    bool IsReady() const { return ::IsFontReady(*this); }
+    bool IsValid() const { return ::IsFontValid(*this); }
 
     /**
      * Draw text using font and additional parameters.
diff --git a/include/Image.hpp b/include/Image.hpp
@@ -208,7 +208,7 @@ class Image : public ::Image {
      */
     void Load(const std::string& fileName) {
         set(::LoadImage(fileName.c_str()));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Image from file: " + fileName);
         }
     }
@@ -222,7 +222,7 @@ class Image : public ::Image {
      */
     void Load(const std::string& fileName, int width, int height, int format, int headerSize) {
         set(::LoadImageRaw(fileName.c_str(), width, height, format, headerSize));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Image from file: " + fileName);
         }
     }
@@ -236,7 +236,7 @@ class Image : public ::Image {
      */
     void Load(const std::string& fileName, int* frames) {
         set(::LoadImageAnim(fileName.c_str(), frames));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Image from file: " + fileName);
         }
     }
@@ -250,7 +250,7 @@ class Image : public ::Image {
      */
     void Load(const std::string& fileType, const unsigned char* fileData, int dataSize) {
         set(::LoadImageFromMemory(fileType.c_str(), fileData, dataSize));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Image data with file type: " + fileType);
         }
     }
@@ -264,7 +264,7 @@ class Image : public ::Image {
      */
     void Load(const ::Texture2D& texture) {
         set(::LoadImageFromTexture(texture));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Image from texture.");
         }
     }
@@ -728,7 +728,7 @@ class Image : public ::Image {
      *
      * @return True or false depending on whether the Image has been loaded.
      */
-    bool IsReady() const { return ::IsImageReady(*this); }
+    bool IsValid() const { return ::IsImageValid(*this); }
 protected:
     void set(const ::Image& image) {
         data = image.data;
diff --git a/include/Material.hpp b/include/Material.hpp
@@ -104,7 +104,7 @@ class Material : public ::Material {
     /**
      * Check if material is ready
      */
-    bool IsReady() const { return ::IsMaterialReady(*this); }
+    bool IsValid() const { return ::IsMaterialValid(*this); }
 protected:
     void set(const ::Material& material) {
         shader = material.shader;
diff --git a/include/MeshUnmanaged.hpp b/include/MeshUnmanaged.hpp
@@ -210,6 +210,12 @@ class MeshUnmanaged : public ::Mesh {
      * Load model from generated mesh
      */
     operator raylib::Model() { return ::LoadModelFromMesh(*this); }
+
+    /**
+     * Returns whether or not the Mesh is valid.
+     */
+    bool IsValid() { return ::IsModelValid(*this); }
+
 protected:
     void set(const ::Mesh& mesh) {
         vertexCount = mesh.vertexCount;
diff --git a/include/Model.hpp b/include/Model.hpp
@@ -183,7 +183,7 @@ class Model : public ::Model {
     /**
      * Determines whether or not the Model has data in it.
      */
-    bool IsReady() const { return ::IsModelReady(*this); }
+    bool IsValid() const { return ::IsModelValid(*this); }
 
     /**
      * Loads a Model from the given file.
@@ -192,7 +192,7 @@ class Model : public ::Model {
      */
     void Load(const std::string& fileName) {
         set(::LoadModel(fileName.c_str()));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Model from " + fileName);
         }
     }
@@ -204,7 +204,7 @@ class Model : public ::Model {
      */
     void Load(const ::Mesh& mesh) {
         set(::LoadModelFromMesh(mesh));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Model from Mesh");
         }
     }
diff --git a/include/Music.hpp b/include/Music.hpp
@@ -183,7 +183,7 @@ class Music : public ::Music {
      */
     void Load(const std::string& fileName) {
         set(::LoadMusicStream(fileName.c_str()));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException(TextFormat("Failed to load Music from file: %s", fileName.c_str()));
         }
     }
@@ -195,7 +195,7 @@ class Music : public ::Music {
      */
     void Load(const std::string& fileType, unsigned char* data, int dataSize) {
         set(::LoadMusicStreamFromMemory(fileType.c_str(), data, dataSize));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException(TextFormat("Failed to load Music from %s file dat", fileType.c_str()));
         }
     }
@@ -205,7 +205,7 @@ class Music : public ::Music {
      *
      * @return True or false depending on whether the Music has been loaded.
      */
-    bool IsReady() const { return ::IsMusicReady(*this); }
+    bool IsValid() const { return ::IsMusicValid(*this); }
 protected:
     void set(const ::Music& music) {
         stream = music.stream;
diff --git a/include/RenderTexture.hpp b/include/RenderTexture.hpp
@@ -103,7 +103,7 @@ class RenderTexture : public ::RenderTexture {
     /**
      * Retrieves whether or not the render texture is ready.
      */
-    bool IsReady() const { return ::IsRenderTextureReady(*this); }
+    bool IsValid() const { return ::IsRenderTextureValid(*this); }
 protected:
     void set(const ::RenderTexture& renderTexture) {
         id = renderTexture.id;
diff --git a/include/ShaderUnmanaged.hpp b/include/ShaderUnmanaged.hpp
@@ -133,7 +133,7 @@ class ShaderUnmanaged : public ::Shader {
     /**
      * Retrieves whether or not the shader is ready.
      */
-    bool IsReady() const { return id != 0 && locs != nullptr; }
+    bool IsValid() const { return ::IsShaderValid(*this); }
 protected:
     void set(const ::Shader& shader) {
         id = shader.id;
diff --git a/include/Sound.hpp b/include/Sound.hpp
@@ -164,7 +164,7 @@ class Sound : public ::Sound {
      */
     void Load(const std::string& fileName) {
         set(::LoadSound(fileName.c_str()));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Sound from file");
         }
     }
@@ -176,7 +176,7 @@ class Sound : public ::Sound {
      */
     void Load(const ::Wave& wave) {
         set(::LoadSoundFromWave(wave));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Wave");
         }
     }
@@ -186,7 +186,7 @@ class Sound : public ::Sound {
      *
      * @return True or false depending on whether the Sound buffer is loaded.
      */
-    bool IsReady() const { return ::IsSoundReady(*this); }
+    bool IsValid() const { return ::IsSoundValid(*this); }
 protected:
     void set(const ::Sound& sound) {
         frameCount = sound.frameCount;
diff --git a/include/TextureUnmanaged.hpp b/include/TextureUnmanaged.hpp
@@ -96,7 +96,7 @@ class TextureUnmanaged : public ::Texture {
      */
     void Load(const ::Image& image) {
         set(::LoadTextureFromImage(image));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Texture from Image");
         }
     }
@@ -106,7 +106,7 @@ class TextureUnmanaged : public ::Texture {
      */
     void Load(const ::Image& image, int layoutType) {
         set(::LoadTextureCubemap(image, layoutType));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Texture from Cubemap");
         }
     }
@@ -116,7 +116,7 @@ class TextureUnmanaged : public ::Texture {
      */
     void Load(const std::string& fileName) {
         set(::LoadTexture(fileName.c_str()));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Texture from file: " + fileName);
         }
     }
@@ -319,7 +319,7 @@ class TextureUnmanaged : public ::Texture {
      *
      * @return True or false depending on whether the Texture has data.
      */
-    bool IsReady() const { return id != 0; }
+    bool IsValid() const { return IsTextureValid(*this); }
 protected:
     void set(const ::Texture& texture) {
         id = texture.id;
diff --git a/include/Vector2.hpp b/include/Vector2.hpp
@@ -140,6 +140,7 @@ class Vector2 : public ::Vector2 {
      */
     Vector2 Divide(const ::Vector2& vector2) const { return Vector2Divide(*this, vector2); }
 
+
     /**
      * Divide vector by vector
      */
diff --git a/include/Wave.hpp b/include/Wave.hpp
@@ -172,7 +172,7 @@ class Wave : public ::Wave {
      */
     void Load(const std::string& fileName) {
         set(::LoadWave(fileName.c_str()));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Wave from file: " + fileName);
         }
     }
@@ -184,7 +184,7 @@ class Wave : public ::Wave {
      */
     void Load(const std::string& fileType, const unsigned char* fileData, int dataSize) {
         set(::LoadWaveFromMemory(fileType.c_str(), fileData, dataSize));
-        if (!IsReady()) {
+        if (!IsValid()) {
             throw RaylibException("Failed to load Wave from file data of type: " + fileType);
         }
     }
@@ -194,7 +194,7 @@ class Wave : public ::Wave {
      *
      * @return True or false depending on whether the wave data has been loaded.
      */
-    bool IsReady() const { return ::IsWaveReady(*this); }
+    bool IsValid() const { return ::IsWaveValid(*this); }
 protected:
     void set(const ::Wave& wave) {
         frameCount = wave.frameCount;
diff --git a/include/raymath.hpp b/include/raymath.hpp
@@ -15,6 +15,7 @@ extern "C" {
 #pragma GCC diagnostic push // These throw a warnings on visual studio, need to check if __GNUC__ is defined to use it.
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
+#define RAYMATH_DISABLE_CPP_OPERATORS
 #include "raymath.h" // NOLINT
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "raylib-cpp",
-  "version": "5.0.2",
+  "version": "5.5.0",
   "description": "raylib-cpp: C++ Object-Oriented Wrapper for raylib",
   "main": "index.js",
   "private": true,
diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt
@@ -8,7 +8,7 @@ if (NOT raylib_FOUND)
     FetchContent_Declare(
         raylib
         GIT_REPOSITORY https://github.com/raysan5/raylib.git
-        GIT_TAG 9b3d019
+        GIT_TAG 5e6cdf3
         GIT_SHALLOW 1
     )
     FetchContent_MakeAvailable(raylib)
@@ -18,7 +18,7 @@ endif()
 find_package(raylib_cpp QUIET)
 if (NOT raylib_cpp_FOUND)
     if (NOT DEFINED RAYLIB_CPP_VERSION)
-        set(RAYLIB_CPP_VERSION v5.0.2)
+        set(RAYLIB_CPP_VERSION next)
     endif()
     include(FetchContent)
     FetchContent_Declare(
diff --git a/projects/Doxygen/doxygen-awesome-css b/projects/Doxygen/doxygen-awesome-css
@@ -1 +1 @@
-Subproject commit 40e9b25b6174dd3b472d8868f63323a870dfeeb8
+Subproject commit 568f56cde6ac78b6dfcc14acd380b2e745c301ea
diff --git a/tests/raylib_cpp_test.cpp b/tests/raylib_cpp_test.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 9b3d019`
	`18`	`+ GIT_TAG 5e6cdf3`
`19`	`19`	`GIT_SHALLOW 1`
`20`	`20`	`)`
`21`	`21`	`FetchContent_GetProperties(raylib)`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class AudioStream : public ::AudioStream {`
`88`	`88`	`* Unload audio stream and free memory`
`89`	`89`	`*/`
`90`	`90`	`void Unload() {`
`91`		`- if (IsReady()) {`
	`91`	`+ if (IsValid()) {`
`92`	`92`	`::UnloadAudioStream(*this);`
`93`	`93`	`}`
`94`	`94`	`}`
`@@ -182,7 +182,7 @@ class AudioStream : public ::AudioStream {`
`182`	`182`	`/**`
`183`	`183`	`* Retrieve whether or not the audio stream is ready.`
`184`	`184`	`*/`
`185`		`- bool IsReady() const { return ::IsAudioStreamReady(*this); }`
	`185`	`+ bool IsValid() const { return ::IsAudioStreamValid(*this); }`
`186`	`186`
`187`	`187`	`/**`
`188`	`188`	`* Load audio stream (to stream raw audio pcm data)`
`@@ -192,7 +192,7 @@ class AudioStream : public ::AudioStream {`
`192`	`192`	`void Load(unsigned int SampleRate, unsigned int SampleSize, unsigned int Channels = 2) {`
`193`	`193`	`Unload();`
`194`	`194`	`set(::LoadAudioStream(SampleRate, SampleSize, Channels));`
`195`		`- if (!IsReady()) {`
	`195`	`+ if (!IsValid()) {`
`196`	`196`	`throw RaylibException("Failed to load audio stream");`
`197`	`197`	`}`
`198`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class AutomationEventList : public ::AutomationEventList {`
`71`	`71`	`void Load(const char* fileName) {`
`72`	`72`	`Unload();`
`73`	`73`	`set(::LoadAutomationEventList(fileName));`
`74`		`- if (!IsReady()) {`
	`74`	`+ if (!IsValid()) {`
`75`	`75`	`throw RaylibException("Failed to load automation event list");`
`76`	`76`	`}`
`77`	`77`	`}`
`@@ -80,7 +80,7 @@ class AutomationEventList : public ::AutomationEventList {`
`80`	`80`	`* Update audio stream buffers with data`
`81`	`81`	`*/`
`82`	`82`	`void Unload() {`
`83`		`- if (!IsReady()) {`
	`83`	`+ if (!IsValid()) {`
`84`	`84`	`return;`
`85`	`85`	`}`
`86`	`86`
`@@ -96,7 +96,7 @@ class AutomationEventList : public ::AutomationEventList {`
`96`	`96`	`#endif`
`97`	`97`	`}`
`98`	`98`
`99`		`- bool IsReady() { return events != nullptr; }`
	`99`	`+ bool IsValid() { return events != nullptr; }`
`100`	`100`
`101`	`101`	`bool Export(const char* fileName) { return ::ExportAutomationEventList(*this, fileName); }`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ class Font : public ::Font {`
`158`	`158`	`*/`
`159`	`159`	`void Load(const std::string& fileName) {`
`160`	`160`	`set(::LoadFont(fileName.c_str()));`
`161`		`- if (!IsReady()) {`
	`161`	`+ if (!IsValid()) {`
`162`	`162`	`throw RaylibException("Failed to load Font with from file: " + fileName);`
`163`	`163`	`}`
`164`	`164`	`}`
`@@ -175,14 +175,14 @@ class Font : public ::Font {`
`175`	`175`	`*/`
`176`	`176`	`void Load(const std::string& fileName, int fontSize, int* fontChars, int charCount) {`
`177`	`177`	`set(::LoadFontEx(fileName.c_str(), fontSize, fontChars, charCount));`
`178`		`- if (!IsReady()) {`
	`178`	`+ if (!IsValid()) {`
`179`	`179`	`throw RaylibException("Failed to load Font with from file with font size: " + fileName);`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`void Load(const ::Image& image, ::Color key, int firstChar) {`
`184`	`184`	`set(::LoadFontFromImage(image, key, firstChar));`
`185`		`- if (!IsReady()) {`
	`185`	`+ if (!IsValid()) {`
`186`	`186`	`throw RaylibException("Failed to load Font with from image");`
`187`	`187`	`}`
`188`	`188`	`}`
`@@ -195,15 +195,15 @@ class Font : public ::Font {`
`195`	`195`	`int* fontChars,`
`196`	`196`	`int charsCount) {`
`197`	`197`	`set(::LoadFontFromMemory(fileType.c_str(), fileData, dataSize, fontSize, fontChars, charsCount));`
`198`		`- if (!IsReady()) {`
	`198`	`+ if (!IsValid()) {`
`199`	`199`	`throw RaylibException("Failed to load Font " + fileType + " with from file data");`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`/**`
`204`	`204`	`* Returns if the font is ready to be used.`
`205`	`205`	`*/`
`206`		`- bool IsReady() const { return ::IsFontReady(*this); }`
	`206`	`+ bool IsValid() const { return ::IsFontValid(*this); }`
`207`	`207`
`208`	`208`	`/**`
`209`	`209`	`* Draw text using font and additional parameters.`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ class Image : public ::Image {`
`208`	`208`	`*/`
`209`	`209`	`void Load(const std::string& fileName) {`
`210`	`210`	`set(::LoadImage(fileName.c_str()));`
`211`		`- if (!IsReady()) {`
	`211`	`+ if (!IsValid()) {`
`212`	`212`	`throw RaylibException("Failed to load Image from file: " + fileName);`
`213`	`213`	`}`
`214`	`214`	`}`
`@@ -222,7 +222,7 @@ class Image : public ::Image {`
`222`	`222`	`*/`
`223`	`223`	`void Load(const std::string& fileName, int width, int height, int format, int headerSize) {`
`224`	`224`	`set(::LoadImageRaw(fileName.c_str(), width, height, format, headerSize));`
`225`		`- if (!IsReady()) {`
	`225`	`+ if (!IsValid()) {`
`226`	`226`	`throw RaylibException("Failed to load Image from file: " + fileName);`
`227`	`227`	`}`
`228`	`228`	`}`
`@@ -236,7 +236,7 @@ class Image : public ::Image {`
`236`	`236`	`*/`
`237`	`237`	`void Load(const std::string& fileName, int* frames) {`
`238`	`238`	`set(::LoadImageAnim(fileName.c_str(), frames));`
`239`		`- if (!IsReady()) {`
	`239`	`+ if (!IsValid()) {`
`240`	`240`	`throw RaylibException("Failed to load Image from file: " + fileName);`
`241`	`241`	`}`
`242`	`242`	`}`
`@@ -250,7 +250,7 @@ class Image : public ::Image {`
`250`	`250`	`*/`
`251`	`251`	`void Load(const std::string& fileType, const unsigned char* fileData, int dataSize) {`
`252`	`252`	`set(::LoadImageFromMemory(fileType.c_str(), fileData, dataSize));`
`253`		`- if (!IsReady()) {`
	`253`	`+ if (!IsValid()) {`
`254`	`254`	`throw RaylibException("Failed to load Image data with file type: " + fileType);`
`255`	`255`	`}`
`256`	`256`	`}`
`@@ -264,7 +264,7 @@ class Image : public ::Image {`
`264`	`264`	`*/`
`265`	`265`	`void Load(const ::Texture2D& texture) {`
`266`	`266`	`set(::LoadImageFromTexture(texture));`
`267`		`- if (!IsReady()) {`
	`267`	`+ if (!IsValid()) {`
`268`	`268`	`throw RaylibException("Failed to load Image from texture.");`
`269`	`269`	`}`
`270`	`270`	`}`
`@@ -728,7 +728,7 @@ class Image : public ::Image {`
`728`	`728`	`*`
`729`	`729`	`* @return True or false depending on whether the Image has been loaded.`
`730`	`730`	`*/`
`731`		`- bool IsReady() const { return ::IsImageReady(*this); }`
	`731`	`+ bool IsValid() const { return ::IsImageValid(*this); }`
`732`	`732`	`protected:`
`733`	`733`	`void set(const ::Image& image) {`
`734`	`734`	`data = image.data;`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ class Model : public ::Model {`
`183`	`183`	`/**`
`184`	`184`	`* Determines whether or not the Model has data in it.`
`185`	`185`	`*/`
`186`		`- bool IsReady() const { return ::IsModelReady(*this); }`
	`186`	`+ bool IsValid() const { return ::IsModelValid(*this); }`
`187`	`187`
`188`	`188`	`/**`
`189`	`189`	`* Loads a Model from the given file.`
`@@ -192,7 +192,7 @@ class Model : public ::Model {`
`192`	`192`	`*/`
`193`	`193`	`void Load(const std::string& fileName) {`
`194`	`194`	`set(::LoadModel(fileName.c_str()));`
`195`		`- if (!IsReady()) {`
	`195`	`+ if (!IsValid()) {`
`196`	`196`	`throw RaylibException("Failed to load Model from " + fileName);`
`197`	`197`	`}`
`198`	`198`	`}`
`@@ -204,7 +204,7 @@ class Model : public ::Model {`
`204`	`204`	`*/`
`205`	`205`	`void Load(const ::Mesh& mesh) {`
`206`	`206`	`set(::LoadModelFromMesh(mesh));`
`207`		`- if (!IsReady()) {`
	`207`	`+ if (!IsValid()) {`
`208`	`208`	`throw RaylibException("Failed to load Model from Mesh");`
`209`	`209`	`}`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ class Music : public ::Music {`
`183`	`183`	`*/`
`184`	`184`	`void Load(const std::string& fileName) {`
`185`	`185`	`set(::LoadMusicStream(fileName.c_str()));`
`186`		`- if (!IsReady()) {`
	`186`	`+ if (!IsValid()) {`
`187`	`187`	`throw RaylibException(TextFormat("Failed to load Music from file: %s", fileName.c_str()));`
`188`	`188`	`}`
`189`	`189`	`}`
`@@ -195,7 +195,7 @@ class Music : public ::Music {`
`195`	`195`	`*/`
`196`	`196`	`void Load(const std::string& fileType, unsigned char* data, int dataSize) {`
`197`	`197`	`set(::LoadMusicStreamFromMemory(fileType.c_str(), data, dataSize));`
`198`		`- if (!IsReady()) {`
	`198`	`+ if (!IsValid()) {`
`199`	`199`	`throw RaylibException(TextFormat("Failed to load Music from %s file dat", fileType.c_str()));`
`200`	`200`	`}`
`201`	`201`	`}`
`@@ -205,7 +205,7 @@ class Music : public ::Music {`
`205`	`205`	`*`
`206`	`206`	`* @return True or false depending on whether the Music has been loaded.`
`207`	`207`	`*/`
`208`		`- bool IsReady() const { return ::IsMusicReady(*this); }`
	`208`	`+ bool IsValid() const { return ::IsMusicValid(*this); }`
`209`	`209`	`protected:`
`210`	`210`	`void set(const ::Music& music) {`
`211`	`211`	`stream = music.stream;`