WIP

include/Engine/Core/EEntityDeleted.h

@@ -2,14 +2,14 @@
 #define EEntityDeleted_h__
 
 #include "Event.h"
-#include "Entity.h"
+#include "EntityWrapper.h"
 
 namespace Events
 {
 
 struct EntityDeleted : Event
 {
-    EntityID DeletedEntity;
+    EntityWrapper DeletedEntity;
     // True if the entity deletion was triggered because the entity's parent was deleted before it
     bool Cascaded;
 };

include/Engine/Core/RespawnSystem.h

@@ -0,0 +1,28 @@
+#ifndef RespawnSystem_h__
+#define RespawnSystem_h__
+
+#include "System.h"
+#include "SpawnerSystem.h"
+#include "EEntityDeleted.h"
+#include "EPause.h"
+
+class RespawnSystem : public PureSystem
+{
+public:
+    RespawnSystem(SystemParams params);
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cRespawn, double dt) override;
+
+private:
+    std::unordered_map<EntityWrapper, EntityWrapper> m_LastRespawnedEntity;
+    bool m_Paused = false;
+
+    EventRelay<RespawnSystem, Events::EntityDeleted> m_EEntityDeleted;
+    bool OnEntityDeleted(const Events::EntityDeleted& e);
+    EventRelay<RespawnSystem, Events::Pause> m_EPause;
+    bool OnPause(const Events::Pause& e);
+    EventRelay<RespawnSystem, Events::Resume> m_EResume;
+    bool OnResume(const Events::Resume& e);
+};
+
+#endif

include/Engine/Core/SpawnerSystem.h

@@ -5,7 +5,7 @@
 #include "Common.h"
 #include "GLM.h"
 #include "Core/System.h"
-#include "Events/ESpawnerSpawn.h"
+#include "Core/ESpawnerSpawn.h"
 #include "Core/Transform.h"
 #include "Core/EntityFile.h"
 

include/Engine/Core/System.h

@@ -68,7 +68,7 @@ protected:
 
     const std::string m_ComponentType;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComponent, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System

include/Engine/Editor/EditorGUI.h

@@ -22,7 +22,7 @@
 #include "../Core/ELockMouse.h"
 #include "../Core/EFileDropped.h"
 #include "../Rendering/Texture.h"
-#include "Game/Events/ESpawnerSpawn.h"
+#include "../Core/ESpawnerSpawn.h"
 
 class EditorGUI
 {

include/Engine/Network/EBecomeServerOrClient.h

@@ -1,15 +0,0 @@
-#ifndef Events_BecomeServerOrClient_h__
-#define Events_BecomeServerOrClient_h__
-
-#include "Core/EventBroker.h"
-
-namespace Events 
-{
-
-struct BecomeServer : public Event { };
-
-struct BecomeClient : public Event { };
-
-}
-
-#endif

include/Engine/Rendering/EResolutionChanged.h

@@ -1,19 +0,0 @@
-#ifndef EResolutionChanged_h__
-#define EResolutionChanged_h__
-
-#include "../Core/Event.h"
-#include "../Core/Util/Rectangle.h"
-
-namespace Events
-{
-
-// Fired when the framebuffer size changes
-struct ResolutionChanged : Event
-{
-    Rectangle OldResolution;
-    Rectangle NewResolution;
-};
-
-}
-
-#endif

include/Engine/Rendering/LightCullingPass.h

@@ -54,7 +54,7 @@ private:
     struct Frustum {
         Plane Planes[4];
     };
-    Frustum* m_Frustums = nullptr;
+    Frustum* m_Frustums;
 
     //This should be a component
     struct LightSource {
@@ -74,11 +74,11 @@ private:
         glm::vec2 Padding = glm::vec2(1.f, 2.f);
     };
 
-    LightGrid* m_LightGrid = nullptr;
+    LightGrid* m_LightGrid;
 
     int m_LightOffset = 0;
 
-    float* m_LightIndex = nullptr;
+    float* m_LightIndex;
 };
 
 

include/Engine/Rendering/RenderSystem.h

@@ -19,7 +19,6 @@
 #include "../Core/Octree.h"
 #include "../Collision/EntityAABB.h"
 #include "../Core/ConfigFile.h"
