Merge remote-tracking branch 'origin/TextRendering' into Networking

# Conflicts: # include/Engine/Rendering/RenderSystem.h # src/Engine/Rendering/RenderSystem.cpp
2016-01-22 22:08:56 +01:00
parent 55ee2bb3bf ea9c4d19d0
commit 90867b094a
23 changed files with 741 additions and 96 deletions
@@ -18,6 +18,8 @@
 #include "Camera.h"
 #include "../Core/Transform.h"

+#include "TextRenderer.h"
+
 class Renderer : public IRenderer
 {
 public:
@@ -34,6 +36,7 @@ public:
 private:
    //----------------------Variables----------------------//
    EventBroker* m_EventBroker;
+    TextRenderer* m_TextRenderer;

    Texture* m_ErrorTexture;
    Texture* m_WhiteTexture;