Renamed EditorRenderSystem to EditorWidgetRenderSystem to make room for a new EditorRenderSystem that renders normally invisible objects

This commit is contained in:
2016-02-02 21:02:56 +01:00
parent a8173488ca
commit bd49bdb297
3 changed files with 12 additions and 12 deletions
@@ -1,5 +1,5 @@
#ifndef EditorRenderSystem_h__ #ifndef EditorWidgetRenderSystem_h__
#define EditorRenderSystem_h__ #define EditorWidgetRenderSystem_h__
#include "../Core/System.h" #include "../Core/System.h"
#include "../Rendering/IRenderer.h" #include "../Rendering/IRenderer.h"
@@ -7,10 +7,10 @@
#include "../Rendering/Camera.h" #include "../Rendering/Camera.h"
#include "../Rendering/ESetCamera.h" #include "../Rendering/ESetCamera.h"
class EditorRenderSystem : public ImpureSystem class EditorWidgetRenderSystem : public ImpureSystem
{ {
public: public:
EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame); EditorWidgetRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
virtual void Update(double dt) override; virtual void Update(double dt) override;
@@ -20,7 +20,7 @@ private:
Camera* m_EditorCamera; Camera* m_EditorCamera;
EntityWrapper m_CurrentCamera = EntityWrapper::Invalid; EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
EventRelay<EditorRenderSystem, Events::SetCamera> m_ESetCamera; EventRelay<EditorWidgetRenderSystem, Events::SetCamera> m_ESetCamera;
bool OnSetCamera(Events::SetCamera& e); bool OnSetCamera(Events::SetCamera& e);
}; };
+2 -2
View File
@@ -1,6 +1,6 @@
#include "Editor/EditorSystem.h" #include "Editor/EditorSystem.h"
#include "Core/UniformScaleSystem.h" #include "Core/UniformScaleSystem.h"
#include "Editor/EditorRenderSystem.h" #include "Editor/EditorWidgetRenderSystem.h"
#include "Editor/EditorWidgetSystem.h" #include "Editor/EditorWidgetSystem.h"
#include "Core/EntityFile.h" #include "Core/EntityFile.h"
@@ -13,7 +13,7 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
m_EditorWorldSystemPipeline = new SystemPipeline(m_EditorWorld, m_EventBroker, IsClient, IsServer); m_EditorWorldSystemPipeline = new SystemPipeline(m_EditorWorld, m_EventBroker, IsClient, IsServer);
m_EditorWorldSystemPipeline->AddSystem<UniformScaleSystem>(0); m_EditorWorldSystemPipeline->AddSystem<UniformScaleSystem>(0);
m_EditorWorldSystemPipeline->AddSystem<EditorWidgetSystem>(0, m_Renderer); m_EditorWorldSystemPipeline->AddSystem<EditorWidgetSystem>(0, m_Renderer);
m_EditorWorldSystemPipeline->AddSystem<EditorRenderSystem>(1, m_Renderer, m_RenderFrame); m_EditorWorldSystemPipeline->AddSystem<EditorWidgetRenderSystem>(1, m_Renderer, m_RenderFrame);
m_EditorCamera = importEntity(EntityWrapper(m_EditorWorld, EntityID_Invalid), "Schema/Entities/Empty.xml"); m_EditorCamera = importEntity(EntityWrapper(m_EditorWorld, EntityID_Invalid), "Schema/Entities/Empty.xml");
m_ActualCamera = m_EditorCamera; m_ActualCamera = m_EditorCamera;
@@ -1,16 +1,16 @@
#include "Editor/EditorRenderSystem.h" #include "Editor/EditorWidgetRenderSystem.h"
EditorRenderSystem::EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) EditorWidgetRenderSystem::EditorWidgetRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame)
: System(params) : System(params)
, m_Renderer(renderer) , m_Renderer(renderer)
, m_RenderFrame(renderFrame) , m_RenderFrame(renderFrame)
{ {
EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &EditorRenderSystem::OnSetCamera); EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &EditorWidgetRenderSystem::OnSetCamera);
auto resolution = Rectangle::Rectangle(1280, 720); auto resolution = Rectangle::Rectangle(1280, 720);
m_EditorCamera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f); m_EditorCamera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
} }
void EditorRenderSystem::Update(double dt) void EditorWidgetRenderSystem::Update(double dt)
{ {
if (m_CurrentCamera.Valid()) { if (m_CurrentCamera.Valid()) {
ComponentWrapper cameraTransform = m_CurrentCamera["Transform"]; ComponentWrapper cameraTransform = m_CurrentCamera["Transform"];
@@ -82,7 +82,7 @@ void EditorRenderSystem::Update(double dt)
m_RenderFrame->Add(scene); m_RenderFrame->Add(scene);
} }
bool EditorRenderSystem::OnSetCamera(Events::SetCamera& e) bool EditorWidgetRenderSystem::OnSetCamera(Events::SetCamera& e)
{ {
ComponentWrapper cTransform = e.CameraEntity["Transform"]; ComponentWrapper cTransform = e.CameraEntity["Transform"];
ComponentWrapper cCamera = e.CameraEntity["Camera"]; ComponentWrapper cCamera = e.CameraEntity["Camera"];