-#include "EResolutionChanged.h"
 
 class RenderSystem : public ImpureSystem
 {
@@ -37,8 +36,6 @@ private:
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     Octree<EntityAABB>* m_Octree;
 
-    EventRelay<RenderSystem, Events::ResolutionChanged> m_EResolutionChanged;
-    bool OnResolutionChanged(Events::ResolutionChanged &event);
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
     EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;

include/Engine/Rendering/Renderer.h

@@ -28,12 +28,10 @@
 #include "Util/CommonFunctions.h"
 #include "Core/PerformanceTimer.h"
 #include "ShadowPass.h"
-#include "EResolutionChanged.h"
 
 class Renderer : public IRenderer
 {
     static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);
-    static void glfwWindowSizeCallback(GLFWwindow* window, int width, int height);
 
 public:
 	Renderer(EventBroker* eventBroker, ConfigFile* config)
@@ -42,14 +40,13 @@ public:
     { }
 	~Renderer();
 
-    virtual void SetResolution(const Rectangle& resolution) override;
-
     virtual void Initialize() override;
     virtual void Update(double dt) override;
     virtual void Draw(RenderFrame& frame) override;
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
+
 private:
     //----------------------Variables----------------------//
 
@@ -93,14 +90,11 @@ private:
     void InputUpdate(double dt);
     //void PickingPass(RenderQueueCollection& rq);
     //void DrawScreenQuad(GLuint textureToDraw);
-    void setWindowSize(Rectangle size);
-    void updateFramebufferSize();
 
     static bool DepthSort(const std::shared_ptr<RenderJob> &i, const std::shared_ptr<RenderJob> &j) { return (i->Depth < j->Depth); }
     void SortRenderJobsByDepth(RenderScene &scene);
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-
+	//--------------------ShaderPrograms-------------------//
-    //--------------------ShaderPrograms-------------------//
     ShaderProgram* m_BasicForwardProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 

include/Engine/Rendering/ShadowPass.h

@@ -63,8 +63,7 @@ private:
 
 	GLuint m_DepthMap;
 	FrameBuffer m_DepthBuffer;
-    ShaderProgram* m_ShadowProgram;
+	ShaderProgram* m_ShadowProgram;
-    ShaderProgram* m_ShadowProgramSkinned;
 
 	std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
 	std::array<glm::mat4, MAX_SPLITS> m_LightView;

include/Engine/Rendering/Util/GLError.h

@@ -16,11 +16,7 @@ inline bool _GLERROR(const char* info, const char* file, const char* func, unsig
 	return false;
 }
 
-#ifndef DEBUG
 #define GLERROR(function) \
 	_GLERROR(function, __BASE_FILE__, __func__, __LINE__)
-#else
-#define GLERROR(function) false
-#endif
 
 #endif

include/Game/Game.h

@@ -29,7 +29,6 @@
 #include "Network/Network.h"
 #include "Network/Server.h"
 #include "Network/Client.h"
-#include "Network/EBecomeServerOrClient.h"
 
 // Sound
 #include "Sound/SoundManager.h"
@@ -71,11 +70,6 @@ private:
     bool m_IsServer = false;
 
     int parseArgs(int argc, char* argv[]);
-
-    EventRelay<Game, Events::BecomeServer> m_EBecomeServer;
-    bool OnBecomeServer(const Events::BecomeServer& e);
-    EventRelay<Game, Events::BecomeClient> m_EBecomeClient;
-    bool OnBecomeClient(const Events::BecomeClient& e);
 };
 
 #endif

include/Game/Systems/MainMenuSystem.h

@@ -5,7 +5,7 @@
 #include "Rendering/IRenderer.h"
 #include "Core/ResourceManager.h"
 #include "Core/Event.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 
 
 #include "GUI/EButtonClicked.h"
@@ -14,7 +14,6 @@
 #include "Input/EInputCommand.h"
 #include "Network/ESearchForServers.h"
 #include "Network/EConnectRequest.h"
-#include "Network/EBecomeServerOrClient.h"
 
 
 class MainMenuSystem : public ImpureSystem

include/Game/Systems/PlayerSpawnSystem.h

@@ -1,7 +1,7 @@
 #include "Core/System.h"
 #include "Input/EInputCommand.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
-#include "Events/ESpawnerSpawn.h"
+#include "Core/ESpawnerSpawn.h"
 #include "Core/EPlayerSpawned.h"
 #include "Core/EPlayerDeath.h"
 #include "Rendering/ESetCamera.h"

include/Game/Systems/ServerListSystem.h

@@ -5,7 +5,7 @@
 #include "Rendering/IRenderer.h"
 #include "Core/ResourceManager.h"
 #include "Core/Event.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Core/EventBroker.h"
 
 #include "Network/ESearchForServers.h"

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -6,7 +6,7 @@
 #include "Core/Octree.h"
 #include "Collision/EntityAABB.h"
 #include "Input/EInputCommand.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
 #include "Rendering/EAutoAnimationBlend.h"

resources/Schema/Components.xsd

@@ -68,4 +68,5 @@
 	<xs:include schemaLocation="Components/NetworkComponent.xsd"/>
 	<xs:include schemaLocation="Components/ServerIdentity.xsd"/>
 	<xs:include schemaLocation="Components/ServerList.xsd"/>
+	<xs:include schemaLocation="Components/Respawn.xsd"/>
 </xs:schema>

