Merge branch 'master' of github.com:lonkaars/crepe into jaro/particle-system-improvement

5 files changed, 119 insertions, 27 deletions

diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index fb11c8d..8f84f06 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -20,6 +20,7 @@ target_sources(crepe PUBLIC
 	Button.cpp
 	UIObject.cpp
 	AI.cpp
+	Scene.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -36,6 +37,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Vector2.hpp
 	Color.h
 	Scene.h
+	Scene.hpp
 	Metadata.h
 	Camera.h
 	Animator.h
diff --git a/src/crepe/api/Scene.cpp b/src/crepe/api/Scene.cpp
new file mode 100644
index 0000000..ad729d2
--- /dev/null
+++ b/src/crepe/api/Scene.cpp
@@ -0,0 +1,15 @@
+#include "Scene.h"
+
+using namespace crepe;
+
+SaveManager & Scene::get_save_manager() const { return mediator->save_manager; }
+
+GameObject Scene::new_object(const std::string & name, const std::string & tag,
+							 const vec2 & position, double rotation, double scale) {
+	// Forward the call to ComponentManager's new_object method
+	return mediator->component_manager->new_object(name, tag, position, rotation, scale);
+}
+
+void Scene::set_persistent(const Asset & asset, bool persistent) {
+	mediator->resource_manager->set_persistent(asset, persistent);
+}
diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h
index ba9bb76..dcca9d4 100644
--- a/src/crepe/api/Scene.h
+++ b/src/crepe/api/Scene.h
@@ -2,13 +2,19 @@
 
 #include <string>
 
+#include "../manager/ComponentManager.h"
 #include "../manager/Mediator.h"
+#include "../manager/ResourceManager.h"
+#include "../util/Log.h"
 #include "../util/OptionalRef.h"
 
+#include "GameObject.h"
+
 namespace crepe {
 
 class SceneManager;
 class ComponentManager;
+class Asset;
 
 /**
  * \brief Represents a Scene
@@ -38,7 +44,7 @@ public:
 	// TODO: Late references should ALWAYS be private! This is currently kept as-is so unit tests
 	// keep passing, but this reference should not be directly accessible by the user!!!
 
-protected:
+private:
 	/**
 	 * \name Late references
 	 *
@@ -53,6 +59,36 @@ protected:
 	//! Mediator reference
 	OptionalRef<Mediator> mediator;
 	//! \}
+
+protected:
+	/**
+	* \brief Retrieve the reference to the SaveManager instance
+	*
+	* \returns A reference to the SaveManager instance held by the Mediator.
+	*/
+	SaveManager & get_save_manager() const;
+
+	//! \copydoc ComponentManager::new_object
+	GameObject new_object(const std::string & name, const std::string & tag = "",
+						  const vec2 & position = {0, 0}, double rotation = 0,
+						  double scale = 1);
+
+	//! \copydoc ResourceManager::set_persistent
+	void set_persistent(const Asset & asset, bool persistent);
+	/**
+	* \name Logging functions
+	* \see Log
+	* \{
+	*/
+	//! \copydoc Log::logf
+	template <class... Args>
+	void logf(const Log::Level & level, std::format_string<Args...> fmt, Args &&... args);
+	//! \copydoc Log::logf
+	template <class... Args>
+	void logf(std::format_string<Args...> fmt, Args &&... args);
+	//! \}
 };
 
 } // namespace crepe
