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

This commit is contained in:
stiffly
2016-01-23 17:51:06 +01:00
7 changed files with 54 additions and 20 deletions
+2 -3
View File
@@ -17,8 +17,7 @@
#include "ImGuiRenderPass.h"
#include "Camera.h"
#include "../Core/Transform.h"
#include "TextRenderer.h"
#include "TextPass.h"
class Renderer : public IRenderer
{
@@ -36,7 +35,7 @@ public:
private:
//----------------------Variables----------------------//
EventBroker* m_EventBroker;
TextRenderer* m_TextRenderer;
TextPass* m_TextPass;
Texture* m_ErrorTexture;
Texture* m_WhiteTexture;
@@ -10,11 +10,12 @@
#include "Font.h"
#include "../Core/ResourceManager.h"
#include "RenderQueue.h"
#include "TextPassState.h"
class TextRenderer
class TextPass
{
public:
TextRenderer();
TextPass();
void Initialize();
void Update();
void Draw(RenderScene& scene);
+15
View File
@@ -0,0 +1,15 @@
#ifndef TextPassState_h__
#define TextPassState_h__
#include "Rendering/RenderState.h"
class TextPassState : public RenderState
{
public:
TextPassState();
~TextPassState();
private:
};
#endif