Text renderer up and working, needs more work to be compatible with the ResourceManager and the Entity Component system

This commit is contained in:
viktorljung
2015-12-11 16:12:29 +01:00
parent 8f007f6daf
commit a8a38716bd
8 changed files with 239 additions and 2 deletions
+6 -1
View File
@@ -15,6 +15,9 @@ void Renderer::Initialize()
InitializeTextures();
InitializeFrameBuffers();
m_TextRenderer = new TextRenderer();
m_TextRenderer->Initialize();
m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj");
m_UnitQuad = ResourceManager::Load<Model>("Models/Core/UnitQuad.obj");
@@ -142,6 +145,7 @@ void Renderer::Update(double dt)
{
m_EventBroker->Process<Renderer>();
InputUpdate(dt);
m_TextRenderer->Update();
}
@@ -149,9 +153,10 @@ void Renderer::Draw(RenderQueueCollection& rq)
{
//TODO: Renderer: Kanske borde vara längst upp i update.
PickingPass(rq);
DrawScreenQuad(m_PickingTexture);
// DrawScreenQuad(m_PickingTexture);
DrawScene(rq);
m_TextRenderer->Draw(m_Camera->ProjectionMatrix(), m_Camera->ViewMatrix());
glfwSwapBuffers(m_Window);
}