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

Rebase fixes

Browse Source
This commit is contained in:
sippeangelo
2016-03-02 22:24:27 +01:00
parent 6d2272f62e
commit ebe2d9d4f5
3 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Editor/EditorRenderSystem.h
+2 -2
View File
@@ -7,7 +7,7 @@
class EditorRenderSystem : public ImpureSystem
{
public:
EditorRenderSystem(World* world, EventBroker* eventBroker, IRenderer* renderer, RenderFrame* renderFrame);
EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
virtual void Update(double dt) override;
@@ -20,5 +20,5 @@ private:
EventRelay<EditorRenderSystem, Events::SetCamera> m_ESetCamera;
bool OnSetCamera(Events::SetCamera& e);
void enqueueModel(RenderScene& scene, EntityWrapper entity, const glm::mat4& modelMatrix, const std::string& modelResource, bool wireframe);
void enqueueModel(RenderScene& scene, EntityWrapper entity, const glm::mat4& modelMatrix, const std::string& modelResource, ComponentWrapper cModel, bool wireframe);
};