From 99cbdd3c1e668b85603ed3fa07d5f9f84ff6f7fa Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Mon, 8 Feb 2016 11:39:29 +0100
Subject: [PATCH] Player death effect fixes

---
 include/Game/Systems/PlayerDeathSystem.h      |  3 ++
 include/Game/Systems/PlayerSpawnSystem.h      |  1 +
 .../PlayerDeathExplosionWithCamera.xml        | 30 +++++++----------
 src/Game/Systems/PlayerDeathSystem.cpp        | 33 +++++++++++--------
 src/Game/Systems/PlayerSpawnSystem.cpp        |  4 ++-
 5 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/include/Game/Systems/PlayerDeathSystem.h b/include/Game/Systems/PlayerDeathSystem.h
index 7d989dbf..988dad57 100644
--- a/include/Game/Systems/PlayerDeathSystem.h
+++ b/include/Game/Systems/PlayerDeathSystem.h
@@ -22,5 +22,8 @@ public:
 private:
     EventRelay<PlayerDeathSystem, Events::PlayerDeath> m_OnPlayerDeath;
     bool OnPlayerDeath(Events::PlayerDeath& e);
+
+    void createDeathEffect(EntityWrapper player);
+
 };
 #endif
\ No newline at end of file
diff --git a/include/Game/Systems/PlayerSpawnSystem.h b/include/Game/Systems/PlayerSpawnSystem.h
index b0ff1d79..f5aa7b82 100644
--- a/include/Game/Systems/PlayerSpawnSystem.h
+++ b/include/Game/Systems/PlayerSpawnSystem.h
@@ -3,6 +3,7 @@
 #include "Systems/SpawnerSystem.h"
 #include "Events/ESpawnerSpawn.h"
 #include "Core/EPlayerSpawned.h"
+#include "Core/EPlayerDeath.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
 
diff --git a/resources/Schema/Entities/PlayerDeathExplosionWithCamera.xml b/resources/Schema/Entities/PlayerDeathExplosionWithCamera.xml
index ff33476d..8a9f5e5b 100644
--- a/resources/Schema/Entities/PlayerDeathExplosionWithCamera.xml
+++ b/resources/Schema/Entities/PlayerDeathExplosionWithCamera.xml
@@ -4,17 +4,18 @@
   <Components>
     <c:Animation>
       <Name>Hold Pos</Name>
-      <Time>0</Time>
-      <Speed>0</Speed>
     </c:Animation>
     <c:Lifetime>
-      <Lifetime>4</Lifetime>
+      <Lifetime>2.5</Lifetime>
     </c:Lifetime>
     <c:ExplosionEffect>
-      <TimeSinceDeath>0</TimeSinceDeath>
-      <ExplosionDuration>4</ExplosionDuration>
-      <ExplosionOrigin X="-60.9153252" Y="0.767338753" Z="-76.4729843"/>
-      <Velocity X="0.5" Y="0.5" Z="0"/>
+      <ColorByDistance>true</ColorByDistance>
+      <Velocity X="0" Y="7.76300049" Z="0"/>
+      <ExplosionOrigin X="0" Y="0.67900002" Z="0"/>
+      <ExponentialAccelaration>true</ExponentialAccelaration>
+      <ExplosionDuration>3</ExplosionDuration>
+      <EndColor A="0" B="0" G="0" R="1"/>
+      <Randomness>true</Randomness>
     </c:ExplosionEffect>
     <c:Model>
       <Resource>Models/AssaultAnimated.mesh</Resource>
@@ -22,24 +23,17 @@
       <Transparent>true</Transparent>
     </c:Model>
     <c:Transform>
-      <Position X="-60.9153252" Y="0.767338753" Z="-76.4729843"/>
+      <Position X="0" Y="0" Z="3.46966481"/>
     </c:Transform>
   </Components>
 
   <Children>
     <Entity name="Camera">
       <Components>
-        <c:Lifetime>
-          <Lifetime>1</Lifetime>
-        </c:Lifetime>
-        <c:Camera>
-          <FOV>120</FOV>
-          <NearClip>0.1</NearClip>
-          <FarClip>10000</FarClip>
-        </c:Camera>
+        <c:Camera/>
         <c:Transform>
