From 9e1a9e8b3c51f0d10a2be3bd2ae16b90be3e8741 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 19:41:29 +0100 Subject: [PATCH] Changed: Renamed getBoundingBox() to getBoundingBoxVertices() as the function returns the array of vertices from the BoundingBox object. --- src/engine/include/models/mesh.hpp | 2 +- src/engine/include/models/mesh_frame.hpp | 4 ++-- src/engine/include/models/mesh_material.hpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/include/models/mesh.hpp b/src/engine/include/models/mesh.hpp index aec1470..1de33bb 100644 --- a/src/engine/include/models/mesh.hpp +++ b/src/engine/include/models/mesh.hpp @@ -97,7 +97,7 @@ public: Vector3 &getCurrentBoundingBoxVertex(const u8 &i) { return frames[animState.currentFrame].getBoundingBoxVertex(i); }; /** Returns bounding box of current frame. Size: 8 */ - Vector3 *getCurrentBoundingBox() const { return frames[animState.currentFrame].getBoundingBox(); }; + Vector3 *getCurrentBoundingBox() const { return frames[animState.currentFrame].getBoundingBoxVertices(); }; // ---- // Setters diff --git a/src/engine/include/models/mesh_frame.hpp b/src/engine/include/models/mesh_frame.hpp index 8b4214f..6c33e89 100644 --- a/src/engine/include/models/mesh_frame.hpp +++ b/src/engine/include/models/mesh_frame.hpp @@ -80,7 +80,7 @@ public: * Returns bounding box (AABB). * Total length: 8 */ - Vector3 *getBoundingBox() { return boundingBoxObj->getVertices(); }; + Vector3 *getBoundingBoxVertices() { return boundingBoxObj->getVertices(); }; /** * Returns bounding box (AABB) vertex. @@ -91,7 +91,7 @@ public: /** * Returns bounding box (AABB) object pointer. */ - BoundingBox *getBoundingBoxP() { return boundingBoxObj; }; + BoundingBox *getBoundingBox() { return boundingBoxObj; }; // ---- // Setters diff --git a/src/engine/include/models/mesh_material.hpp b/src/engine/include/models/mesh_material.hpp index b2588f9..5099901 100644 --- a/src/engine/include/models/mesh_material.hpp +++ b/src/engine/include/models/mesh_material.hpp @@ -66,7 +66,7 @@ public: * Returns bounding box (AABB). * Total length: 8 */ - Vector3 *getBoundingBox() { return boundingBoxObj->getVertices(); }; + Vector3 *getBoundingBoxVertices() { return boundingBoxObj->getVertices(); }; /** * Returns bounding box (AABB) vertex. @@ -77,7 +77,7 @@ public: /** * Returns bounding box (AABB) object pointer. */ - BoundingBox *getBoundingBoxP() { return boundingBoxObj; }; + BoundingBox *getBoundingBox() { return boundingBoxObj; }; // ---- // Setters