From 3cee4e42482e026a393f2682669cb11b8d8c71c5 Mon Sep 17 00:00:00 2001
From: viktorljung <vilb12@student.bth.se>
Date: Sun, 13 Mar 2016 16:42:07 +0100
Subject: [PATCH] defender ray fixes

---
 resources/Schema/Entities/DefenderRayBlue.xml | 22 +++++++++----------
 .../Weapon/DefenderWeaponBehaviour.cpp        |  8 +++----
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/resources/Schema/Entities/DefenderRayBlue.xml b/resources/Schema/Entities/DefenderRayBlue.xml
index 7680f1da..37a8f80c 100644
--- a/resources/Schema/Entities/DefenderRayBlue.xml
+++ b/resources/Schema/Entities/DefenderRayBlue.xml
@@ -3,11 +3,9 @@
 
   <Components>
     <c:Lifetime>
-      <Lifetime>0.5</Lifetime>
+      <Lifetime>0.079999998211860657</Lifetime>
     </c:Lifetime>
-    <c:Transform>
-      <Scale X="0" Y="1" Z="1"/>
-    </c:Transform>
+    <c:Transform/>
   </Components>
 
   <Children>
@@ -16,14 +14,14 @@
         <c:Sprite>
           <Model>Models/Core/UnitQuad.mesh</Model>
           <GlowMap></GlowMap>
-          <DiffuseTexture>Textures/Effects/NewRay3.png</DiffuseTexture>
-          <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
-          <KeepRatioX>true</KeepRatioX>
+          <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
+          <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
+          <KeepRatio>true</KeepRatio>
         </c:Sprite>
         <c:Transform>
           <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="-1.57099998" Z="0"/>
-          <Scale X="1" Y="0.0710000023" Z="0"/>
+          <Scale X="1" Y="0.0700000003" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -33,14 +31,14 @@
         <c:Sprite>
           <Model>Models/Core/UnitQuad.mesh</Model>
           <GlowMap></GlowMap>
-          <DiffuseTexture>Textures/Effects/NewRay3.png</DiffuseTexture>
-          <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
-          <KeepRatioX>true</KeepRatioX>
+          <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
+          <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
+          <KeepRatio>true</KeepRatio>
         </c:Sprite>
         <c:Transform>
           <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
-          <Scale X="1" Y="0.0710000023" Z="0"/>
+          <Scale X="1" Y="0.0700000003" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
diff --git a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
index cc2f9f7c..7fd07e2d 100644
--- a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
+++ b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
@@ -393,7 +393,7 @@ void DefenderWeaponBehaviour::spawnTracers(ComponentWrapper cWeapon, WeaponInfo&
                 float yaw = std::atan2(lookVector.x, lookVector.z);
                 glm::quat orientation = glm::quat(glm::vec3(pitch, yaw, 0));
                 rayOrientation = glm::eulerAngles(orientation);
-                rayScale.z(glm::length(muzzleToHit));
+                rayScale.x(glm::length(muzzleToHit));
             }
         }
     }
@@ -449,8 +449,8 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
         }
 
         // Temp hit decal
-       // EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World);
-       // hit["Transform"]["Position"] = pick.Position;
+        EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World);
+        (Field<glm::vec3>)hit["Transform"]["Position"] = pick.Position;
 
         // Don't let us shoot ourselves in the foot somehow
         if (victim == LocalPlayer) {
@@ -472,7 +472,7 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
         }
 
         damageSum[victim] += pelletDamage;
-      //  ((glm::vec3&)hit["Model"]["Color"]).b = 1.f;
+        ((Field<glm::vec4>)hit["Model"]["Color"]).z(1.f);
     }
 
     // Deal damage!