resources/Schema/Components/Respawn.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Respawn xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Respawn.xsd">
+	<Delay>0</Delay>
+	<_RespawnCountdown>0</_RespawnCountdown>
+</Respawn>

resources/Schema/Components/Respawn.xsd

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Respawn">
+		<xs:annotation>
+			<xs:documentation>Triggers a Spawner component after its last spawned entity is destroyed with an optional delay.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Delay" type="t:double" minOccurs="0"/>
+				<xs:element name="_RespawnCountdown" type="t:double" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Entities/HealthPickup.xml

@@ -2,19 +2,13 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:HealthPickup/>
     <c:Model>
       <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
     </c:Model>
-    <c:RaptorCopter>
+    <c:NetworkComponent/>
-      <Speed>8</Speed>
-      <Axis X="0" Y="0.100000001" Z="0"/>
-    </c:RaptorCopter>
     <c:Transform>
-      <Position X="0" Y="2.36784196" Z="0"/>
+      <Scale X="0.25" Y="0.25" Z="0.25"/>
-      <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-      <Orientation X="0" Y="18767.0273" Z="0"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/HealthPickupHolder.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="-0.871185362" Z="1.77631724"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>Models/Props/PickUps/PickUpHolder.mesh</Resource>
+          <Shadow>false</Shadow>
+        </c:Model>
+        <c:Transform>
+          <Scale X="0.479999989" Y="0.479999989" Z="0.479999989"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Transform>
+          <Position X="0" Y="1.41138339" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Respawn>
+              <Delay>3</Delay>
+            </c:Respawn>
+            <c:RaptorCopter>
+              <Speed>1</Speed>
+              <Axis X="0" Y="1" Z="0"/>
+            </c:RaptorCopter>
+            <c:FloatingEffect>
+              <Period>2</Period>
+              <Time>75.797556530109119</Time>
+              <Axis X="0" Y="0.200000003" Z="0"/>
+            </c:FloatingEffect>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/HealthPickup.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="-0" Y="-0.118795805" Z="-0"/>
+              <Orientation X="0" Y="13.0735149" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MainMenu.xml

@@ -319,80 +319,23 @@
             </Entity>
           </Children>
         </Entity>
-        <Entity name="ButtonPos_5">
+      </Children>
+    </Entity>
+    <Entity name="Popup_Origin">
+      <Components>
+        <c:Transform>
+          <Position X="-0.103822395" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaySpawner">
           <Components>
-            <c:Transform>
+            <c:Spawner>
-              <Position X="0" Y="-0.280000001" Z="0"/>
+              <EntityFile>Schema/Entities/ServerList.xml</EntityFile>
-            </c:Transform>
+            </c:Spawner>
+            <c:Transform/>
           </Components>
-          <Children>
+          <Children/>
-            <Entity name="Button_5">
-              <Components>
-                <c:Button/>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                  <BlurBackground>true</BlurBackground>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                  <Color A="0.392156869" B="0" G="0" R="0"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Text">
-              <Components>
-                <c:Text>
-                  <Content>Host</Content>
-                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Alignment>
-                    <Right/>
-                  </Alignment>
-                </c:Text>
-                <c:Transform>
-                  <Position X="0.0920000002" Y="-0.0150000006" Z="0.00499999989"/>
-                  <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="ButtonCorner_Origin">
-              <Components>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="TopRight">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
-                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="BottomRight">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
-                      <Orientation X="0" Y="0" Z="4.71199989"/>
-                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
         </Entity>
       </Children>
     </Entity>

resources/Schema/Types/Entity.xsd

@@ -71,6 +71,7 @@
 							<xs:element ref="c:NetworkComponent" minOccurs="0"/>
 							<xs:element ref="c:ServerIdentity" minOccurs="0"/>
 							<xs:element ref="c:ServerList" minOccurs="0"/>
+							<xs:element ref="c:Respawn" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/ShadowSkinned.vert.glsl

@@ -1,29 +0,0 @@
-#version 430
-
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
-uniform mat4 Bones[100];
-
-layout (location = 0) in vec3 Position;
-layout (location = 4) in vec2 TextureCoords;
-layout(location = 5) in vec4 BoneIndices;
-layout(location = 6) in vec4 BoneWeights;
-
-out VertexData{
-	vec2 TextureCoordinate;
-}Output;
-
-void main()
-{	
-	mat4 boneTransform = mat4(1);
-	if(BoneWeights[0] > 0.0f){
-	boneTransform = BoneWeights[0] * Bones[int(BoneIndices[0])]
-				  + BoneWeights[1] * Bones[int(BoneIndices[1])]
-				  + BoneWeights[2] * Bones[int(BoneIndices[2])]
-				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
-	}
-
-	gl_Position = P * V * M * boneTransform * vec4(Position, 1.0);
-	Output.TextureCoordinate = TextureCoords;
-}

