From 007dc2aace28a176a32c2e90c45ec6875571d1b3 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Tue, 1 Mar 2016 16:35:54 +0100
Subject: [PATCH] Updated Player.xml for multiple weapons

---
 .../Schema/Entities/DefenderWeaponView.xml    |  8 +--
 resources/Schema/Entities/Player.xml          | 58 +++++++++++++------
 .../Schema/Entities/SidearmWeaponView.xml     | 27 +++++++++
 .../Schema/Entities/SidearmWeaponWorld.xml    | 27 +++++++++
 src/Game/Game.cpp                             |  2 +
 5 files changed, 97 insertions(+), 25 deletions(-)
 create mode 100644 resources/Schema/Entities/SidearmWeaponView.xml
 create mode 100644 resources/Schema/Entities/SidearmWeaponWorld.xml

diff --git a/resources/Schema/Entities/DefenderWeaponView.xml b/resources/Schema/Entities/DefenderWeaponView.xml
index f6b6e89d..b65194f9 100755
--- a/resources/Schema/Entities/DefenderWeaponView.xml
+++ b/resources/Schema/Entities/DefenderWeaponView.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="WeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="DefenderWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:BoneAttachment>
-      <BoneName>R_Arm_Weapon_Joint</BoneName>
-      <PositionOffset X="0" Y="0.0480000004" Z="-0.183000013"/>
-    </c:BoneAttachment>
     <c:Model>
       <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
     </c:Model>
     <c:Transform>
-      <Position X="0.120430306" Y="0.775375426" Z="1.36542225"/>
+      <Position X="0" Y="0.0350000001" Z="-0.295000017"/>
     </c:Transform>
   </Components>
 
diff --git a/resources/Schema/Entities/Player.xml b/resources/Schema/Entities/Player.xml
index 6a28f02d..0cd93fae 100644
--- a/resources/Schema/Entities/Player.xml
+++ b/resources/Schema/Entities/Player.xml
@@ -8,9 +8,10 @@
     </c:AABB>
     <c:Collidable/>
     <c:DefenderWeapon>
-      <TimeSinceLastFire>1.6944730461160304</TimeSinceLastFire>
+      <TimeSinceLastFire>95.044877438627367</TimeSinceLastFire>
     </c:DefenderWeapon>
     <c:DoubleJump/>
+    <c:SidearmWeapon/>
     <c:Health/>
     <c:Physics>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
@@ -367,7 +368,7 @@
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>0.67172915251515519</Time1>
+              <Time1>0.022133545026491674</Time1>
               <Speed1>1</Speed1>
               <AnimationName2></AnimationName2>
               <AnimationName3></AnimationName3>
@@ -381,25 +382,37 @@
           <Children>
             <Entity name="PrimaryAttachment">
               <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/DefenderWeaponView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
+                <c:BoneAttachment>
+                  <BoneName>R_Arm_Weapon_Joint</BoneName>
+                </c:BoneAttachment>
                 <c:WeaponAttachment>
                   <Weapon>DefenderWeapon</Weapon>
                 </c:WeaponAttachment>
+                <c:Spawner>
+                  <EntityFile>Schema/Entities/DefenderWeaponView.xml</EntityFile>
+                </c:Spawner>
+                <c:Transform>
+                  <Position X="0.120430708" Y="-0.228458226" Z="-0.181454539"/>
+                  <Orientation X="0.0104047246" Y="-0.00268179877" Z="0.0428441055"/>
+                </c:Transform>
               </Components>
               <Children/>
             </Entity>
             <Entity name="SecondaryAttachment">
               <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
+                <c:BoneAttachment>
+                  <BoneName>R_Arm_Weapon_Joint</BoneName>
+                </c:BoneAttachment>
                 <c:WeaponAttachment>
                   <Weapon>SidearmWeapon</Weapon>
                 </c:WeaponAttachment>
+                <c:Spawner>
+                  <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
+                </c:Spawner>
+                <c:Transform>
+                  <Position X="0.120430708" Y="-0.228458226" Z="-0.181454539"/>
+                  <Orientation X="0.0104047246" Y="-0.00268179877" Z="0.0428441055"/>
+                </c:Transform>
               </Components>
               <Children/>
             </Entity>
@@ -425,6 +438,7 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
+          <Time1>0.13373697879978863</Time1>
           <Speed1>1</Speed1>
           <AnimationName2></AnimationName2>
           <AnimationName3></AnimationName3>
@@ -444,31 +458,37 @@
       <Children>
         <Entity name="PrimaryAttachment">
           <Components>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/DefenderWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform/>
             <c:WeaponAttachment>
               <Weapon>DefenderWeapon</Weapon>
               <Person>
                 <ThirdPerson/>
               </Person>
             </c:WeaponAttachment>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/DefenderWeaponWorld.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
           </Components>
           <Children/>
         </Entity>
         <Entity name="SecondaryAttachment">
           <Components>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/AssaultWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform/>
+            <c:BoneAttachment>
+              <BoneName>R_Arm_Weapon_Joint</BoneName>
+            </c:BoneAttachment>
             <c:WeaponAttachment>
-              <Weapon>AssaultWeapon</Weapon>
+              <Weapon>SidearmWeapon</Weapon>
               <Person>
                 <ThirdPerson/>
               </Person>
             </c:WeaponAttachment>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.158007994" Y="1.03165817" Z="-0.216171086"/>
+              <Orientation X="-0.0626474619" Y="-0.03413276" Z="0.120247819"/>
+            </c:Transform>
           </Components>
           <Children/>
         </Entity>
diff --git a/resources/Schema/Entities/SidearmWeaponView.xml b/resources/Schema/Entities/SidearmWeaponView.xml
new file mode 100644
index 00000000..68d29676
--- /dev/null
+++ b/resources/Schema/Entities/SidearmWeaponView.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SidearmWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Model>
+      <Resource>Models/Weapons/SecondaryWeapon.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="-0.00200000009" Y="0.0600000024" Z="-0.297000021"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0" Y="0.105000004" Z="-0.256000012"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>
diff --git a/resources/Schema/Entities/SidearmWeaponWorld.xml b/resources/Schema/Entities/SidearmWeaponWorld.xml
new file mode 100644
index 00000000..21cb26a7
--- /dev/null
+++ b/resources/Schema/Entities/SidearmWeaponWorld.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SidearmWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Model>
+      <Resource>Models/Weapons/SecondaryWeapon.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="-0.0160000008" Y="0.0800000057" Z="-0.275000006"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.0123999491" Y="0.102453232" Z="-0.273824364"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index 2946d656..0d7c4dd4 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -17,6 +17,7 @@
 #include "Game/Systems/AmmoPickupSystem.h"
 #include "Game/Systems/DamageIndicatorSystem.h"
 #include "Game/Systems/Weapon/DefenderWeaponBehaviour.h"
+#include "Game/Systems/Weapon/SidearmWeaponBehaviour.h"
 #include "Rendering/AnimationSystem.h"
 #include "Game/Systems/HealthHUDSystem.h"
 #include "Rendering/BoneAttachmentSystem.h"
@@ -124,6 +125,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<SpawnerSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerSpawnSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<DefenderWeaponBehaviour>(updateOrderLevel, m_Renderer, m_OctreeCollision);
+    m_SystemPipeline->AddSystem<SidearmWeaponBehaviour>(updateOrderLevel, m_Renderer, m_OctreeCollision);
     m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);