Updated raylib-cpp header files

includes/raylib-cpp/Shader.hpp

@@ -3,73 +3,28 @@
 
 #include <string>
 
-#include "./raylib.hpp"
-#include "./raylib-cpp-utils.hpp"
+#include "ShaderUnmanaged.hpp"
 #include "Texture.hpp"
+#include "./raylib-cpp-utils.hpp"
+#include "./raylib.hpp"
 
 namespace raylib {
 /**
  * Shader type (generic)
  */
-class Shader : public ::Shader {
- public:
-    Shader(const ::Shader& shader) {
-        set(shader);
-    }
-
-    Shader(unsigned int id, int* locs = nullptr) : ::Shader{id, locs} {}
-
-    Shader(const std::string& vsFileName, const std::string& fsFileName) {
-        set(::LoadShader(vsFileName.c_str(), fsFileName.c_str()));
-    }
-
-    Shader(const char* vsFileName, const char* fsFileName) {
-        set(::LoadShader(vsFileName, fsFileName));
-    }
+class Shader : public ShaderUnmanaged {
+public:
+    using ShaderUnmanaged::ShaderUnmanaged;
 
     Shader(const Shader&) = delete;
 
-    Shader(Shader&& other) {
+    Shader(Shader&& other) noexcept {
         set(other);
 
         other.id = 0;
         other.locs = nullptr;
     }
 
-    /**
-     * Load shader from files and bind default locations.
-     *
-     * @see ::LoadShader
-     */
-    static ::Shader Load(const std::string& vsFileName, const std::string& fsFileName) {
-        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.
-     *
-     * @see ::LoadShaderFromMemory
-     */
-    static ::Shader LoadFromMemory(const std::string& vsCode, const std::string& fsCode) {
-        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)
-
-    Shader& operator=(const ::Shader& shader) {
-        set(shader);
-        return *this;
-    }
-
     Shader& operator=(const Shader&) = delete;
 
     Shader& operator=(Shader&& other) noexcept {
@@ -89,9 +44,7 @@ class Shader : public ::Shader {
     /**
      * Unload shader from GPU memory (VRAM)
      */
-    ~Shader() {
-        Unload();
-    }
+    ~Shader() { Unload(); }
 
     /**
      * Unload shader from GPU memory (VRAM)
@@ -101,96 +54,9 @@ class Shader : public ::Shader {
             ::UnloadShader(*this);
         }
     }
-
-    /**
-     * Begin custom shader drawing.
-     */
-    inline Shader& BeginMode() {
-        ::BeginShaderMode(*this);
-        return *this;
-    }
-
-    /**
-     * End custom shader drawing (use default shader).
-     */
-    inline Shader& EndMode() {
-        ::EndShaderMode();
-        return *this;
-    }
-
-    /**
-     * Get shader uniform location
-     *
-     * @see GetShaderLocation()
-     */
-    inline int GetLocation(const std::string& uniformName) const {
-        return ::GetShaderLocation(*this, uniformName.c_str());
-    }
-
-    /**
-     * Get shader attribute location
-     *
-     * @see GetShaderLocationAttrib()
-     */
-    inline int GetLocationAttrib(const std::string& attribName) const {
-        return ::GetShaderLocationAttrib(*this, attribName.c_str());
-    }
-
-    /**
-     * Set shader uniform value
-     *
-     * @see SetShaderValue()
-     */
-    inline Shader& SetValue(int uniformLoc, const void* value, int uniformType) {
-        ::SetShaderValue(*this, uniformLoc, value, uniformType);
-        return *this;
-    }
-
-    /**
-     * Set shader uniform value vector
-     *
-     * @see SetShaderValueV()
-     */
-    inline Shader& SetValue(int uniformLoc, const void* value, int uniformType, int count) {
-        ::SetShaderValueV(*this, uniformLoc, value, uniformType, count);
-        return *this;
-    }
-
-    /**
-     * Set shader uniform value (matrix 4x4)
-     *
-     * @see SetShaderValueMatrix()
-     */
-    inline Shader& SetValue(int uniformLoc, const ::Matrix& mat) {
-        ::SetShaderValueMatrix(*this, uniformLoc, mat);
-        return *this;
-    }
-
-    /**
-     * Set shader uniform value for texture
-     *
-     * @see SetShaderValueTexture()
-     */
-    inline Shader& SetValue(int uniformLoc, const ::Texture2D& texture) {
-        ::SetShaderValueTexture(*this, uniformLoc, texture);
-        return *this;
-    }
-
-    /**
-     * Retrieves whether or not the shader is ready.
-     */
-    bool IsReady() const {
-        return id != 0 && locs != nullptr;
-    }
-
- protected:
-    void set(const ::Shader& shader) {
-        id = shader.id;
-        locs = shader.locs;
-    }
 };
-}  // namespace raylib
+} // namespace raylib
 
 using RShader = raylib::Shader;
 
-#endif  // RAYLIB_CPP_INCLUDE_SHADER_HPP_
+#endif // RAYLIB_CPP_INCLUDE_SHADER_HPP_