Update

Author: RobLoach

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 3.5.0
+    VERSION 3.6.0
     DESCRIPTION "raylib-cpp C++ Object Oriented Wrapper for raylib"
     HOMEPAGE_URL "https://github.com/robloach/raylib-cpp"
     LANGUAGES C CXX)

include/Image.hpp

@@ -97,7 +97,7 @@ class Image : public ::Image {
      * Generate image: checked
      */
     static ::Image Checked(int width, int height, int checksX, int checksY,
-            ::Color col1, ::Color col2) {
+            ::Color col1 = {255, 255, 255, 255}, ::Color col2 = {0, 0, 0, 255}) {
         return ::GenImageChecked(width, height, checksX, checksY, col1, col2);
     }
 

include/Material.hpp

@@ -65,6 +65,14 @@ class Material : public ::Material {
         return *this;
     }
 
+    /**
+     * Set texture for a material map type (MAP_DIFFUSE, MAP_SPECULAR...)
+     */
+    inline Material& SetModelMesh(int meshId, int materialId) {
+        ::SetModelMeshMaterial(this, meshId, materialId);
+        return *this;
+    }
+
  private:
     inline void set(const ::Material& material) {
         shader = material.shader;

include/Mesh.hpp

@@ -19,11 +19,15 @@ class Mesh : public ::Mesh {
         set(mesh);
     }
 
-    Mesh(int VertexCount = 0, int TriangleCount = 0) {
+    Mesh(int VertexCount, int TriangleCount) {
         vertexCount = VertexCount;
         triangleCount = TriangleCount;
     }
 
+    Mesh(int vertexCount) {
+        set(GenMeshDefault(vertexCount));
+    }
+
     /**
      * Load meshes from model file
      */
@@ -33,6 +37,13 @@ class Mesh : public ::Mesh {
     //    return std::vector<Mesh>(meshes, meshes + count);
     // }
 
+    /**
+     * Generate default mesh
+     */
+    static ::Mesh Default(int vertexCount) {
+        return ::GenMeshDefault(vertexCount);
+    }
+
     /**
      * Generate polygonal mesh
      */
@@ -135,6 +146,21 @@ class Mesh : public ::Mesh {
         ::UploadMesh(this, dynamic);
     }
 
+    /**
+     * Upload mesh vertex data to GPU (VRAM)
+     */
+    inline void UpdateBuffer(int index, void *data, int dataSize, int offset = 0) {
+        ::UpdateMeshBuffer(*this, index, data, dataSize, offsetof);
+    }
+
+    inline void Draw(const ::Material& material, const ::Matrix& transform) {
+        ::DrawMesh(*this, material, transform);
+    }
+
+    inline void DrawInstanced(const ::Material& material, ::Matrix* transforms, int instances) {
+        ::DrawMeshInstanced(*this, material, transforms, instances);
+    }
+
     /**
      * Export mesh data to file
      */

include/Model.hpp

@@ -81,7 +81,7 @@ class Model : public ::Model {
     /**
      * Update model animation pose
      */
-    inline Model& UpdateModelAnimation(const ::ModelAnimation& anim, int frame) {
+    inline Model& UpdateAnimation(const ::ModelAnimation& anim, int frame) {
         ::UpdateModelAnimation(*this, anim, frame);
         return *this;
     }

include/Music.hpp

@@ -23,6 +23,13 @@ class Music : public ::Music {
         set(::LoadMusicStream(fileName.c_str()));
     }
 
+    /**
+     * Load music stream from memory
+     */
+    Music(const std::string& fileType, unsigned char* data, int dataSize) {
+        set(::LoadMusicStreamFromMemory(fileType.c_str(), data, dataSize));
+    }
+
     /**
      * Unload music stream
      */

include/Shader.hpp

@@ -33,6 +33,10 @@ class Shader : public ::Shader {
         return ::LoadShader(vsFileName.c_str(), fsFileName.c_str());
     }
 
+    static ::Shader LoadFromMemory(const std::string& vsCode, const std::string& fsCode) {
+        return ::LoadShaderFromMemory(vsCode.c_str(), fsCode.c_str());
+    }
+
     GETTERSETTER(unsigned int, Id, id)
     GETTERSETTER(int*, Locs, locs)
 
@@ -46,7 +50,13 @@ class Shader : public ::Shader {
     }
 
     void Unload() {
-        ::UnloadShader(*this);
+        if (locs != NULL) {
+            ::UnloadShader(*this);
+        }
+    }
+
+    inline Shader& LoadFromMemory(const std::string& vsCode, const std::string& fsCode) {
+        set(::LoadShaderFromMemory(vsCode.c_str(), fsCode.c_str()));
     }
 
     /**

include/Texture.hpp

@@ -204,6 +204,11 @@ class Texture : public ::Texture {
         return *this;
     }
 
+    inline Texture& DrawPoly(Vector2 center, Vector2 *points, Vector2 *texcoords, int pointsCount, Color tint = {255, 255, 255, 255}) {
+        ::DrawTexturePoly(*this, center, points, texcoords, pointsCount, tint);
+        return *this;
+    }
+
     /**
      * Set texture for a material map type (MAP_DIFFUSE, MAP_SPECULAR...)
      */

projects/CMake/CMakeLists.txt

@@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.11) # FetchContent is available in 3.11+
 project(raylib-cpp-example)
 
 # raylib
-find_package(raylib 3.5.0 QUIET)
+find_package(raylib 3.7.0 QUIET)
 if (NOT raylib_FOUND)
     include(FetchContent)
         FetchContent_Declare(
         raylib
         GIT_REPOSITORY https://github.com/raysan5/raylib.git
-        GIT_TAG e25e380e80a117f2404d65b37700fb620dc1f990
+        GIT_TAG b6c8d343dca2ef19c23c50975328a028124cf3cb
     )
     FetchContent_GetProperties(raylib)
     if (NOT raylib_POPULATED) # Have we downloaded raylib yet?
@@ -22,13 +22,13 @@ if (NOT raylib_FOUND)
 endif()
 
 # raylib-cpp
-find_package(raylib-cpp 3.5.0 QUIET)
+find_package(raylib-cpp 3.6.0 QUIET)
 if (NOT raylib-cpp_FOUND)
     include(FetchContent)
         FetchContent_Declare(
         raylib-cpp
         GIT_REPOSITORY https://github.com/RobLoach/raylib-cpp.git
-        GIT_TAG 21d26ca66e3a8fc70a39ad13b40dcabbc1840a78
+        GIT_TAG 6b5db70b4f9b90c60a53dea13157a01e01092bd5
     )
     FetchContent_GetProperties(raylib-cpp)
     if (NOT raylib-cpp_POPULATED) # Have we downloaded raylib yet?

projects/CMake/main.cpp

@@ -10,12 +10,12 @@
 *   You can find all basic examples on C:\raylib\raylib\examples folder or
 *   raylib official webpage: www.raylib.com
 *
-*   Enjoy using raylib. :)
+*   Enjoy using raylib-cpp. :)
 *
 *   This example has been created using raylib 1.0 (www.raylib.com)
-*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*   raylib-cpp is licensed under an unmodified zlib/libpng license (View raylib-cpp.hpp for details)
 *
-*   Copyright (c) 2014 Ramon Santamaria (@raysan5)
+*   Copyright (c) 2021 Rob Loach (@RobLoach)
 *
 ********************************************************************************************/