+
+#include "Scene.hpp"
diff --git a/src/crepe/api/Scene.hpp b/src/crepe/api/Scene.hpp
new file mode 100644
index 0000000..14635df
--- /dev/null
+++ b/src/crepe/api/Scene.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../util/Log.h"
+
+#include "Scene.h"
+
+namespace crepe {
+
+template <class... Args>
+void Scene::logf(const Log::Level & level, std::format_string<Args...> fmt, Args &&... args) {
+	Log::logf(level, fmt, std::forward<Args>(args)...);
+}
+
+template <class... Args>
+void Scene::logf(std::format_string<Args...> fmt, Args &&... args) {
+	Log::logf(fmt, std::forward<Args>(args)...);
+}
+
+} // namespace crepe
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index 44a0431..496224e 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -192,13 +192,15 @@ CollisionSystem::collision_handler(CollisionInternal & data1, CollisionInternal
 		resolution_direction = Direction::BOTH;
 	} else if (resolution.x != 0) {
 		resolution_direction = Direction::X_DIRECTION;
-		if (data1.rigidbody.data.linear_velocity.y != 0)
-			resolution.y = data1.rigidbody.data.linear_velocity.y
+		//checks if the other velocity has a value and if this object moved
+		if (data1.rigidbody.data.linear_velocity.x != 0 && data1.rigidbody.data.linear_velocity.y != 0)
+			resolution.y = -data1.rigidbody.data.linear_velocity.y
 						   * (resolution.x / data1.rigidbody.data.linear_velocity.x);
 	} else if (resolution.y != 0) {
 		resolution_direction = Direction::Y_DIRECTION;
-		if (data1.rigidbody.data.linear_velocity.x != 0)
-			resolution.x = data1.rigidbody.data.linear_velocity.x
+		//checks if the other velocity has a value and if this object moved
+		if (data1.rigidbody.data.linear_velocity.x != 0 && data1.rigidbody.data.linear_velocity.y != 0)
+			resolution.x = -data1.rigidbody.data.linear_velocity.x
 						   * (resolution.y / data1.rigidbody.data.linear_velocity.y);
 	}
 
@@ -314,28 +316,46 @@ void CollisionSystem::static_collision_handler(CollisionInfo & info) {
 	// Move object back using calculate move back value
 	info.this_transform.position += info.resolution;
 
-	// If bounce is enabled mirror velocity
-	if (info.this_rigidbody.data.elastisity_coefficient > 0) {
-		if (info.resolution_direction == Direction::BOTH) {
-			info.this_rigidbody.data.linear_velocity.y
-				= -info.this_rigidbody.data.linear_velocity.y
-				  * info.this_rigidbody.data.elastisity_coefficient;
-			info.this_rigidbody.data.linear_velocity.x
-				= -info.this_rigidbody.data.linear_velocity.x
-				  * info.this_rigidbody.data.elastisity_coefficient;
-		} else if (info.resolution_direction == Direction::Y_DIRECTION) {
-			info.this_rigidbody.data.linear_velocity.y
-				= -info.this_rigidbody.data.linear_velocity.y
-				  * info.this_rigidbody.data.elastisity_coefficient;
-		} else if (info.resolution_direction == Direction::X_DIRECTION) {
-			info.this_rigidbody.data.linear_velocity.x
-				= -info.this_rigidbody.data.linear_velocity.x
-				  * info.this_rigidbody.data.elastisity_coefficient;
-		}
-	}
-	// Stop movement if bounce is disabled
-	else {
-		info.this_rigidbody.data.linear_velocity = {0, 0};
+	switch (info.resolution_direction) {
+		case Direction::BOTH:
+			//bounce
+			if (info.this_rigidbody.data.elastisity_coefficient > 0) {
+				info.this_rigidbody.data.linear_velocity = -info.this_rigidbody.data.linear_velocity * info.this_rigidbody.data.elastisity_coefficient;
+			}
+			//stop movement
+			else {
+				info.this_rigidbody.data.linear_velocity = {0, 0};
+			}
+			break;
+		case Direction::Y_DIRECTION:
+			// Bounce
+			if (info.this_rigidbody.data.elastisity_coefficient > 0) {
+				info.this_rigidbody.data.linear_velocity.y
+					= -info.this_rigidbody.data.linear_velocity.y
+					  * info.this_rigidbody.data.elastisity_coefficient;
+			}
+			// Stop movement
+			else {
+				info.this_rigidbody.data.linear_velocity.y = 0;
+				info.this_transform.position.x -= info.resolution.x;
+			}
+			break;
+		case Direction::X_DIRECTION:
+			// Bounce
+			if (info.this_rigidbody.data.elastisity_coefficient > 0) {
+				info.this_rigidbody.data.linear_velocity.x
+					= -info.this_rigidbody.data.linear_velocity.x
+					  * info.this_rigidbody.data.elastisity_coefficient;
+			}
+			// Stop movement
+			else {
+				info.this_rigidbody.data.linear_velocity.x = 0;
+				info.this_transform.position.y -= info.resolution.y;
+			}
+			break;
+		case Direction::NONE:
+			// Not possible
+			break;
 	}
 }