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

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

Browse Source 
# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	src/Engine/Rendering/RenderSystem.cpp
This commit is contained in:
viktorljung
2016-01-23 11:48:10 +01:00
parent e4513376bb 64a7239b17
commit 9a23d8887a
95 changed files with 2520 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/Renderer.h
+1 -4
View File
@@ -11,14 +11,12 @@
#include "FrameBuffer.h"
#include "../Core/World.h"
#include "PickingPass.h"
#include "DrawScenePass.h"
#include "LightCullingPass.h"
#include "DrawFinalPass.h"
#include "../Core/EventBroker.h"
#include "ImGuiRenderPass.h"
#include "Camera.h"
#include "../Core/Transform.h"
#include "TextPass.h"
class Renderer : public IRenderer
@@ -37,7 +35,7 @@ public:
private:
//----------------------Variables----------------------//
EventBroker* m_EventBroker;
TextPass* m_TextRenderer;
TextPass* m_TextPass;
Texture* m_ErrorTexture;
Texture* m_WhiteTexture;
@@ -46,7 +44,6 @@ private:
Model* m_UnitQuad;
Model* m_UnitSphere;
DrawScenePass* m_DrawScenePass;
PickingPass* m_PickingPass;
LightCullingPass* m_LightCullingPass;
ImGuiRenderPass* m_ImGuiRenderPass;