src/Engine/Core/RespawnSystem.cpp

@@ -0,0 +1,54 @@
+#include "Core/RespawnSystem.h"
+
+RespawnSystem::RespawnSystem(SystemParams params) 
+    : System(params)
+    , PureSystem("Respawn")
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EEntityDeleted, &RespawnSystem::OnEntityDeleted);
+    EVENT_SUBSCRIBE_MEMBER(m_EPause, &RespawnSystem::OnPause);
+    EVENT_SUBSCRIBE_MEMBER(m_EResume, &RespawnSystem::OnResume);
+}
+
+void RespawnSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cRespawn, double dt)
+{
+    if (m_Paused) {
+        return;
+    }
+
+    if (!entity.HasComponent("Spawner")) {
+        return;
+    }
+
+    EntityWrapper& lastRespawnedEntity = m_LastRespawnedEntity[entity];
+    if (!lastRespawnedEntity.Valid()) {
+        double& _respawnCountdown = cRespawn["_RespawnCountdown"];
+        _respawnCountdown -= dt;
+        if (_respawnCountdown <= 0) {
+            lastRespawnedEntity = SpawnerSystem::Spawn(entity, entity);
+            _respawnCountdown = cRespawn["Delay"];
+        }
+    }
+}
+
+bool RespawnSystem::OnEntityDeleted(const Events::EntityDeleted& e)
+{
+    m_LastRespawnedEntity.erase(e.DeletedEntity);
+    return true;
+}
+
+bool RespawnSystem::OnPause(const Events::Pause& e)
+{
+    if (e.World == m_World) {
+        m_Paused = true;
+    }
+    return true;
+}
+
+bool RespawnSystem::OnResume(const Events::Resume& e)
+{
+    if (e.World == m_World) {
+        m_Paused = false;
+    }
+    return true;
+}
+

src/Engine/Core/SpawnerSystem.cpp

@@ -1,4 +1,4 @@
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Collision/Collision.h"
 
 SpawnerSystem::SpawnerSystem(SystemParams params)

src/Engine/Core/World.cpp

@@ -223,7 +223,7 @@ void World::deleteEntityRecursive(EntityID entity, bool cascaded /*= false*/)
 
     if (m_EventBroker != nullptr) {
         Events::EntityDeleted e;
-        e.DeletedEntity = entity;
+        e.DeletedEntity = EntityWrapper(this, entity);
         e.Cascaded = cascaded;
         m_EventBroker->Publish(e);
     }

src/Engine/Network/Server.cpp

@@ -22,8 +22,7 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
         port = config->Get<float>("Networking.Port", 27666);
     }
     m_Port = port;
-    printf("Server initialized and bound to port %i\n", port);
+    LOG_INFO("Server initialized and bound to port %i", port);
-    
 }
 
 Server::~Server()
