Merge pull request #148 from RobLoach/update-2021-10-17

Update to raylib 4.0.0

Author: RobLoach

CHANGELOG.md

@@ -5,8 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [x.x.x] - xxxx-xx-xx
+## [4.0.0] - 2021-11-04
 ### Changes
+- Update to [raylib 4.0.0](https://github.com/raysan5/raylib/releases/tag/4.0.0)
 - For tests, replaced catch.hpp with `assert()` calls
 - Added assignment operators for objects ([#142](https://github.com/RobLoach/raylib-cpp/pull/142) by [@marciejewiczow](https://github.com/maciejewiczow))
 - Replaced `NULL` with `nullptr`

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

examples/core/core_random_values.cpp

@@ -47,7 +47,7 @@ int main() {
 
             DrawText("Every 2 seconds a new random value is generated:", 130, 100, 20, MAROON);
 
-            DrawText(FormatText("%i", randValue), 360, 180, 80, LIGHTGRAY);
+            DrawText(TextFormat("%i", randValue), 360, 180, 80, LIGHTGRAY);
         }
         EndDrawing();
         //----------------------------------------------------------------------------------

examples/models/models_first_person_maze.cpp

@@ -30,7 +30,7 @@ int main(void)
 
     // NOTE: By default each cube is mapped to one part of texture atlas
     raylib::Texture texture("resources/cubicmap_atlas.png");    // Load map texture
-    model.materials[0].maps[MAP_DIFFUSE].texture = texture;     // Set map diffuse texture
+    model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture;     // Set map diffuse texture
 
     // Get map image data to be used for collision detection
     Color *mapPixels = imMap.LoadColors();

examples/shapes/shapes_collision_area.cpp

@@ -89,7 +89,7 @@ int main(void)
                 DrawText("COLLISION!", GetScreenWidth()/2 - MeasureText("COLLISION!", 20)/2, screenUpperLimit/2 - 10, 20, BLACK);
 
                 // Draw collision area
-                DrawText(FormatText("Collision Area: %i", (int)boxCollision.width*(int)boxCollision.height), GetScreenWidth()/2 - 100, screenUpperLimit + 10, 20, BLACK);
+                DrawText(TextFormat("Collision Area: %i", (int)boxCollision.width*(int)boxCollision.height), GetScreenWidth()/2 - 100, screenUpperLimit + 10, 20, BLACK);
             }
 
             DrawFPS(10, 10);

examples/textures/textures_bunnymark.cpp

@@ -103,8 +103,8 @@ int main(void)
             }
 
             DrawRectangle(0, 0, screenWidth, 40, BLACK);
-            DrawText(FormatText("bunnies: %i", bunnies.size()), 120, 10, 20, GREEN);
-            DrawText(FormatText("batched draw calls: %i", 1 + bunnies.size()/MAX_BATCH_ELEMENTS), 320, 10, 20, MAROON);
+            DrawText(TextFormat("bunnies: %i", bunnies.size()), 120, 10, 20, GREEN);
+            DrawText(TextFormat("batched draw calls: %i", 1 + bunnies.size()/MAX_BATCH_ELEMENTS), 320, 10, 20, MAROON);
 
             DrawFPS(10, 10);
         }

include/AudioStream.hpp

@@ -18,7 +18,7 @@ class AudioStream : public ::AudioStream {
      * Init audio stream (to stream raw audio pcm data)
      */
     AudioStream(unsigned int SampleRate, unsigned int SampleSize, unsigned int Channels = 2) {
-        set(InitAudioStream(SampleRate, SampleSize, Channels));
+        set(LoadAudioStream(SampleRate, SampleSize, Channels));
     }
 
     AudioStream(const AudioStream&) = delete;
@@ -33,7 +33,7 @@ class AudioStream : public ::AudioStream {
     }
 
     ~AudioStream() {
-        Close();
+        Unload();
     }
 
     GETTERSETTER(rAudioBuffer *, Buffer, buffer)
@@ -53,7 +53,7 @@ class AudioStream : public ::AudioStream {
             return *this;
         }
 
-        Close();
+        Unload();
         set(other);
 
         other.buffer = nullptr;
@@ -73,10 +73,10 @@ class AudioStream : public ::AudioStream {
     }
 
     /**
-     * Close audio stream and free memory
+     * Unload audio stream and free memory
      */
-    inline void Close() {
-        ::CloseAudioStream(*this);
+    inline void Unload() {
+        ::UnloadAudioStream(*this);
     }
 
     /**

include/BoundingBox.hpp

@@ -18,7 +18,7 @@ class BoundingBox : public ::BoundingBox {
      * Compute mesh bounding box limits
      */
     BoundingBox(const ::Mesh& mesh) {
-        set(::MeshBoundingBox(mesh));
+        set(::GetMeshBoundingBox(mesh));
     }
 
     BoundingBox(::Vector3 minMax) : ::BoundingBox{minMax, minMax} {}
@@ -58,7 +58,14 @@ class BoundingBox : public ::BoundingBox {
      * Detect collision between ray and bounding box
      */
     inline bool CheckCollision(const ::Ray& ray) const {
-        return CheckCollisionRayBox(ray, *this);
+        return GetRayCollisionBox(ray, *this).hit;
+    }
+    
+    /**
+     * Get collision information between ray and bounding box
+     */
+    inline RayCollision GetCollision(const ::Ray& ray) const {
+        return GetRayCollisionBox(ray, *this);
     }
 
  private:

include/CMakeLists.txt

@@ -25,7 +25,7 @@ install(FILES
     physac.hpp
     Physics.hpp
     Ray.hpp
-    RayHitInfo.hpp
+    RayCollision.hpp
     raylib-cpp-utils.hpp
     raylib-cpp.hpp
     raylib.hpp

include/Camera3D.hpp

@@ -143,7 +143,7 @@ class Camera3D : public ::Camera3D {
             const ::Texture2D& texture,
             ::Rectangle sourceRec,
             ::Vector3 center,
-            float size,
+            ::Vector2 size,
             ::Color tint = {255, 255, 255, 255}) {
         ::DrawBillboardRec(*this, texture, sourceRec, center, size, tint);
         return *this;