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

GL renderer working again, bgfx still here but not used.

Browse Source
This commit is contained in:
tleety
2015-09-09 21:19:37 +02:00
parent ec137acb38
commit 4aef84e7c8
1 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
Regular → Executable
+39 -39
View File
@@ -25,7 +25,7 @@
#include "Texture.h" #include "Texture.h"
#include "EventBroker.h" #include "EventBroker.h"
#include "RenderQueue.h" #include "RenderQueue.h"
#include "BGFXRenderer.h" #include "Renderer.h"
#include "InputManager.h" #include "InputManager.h"
//TODO: Remove includes that are only here for the temporary draw solution. //TODO: Remove includes that are only here for the temporary draw solution.
#include "World.h" #include "World.h"
@@ -42,30 +42,30 @@ class Engine
public: public:
Engine(int argc, char* argv[]) Engine(int argc, char* argv[])
{ {
// m_EventBroker = std::make_shared<EventBroker>(); m_EventBroker = std::make_shared<EventBroker>();
m_Renderer = std::make_shared<BGFXRenderer>(); m_Renderer = std::make_shared<Renderer>();
m_Renderer->SetFullscreen(false); m_Renderer->SetFullscreen(false);
m_Renderer->SetResolution(Rectangle(0, 0, 1280, 720)); m_Renderer->SetResolution(Rectangle(0, 0, 1920, 1080));
m_Renderer->Initialize(); m_Renderer->Initialize();
// m_InputManager = std::make_shared<InputManager>(m_Renderer->Window(), m_EventBroker); m_InputManager = std::make_shared<InputManager>(m_Renderer->Window(), m_EventBroker);
//
// m_World = std::make_shared<World>(m_EventBroker);
//
// //TODO: Move this out of engine.h
// 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>();
// m_World->ComponentFactory.Register<Components::Model>();
// m_World->ComponentFactory.Register<Components::Template>();
// m_World->Initialize();
// auto ent = m_World->CreateEntity(); m_World = std::make_shared<World>(m_EventBroker);
// std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
// transform->Position = glm::vec3(0.f, 0.f, -10.f); //TODO: Move this out of engine.h
// std::shared_ptr<Components::Model> model = m_World->AddComponent<Components::Model>(ent); m_World->ComponentFactory.Register<Components::Transform>();
// model->ModelFile = "Models/Core/UnitSphere.obj"; m_World->SystemFactory.Register<Systems::TransformSystem>([this]() { return new Systems::TransformSystem(m_World.get(), m_EventBroker); });
m_World->AddSystem<Systems::TransformSystem>();
m_World->ComponentFactory.Register<Components::Model>();
m_World->ComponentFactory.Register<Components::Template>();
m_World->Initialize();
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";
m_LastTime = glfwGetTime(); m_LastTime = glfwGetTime();
@@ -79,26 +79,26 @@ public:
double dt = currentTime - m_LastTime; double dt = currentTime - m_LastTime;
m_LastTime = currentTime; m_LastTime = currentTime;
// ResourceManager::Update(); ResourceManager::Update();
//
// // Update input // Update input
// m_InputManager->Update(dt); m_InputManager->Update(dt);
//
// m_World->Update(dt); m_World->Update(dt);
//
// if (glfwGetKey(m_Renderer->Window(), GLFW_KEY_R)) { if (glfwGetKey(m_Renderer->Window(), GLFW_KEY_R)) {
// ResourceManager::Reload("Shaders/Deferred/3/Fragment.glsl"); ResourceManager::Reload("Shaders/Deferred/3/Fragment.glsl");
// } }
//
// //TODO Fill up the renderQueue with models (Temp fix) //TODO Fill up the renderQueue with models (Temp fix)
// TEMPAddToRenderQueue(); TEMPAddToRenderQueue();
//
// // Render scene // Render scene
// //TODO send renderqueue to draw. //TODO send renderqueue to draw.
m_Renderer->Draw(m_RendererQueue); m_Renderer->Draw(m_RendererQueue);
// Swap event queues // Swap event queues
// m_EventBroker->Clear(); m_EventBroker->Clear();
glfwPollEvents(); glfwPollEvents();
} }
@@ -168,9 +168,9 @@ public:
} }
private: private:
//std::shared_ptr<ResourceManager> m_ResourceManager; std::shared_ptr<ResourceManager> m_ResourceManager;
std::shared_ptr<EventBroker> m_EventBroker; std::shared_ptr<EventBroker> m_EventBroker;
std::shared_ptr<BGFXRenderer> m_Renderer; std::shared_ptr<Renderer> m_Renderer;
RenderQueueCollection m_RendererQueue; RenderQueueCollection m_RendererQueue;
std::shared_ptr<InputManager> m_InputManager; std::shared_ptr<InputManager> m_InputManager;
std::shared_ptr<World> m_World; std::shared_ptr<World> m_World;