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

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

Browse Source
This commit is contained in:
viktorljung
2016-01-15 13:24:24 +01:00
parent 6fbb962b5e 627108c6ee
commit 7faed50507
18 changed files with 444 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/RenderSystem.h
+5 -5
View File
@@ -14,22 +14,24 @@
#include "ModelJob.h"
#include "Renderer.h"
#include "../Core/Transform.h"
#include "DebugCameraInputController.h"
class RenderSystem : public ImpureSystem
{
public:
RenderSystem(EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame);
~RenderSystem();
virtual void Update(World* world, double dt) override;
private:
World* m_World = nullptr;
const IRenderer* m_Renderer = nullptr;
const IRenderer* m_Renderer;
RenderFrame* m_RenderFrame;
bool m_SwitchCamera = false;
Camera* m_Camera = nullptr;
Camera* m_DefaultCamera = nullptr;
Camera* m_Camera;
DebugCameraInputController<RenderSystem>* m_DebugCameraInputController;
std::list<ComponentWrapper> m_CameraComponents;
@@ -41,8 +43,6 @@ private:
void updateCamera(World* world, double dt);
void updateProjectionMatrix(ComponentWrapper& cameraComponent);
glm::mat4 m_ViewMatrix;
glm::mat4 m_ProjectionMatrix;
void fillModels(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
void fillText(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);