Cray cray weapons

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

@@ -39,6 +39,8 @@ void AssaultWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
         ammo = glm::max(0, ammo - (magSize - magAmmo));
         magAmmo = glm::min(magSize, ammo);
         isReloading = false;
+        wi.FirstPersonEntity["Model"]["Visible"] = true;
+        wi.ThirdPersonEntity["Model"]["Visible"] = true;
     }    
     
     // Restore view angle
@@ -57,19 +59,18 @@ void AssaultWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
     }
 
     // Update first person run animation
-    /*ComponentWrapper cPlayer = wi.Player["Player"];
+    ComponentWrapper cPlayer = wi.Player["Player"];
     ComponentWrapper cPhysics = wi.Player["Physics"];
     const float& movementSpeed = cPlayer["MovementSpeed"];
     float speed = glm::length((const glm::vec3&)cPhysics["Velocity"]);
-    float animationSpeed = glm::max(speed, movementSpeed) / movementSpeed;
+    float animationWeight = glm::min(speed, movementSpeed) / movementSpeed;
     EntityWrapper rootNode = wi.FirstPersonEntity.FirstParentWithComponent("Model");
     if (rootNode.Valid()) {
-        EntityWrapper animationNode = rootNode.FirstChildByName("Run");
-        if (animationNode.Valid()) {
-            (bool&)animationNode["Animation"]["Play"] = animationSpeed > 0;
-            (double&)animationNode["Animation"]["Speed"] = animationSpeed;
+        EntityWrapper blend = rootNode.FirstChildByName("MovementBlend");
+        if (blend.Valid()) {
+            (double&)blend["Blend"]["Weight"] = animationWeight;
         }
-    }*/
+    }
 
     // Fire if we're able to fire
     if (canFire(cWeapon, wi)) {
@@ -122,6 +123,8 @@ void AssaultWeaponBehaviour::OnReload(ComponentWrapper cWeapon, WeaponInfo& wi)
     EntityWrapper reloadEffectSpawner = wi.FirstPersonEntity.FirstChildByName("FirstPersonReloadSpawner");
     if (reloadEffectSpawner.Valid()) {
         SpawnerSystem::Spawn(reloadEffectSpawner, reloadEffectSpawner);
+        wi.FirstPersonEntity["Model"]["Visible"] = false;
+        wi.ThirdPersonEntity["Model"]["Visible"] = false;
     }
 }
 

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -36,6 +36,7 @@ void DefenderWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
             m_EventBroker->Publish(e);
         } else {
             isReloading = false;
+            playAnimationAndReturn(wi.FirstPersonEntity, "FinalBlend", "Idle");
         }
     }
 
@@ -96,6 +97,9 @@ void DefenderWeaponBehaviour::OnReload(ComponentWrapper cWeapon, WeaponInfo& wi)
     // Start reload
     isReloading = true;
     reloadTimer = reloadTime;
+
+    // Play animation
+    playAnimationAndReturn(wi.FirstPersonEntity, "FinalBlend", "Reload");
 }
 
 void DefenderWeaponBehaviour::OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi)
@@ -115,8 +119,40 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
         if (attachment.Valid()) {
             if (e.Value > 0) {
                 SpawnerSystem::Spawn(attachment, attachment);
+
+                EntityWrapper root = wi.FirstPersonEntity.FirstParentWithComponent("Model");
+                if (root.Valid()) {
+                    EntityWrapper subTree = root.FirstChildByName("FinalBlend");
+                    if (subTree.Valid()) {
+                        EntityWrapper animationNode = subTree.FirstChildByName("Shield");
+                        if (animationNode.Valid()) {
+                            Events::AutoAnimationBlend eFireBlend;
+                            eFireBlend.RootNode = root;
+                            eFireBlend.NodeName = "Shield";
+                            eFireBlend.Restart = true;
+                            eFireBlend.Start = true;
+                            m_EventBroker->Publish(eFireBlend);
+                        }
+                    }
+                }
             } else {
                 attachment.DeleteChildren();
+
+                EntityWrapper root = wi.FirstPersonEntity.FirstParentWithComponent("Model");
+                if (root.Valid()) {
+                    EntityWrapper subTree = root.FirstChildByName("FinalBlend");
+                    if (subTree.Valid()) {
+                        EntityWrapper animationNode = subTree.FirstChildByName("ActionBlend");
+                        if (animationNode.Valid()) {
+                            Events::AutoAnimationBlend eFireBlend;
+                            eFireBlend.RootNode = root;
+                            eFireBlend.NodeName = "ActionBlend";
+                            eFireBlend.Restart = true;
+                            eFireBlend.Start = true;
+                            m_EventBroker->Publish(eFireBlend);
+                        }
+                    }
+                }
             }
         }
     }
@@ -195,6 +231,9 @@ void DefenderWeaponBehaviour::fireShell(ComponentWrapper cWeapon, WeaponInfo& wi
         }
     }
 
+    // Play animation
+    playAnimationAndReturn(wi.FirstPersonEntity, "BlendTreeDefenderWeapon", "Fire");
+
     // Sound
     Events::PlaySoundOnEntity e;
     e.EmitterID = wi.Player.ID;