@@ -495,7 +494,7 @@ bool Server::OnEntityDeleted(const Events::EntityDeleted & e)
 {
     if (!e.Cascaded) {
         Packet packet = Packet(MessageType::EntityDeleted);
-        packet.WritePrimitive<EntityID>(e.DeletedEntity);
+        packet.WritePrimitive<EntityID>(e.DeletedEntity.ID);
         reliableBroadcast(packet);
     }
     return false;

src/Engine/Rendering/AnimationSystem.cpp

@@ -127,12 +127,12 @@ void AnimationSystem::UpdateAnimations(double dt)
 void AnimationSystem::UpdateWeights(double dt)
 {
     for (auto it = m_AutoBlendQueues.begin(); it != m_AutoBlendQueues.end(); ) {
-       /* LOG_INFO("%s", it->first.Name().c_str());
+        LOG_INFO("%s", it->first.Name().c_str());
-        it->second.PrintQueue();*/
+        it->second.PrintQueue();
         
         if(it->second.HasActiveBlendJob()) {
             AutoBlendQueue::AutoBlendJob& blendJob = it->second.GetActiveBlendJob();
-            //LOG_INFO("%s", blendJob.RootNode.Name().c_str());
+            LOG_INFO("%s", blendJob.RootNode.Name().c_str());
             std::shared_ptr<BlendTree> blendTree = it->second.GetBlendTree();
             if (blendTree != nullptr) {
                 if (blendJob.Duration != 0.0) {
@@ -283,7 +283,7 @@ bool AnimationSystem::OnAutoAnimationBlend(Events::AutoAnimationBlend& e)
 
 bool AnimationSystem::OnEntityDeleted(Events::EntityDeleted& e)
 {
-    EntityWrapper entity = EntityWrapper(m_World, e.DeletedEntity);
+    EntityWrapper entity = e.DeletedEntity;
 
     if (entity.HasComponent("Model")) {
         Model* model;

src/Engine/Rendering/LightCullingPass.cpp

@@ -42,15 +42,6 @@ void LightCullingPass::SetSSBOSizes()
 {
     m_NumberOfTiles = (int)(m_Renderer->GetViewportSize().Width/TILE_SIZE) * (int)(m_Renderer->GetViewportSize().Height/TILE_SIZE);
 
-	if (m_Frustums != nullptr) {
-		delete[] m_Frustums;
-	}
-	if (m_LightGrid != nullptr) {
-		delete[] m_LightGrid;
-	}
-	if (m_LightIndex != nullptr) {
-		delete[] m_LightIndex;
-	}
     m_Frustums = new Frustum[m_NumberOfTiles];
     m_LightGrid = new LightGrid[m_NumberOfTiles];
     m_LightIndex = new float[m_NumberOfTiles*MAX_LIGHTS_PER_TILE];

src/Engine/Rendering/PickingPass.cpp

@@ -219,7 +219,7 @@ void PickingPass::Draw(RenderScene& scene)
 					m_PickingSkinnedProgram->Bind();
 					lastShader = m_PickingSkinnedProgram->GetHandle();
 				}
-				glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
+				glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
                 std::vector<glm::mat4> frameBones;

src/Engine/Rendering/RenderSystem.cpp

@@ -9,11 +9,10 @@ RenderSystem::RenderSystem(SystemParams params, const IRenderer* renderer, Rende
     , m_Octree(frustumCullOctree)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &RenderSystem::OnSetCamera);
-    EVENT_SUBSCRIBE_MEMBER(m_EResolutionChanged, &RenderSystem::OnResolutionChanged);
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &RenderSystem::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &RenderSystem::OnPlayerSpawned);
 
-    m_Camera = new Camera((float)m_Renderer->GetViewportSize().Width / m_Renderer->GetViewportSize().Height, glm::radians(45.f), 0.01f, 5000.f);
+    m_Camera = new Camera((float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height, glm::radians(45.f), 0.01f, 5000.f);
 }
 
 RenderSystem::~RenderSystem()
@@ -21,13 +20,6 @@ RenderSystem::~RenderSystem()
     delete m_Camera;
 }
 
-bool RenderSystem::OnResolutionChanged(Events::ResolutionChanged& e)
-{
-    // Update camera aspect ration on resolution change
-    m_Camera->SetAspectRatio((float)e.NewResolution.Width / e.NewResolution.Height);
-    return true;
-}
-
 bool RenderSystem::OnSetCamera(Events::SetCamera& e)
 {
     ComponentWrapper cTransform = e.CameraEntity["Transform"];

src/Engine/Rendering/Renderer.cpp

@@ -36,24 +36,16 @@ void Renderer::Initialize()
     m_ImGuiRenderPass = new ImGuiRenderPass(this, m_EventBroker);
 }
 
-void Renderer::glfwWindowSizeCallback(GLFWwindow* window, int width, int height)
-{
-    m_WindowToRenderer[window]->setWindowSize(Rectangle(width, height));
-}
-
 void Renderer::glfwFrameBufferCallback(GLFWwindow* window, int width, int height)
 {
-    m_WindowToRenderer[window]->updateFramebufferSize();
+    glViewport(0, 0, width, height);
-}
+    Renderer* currentRenderer = m_WindowToRenderer[window];
-
+    currentRenderer->m_ViewportSize = Rectangle(width, height);
-void Renderer::SetResolution(const Rectangle& resolution)
+	currentRenderer->m_PickingPass->OnWindowResize();
-{
+    currentRenderer->m_DrawFinalPass->OnWindowResize();
-    m_Resolution = resolution;
+    currentRenderer->m_LightCullingPass->OnWindowResize();
-
+    currentRenderer->m_DrawBloomPass->OnWindowResize();
-    if (m_Window != nullptr) {
+	currentRenderer->m_SSAOPass->OnWindowResize();
-        setWindowSize(resolution);
-        updateFramebufferSize();
-    }
 }
 
 void Renderer::InitializeWindow()
@@ -75,7 +67,6 @@ void Renderer::InitializeWindow()
 		LOG_ERROR("GLFW: Failed to create window");
 		exit(EXIT_FAILURE);
 	}
-    glfwSetWindowSizeCallback(m_Window, &glfwWindowSizeCallback);
     glfwSetFramebufferSizeCallback(m_Window, &glfwFrameBufferCallback);
 	glfwMakeContextCurrent(m_Window);
 
@@ -120,30 +111,6 @@ void Renderer::InputUpdate(double dt)
    
 }
 
-void Renderer::setWindowSize(Rectangle size)
-{
-    glfwSetWindowSize(m_Window, size.Width, size.Height);
-}
-
-void Renderer::updateFramebufferSize()
-{
-    Events::ResolutionChanged e;
-    e.OldResolution = m_ViewportSize;
-
-    int width, height;
-    glfwGetFramebufferSize(m_Window, &width, &height);
-    glViewport(0, 0, width, height);
-    m_ViewportSize = Rectangle(width, height);
-    m_PickingPass->OnWindowResize();
-    m_DrawFinalPass->OnWindowResize();
-    m_LightCullingPass->OnWindowResize();
-    m_DrawBloomPass->OnWindowResize();
-    m_SSAOPass->OnWindowResize();
-    
-    e.NewResolution = m_ViewportSize;
-    m_EventBroker->Publish(e);
-}
-
 void Renderer::Update(double dt)
 {
     m_EventBroker->Process<Renderer>();
@@ -296,7 +263,6 @@ void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filterin
     GLERROR("Texture initialization failed");
 }
 
-
 void Renderer::InitializeRenderPasses()
 {
     m_PickingPass = new PickingPass(this, m_EventBroker);

src/Engine/Rendering/ShadowPass.cpp

@@ -156,12 +156,7 @@ void ShadowPass::InitializeShaderPrograms()
 	m_ShadowProgram->BindFragDataLocation(0, "ShadowMap");
 	m_ShadowProgram->Link();
 
-    m_ShadowProgramSkinned = ResourceManager::Load<ShaderProgram>("#ShadowProgramSkinned");
+
-    m_ShadowProgramSkinned->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/ShadowSkinned.vert.glsl")));
-    m_ShadowProgramSkinned->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Shadow.frag.glsl")));
-    m_ShadowProgramSkinned->Compile();
-    m_ShadowProgramSkinned->BindFragDataLocation(0, "ShadowMap");
-    m_ShadowProgramSkinned->Link();
 }
 
 void ShadowPass::ClearBuffer()
@@ -217,7 +212,8 @@ void ShadowPass::Draw(RenderScene & scene)
 
 		ShadowPassState* state = new ShadowPassState(m_DepthBuffer.GetHandle());
 
-		
+		m_ShadowProgram->Bind();
+		GLuint shaderHandle = m_ShadowProgram->GetHandle();
 		glViewport(0, 0, m_ResolutionSizeWidth, m_ResolutionSizeHeight);
 
 		for (int i = 0; i < m_CurrentNrOfSplits; i++) {
@@ -225,11 +221,7 @@ void ShadowPass::Draw(RenderScene & scene)
 
 			glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_DepthMap, 0, i);
 
-
-            GLuint shaderHandle;
-
 			for (auto &job : scene.Jobs.DirectionalLight) {
-
 				auto directionalLightJob = std::dynamic_pointer_cast<DirectionalLightJob>(job);
 
 				if (directionalLightJob) {
@@ -240,19 +232,9 @@ void ShadowPass::Draw(RenderScene & scene)
 					//RadiusToLightspace(m_shadowFrusta[i]);
 					m_LightProjection[i] = glm::ortho(m_shadowFrusta[i].LRBT[LEFT], m_shadowFrusta[i].LRBT[RIGHT], m_shadowFrusta[i].LRBT[BOTTOM], m_shadowFrusta[i].LRBT[TOP], m_NearFarPlane[NEAR], m_NearFarPlane[FAR]);
 
-
-                    m_ShadowProgram->Bind();
-                    shaderHandle = m_ShadowProgram->GetHandle();
 					glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(m_LightProjection[i]));
 					glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(m_LightView[i]));
 
-                    m_ShadowProgramSkinned->Bind();
-                    shaderHandle = m_ShadowProgramSkinned->GetHandle();
-                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(m_LightProjection[i]));
-                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(m_LightView[i]));
-
-
-
 					GLERROR("ShadowLight ERROR");
 
 					for (auto &objectJob : scene.Jobs.OpaqueObjects) {
@@ -263,23 +245,6 @@ void ShadowPass::Draw(RenderScene & scene)
 								continue;
 							}
 
-                            if(modelJob->Model->IsSkinned()) {
-                                m_ShadowProgramSkinned->Bind();
-                                shaderHandle = m_ShadowProgramSkinned->GetHandle();
-
-                                std::vector<glm::mat4> frameBones;
-                                if (modelJob->BlendTree != nullptr) {
-                                    frameBones = modelJob->BlendTree->GetFinalPose();
-                                } else {
-                                    frameBones = modelJob->Skeleton->GetTPose();
-                                }
-                                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-
-                            } else {
-                                m_ShadowProgram->Bind();
-                                shaderHandle = m_ShadowProgram->GetHandle();
-                            }
-
 							glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
 							glUniform1f(glGetUniformLocation(shaderHandle, "Alpha"), 1.f);
 
@@ -300,23 +265,6 @@ void ShadowPass::Draw(RenderScene & scene)
 									continue;
 								}
 
-                                if (modelJob->Model->IsSkinned()) {
-                                    m_ShadowProgramSkinned->Bind();
-                                    shaderHandle = m_ShadowProgramSkinned->GetHandle();
-
-                                    std::vector<glm::mat4> frameBones;
-                                    if (modelJob->BlendTree != nullptr) {
-                                        frameBones = modelJob->BlendTree->GetFinalPose();
-                                    } else {
-                                        frameBones = modelJob->Skeleton->GetTPose();
-                                    }
-                                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-
-                                } else {
-                                    m_ShadowProgram->Bind();
-                                    shaderHandle = m_ShadowProgram->GetHandle();
-                                }
-
 								glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
 								glUniform1f(glGetUniformLocation(shaderHandle, "Alpha"), modelJob->Color.a);
 

src/Game/Game.cpp

@@ -7,7 +7,7 @@
 #include "Systems/RaptorCopterSystem.h"
 #include "Systems/HealthSystem.h"
 #include "Systems/PlayerMovementSystem.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Systems/PlayerSpawnSystem.h"
 #include "Systems/PlayerDeathSystem.h"
 #include "Systems/FloatingEffectSystem.h"
@@ -40,6 +40,7 @@
 #include "Game/Systems/MainMenuSystem.h"
 #include "Game/Systems/ServerListSystem.h"
 #include "Game/Systems/StartSystem.h"
+#include "Core/RespawnSystem.h"
 #include "Rendering/TextureSprite.h"
 
 
@@ -58,6 +59,7 @@ Game::Game(int argc, char* argv[])
     ResourceManager::RegisterType<EntityFile>("EntityFile");
     ResourceManager::RegisterType<EntityXMLFile>("EntityXMLFile");
     ResourceManager::RegisterType<Font>("FontFile");
+
     m_Config = ResourceManager::Load<ConfigFile>("Config.ini");
     ResourceManager::UseThreading = m_Config->Get<bool>("Multithreading.ResourceLoading", true);
     DisableMemoryPool::Value = m_Config->Get<bool>("Debug.DisableMemoryPool", false);
@@ -65,8 +67,6 @@ Game::Game(int argc, char* argv[])
 
     // Create the core event broker
     m_EventBroker = new EventBroker();
-    EVENT_SUBSCRIBE_MEMBER(m_EBecomeServer, &Game::OnBecomeServer);
-    EVENT_SUBSCRIBE_MEMBER(m_EBecomeClient, &Game::OnBecomeClient);
 
     // Create the renderer
     m_Renderer = new Renderer(m_EventBroker, m_Config);
@@ -77,7 +77,7 @@ Game::Game(int argc, char* argv[])
         0,
         m_Config->Get<int>("Video.Width", 1280),
         m_Config->Get<int>("Video.Height", 720)
-        ));
+    ));
     m_Renderer->Initialize();
     //m_Renderer->Camera()->SetFOV(glm::radians(m_Config->Get<float>("Video.FOV", 90.f)));
     m_RenderFrame = new RenderFrame();
