Merge pull request #165 from teamfisk/PickClassCamera

Pick class camera

src/Engine/GUI/ButtonSystem.cpp

@@ -1,4 +1,5 @@
 #include "GUI/ButtonSystem.h"
+#include "Input/EInputCommand.h"
 
 ButtonSystem::ButtonSystem(SystemParams params, IRenderer* renderer)
     : System(params)
@@ -37,10 +38,20 @@ bool ButtonSystem::OnMousePress(const Events::MousePress& e)
                 m_PickEntity = EntityWrapper(m_World, m_PickData.Entity);
 
                 //You have clicked on a button entity, send pressed event.
-                Events::ButtonPressed ePressed;
-                ePressed.Entity = m_PickEntity;
-                ePressed.EntityName = m_PickEntity.Name();
-                m_EventBroker->Publish(ePressed);
+                if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
+                    Events::InputCommand eInputCmd;
+                    eInputCmd.PlayerID = LocalPlayer.ID;
+                    eInputCmd.Player = LocalPlayer;
+                    EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
+                    eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];
+                    eInputCmd.Value = (float)button["InputCmdButton"]["PressValue"];
+                    m_EventBroker->Publish(eInputCmd);
+                } else {
+                    Events::ButtonPressed ePressed;
+                    ePressed.Entity = m_PickEntity;
+                    ePressed.EntityName = m_PickEntity.Name();
+                    m_EventBroker->Publish(ePressed);
+                }
             }
         }
     }
@@ -55,10 +66,20 @@ bool ButtonSystem::OnMouseRelease(const Events::MouseRelease& e)
         if(m_PickData.Entity != EntityID_Invalid && m_PickData.World == m_World) {
             EntityWrapper ent = EntityWrapper(m_World, m_PickData.Entity);
 
-            Events::ButtonReleased eReleased;
-            eReleased.EntityName = m_PickEntity.Name();
-            eReleased.Entity = m_PickEntity;
-            m_EventBroker->Publish(eReleased);
+            if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
+                Events::InputCommand eInputCmd;
+                eInputCmd.PlayerID = LocalPlayer.ID;
+                eInputCmd.Player = LocalPlayer;
+                EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
+                eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];
+                eInputCmd.Value = 0;
+                m_EventBroker->Publish(eInputCmd);
+            } else {
+                Events::ButtonReleased eReleased;
+                eReleased.EntityName = m_PickEntity.Name();
+                eReleased.Entity = m_PickEntity;
+                m_EventBroker->Publish(eReleased);
+            }
 
             if(m_World->HasComponent(m_PickData.Entity, "Button")) {
                 if (ent == m_PickEntity) {

src/Game/Systems/PlayerSpawnSystem.cpp

@@ -105,7 +105,7 @@ void PlayerSpawnSystem::Update(double dt)
 
 bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
 {
-    if (e.Command != "PickTeam") {
+    if (e.Command != "PickTeam" && e.Command != "SwapToClassPick") {
         return false;
     }
 
@@ -113,11 +113,12 @@ bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
         return false;
     }
 
-    // A dead client should be able to swap to the spectator camera.
+    // A dead client should be able to swap to the overwatch camera.
     if (IsClient && !LocalPlayer.Valid()) {
-        // Set the spectator camera as active, if it exists.
-        // Find the camera.
-        EntityWrapper spectatorCam = m_World->GetFirstEntityByName("SpectatorCamera");
+        // Set the camera as active, if it exists.
+        // Find the respawn camera or class pick camera.
+        std::string camName = e.Command == "SwapToClassPick" ? "PickClassCamera" : "SpectatorCamera";
+        EntityWrapper spectatorCam = m_World->GetFirstEntityByName(camName);
         if (spectatorCam.Valid() && spectatorCam.HasComponent("Camera")) {
             Events::SetCamera eSetCamera;
             eSetCamera.CameraEntity = spectatorCam;
@@ -135,10 +136,18 @@ bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
     auto iter = m_SpawnRequests.begin();
     for (; iter != m_SpawnRequests.end(); ++iter) {
         if (iter->PlayerID == e.PlayerID) {
+            // If player wants to switch class, remove their spawn request.
+            if (e.Command == "SwapToClassPick") {
+                m_SpawnRequests.erase(iter);
+            }
             break;
         }
     }
 
+    if (e.Command == "SwapToClassPick") {
+        return true;
+    }
+
     if (iter != m_SpawnRequests.end()) {
         // If player is in queue to spawn, then change their team affiliation in the request.
         iter->Team = (ComponentInfo::EnumType)e.Value;