Merge remote-tracking branch 'origin/master' into Forward+

# Conflicts: # include/Engine/Rendering/Renderer.h # src/Engine/Rendering/PickingPass.cpp # src/Engine/Rendering/Renderer.cpp
2016-01-23 13:59:21 +01:00
parent b499f4b020 bef95235d0
commit 6a18cb88af
27 changed files with 775 additions and 96 deletions
@@ -21,6 +21,7 @@
 #include "Camera.h"
 #include "../Core/Transform.h"
 #include "imgui/imgui.h"
+#include "TextPass.h"

 class Renderer : public IRenderer
 {
@@ -38,6 +39,7 @@ public:
 private:
    //----------------------Variables----------------------//
    EventBroker* m_EventBroker;
+    TextPass* m_TextPass;

    Texture* m_ErrorTexture;
    Texture* m_WhiteTexture;