@@ -100,7 +100,21 @@ Game::Game(int argc, char* argv[])
     // Create the sound manager
     m_SoundManager = new SoundManager(m_World, m_EventBroker);
 
-
+    // Initialize network
+    if (m_Config->Get<bool>("Networking.StartNetwork", false)) {
+        if (m_IsServer) {
+            m_NetworkServer = new Server(m_World, m_EventBroker, m_NetworkPort);
+            m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " SERVER");
+        } else if (m_IsClient) {
+            m_NetworkClient = new Client(m_World, m_EventBroker, std::make_unique<MultiplayerSnapshotFilter>(m_EventBroker));
+            m_NetworkClient->Connect(m_NetworkAddress, m_NetworkPort);
+            m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " CLIENT");
+        }
+    } else {
+        // If network is disabled, pretend we're a server
+        m_IsClient = true;
+        m_IsServer = true;
+    }
 
     // Create Octrees
     // TODO: Perhaps the world bounds should be set in some non-arbitrary way instead of this.
@@ -122,6 +136,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<HealthSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerMovementSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<SpawnerSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<RespawnSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerSpawnSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AssaultWeaponBehaviour>(updateOrderLevel, m_Renderer, m_OctreeCollision);
     m_SystemPipeline->AddSystem<DefenderWeaponBehaviour>(updateOrderLevel, m_Renderer, m_OctreeCollision);
