Scene GameObject management

Author: PR3C14D0

src/private/Core/Scene/Scene.cpp

@@ -3,27 +3,55 @@
 Scene::Scene(std::string name) {
 	this->name = name;
 	this->m_go = new GameObject("SampleObject");
-	this->m_gameObjects.push_back(this->m_go);
+	this->AddGameObject(m_go);
+	
+	this->m_editorCamera = new Camera("EditorCamera");
+	this->AddGameObject(this->m_editorCamera);
 }
 
 void Scene::Init() {
-	for (GameObject* object : this->m_gameObjects) {
-		object->Init();
+	for (std::pair<std::string, GameObject*> object : this->m_gameObjects) {
+		object.second->Init();
 	}
 }
 
 void Scene::Update() {
-	for (GameObject* object : this->m_gameObjects) {
-		object->Update();
+	for (std::pair<std::string, GameObject*> object : this->m_gameObjects) {
+		object.second->Update();
 	}
 }
 
 void Scene::Render() {
-	for (GameObject* object : this->m_gameObjects) {
-		object->Render();
+	for (std::pair<std::string, GameObject*> object : this->m_gameObjects) {
+		object.second->Render();
 	}
 }
 
+bool Scene::ObjectExists(std::string name) {
+	if (this->m_gameObjects.size() > 0) {
+		if (this->m_gameObjects.count(name) > 0)
+			return true;
+		else
+			spdlog::error("Scene#{0}: GameObject {1} not found in the scene.", this->name, name);
+	}
+	else {
+		spdlog::error("Scene#{0}: No GameObjects added on the Scene.", this->name);
+	}
+
+	return false;
+}
+
 void Scene::AddGameObject(GameObject* object) {
-	this->m_gameObjects.push_back(object);
+	if (!object)
+		return;
+
+	if (this->ObjectExists(object->m_name)) {
+		spdlog::error("Scene#{0}: A GameObject with the name {1} already exists in the scene.", this->name, object->m_name);
+		return;
+	}
+
+	if (Camera* cam = dynamic_cast<Camera*>(object))
+		this->m_cameras[object->m_name] = cam;
+
+	this->m_gameObjects[object->m_name] = object;
 }

src/public/Core/GameObject/GameObject.h

@@ -9,6 +9,7 @@
 #include "Core/Input/Input.h"
 
 class GameObject {
+	friend class Scene;
 private:
 	std::string m_name;
 

src/public/Core/Scene/Scene.h

@@ -2,13 +2,20 @@
 #include <iostream>
 #include <vector>
 #include <map>
+#include <spdlog/spdlog.h>
 
 #include "Core/GameObject/GameObject.h"
+#include "Core/GameObject/Camera/Camera.h"
 
 class Scene {
 private:
-	std::vector<GameObject*> m_gameObjects;
 	GameObject* m_go;
+
+	std::map<std::string, GameObject*> m_gameObjects;
+	std::map<std::string, Camera*> m_cameras;
+	Camera* m_currentCamera;
+
+	Camera* m_editorCamera;
 public:
 	std::string name;
 
@@ -20,4 +27,5 @@ class Scene {
 	void Render();
 
 	void AddGameObject(GameObject* object);
+	bool ObjectExists(std::string name);
 };