Standardizing function declarations

Author: RobLoach

CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 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).
 
+## [4.0.3] - Unreleased
+### Changed
+- CMake now used for raylib dependency, rather than git submodules
+- Standardized functions across:
+  - Color
+  - Material
+  - Mesh
+  - Model
+  - ModelAnimation
+  - Physics
+  - Ray
+  - Rectangle
+  - Texture
+  - Window
+
 ## [4.0.2] - 2021-12-24
 ### Added
 - `Image::IsLoaded()`

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

examples/physics/physics_demo.cpp

@@ -55,7 +55,7 @@ int main(void)
         // Update
         //----------------------------------------------------------------------------------
         // Delay initialization of variables due to physics reset async
-        physics.UpdateStep();
+        physics.Update();
 
         if (needsReset)
         {

include/Color.hpp

@@ -162,7 +162,7 @@ class Color : public ::Color {
     }
 
     inline Color& DrawText(
-            const ::Font font,
+            const ::Font& font,
             const std::string& text,
             ::Vector2 position,
             ::Vector2 origin,

include/Material.hpp

@@ -91,6 +91,22 @@ class Material : public ::Material {
         return *this;
     }
 
+    /**
+     * Draw a 3d mesh with material and transform
+     */
+    inline const Material& DrawMesh(const ::Mesh& mesh, ::Matrix transform) const {
+        ::DrawMesh(mesh, *this, transform);
+        return *this;
+    }
+
+    /**
+     * Draw multiple mesh instances with material and different transforms
+     */
+    inline const Material& DrawMesh(const ::Mesh& mesh, ::Matrix* transforms, int instances) const {
+        ::DrawMeshInstanced(mesh, *this, transforms, instances);
+        return *this;
+    }
+
  private:
     inline void set(const ::Material& material) {
         shader = material.shader;

include/Mesh.hpp

@@ -206,11 +206,17 @@ class Mesh : public ::Mesh {
         ::UpdateMeshBuffer(*this, index, data, dataSize, offset);
     }
 
+    /**
+     * Draw a 3d mesh with material and transform
+     */
     inline void Draw(const ::Material& material, const ::Matrix& transform) {
         ::DrawMesh(*this, material, transform);
     }
 
-    inline void DrawInstanced(const ::Material& material, ::Matrix* transforms, int instances) {
+    /**
+     * Draw multiple mesh instances with material and different transforms
+     */
+    inline void Draw(const ::Material& material, ::Matrix* transforms, int instances) {
         ::DrawMeshInstanced(*this, material, transforms, instances);
     }
 
@@ -249,15 +255,15 @@ class Mesh : public ::Mesh {
     /**
      * Compute mesh tangents
      */
-    inline Mesh& Tangents() {
+    inline Mesh& GenTangents() {
         ::GenMeshTangents(this);
         return *this;
     }
 
     /**
      * Compute mesh binormals (aka bitangent)
      */
-    inline Mesh& Binormals() {
+    inline Mesh& GenBinormals() {
         ::GenMeshBinormals(this);
         return *this;
     }

include/Model.hpp

@@ -174,6 +174,20 @@ class Model : public ::Model {
         return *this;
     }
 
+    /**
+     * Compute model bounding box limits (considers all meshes)
+     */
+    inline BoundingBox GetBoundingBox() const {
+        return ::GetModelBoundingBox(*this);
+    }
+
+    /**
+     * Compute model bounding box limits (considers all meshes)
+     */
+    operator BoundingBox() const {
+        return ::GetModelBoundingBox(*this);
+    }
+
  private:
     inline void set(const ::Model& model) {
         transform = model.transform;

include/ModelAnimation.hpp

@@ -56,7 +56,6 @@ class ModelAnimation : public ::ModelAnimation {
         return *this;
     }
 
-
     ModelAnimation& operator=(const ModelAnimation&) = delete;
 
     ModelAnimation& operator=(ModelAnimation&& other) {

include/Physics.hpp

@@ -34,13 +34,18 @@ class Physics {
         return *this;
     }
 
-    inline Physics& Close() {
-        ::ClosePhysics();
+    inline Physics& Update() {
+        ::UpdatePhysics();
         return *this;
     }
 
-    inline Physics& UpdateStep() {
-        ::UpdatePhysicsStep();
+    inline Physics& Reset() {
+        ::ResetPhysics();
+        return *this;
+    }
+
+    inline Physics& Close() {
+        ::ClosePhysics();
         return *this;
     }
 
@@ -66,6 +71,11 @@ class Physics {
         return ::CreatePhysicsBodyPolygon(pos, radius, sides, density);
     }
 
+    inline Physics& DestroyBody(PhysicsBody body) {
+        ::DestroyPhysicsBody(body);
+        return *this;
+    }
+
     inline Physics& AddForce(PhysicsBody body, Vector2 force) {
         ::PhysicsAddForce(body, force);
         return *this;
@@ -81,6 +91,11 @@ class Physics {
         return *this;
     }
 
+    inline Physics& SetBodyRotation(PhysicsBody body, float radians) {
+        ::SetPhysicsBodyRotation(body, radians);
+        return *this;
+    }
+
     inline int GetBodiesCount() const {
         return ::GetPhysicsBodiesCount();
     }
@@ -100,21 +115,6 @@ class Physics {
     inline Vector2 GetShapeVertex(PhysicsBody body, int vertex) const {
         return ::GetPhysicsShapeVertex(body, vertex);
     }
-
-    inline Physics& SetBodyRotation(PhysicsBody body, float radians) {
-        ::SetPhysicsBodyRotation(body, radians);
-        return *this;
-    }
-
-    inline Physics& DestroyBody(PhysicsBody body) {
-        ::DestroyPhysicsBody(body);
-        return *this;
-    }
-
-    inline Physics& Reset() {
-        ::ResetPhysics();
-        return *this;
-    }
 };
 }  // namespace raylib
 

include/Ray.hpp

@@ -47,7 +47,7 @@ class Ray : public ::Ray {
     /**
      * Get collision information between ray and sphere
      */
-    inline RayCollision GetCollisionSphere(::Vector3 center, float radius) const {
+    inline RayCollision GetCollision(::Vector3 center, float radius) const {
         return GetRayCollisionSphere(*this, center, radius);
     }
 
@@ -59,26 +59,33 @@ class Ray : public ::Ray {
     }
 
     /**
-     * Get collision information between ray and box
+     * Get collision info between ray and model
      */
-    inline RayCollision GetCollision(const ::BoundingBox& box) const {
-        return GetRayCollisionBox(*this, box);
+    inline RayCollision GetCollision(const ::Model& model) const {
+        return GetRayCollisionModel(*this, model);
     }
 
     /**
-     * Get collision info between ray and model
+     * Get collision information between ray and mesh
      */
-    inline RayCollision GetCollision(const ::Model& model) const {
-        return GetRayCollisionModel(*this, model);
+    inline RayCollision GetCollision(const ::Mesh& mesh, const ::Matrix& transform) const {
+        return GetRayCollisionMesh(*this, mesh, transform);
     }
 
     /**
      * Get collision info between ray and triangle
      */
-    inline RayCollision GetCollisionTriangle(::Vector3 p1, ::Vector3 p2, ::Vector3 p3) const {
+    inline RayCollision GetCollision(::Vector3 p1, ::Vector3 p2, ::Vector3 p3) const {
         return GetRayCollisionTriangle(*this, p1, p2, p3);
     }
 
+    /**
+     * Get collision info between ray and quad
+     */
+    inline RayCollision GetCollision(Vector3 p1, Vector3 p2, Vector3 p3, Vector3 p4) const {
+        return GetRayCollisionQuad(*this, p1, p2, p3, p4);
+    }
+
  private:
     inline void set(const ::Ray& ray) {
         position = ray.position;