Fixed exit crash(es)

This commit is contained in:
2016-01-06 11:20:16 +01:00
parent c133223bac
commit 34cbbb3eb1
5 changed files with 21 additions and 49 deletions
+5
View File
@@ -7,10 +7,13 @@
class System
{
friend class SystemPipeline;
protected:
System(EventBroker* eventBroker)
: m_EventBroker(eventBroker)
{ }
virtual ~System() = default;
EventBroker* m_EventBroker;
};
@@ -24,6 +27,7 @@ protected:
: System(eventBroker)
, m_ComponentType(componentType)
{ }
virtual ~PureSystem() = default;
const std::string m_ComponentType;
@@ -38,6 +42,7 @@ protected:
ImpureSystem(EventBroker* eventBroker)
: System(eventBroker)
{ }
virtual ~ImpureSystem() = default;
virtual void Update(World* world, double dt) = 0;
};
+2 -4
View File
@@ -14,10 +14,8 @@ public:
{ }
~SystemPipeline()
{
for (auto& pair : m_PureSystems) {
for (auto& system : pair.second) {
delete system;
}
for (auto& pair : m_Systems) {
delete pair.second;
}
}
+3
View File
@@ -12,6 +12,7 @@
#include "../Core/World.h"
#include "PickingPass.h"
#include "DrawScenePass.h"
#include "DebugCameraInputController.h"
#define TILE_SIZE 16
@@ -45,6 +46,8 @@ private:
//----------------------Variables----------------------//
EventBroker* m_EventBroker;
std::shared_ptr<DebugCameraInputController<Renderer>> m_DebugCameraInputController;
Texture* m_ErrorTexture;
Texture* m_WhiteTexture;
float m_CameraMoveSpeed;