- Add bbox expand & contains

- Catch errors only on release mode, not on DEBUG

Author: edunad

rawrbox.engine/src/engine.cpp

@@ -59,7 +59,9 @@ namespace rawrbox {
 
 		// Setup render threading
 		auto renderThread = std::jthread([this]() {
+#ifndef _DEBUG
 			try {
+#endif
 				rawrbox::RENDER_THREAD_ID = std::this_thread::get_id();
 				rawrbox::ThreadUtils::setName("rawrbox:render");
 
@@ -113,6 +115,7 @@ namespace rawrbox {
 
 				this->onThreadShutdown(rawrbox::ENGINE_THREADS::THREAD_RENDER);
 				this->_shutdown = rawrbox::ENGINE_THREADS::THREAD_INPUT; // Done killing rendering, now destroy glfw
+#ifndef _DEBUG
 			} catch (const cpptrace::exception_with_message& err) {
 				this->prettyPrintErr(err.message());
 
@@ -125,6 +128,7 @@ namespace rawrbox {
 				cpptrace::generate_trace().print();
 				throw err;
 			}
+#endif
 		});
 		// ----
 

rawrbox.math/include/rawrbox/math/bbox.hpp

@@ -25,6 +25,22 @@ namespace rawrbox {
 			return this->_size;
 		}
 
+		void expand(const rawrbox::Vector3_t<NumberType>& pos) {
+			if (pos.x < _min.x) _min.x = pos.x;
+			if (pos.y < _min.y) _min.y = pos.y;
+			if (pos.z < _min.z) _min.z = pos.z;
+
+			if (pos.x > _max.x) _max.x = pos.x;
+			if (pos.y > _max.y) _max.y = pos.y;
+			if (pos.z > _max.z) _max.z = pos.z;
+
+			_size = _max - _min;
+		}
+
+		bool contains(const rawrbox::Vector3_t<NumberType>& pos) {
+			return pos.x >= _min.x && pos.x <= _max.x && pos.y >= _min.y && pos.y <= _max.y && pos.z >= _min.z && pos.z <= _max.z;
+		}
+
 		void combine(const BBOX_t<NumberType>& b) {
 			this->_min = {std::min(this->_min.x, b._min.x), std::min(this->_min.y, b._min.y), std::min(this->_min.z, b._min.z)};
 			this->_max = {std::max(this->_max.x, b._max.x), std::max(this->_max.y, b._max.y), std::max(this->_max.z, b._max.z)};

rawrbox.math/tests/bbox.spec.cpp

@@ -0,0 +1,63 @@
+#include <rawrbox/math/bbox.hpp>
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+
+TEST_CASE("BBOX should behave as expected", "[rawrbox::BBOX]") {
+	SECTION("rawrbox::BBOX") {
+		rawrbox::BBOX bbox(rawrbox::Vector3f(0, 0, 0), rawrbox::Vector3f(1, 1, 1), rawrbox::Vector3f(1, 1, 1));
+
+		REQUIRE(bbox._min == rawrbox::Vector3f(0, 0, 0));
+		REQUIRE(bbox._max == rawrbox::Vector3f(1, 1, 1));
+		REQUIRE(bbox._size == rawrbox::Vector3f(1, 1, 1));
+	}
+
+	SECTION("rawrbox::BBOX::isEmpty") {
+		rawrbox::BBOX bbox1;
+		rawrbox::BBOX bbox2(rawrbox::Vector3f(0, 0, 0), rawrbox::Vector3f(1, 1, 1), rawrbox::Vector3f(1, 1, 1));
+
+		REQUIRE(bbox1.isEmpty() == true);
+		REQUIRE(bbox2.isEmpty() == false);
+	}
+
+	SECTION("rawrbox::BBOX::size") {
+		rawrbox::BBOX bbox(rawrbox::Vector3f(0, 0, 0), rawrbox::Vector3f(1, 2, 3), rawrbox::Vector3f(1, 2, 3));
+
+		REQUIRE(bbox.size() == rawrbox::Vector3f(1, 2, 3));
+	}
+
+	SECTION("rawrbox::BBOX::expand") {
+		rawrbox::BBOX bbox(rawrbox::Vector3f(0, 0, 0), rawrbox::Vector3f(1, 1, 1), rawrbox::Vector3f(1, 1, 1));
+		bbox.expand(rawrbox::Vector3f(2, 2, 2));
+
+		REQUIRE(bbox._min == rawrbox::Vector3f(0, 0, 0));
+		REQUIRE(bbox._max == rawrbox::Vector3f(2, 2, 2));
+		REQUIRE(bbox._size == rawrbox::Vector3f(2, 2, 2));
+	}
+
+	SECTION("rawrbox::BBOX::contains") {
+		rawrbox::BBOX bbox(rawrbox::Vector3f(0, 0, 0), rawrbox::Vector3f(1, 1, 1), rawrbox::Vector3f(1, 1, 1));
+
+		REQUIRE(bbox.contains(rawrbox::Vector3f(0.5F, 0.5F, 0.5F)) == true);
+		REQUIRE(bbox.contains(rawrbox::Vector3f(1.5F, 1.5F, 1.5F)) == false);
+	}
+
+	SECTION("rawrbox::BBOX::combine") {
+		rawrbox::BBOX bbox1(rawrbox::Vector3f(0, 0, 0), rawrbox::Vector3f(1, 1, 1), rawrbox::Vector3f(1, 1, 1));
+		rawrbox::BBOX bbox2(rawrbox::Vector3f(1, 1, 1), rawrbox::Vector3f(2, 2, 2), rawrbox::Vector3f(1, 1, 1));
+		bbox1.combine(bbox2);
+
+		REQUIRE(bbox1._min == rawrbox::Vector3f(0, 0, 0));
+		REQUIRE(bbox1._max == rawrbox::Vector3f(2, 2, 2));
+	}
+
+	SECTION("rawrbox::BBOX::operators") {
+		rawrbox::BBOX bbox1(rawrbox::Vector3f(0, 0, 0), rawrbox::Vector3f(1, 1, 1), rawrbox::Vector3f(1, 1, 1));
+		rawrbox::BBOX bbox2(rawrbox::Vector3f(0, 0, 0), rawrbox::Vector3f(1, 1, 1), rawrbox::Vector3f(1, 1, 1));
+		rawrbox::BBOX bbox3(rawrbox::Vector3f(0, 0, 0), rawrbox::Vector3f(2, 2, 2), rawrbox::Vector3f(2, 2, 2));
+
+		REQUIRE(bbox1 == bbox2);
+		REQUIRE(bbox1 != bbox3);
+	}
+}