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

merge fixes

Browse Source
This commit is contained in:
Tleety
2016-02-11 14:52:52 +01:00
parent f0ae365401
commit 9f657ada4e
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/Systems/CapturePointHUDSystem.h
+1 -1
View File
@@ -12,7 +12,7 @@
class CapturePointHUDSystem : public ImpureSystem class CapturePointHUDSystem : public ImpureSystem
{ {
public: public:
CapturePointHUDSystem(World* world, EventBroker* eventBroker); CapturePointHUDSystem(SystemParams params);
virtual void Update(double dt) override; virtual void Update(double dt) override;
src/Engine/Rendering/DrawFinalPass.cpp
-1
View File
@@ -323,7 +323,6 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightCullingPass->LightGridSSBO()); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightCullingPass->LightGridSSBO());
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightCullingPass->LightIndexSSBO()); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightCullingPass->LightIndexSSBO());
for (auto &job : jobs) { for (auto &job : jobs) {
auto explosionEffectJob = std::dynamic_pointer_cast<ExplosionEffectJob>(job); auto explosionEffectJob = std::dynamic_pointer_cast<ExplosionEffectJob>(job);
if (explosionEffectJob) { if (explosionEffectJob) {
src/Game/Systems/CapturePointHUDSystem.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
#include "Systems/CapturePointHUDSystem.h" #include "Systems/CapturePointHUDSystem.h"
CapturePointHUDSystem::CapturePointHUDSystem(World* world, EventBroker* eventBroker) CapturePointHUDSystem::CapturePointHUDSystem(SystemParams params)
: System(world, eventBroker) : System(params)
, ImpureSystem() , ImpureSystem()
{ {
//subscribe/listenTo playerdamage,healthpickup events (using the eventBroker) //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)