BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

I've added code in preparation to loading a file including a Level to the LevelSystem to the game. Not done at all.

Browse Source
This commit is contained in:
PlatinumSkink
2015-09-10 14:08:16 +02:00
parent 5d753babe6 61efddb52e
commit 2041640441
3 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
+30 -5
View File
@@ -25,7 +25,7 @@
#include "Texture.h"
#include "EventBroker.h"
#include "RenderQueue.h"
#include "BGFXRenderer.h"
#include "Renderer.h"
#include "InputManager.h"
//TODO: Remove includes that are only here for the temporary draw solution.
#include "World.h"
@@ -45,9 +45,9 @@ public:
{
m_EventBroker = std::make_shared<EventBroker>();
m_Renderer = std::make_shared<BGFXRenderer>();
m_Renderer = std::make_shared<Renderer>();
m_Renderer->SetFullscreen(false);
m_Renderer->SetResolution(Rectangle(0, 0, 1280, 720));
m_Renderer->SetResolution(Rectangle(0, 0, 1920, 1080));
m_Renderer->Initialize();
m_InputManager = std::make_shared<InputManager>(m_Renderer->Window(), m_EventBroker);
@@ -58,17 +58,28 @@ public:
m_World->ComponentFactory.Register<Components::Transform>();
m_World->SystemFactory.Register<Systems::TransformSystem>([this]() { return new Systems::TransformSystem(m_World.get(), m_EventBroker); });
m_World->AddSystem<Systems::TransformSystem>();
<<<<<<< HEAD
m_World->SystemFactory.Register<Systems::LevelSystem>([this]() { return new Systems::LevelSystem(m_World.get(), m_EventBroker); });
m_World->AddSystem<Systems::LevelSystem>();
=======
>>>>>>> origin/master
m_World->ComponentFactory.Register<Components::Model>();
m_World->ComponentFactory.Register<Components::Template>();
m_World->Initialize();
<<<<<<< HEAD
// auto ent = m_World->CreateEntity();
// std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
// transform->Position = glm::vec3(0.f, 0.f, -10.f);
// std::shared_ptr<Components::Model> model = m_World->AddComponent<Components::Model>(ent);
// model->ModelFile = "Models/Core/UnitSphere.obj";
=======
auto ent = m_World->CreateEntity();
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
transform->Position = glm::vec3(0.f, 0.f, -10.f);
std::shared_ptr<Components::Model> model = m_World->AddComponent<Components::Model>(ent);
model->ModelFile = "Models/Core/UnitSphere.obj";
>>>>>>> origin/master
m_LastTime = glfwGetTime();
@@ -88,6 +99,7 @@ public:
m_InputManager->Update(dt);
m_World->Update(dt);
<<<<<<< HEAD
//
// if (glfwGetKey(m_Renderer->Window(), GLFW_KEY_R)) {
// ResourceManager::Reload("Shaders/Deferred/3/Fragment.glsl");
@@ -99,6 +111,19 @@ public:
// Render scene
//TODO send renderqueue to draw.
// m_Renderer->Draw(m_RendererQueue);
=======
if (glfwGetKey(m_Renderer->Window(), GLFW_KEY_R)) {
ResourceManager::Reload("Shaders/Deferred/3/Fragment.glsl");
}
//TODO Fill up the renderQueue with models (Temp fix)
TEMPAddToRenderQueue();
// Render scene
//TODO send renderqueue to draw.
m_Renderer->Draw(m_RendererQueue);
>>>>>>> origin/master
// Swap event queues
m_EventBroker->Clear();
@@ -172,9 +197,9 @@ public:
}
private:
//std::shared_ptr<ResourceManager> m_ResourceManager;
std::shared_ptr<ResourceManager> m_ResourceManager;
std::shared_ptr<EventBroker> m_EventBroker;
std::shared_ptr<BGFXRenderer> m_Renderer;
std::shared_ptr<Renderer> m_Renderer;
RenderQueueCollection m_RendererQueue;
std::shared_ptr<InputManager> m_InputManager;
std::shared_ptr<World> m_World;