diff --git a/.gitignore b/.gitignore index dfcbe19a..c8e7988f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ node_modules cmake-build-debug .idea docs +/.vs diff --git a/CMakeLists.txt b/CMakeLists.txt index d1dcf0a6..bc49c3a8 100644 --- 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 5.5.1 + VERSION 6.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/README.md b/README.md index dd5b59f3..991a89fe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![raylib-cpp Logo](projects/Doxygen/raylib-cpp_256x256.png) -# raylib-cpp ![Targeting raylib 5.0](https://img.shields.io/badge/for_raylib-5.0-blue) [![Tests](https://github.com/RobLoach/raylib-cpp/workflows/Tests/badge.svg)](https://github.com/RobLoach/raylib-cpp/actions?query=workflow%3ATests+branch%3Amaster) [![License](https://img.shields.io/badge/license-zlib%2Flibpng-blue.svg)](LICENSE) +# raylib-cpp ![Targeting raylib 6](https://img.shields.io/badge/for_raylib-6-blue) [![Tests](https://github.com/RobLoach/raylib-cpp/workflows/Tests/badge.svg)](https://github.com/RobLoach/raylib-cpp/actions?query=workflow%3ATests+branch%3Amaster) [![License](https://img.shields.io/badge/license-zlib%2Flibpng-blue.svg)](LICENSE) [raylib-cpp](https://github.com/robloach/raylib-cpp) is a C++ wrapper library for [raylib](https://www.raylib.com), a simple and easy-to-use library to enjoy videogames programming. This C++ header provides object-oriented wrappers around *raylib*'s struct interfaces. *raylib-cpp* is not required to use *raylib* in C++, but the classes do bring using the raylib API more inline with C++'s language paradigm. @@ -198,7 +198,7 @@ for (int i = 0; i < files.count; i++) { UnloadDirectoryFiles(files); // raylib-cpp -std::vector files = raylib::GetDirectoryFiles("."); +std::vector files = raylib::LoadDirectoryFiles("."); TraceLog(LOG_INFO, "Count: %i", files.size()); for (auto& file : files) { TraceLog(LOG_INFO, "File: %s", file.c_str()); diff --git a/clib.json b/clib.json index 6b098e77..800d7059 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "raylib-cpp", - "version": "5.5.1", + "version": "6.0.0", "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 index 6f4c3681..3c2ab124 100644 --- 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 5.5 + GIT_TAG 6.0 GIT_SHALLOW 1 ) FetchContent_GetProperties(raylib) diff --git a/include/Font.hpp b/include/Font.hpp index 748ef69d..f70ebbff 100644 --- a/include/Font.hpp +++ b/include/Font.hpp @@ -50,8 +50,8 @@ class Font : public ::Font { * * @see ::LoadFontEx */ - Font(const std::string& fileName, int fontSize, int* fontChars = 0, int charCount = 0) { - Load(fileName, fontSize, fontChars, charCount); + Font(const std::string& fileName, int fontSize, const int* codepoints = nullptr, int codepointCount = 0) { + Load(fileName, fontSize, codepoints, codepointCount); } /** @@ -77,9 +77,9 @@ class Font : public ::Font { const unsigned char* fileData, int dataSize, int fontSize, - int* fontChars, - int charsCount) { - Load(fileType, fileData, dataSize, fontSize, fontChars, charsCount); + const int* codepoints, + int codepointCount) { + Load(fileType, fileData, dataSize, fontSize, codepoints, codepointCount); } Font(const Font&) = delete; @@ -173,8 +173,8 @@ class Font : public ::Font { * * @see ::LoadFontEx() */ - void Load(const std::string& fileName, int fontSize, int* fontChars, int charCount) { - set(::LoadFontEx(fileName.c_str(), fontSize, fontChars, charCount)); + void Load(const std::string& fileName, int fontSize, const int* codepoints = nullptr, int codepointCount = 0) { + set(::LoadFontEx(fileName.c_str(), fontSize, codepoints, codepointCount)); if (!IsValid()) { throw RaylibException("Failed to load Font with from file with font size: " + fileName); } @@ -192,9 +192,9 @@ class Font : public ::Font { const unsigned char* fileData, int dataSize, int fontSize, - int* fontChars, - int charsCount) { - set(::LoadFontFromMemory(fileType.c_str(), fileData, dataSize, fontSize, fontChars, charsCount)); + const int* codepoints, + int codepointCount) { + set(::LoadFontFromMemory(fileType.c_str(), fileData, dataSize, fontSize, codepoints, codepointCount)); if (!IsValid()) { throw RaylibException("Failed to load Font " + fileType + " with from file data"); } diff --git a/include/Functions.hpp b/include/Functions.hpp index 27b083ca..07e822ec 100644 --- a/include/Functions.hpp +++ b/include/Functions.hpp @@ -81,7 +81,7 @@ namespace raylib { * Save text data to file (write) */ [[maybe_unused]] RLCPPAPI inline bool SaveFileText(const std::string& fileName, const std::string& text) { - return ::SaveFileText(fileName.c_str(), const_cast(text.c_str())); + return ::SaveFileText(fileName.c_str(), text.c_str()); } /** @@ -157,6 +157,17 @@ namespace raylib { return output; } +/** + * Load directory filepaths with extension filtering and optional subdirectory scanning + */ +[[maybe_unused]] RLCPPAPI std::vector +LoadDirectoryFilesEx(const std::string& basePath, const std::string& filter, bool scanSubdirs = false) { + FilePathList files = ::LoadDirectoryFilesEx(basePath.c_str(), filter.c_str(), scanSubdirs); + std::vector output(files.paths, files.paths + files.count); + ::UnloadDirectoryFiles(files); + return output; +} + /** * Change working directory, return true on success */ @@ -254,7 +265,7 @@ DrawText(const std::string& text, int posX, int posY, int fontSize, ::Color colo * Draw text using font and additional parameters */ [[maybe_unused]] RLCPPAPI inline void -DrawTextEx(const Font& font, char* text, Vector2 position, float fontSize, float spacing, ::Color tint) { +DrawTextEx(const Font& font, const char* text, Vector2 position, float fontSize, float spacing, ::Color tint) { ::DrawTextEx(font, text, position, fontSize, spacing, tint); } @@ -307,8 +318,8 @@ DrawTextEx(const Font& font, const std::string& text, Vector2 position, float fo * Load font from file (filename must include file extension) */ [[maybe_unused]] RLCPPAPI inline ::Font -LoadFontEx(const std::string& fileName, int fontSize, int* fontChars, int charsCount) { - return ::LoadFontEx(fileName.c_str(), fontSize, fontChars, charsCount); +LoadFontEx(const std::string& fileName, int fontSize, const int* codepoints = nullptr, int codepointCount = 0) { + return ::LoadFontEx(fileName.c_str(), fontSize, codepoints, codepointCount); } /** @@ -340,21 +351,21 @@ LoadFontEx(const std::string& fileName, int fontSize, int* fontChars, int charsC } /** - * Check if two text string are equal + * Get text length, checks for '\0' ending */ [[maybe_unused]] RLCPPAPI inline unsigned int TextLength(const char* text) { return ::TextLength(text); } /** - * Check if two text string are equal + * Get text length, checks for '\0' ending */ [[maybe_unused]] RLCPPAPI inline unsigned int TextLength(const std::string& text) { return ::TextLength(text.c_str()); } /** - * Get text length, checks for '\0' ending + * Get a piece of a text string */ [[maybe_unused]] RLCPPAPI inline std::string TextSubtext(const std::string& text, int position, int length) { return ::TextSubtext(text.c_str(), position, length); @@ -365,12 +376,9 @@ LoadFontEx(const std::string& fileName, int fontSize, int* fontChars, int charsC */ [[maybe_unused]] RLCPPAPI std::string TextReplace(const std::string& text, const std::string& replace, const std::string& by) { - const char* input = text.c_str(); - char* output = ::TextReplace(const_cast(input), replace.c_str(), by.c_str()); + const char* output = ::TextReplace(text.c_str(), replace.c_str(), by.c_str()); if (output != NULL) { - std::string stringOutput(output); - free(output); - return stringOutput; + return std::string(output); } return ""; } @@ -379,11 +387,9 @@ TextReplace(const std::string& text, const std::string& replace, const std::stri * Insert text in a position */ [[maybe_unused]] RLCPPAPI std::string TextInsert(const std::string& text, const std::string& insert, int position) { - char* output = ::TextInsert(text.c_str(), insert.c_str(), position); + const char* output = ::TextInsert(text.c_str(), insert.c_str(), position); if (output != NULL) { - std::string stringOutput(output); - free(output); - return stringOutput; + return std::string(output); } return ""; } @@ -425,6 +431,20 @@ TextReplace(const std::string& text, const std::string& replace, const std::stri return ::TextToPascal(text.c_str()); } +/** + * Get Snake case notation version of provided string + */ +[[maybe_unused]] RLCPPAPI inline std::string TextToSnake(const std::string& text) { + return ::TextToSnake(text.c_str()); +} + +/** + * Get Camel case notation version of provided string + */ +[[maybe_unused]] RLCPPAPI inline std::string TextToCamel(const std::string& text) { + return ::TextToCamel(text.c_str()); +} + /** * Get integer value from text (negative values not supported) */ @@ -432,6 +452,13 @@ TextReplace(const std::string& text, const std::string& replace, const std::stri return ::TextToInteger(text.c_str()); } +/** + * Get float value from text + */ +[[maybe_unused]] RLCPPAPI inline float TextToFloat(const std::string& text) { + return ::TextToFloat(text.c_str()); +} + } // namespace raylib #endif // RAYLIB_CPP_INCLUDE_FUNCTIONS_HPP_ diff --git a/include/Matrix.hpp b/include/Matrix.hpp index cbcb200c..b6871e87 100644 --- a/include/Matrix.hpp +++ b/include/Matrix.hpp @@ -120,8 +120,12 @@ class Matrix : public ::Matrix { [[nodiscard]] Matrix Multiply(const ::Matrix& right) const { return ::MatrixMultiply(*this, right); } + [[nodiscard]] Matrix Multiply(float value) const { return ::MatrixMultiplyValue(*this, value); } + Matrix operator*(const ::Matrix& matrix) { return ::MatrixMultiply(*this, matrix); } + Matrix operator*(float value) { return ::MatrixMultiplyValue(*this, value); } + static Matrix Frustum(double left, double right, double bottom, double top, double near, double far) { return ::MatrixFrustum(left, right, bottom, top, near, far); } diff --git a/include/Mesh.hpp b/include/Mesh.hpp index ff960406..29182350 100644 --- a/include/Mesh.hpp +++ b/include/Mesh.hpp @@ -48,7 +48,7 @@ class Mesh : public MeshUnmanaged { other.indices = nullptr; other.animVertices = nullptr; other.animNormals = nullptr; - other.boneIds = nullptr; + other.boneIndices = nullptr; other.boneWeights = nullptr; other.vaoId = 0; other.vboId = nullptr; @@ -73,7 +73,7 @@ class Mesh : public MeshUnmanaged { other.indices = nullptr; other.animVertices = nullptr; other.animNormals = nullptr; - other.boneIds = nullptr; + other.boneIndices = nullptr; other.boneWeights = nullptr; other.vaoId = 0; other.vboId = nullptr; diff --git a/include/MeshUnmanaged.hpp b/include/MeshUnmanaged.hpp index 386ae2a4..09030e78 100644 --- a/include/MeshUnmanaged.hpp +++ b/include/MeshUnmanaged.hpp @@ -35,9 +35,8 @@ class MeshUnmanaged : public ::Mesh { indices = nullptr; animVertices = nullptr; animNormals = nullptr; - boneIds = nullptr; + boneIndices = nullptr; boneWeights = nullptr; - boneMatrices = nullptr; boneCount = 0; vaoId = 0; vboId = nullptr; @@ -130,7 +129,7 @@ class MeshUnmanaged : public ::Mesh { GETTERSETTER(unsigned short*, Indices, indices) // NOLINT GETTERSETTER(float*, AnimVertices, animVertices) GETTERSETTER(float*, AnimNormals, animNormals) - GETTERSETTER(unsigned char*, BoneIds, boneIds) + GETTERSETTER(unsigned char*, BoneIndices, boneIndices) GETTERSETTER(float*, BoneWeights, boneWeights) GETTERSETTER(unsigned int, VaoId, vaoId) GETTERSETTER(unsigned int*, VboId, vboId) @@ -170,7 +169,7 @@ class MeshUnmanaged : public ::Mesh { /** * Draw multiple mesh instances with material and different transforms */ - void Draw(const ::Material& material, ::Matrix* transforms, int instances) const { + void Draw(const ::Material& material, const ::Matrix* transforms, int instances) const { ::DrawMeshInstanced(*this, material, transforms, instances); } @@ -227,7 +226,7 @@ class MeshUnmanaged : public ::Mesh { /** * Returns whether or not the Mesh is valid. */ - bool IsValid() { return ::IsModelValid(*this); } + [[nodiscard]] bool IsValid() const { return vaoId != 0 && vertexCount > 0; } protected: void set(const ::Mesh& mesh) { @@ -242,9 +241,8 @@ class MeshUnmanaged : public ::Mesh { indices = mesh.indices; animVertices = mesh.animVertices; animNormals = mesh.animNormals; - boneIds = mesh.boneIds; + boneIndices = mesh.boneIndices; boneWeights = mesh.boneWeights; - boneMatrices = mesh.boneMatrices; vaoId = mesh.vaoId; vboId = mesh.vboId; } diff --git a/include/Model.hpp b/include/Model.hpp index c8c65af5..15284668 100644 --- a/include/Model.hpp +++ b/include/Model.hpp @@ -58,9 +58,12 @@ class Model : public ::Model { other.meshes = nullptr; other.materials = nullptr; other.meshMaterial = nullptr; - other.boneCount = 0; - other.bones = nullptr; - other.bindPose = nullptr; + + other.skeleton.boneCount = 0; + other.skeleton.bones = nullptr; + other.skeleton.bindPose = nullptr; + other.currentPose = nullptr; + other.boneMatrices = nullptr; } GETTERSETTER(::Matrix, Transform, transform) @@ -69,9 +72,11 @@ class Model : public ::Model { GETTERSETTER(::Mesh*, Meshes, meshes) GETTERSETTER(::Material*, Materials, materials) GETTERSETTER(int*, MeshMaterial, meshMaterial) - GETTERSETTER(int, BoneCount, boneCount) - GETTERSETTER(::BoneInfo*, Bones, bones) - GETTERSETTER(::Transform*, BindPose, bindPose) + GETTERSETTER(int, BoneCount, skeleton.boneCount) + GETTERSETTER(::BoneInfo*, Bones, skeleton.bones) + GETTERSETTER(::Transform*, BindPose, skeleton.bindPose) + GETTERSETTER(::ModelAnimPose, CurrentPose, currentPose) + GETTERSETTER(::Matrix*, BoneMatrices, boneMatrices) Model& operator=(const ::Model& model) { set(model); @@ -93,9 +98,11 @@ class Model : public ::Model { other.meshes = nullptr; other.materials = nullptr; other.meshMaterial = nullptr; - other.boneCount = 0; - other.bones = nullptr; - other.bindPose = nullptr; + other.skeleton.boneCount = 0; + other.skeleton.bones = nullptr; + other.skeleton.bindPose = nullptr; + other.currentPose = nullptr; + other.boneMatrices = nullptr; return *this; } @@ -122,16 +129,16 @@ class Model : public ::Model { /** * Update model animation pose */ - Model& UpdateAnimation(const ::ModelAnimation& anim, int frame) { + Model& UpdateAnimation(const ::ModelAnimation& anim, float frame) { ::UpdateModelAnimation(*this, anim, frame); return *this; } /** - * Update model animation pose + * Blend two model animation poses */ - Model& UpdateAnimationBones(const ::ModelAnimation& anim, int frame) { - ::UpdateModelAnimationBones(*this, anim, frame); + Model& BlendAnimation(const ::ModelAnimation& animA, float frameA, const ::ModelAnimation& animB, float frameB, float blend) { + ::UpdateModelAnimationEx(*this, animA, frameA, animB, frameB, blend); return *this; } @@ -178,20 +185,6 @@ class Model : public ::Model { ::DrawModelWiresEx(*this, position, rotationAxis, rotationAngle, scale, tint); } - /** - * Draw a model as points - */ - void DrawPoints(::Vector3 position, float scale = 1.0f, ::Color tint = {255, 255, 255, 255}) { - ::DrawModelPoints(*this, position, scale, tint); - } - - /** - * Draw a model as points - */ - void DrawPoints(::Vector3 position, ::Vector3 rotationAxis, float rotationAngle = 0.0f, ::Vector3 scale = {1.0f, 1.0f, 1.0f}, ::Color tint = {255, 255, 255, 255}) { - ::DrawModelPointsEx(*this, position, rotationAxis, rotationAngle, scale, tint); - } - /** * Compute model bounding box limits (considers all meshes) */ @@ -240,9 +233,11 @@ class Model : public ::Model { materials = model.materials; meshMaterial = model.meshMaterial; - boneCount = model.boneCount; - bones = model.bones; - bindPose = model.bindPose; + skeleton.boneCount = model.skeleton.boneCount; + skeleton.bones = model.skeleton.bones; + skeleton.bindPose = model.skeleton.bindPose; + currentPose = model.currentPose; + boneMatrices = model.boneMatrices; } }; diff --git a/include/ModelAnimation.hpp b/include/ModelAnimation.hpp index f747244e..6cbcd6a7 100644 --- a/include/ModelAnimation.hpp +++ b/include/ModelAnimation.hpp @@ -22,11 +22,11 @@ class ModelAnimation : public ::ModelAnimation { set(other); other.boneCount = 0; - other.frameCount = 0; - other.bones = nullptr; - other.framePoses = nullptr; + other.keyframeCount = 0; + other.keyframePoses = nullptr; } + // Unloads animation data using populated animCount field, which is set by Load() method. ~ModelAnimation() { Unload(); } /** @@ -35,6 +35,7 @@ class ModelAnimation : public ::ModelAnimation { static std::vector Load(const std::string& fileName) { int count = 0; ::ModelAnimation* modelAnimations = ::LoadModelAnimations(fileName.c_str(), &count); + std::vector mats(modelAnimations, modelAnimations + count); RL_FREE(modelAnimations); @@ -43,9 +44,8 @@ class ModelAnimation : public ::ModelAnimation { } GETTERSETTER(int, BoneCount, boneCount) - GETTERSETTER(::BoneInfo*, Bones, bones) - GETTERSETTER(int, FrameCount, frameCount) - GETTERSETTER(::Transform**, FramePoses, framePoses) + GETTERSETTER(int, KeyframeCount, keyframeCount) + GETTERSETTER(::Transform**, KeyframePoses, keyframePoses) ModelAnimation& operator=(const ::ModelAnimation& model) { set(model); @@ -63,9 +63,8 @@ class ModelAnimation : public ::ModelAnimation { set(other); other.boneCount = 0; - other.frameCount = 0; - other.bones = nullptr; - other.framePoses = nullptr; + other.keyframeCount = 0; + other.keyframePoses = nullptr; return *this; } @@ -73,24 +72,31 @@ class ModelAnimation : public ::ModelAnimation { /** * Unload animation data */ - void Unload() { ::UnloadModelAnimation(*this); } + void Unload() { + ::UnloadModelAnimations(this, 1); + } + + static void Unload(ModelAnimation *modelAnimation, int count) { + ::UnloadModelAnimations(modelAnimation, count); + } /** * Update model animation pose */ - ModelAnimation& Update(const ::Model& model, int frame) { + ModelAnimation& Update(const ::Model& model, float frame) { ::UpdateModelAnimation(model, *this, frame); return *this; } /** - * Update model animation mesh bone matrices (GPU skinning) + * Blend two animation poses */ - ModelAnimation& UpdateBones(const ::Model& model, int frame) { - ::UpdateModelAnimationBones(model, *this, frame); + ModelAnimation& Blend(const ::Model& model, float frameA, const ::ModelAnimation& animB, float frameB, float blend) { + ::UpdateModelAnimationEx(model, *this, frameA, animB, frameB, blend); return *this; } + /** * Check model animation skeleton match */ @@ -98,9 +104,8 @@ class ModelAnimation : public ::ModelAnimation { protected: void set(const ::ModelAnimation& model) { boneCount = model.boneCount; - frameCount = model.frameCount; - bones = model.bones; - framePoses = model.framePoses; + keyframeCount = model.keyframeCount; + keyframePoses = model.keyframePoses; // Duplicate the name. TextCopy() uses the null terminator, which we ignore here. for (int i = 0; i < 32; i++) { diff --git a/include/Rectangle.hpp b/include/Rectangle.hpp index e07a45c1..1766a039 100644 --- a/include/Rectangle.hpp +++ b/include/Rectangle.hpp @@ -40,6 +40,14 @@ class Rectangle : public ::Rectangle { /** * Draw a color-filled rectangle */ + static void Draw(int posX, int posY, int width, int height, ::Color color) { + ::DrawRectangle(posX, posY, width, height, color); + } + + static void Draw(::Vector2 position, ::Vector2 size, ::Color color) { + ::DrawRectangleV(position, size, color); + } + void Draw(::Color color) const { ::DrawRectangleRec(*this, color); } void Draw(::Vector2 origin, float rotation, ::Color color) const { @@ -66,8 +74,8 @@ class Rectangle : public ::Rectangle { color2); } - void DrawGradient(::Color topLeft, ::Color bottomLeft, ::Color topRight, ::Color bottomRight) const { - ::DrawRectangleGradientEx(*this, topLeft, bottomLeft, topRight, bottomRight); + void DrawGradient(::Color topLeft, ::Color bottomLeft, ::Color bottomRight, ::Color topRight) const { + ::DrawRectangleGradientEx(*this, topLeft, bottomLeft, bottomRight, topRight); } void DrawLines(::Color color) const { @@ -90,7 +98,7 @@ class Rectangle : public ::Rectangle { } void DrawRoundedLines(float roundness, int segments, float lineThick, ::Color color) const { - DrawRectangleRoundedLinesEx(*this, roundness, segments, lineThick, color); + ::DrawRectangleRoundedLinesEx(*this, roundness, segments, lineThick, color); } /** diff --git a/include/Wave.hpp b/include/Wave.hpp index dc446640..d012376c 100644 --- a/include/Wave.hpp +++ b/include/Wave.hpp @@ -81,7 +81,7 @@ class Wave : public ::Wave { } Wave& operator=(Wave&& other) noexcept { - if (this != &other) { + if (this == &other) { return *this; } diff --git a/include/raylib.hpp b/include/raylib.hpp index 7fb2da34..94a85719 100644 --- a/include/raylib.hpp +++ b/include/raylib.hpp @@ -18,16 +18,12 @@ extern "C" { #error "raylib-cpp requires raylib >= 5" #endif -#if RAYLIB_VERSION_MAJOR < 5 -#error "raylib-cpp requires raylib >= 5" -#endif - -#if RAYLIB_VERSION_MAJOR > 5 -#error "raylib-cpp requires raylib ~5.0. Use the `next` branch for the next version of raylib." +#if RAYLIB_VERSION_MAJOR < 6 +#error "raylib-cpp requires raylib >= 6" #endif -#if RAYLIB_VERSION_MINOR < 1 - #error "raylib-cpp targets raylib 5.1 or higher." +#if RAYLIB_VERSION_MAJOR > 6 +#error "raylib-cpp requires raylib ~6.0. Use the `next` branch for the next version of raylib." #endif #ifdef __cplusplus diff --git a/package.json b/package.json index 89ba1461..a434fe5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "raylib-cpp", - "version": "5.5.1", + "version": "6.0.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 index f9f10399..06c885d7 100644 --- 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 5e6cdf3 + GIT_TAG 6.0 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.5.1) + set(RAYLIB_CPP_VERSION v6.0.0) endif() include(FetchContent) FetchContent_Declare(