Patch 9:

Adding gameobjects to a scene
cappah · Sep 3, 2016 · 75d6cdf · 75d6cdf
1 parent 593dae1
commit 75d6cdf
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 0 deletions.
diff --git a/DyroEngine/include/SceneGraph/Scene/Scene.h b/DyroEngine/include/SceneGraph/Scene/Scene.h
@@ -30,11 +30,15 @@ class Scene : public Object, public IDrawable
 
 	virtual void destroy();
 
+	void addGameObject(GameObject* object);
+	void removeGameObject(GameObject* object);
+
 	void setRenderer(Renderer* renderer);
 	Renderer* getRenderer() const;
 
 private:
 	Renderer* renderer;
+	std::vector<GameObject*> vec_objects;
 };
 
 #endif //_SCENE_H

diff --git a/DyroEngine/src/SceneGraph/Scene/Scene.cpp b/DyroEngine/src/SceneGraph/Scene/Scene.cpp
@@ -1,4 +1,5 @@
 #include "SceneGraph/Scene/Scene.h"
+#include "SceneGraph/Object/GameObjects/GameObject.h"
 
 #ifndef _ALGORITHM
 #include <algorithm>
@@ -8,6 +9,7 @@
 
 #include "Helpers/Singleton.h"
 
+#include "Interfaces/IDrawable.h"
 
 Scene::Scene(const std::tstring& name)
 	:Object(name)
@@ -20,16 +22,46 @@ Scene::~Scene()
 
 bool Scene::initialize()
 {
+	for (GameObject* obj : this->vec_objects)
+	{
+		if (obj->getInitialized())
+			continue;
+		if (!obj->initialize())
+			return false;
+	}
+
 	return true;
 }
 void Scene::update()
 {
+	for (GameObject* obj : this->vec_objects)
+	{
+		if (obj->isActive())
+			obj->update();
+	}
 }
 void Scene::draw()
 {
+	for (GameObject* obj : this->vec_objects)
+	{
+		IDrawable* drawable_obj = dynamic_cast<IDrawable*>(obj);
+		if(drawable_obj == nullptr)
+			continue;
+
+		if(drawable_obj->getCanDraw())
+			drawable_obj->draw();
+	}
 }
 bool Scene::shutdown()
 {
+	for (GameObject* obj : this->vec_objects)
+	{
+		if (!obj->shutdown())
+			return false;
+		SafeDelete(obj);
+	}
+	this->vec_objects.clear();
+
 	return true;
 }
 
@@ -47,6 +79,25 @@ void Scene::destroy()
 	Object::destroy();
 }
 
+void Scene::addGameObject(GameObject* object)
+{
+	std::vector<GameObject*>::iterator it = std::find(this->vec_objects.begin(), this->vec_objects.end(), object);
+	if (it == this->vec_objects.end())
+	{
+		this->vec_objects.push_back(object);
+		object->setScene(this);
+	}
+}
+void Scene::removeGameObject(GameObject* object)
+{
+	std::vector<GameObject*>::iterator it = std::find(this->vec_objects.begin(), this->vec_objects.end(), object);
+	if (it != this->vec_objects.end())
+	{
+		this->vec_objects.erase(it);
+		SafeDelete((*it));
+	}
+}
+
 void Scene::setRenderer(Renderer* renderer)
 {
 	this->renderer = renderer;