Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement

src/Game/Game.cpp

@@ -41,6 +41,7 @@
 #include "Game/Systems/ServerListSystem.h"
 #include "Game/Systems/StartSystem.h"
 #include "Game/Systems/EndScreenSystem.h"
+#include "Game/Systems/FadeSystem.h"
 #include "Rendering/TextureSprite.h"
 
 
@@ -159,6 +160,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<ServerListSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<StartSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<EndScreenSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<FadeSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");

src/Game/Systems/FadeSystem.cpp

@@ -0,0 +1,49 @@
+#include "Systems/FadeSystem.h"
+
+void FadeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFade, double dt)
+{
+    double dTime = dt;
+    if (dTime == 0.0) {
+        return;
+    }
+
+    if (!entity.Valid()) {
+        return;
+    }
+
+    if (!(bool)cFade["Out"]) {
+        dTime *= -1;
+    }
+
+    if((bool)cFade["Reverse"]) {
+        dTime *= 2;
+    }
+
+    double fadeTime = cFade["FadeTime"];
+    double& currentTime = cFade["Time"];
+    currentTime += dTime;
+
+    if(currentTime > fadeTime) {
+        currentTime = 0.0;
+        if ((bool)cFade["Reverse"]) {
+            (bool&)cFade["Out"] = !(bool)cFade["Out"];
+            currentTime = fadeTime;
+        }
+    }
+    if(currentTime < 0.0) {
+        currentTime = fadeTime;
+        if ((bool)cFade["Reverse"]) {
+            (bool&)cFade["Out"] = !(bool)cFade["Out"];
+            currentTime = 0.0;
+        }
+    }
+    double ratio = currentTime/fadeTime;
+
+    if(entity.HasComponent("Model")){
+        ((glm::vec4&)entity["Model"]["Color"]).a = ratio;
+    }
+    if (entity.HasComponent("Sprite")) {
+        ((glm::vec4&)entity["Sprite"]["Color"]).a = ratio;
+
+    }
+}

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

@@ -198,6 +198,46 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
         magAmmo -= 1;
     }
 
+    // Get weapon model based on current person
+    EntityWrapper weaponModelEntity = getRelevantWeaponEntity(wi);
+    if (!weaponModelEntity.Valid()) {
+        return;
+    }
+
+    // Tracer
+    EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleRay");
+    if (tracerSpawner.Valid()) {
+        glm::vec3 origin = Transform::AbsolutePosition(tracerSpawner);
+        glm::vec3 direction = glm::quat(Transform::AbsoluteOrientationEuler(tracerSpawner)) * glm::vec3(0, 0, -1);
+        float distance = traceRayDistance(origin, direction);
+        EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner);
+        if (ray.Valid()) {
+            ((glm::vec3&)ray["Transform"]["Scale"]).z = distance;
+        }
+    }
+    //MuzzleFlash
+    EntityWrapper muzzleFlashSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleFlash");
+    if (muzzleFlashSpawner.Valid()) {
+        std::uniform_real_distribution<float> randomSpreadAngle(0.f, 3.1415f*2);
+        EntityWrapper flash = SpawnerSystem::Spawn(muzzleFlashSpawner, muzzleFlashSpawner);
+        if (flash.Valid()) {
+            ((glm::vec3&)flash["Transform"]["Orientation"]).z = randomSpreadAngle(m_RandomEngine);
+        }
+    }
+
+    // Deal damage
+    if (dealDamage(cWeapon, wi)) {
+        // Show hit marker
+        EntityWrapper hitMarkerSpawner = wi.Player.FirstChildByName("HitMarkerSpawner");
+        if (hitMarkerSpawner.Valid()) {
+            SpawnerSystem::Spawn(hitMarkerSpawner, hitMarkerSpawner);
+            Events::PlaySoundOnEntity e;
+            e.EmitterID = wi.Player.ID;
+            e.FilePath = "Audio/weapon/hitclick.wav";
+            m_EventBroker->Publish(e);
+        }
+    }
+
     // View punch
     if (IsClient) {
         EntityWrapper camera = wi.Player.FirstChildByName("Camera");
@@ -216,37 +256,6 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
             }
         }
     }
-
-    // Get weapon model based on current person
-    EntityWrapper weaponModelEntity = getRelevantWeaponEntity(wi);
-    if (!weaponModelEntity.Valid()) {
-        return;
-    }
-
-    // Tracer
-    EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzle");
-    if (tracerSpawner.Valid()) {
-        glm::vec3 origin = Transform::AbsolutePosition(tracerSpawner);
-        glm::vec3 direction = glm::quat(Transform::AbsoluteOrientationEuler(tracerSpawner)) * glm::vec3(0, 0, -1);
-        float distance = traceRayDistance(origin, direction);
-        EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner);
-        if (ray.Valid()) {
-            ((glm::vec3&)ray["Transform"]["Scale"]).z = distance;
-        }
-    }
-
-    // Deal damage
-    if (dealDamage(cWeapon, wi)) {
-        // Show hit marker
-        EntityWrapper hitMarkerSpawner = wi.Player.FirstChildByName("HitMarkerSpawner");
-        if (hitMarkerSpawner.Valid()) {
-            SpawnerSystem::Spawn(hitMarkerSpawner, hitMarkerSpawner);
-            Events::PlaySoundOnEntity e;
-            e.EmitterID = wi.Player.ID;
-            e.FilePath = "Audio/weapon/hitclick.wav";
-            m_EventBroker->Publish(e);
-        }
-    }
     
     // Play animation
     playAnimationAndReturn(wi.FirstPersonEntity, "ActionBlend", "Fire");