@@ -175,8 +190,6 @@ Game::~Game()
     delete m_OctreeCollision;
     delete m_OctreeTrigger;
     delete m_SoundManager;
-    m_EventBroker->Unsubscribe(m_EBecomeServer);
-    m_EventBroker->Unsubscribe(m_EBecomeClient);
     if (m_NetworkClient != nullptr) {
         delete m_NetworkClient;
     }
@@ -199,7 +212,6 @@ void Game::Tick()
     double dt = currentTime - m_LastTime;
     m_LastTime = currentTime;
 
-    m_EventBroker->Process<Game>();
     // Handle input in a weird looking but responsive way
     m_EventBroker->Process<InputManager>();
     m_EventBroker->Swap();
@@ -274,40 +286,3 @@ int Game::parseArgs(int argc, char* argv[])
 
     return 0;
 }
-
-bool Game::OnBecomeServer(const Events::BecomeServer& e)
-{
-
-    //    if (m_IsServer) {
-    //        m_NetworkServer = new Server(m_World, m_EventBroker, m_NetworkPort);
-    //        m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " SERVER");
-    //    } else if (m_IsClient) {
-    //        m_NetworkClient = new Client(m_World, m_EventBroker, std::make_unique<MultiplayerSnapshotFilter>(m_EventBroker));
-    //        m_NetworkClient->Connect(m_NetworkAddress, m_NetworkPort);
-    //        m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " CLIENT");
-    //    }
-
-    if (m_NetworkServer != nullptr) {
-        delete m_NetworkServer;
-    }
-    if (m_NetworkClient != nullptr) {
-        delete m_NetworkClient;
-    }
-    m_NetworkServer = new Server(m_World, m_EventBroker, m_NetworkPort);
-    m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " SERVER");
-    return true;
-}
-
-bool Game::OnBecomeClient(const Events::BecomeClient& e)
-{
-    if (m_NetworkServer != nullptr) {
-        delete m_NetworkServer;
-    }
-    if (m_NetworkClient != nullptr) {
-        delete m_NetworkClient;
-    }
-    m_NetworkClient = new Client(m_World, m_EventBroker, std::make_unique<MultiplayerSnapshotFilter>(m_EventBroker));
-    m_NetworkClient->Connect(m_NetworkAddress, m_NetworkPort);
-    m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " CLIENT");
-    return true;
-}