-          <Position X="-60.9153252" Y="0.767338753" Z="-76.4729843"/>
-          <Orientation X="-0.7" Y="1.46" Z="0.8"/>
+          <Position X="0" Y="2.49700022" Z="4.31700039"/>
+          <Orientation X="5.95600033" Y="0" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
diff --git a/src/Game/Systems/PlayerDeathSystem.cpp b/src/Game/Systems/PlayerDeathSystem.cpp
index f7fe1ab5..60c31ce5 100644
--- a/src/Game/Systems/PlayerDeathSystem.cpp
+++ b/src/Game/Systems/PlayerDeathSystem.cpp
@@ -11,18 +11,31 @@ void PlayerDeathSystem::Update(double dt)
 }
 
 bool PlayerDeathSystem::OnPlayerDeath(Events::PlayerDeath& e)
+{
+    if (!e.Player.Valid()) {
+        return false;
+    }
+
+    createDeathEffect(e.Player);
+
+    // Delete player
+    m_World->DeleteEntity(e.Player.ID);
+
+    return true;
+}
+
+void PlayerDeathSystem::createDeathEffect(EntityWrapper player)
 {
     //load the explosioneffect XML
     auto deathEffect = ResourceManager::Load<EntityFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");
-
     EntityFileParser parser(deathEffect);
     EntityID deathEffectID = parser.MergeEntities(m_World);
     EntityWrapper deathEffectEW = EntityWrapper(m_World, deathEffectID);
 
     //components that we need from player
-    auto playerCamera = e.Player.FirstChildByName("Camera");
-    auto playerEntityModel = e.Player.FirstChildByName("PlayerModel")["Model"];
-    auto playerEntityAnimation = e.Player.FirstChildByName("PlayerModel")["Animation"];
+    auto playerCamera = player.FirstChildByName("Camera");
+    auto playerEntityModel = player.FirstChildByName("PlayerModel")["Model"];
+    auto playerEntityAnimation = player.FirstChildByName("PlayerModel")["Animation"];
 
     //copy the data from player to explisioneffectmodel
     playerEntityModel.Copy(deathEffectEW["Model"]);
@@ -31,20 +44,14 @@ bool PlayerDeathSystem::OnPlayerDeath(Events::PlayerDeath& e)
     deathEffectEW["Animation"]["Speed"] = 0.0;
 
     //copy the models position,orientation
-    deathEffectEW["Transform"]["Position"] = (glm::vec3)e.Player["Transform"]["Position"];
-    deathEffectEW["Transform"]["Orientation"] = (glm::vec3)e.Player["Transform"]["Orientation"];
+    deathEffectEW["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
+    deathEffectEW["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
     //effect,camera is relative to playersPosition
-    deathEffectEW["ExplosionEffect"]["ExplosionOrigin"] = glm::vec3(0, 0, 0);
+    //deathEffectEW["ExplosionEffect"]["ExplosionOrigin"] = glm::vec3(0, 0, 0);
 
     //camera (with lifetime) behind the player
     auto cam = deathEffectEW.FirstChildByName("Camera");
-    cam["Transform"]["Position"] = glm::vec3(0, 2.5f, 1.8f);
-    cam["Transform"]["Orientation"] = glm::vec3(5.655f, 0, 0);
     Events::SetCamera eSetCamera;
     eSetCamera.CameraEntity = cam;
     m_EventBroker->Publish(eSetCamera);
-
-    //done -> del entity
-    m_World->DeleteEntity(e.Player.ID);
-    return true;
 }
diff --git a/src/Game/Systems/PlayerSpawnSystem.cpp b/src/Game/Systems/PlayerSpawnSystem.cpp
index 7db6e8ff..5f46cce3 100644
--- a/src/Game/Systems/PlayerSpawnSystem.cpp
+++ b/src/Game/Systems/PlayerSpawnSystem.cpp
@@ -75,7 +75,9 @@ bool PlayerSpawnSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
     // Check if a player already exists
     if (m_PlayerEntities.count(e.PlayerID) != 0) {
         // TODO: Disallow infinite respawning here
-        m_World->DeleteEntity(m_PlayerEntities[e.PlayerID].ID);
+        if (m_PlayerEntities[e.PlayerID].Valid()) {
+            m_World->DeleteEntity(m_PlayerEntities[e.PlayerID].ID);
+        }
     }
 
     // Store the player for future reference