1 files changed, 61 insertions, 9 deletions

diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h
index 869bf6f..b50a0fc 100644
--- a/src/crepe/api/Scene.h
+++ b/src/crepe/api/Scene.h
@@ -2,24 +2,30 @@
 
 #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
- * 
+ *
  * This class represents a Scene. The Scene class is only used as an interface for the game
  * programmer.
  */
 class Scene {
 protected:
-	//TODO: Use Loek's custom reference class to set ComponentManger via SceneManager instead of via constructor
-	/**
-	 * \param mgr  Reference to the ComponentManager
-	 */
-	Scene(ComponentManager & mgr);
+	// NOTE: This must be the only constructor on Scene, see "Late references" below
+	Scene() = default;
 	//! SceneManager instances Scene
 	friend class SceneManager;
 
@@ -35,9 +41,55 @@ public:
 	 */
 	virtual std::string get_name() const = 0;
 
-protected:
-	//! Reference to the ComponentManager
-	ComponentManager & component_manager;
+	// 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!!!
+
+private:
+	/**
+	 * \name Late references
+	 *
+	 * These references are set by SceneManager immediately after calling the constructor of Scene.
+	 *
+	 * \note Scene must have a constructor without arguments so the game programmer doesn't need to
+	 * manually add `using Scene::Scene` to their concrete scene class, if they want to add a
+	 * constructor with arguments (e.g. for passing references to their own concrete Scene classes).
+	 *
+	 * \{
+	 */
+	//! Mediator reference
+	OptionalRef<Mediator> mediator;
+	//! \}
+
+public:
+	/**
+	* \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"