src/Game/Systems/MainMenuSystem.cpp

@@ -21,7 +21,7 @@ bool MainMenuSystem::OnButtonClick(const Events::ButtonClicked& e)
     if (e.EntityName == "ServerIdentityConnect") {
         EntityWrapper entity = e.Entity;
         EntityWrapper serverIdentityEntity = entity.FirstParentWithComponent("ServerIdentity");
-        if (serverIdentityEntity.Valid()) {
+        if(serverIdentityEntity.Valid()) {
             Events::ConnectRequest event;
             event.IP = (std::string)serverIdentityEntity["ServerIdentity"]["IP"];
             event.Port = (int)serverIdentityEntity["ServerIdentity"]["Port"];
@@ -44,13 +44,7 @@ bool MainMenuSystem::OnButtonPress(const Events::ButtonPressed& e)
 
 bool MainMenuSystem::OnInputCommand(const Events::InputCommand& e)
 {
-    if (e.Command == "Host" && e.Value == 1) {
+    if(e.Command == "Play" && e.Value == 1) {
-        printf("Sending event...\n");
-        m_EventBroker->Publish(Events::BecomeServer());
-        return true;
-    }
-    if (e.Command == "Play" && e.Value == 1) {
-        m_EventBroker->Publish(Events::BecomeClient());
         auto menus = m_World->GetComponents("Menu");
         if (menus == nullptr) {
             return 0;
@@ -70,7 +64,7 @@ bool MainMenuSystem::OnInputCommand(const Events::InputCommand& e)
                 break;
             }
 
-        } else if (!m_OpenSubMenu.HasComponent("ServerList")) {
+        } else if(!m_OpenSubMenu.HasComponent("ServerList")) {
             //Menu is open, but not the right one, delete the old one and open a new one.
             m_World->DeleteEntity(m_OpenSubMenu.ID);
             m_OpenSubMenu = EntityWrapper::Invalid;
@@ -91,7 +85,7 @@ bool MainMenuSystem::OnInputCommand(const Events::InputCommand& e)
             m_World->DeleteEntity(m_OpenSubMenu.ID);
             m_OpenSubMenu = EntityWrapper::Invalid;
         }
-    } else if (e.Command == "RefreshServerList" && e.Value == 1) {
+    } else if (e.Command == "RefreshServerList" && e.Value == 1){
         Events::SearchForServers event;
         m_EventBroker->Publish(event);
     }

src/Game/Systems/PlayerDeathSystem.cpp

@@ -67,7 +67,7 @@ void PlayerDeathSystem::createDeathEffect(EntityWrapper player)
 bool PlayerDeathSystem::OnEntityDeleted(Events::EntityDeleted& e)
 {
     // We only care about when the local players death effect is removed.
-    if (m_LocalPlayerDeathEffect.ID != e.DeletedEntity) {
+    if (m_LocalPlayerDeathEffect != e.DeletedEntity) {
         return false;
     }