From 7bae2d08730c646aad8e2813aaa080885ac9e441 Mon Sep 17 00:00:00 2001
From: Tleety <dahltobbe@hotmail.com>
Date: Wed, 3 Feb 2016 11:58:06 +0100
Subject: [PATCH] Added a ShieldComponent and a test area in QA map for
 defender shield

---
 include/Engine/Rendering/DrawFinalPass.h      |   1 +
 resources/Schema/Components.xsd               |   1 +
 .../Schema/Components/ShieldComponent.xml     |   3 +
 .../Schema/Components/ShieldComponent.xsd     |   7 +
 .../Schema/Entities/QualityAssurance.xml      | 309 ++++++++++++++++--
 5 files changed, 302 insertions(+), 19 deletions(-)
 create mode 100644 resources/Schema/Components/ShieldComponent.xml
 create mode 100644 resources/Schema/Components/ShieldComponent.xsd

diff --git a/include/Engine/Rendering/DrawFinalPass.h b/include/Engine/Rendering/DrawFinalPass.h
index 74f505fe..4b2bcf1f 100644
--- a/include/Engine/Rendering/DrawFinalPass.h
+++ b/include/Engine/Rendering/DrawFinalPass.h
@@ -30,6 +30,7 @@ public:
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
     void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;
+
     void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& job, RenderScene& scene);
 
     void BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene);
diff --git a/resources/Schema/Components.xsd b/resources/Schema/Components.xsd
index bb1fd770..24af1f47 100644
--- a/resources/Schema/Components.xsd
+++ b/resources/Schema/Components.xsd
@@ -30,4 +30,5 @@
 	<xs:include schemaLocation="Components/Fill.xsd"/>
 	<xs:include schemaLocation="Components/Lifetime.xsd"/>
 	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
+	<xs:include schemaLocation="Components/ShieldComponent.xsd"/>
 </xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Components/ShieldComponent.xml b/resources/Schema/Components/ShieldComponent.xml
new file mode 100644
index 00000000..855ead48
--- /dev/null
+++ b/resources/Schema/Components/ShieldComponent.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ShieldComponent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ShieldComponent.xsd">
+</ShieldComponent>
\ No newline at end of file
diff --git a/resources/Schema/Components/ShieldComponent.xsd b/resources/Schema/Components/ShieldComponent.xsd
new file mode 100644
index 00000000..0076477d
--- /dev/null
+++ b/resources/Schema/Components/ShieldComponent.xsd
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="ShieldComponent">
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Entities/QualityAssurance.xml b/resources/Schema/Entities/QualityAssurance.xml
index e057cf38..90c52820 100644
--- a/resources/Schema/Entities/QualityAssurance.xml
+++ b/resources/Schema/Entities/QualityAssurance.xml
@@ -188,7 +188,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="2019.28503" Z="0"/>
+                  <Orientation X="0" Y="2019.28516" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -586,7 +586,7 @@
               <Transparent>true</Transparent>
             </c:Model>
             <c:Transform>
-              <Position X="-0.258742422" Y="0.5" Z="-1.8603574"/>
+              <Position X="-0.236842498" Y="0.5" Z="-1.83845747"/>
               <Orientation X="2.03600001" Y="0" Z="0"/>
             </c:Transform>
           </Components>
@@ -683,7 +683,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="316.504547" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -730,7 +730,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="316.504547" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -790,7 +790,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="316.504547" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -837,7 +837,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="316.504547" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -883,7 +883,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="316.504547" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -930,7 +930,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="316.504547" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -977,7 +977,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="316.504456" Z="0"/>
+                  <Orientation X="0" Y="316.504547" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1038,7 +1038,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="1" B="0" G="0.200000003" R="1"/>
+                  <Color A="0.300000012" B="0" G="0.200000003" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1088,7 +1088,8 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="1" B="0" G="1" R="1"/>
+                  <Color A="0.300000012" B="0" G="1" R="1"/>
+                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
                 <c:Transform>
@@ -1131,6 +1132,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
+                  <Color A="0.300000012" B="1" G="1" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
@@ -1177,7 +1179,8 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="1" B="1" G="1" R="0"/>
+                  <Color A="0.300000012" B="1" G="1" R="0"/>
+                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
                 <c:Transform>
@@ -1225,7 +1228,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="1" B="1" G="0.200000003" R="0"/>
+                  <Color A="0.300000012" B="1" G="0.200000003" R="0"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1374,7 +1377,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="850.206848" Z="0"/>
+                  <Orientation X="0" Y="850.206909" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1383,7 +1386,7 @@
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                      <TimeSinceDeath>0.75008034908941568</TimeSinceDeath>
+                      <TimeSinceDeath>0.7502397033169681</TimeSinceDeath>
                       <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                       <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                       <Randomness>true</Randomness>
@@ -1430,7 +1433,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="850.206848" Z="0"/>
+                  <Orientation X="0" Y="850.206909" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1439,7 +1442,7 @@
                     <c:ExplosionEffect>
                       <Velocity X="0.5" Y="1" Z="0"/>
                       <ExplosionOrigin X="0" Y="0.900000036" Z="0"/>
-                      <TimeSinceDeath>1.1999860997035228</TimeSinceDeath>
+                      <TimeSinceDeath>1.2001454539310752</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Assault.mesh</Resource>
@@ -1482,7 +1485,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="850.206848" Z="0"/>
+                  <Orientation X="0" Y="850.206909" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1497,7 +1500,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.300000012" Y="2" Z="0"/>
                       <ExplosionOrigin X="0" Y="1.30000007" Z="-0.200000003"/>
-                      <TimeSinceDeath>0.68343188336345406</TimeSinceDeath>
+                      <TimeSinceDeath>0.68359123759100648</TimeSinceDeath>
                       <EndColor A="0" B="0.333333343" G="0.933333337" R="3.92156863"/>
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
@@ -1553,6 +1556,274 @@
         </Entity>
       </Children>
     </Entity>
+    <Entity name="DefenderShieldTestOrigin">
+      <Components>
+        <c:Transform>
+          <Position X="-11.0375881" Y="0" Z="20.9209175"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Shield">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitHexagon.mesh</Resource>
+            </c:Model>
+            <c:ShieldComponent/>
+            <c:Transform>
+              <Position X="0" Y="1.47765553" Z="0"/>
+              <Orientation X="0" Y="2.15300012" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ShieldedCube">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitCube.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="-3.34650159" Y="1.19966424" Z="3.09996605"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ShieldedPlayer">
+          <Components>
+            <c:AABB>
+              <Origin X="0" Y="0.772000015" Z="0"/>
+              <Size X="1" Y="1.60000002" Z="1"/>
+            </c:AABB>
+            <c:Collidable/>
+            <c:Health/>
+            <c:Physics>
+              <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
+            </c:Physics>
+            <c:Player>
+              <MovementSpeed>5</MovementSpeed>
+            </c:Player>
+            <c:Team>
+              <Team>
+                <Red/>
+              </Team>
+            </c:Team>
+            <c:Transform>
+              <Position X="-1.56735241" Y="0.527999997" Z="0.929739475"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Camera">
+              <Components>
+                <c:Camera/>
+                <c:Transform>
+                  <Position X="0" Y="1.37700009" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="PlayerName">
+                  <Components>
+                    <c:Text>
+                      <Resource>Fonts/DroidSans.ttf,100</Resource>
+                      <Color A="1" B="0" G="1" R="0"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
+                      <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
+                      <Orientation X="0" Y="3.14199996" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="CameraModel">
+                  <Components>
+                    <c:Model>
+                      <Resource>Models/Camera.mesh</Resource>
+                      <Visible>false</Visible>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
+                      <Scale X="1.30000007" Y="1.50000012" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="HUD">
+                  <Components>
+                    <c:Transform>
+                      <Position X="0" Y="0" Z="-0.5"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="HealthBar">
+                      <Components>
+                        <c:Fill>
+                          <Percentage>1</Percentage>
+                          <Color A="0" B="1" G="0" R="0"/>
+                        </c:Fill>
+                        <c:HealthHUD/>
+                        <c:Model>
+                          <Resource>Models/Core/UnitHexagon.mesh</Resource>
+                          <Color A="1" B="0.70588237" G="0.70588237" R="0.70588237"/>
+                        </c:Model>
+                        <c:Transform>
+                          <Position X="-0.383000016" Y="-0.185000002" Z="0"/>
+                          <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
+                          <Orientation X="0" Y="0.594000041" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Crosshair">
+                      <Components>
+                        <c:Model>
+                          <Resource>Models/CrosshairQuad.mesh</Resource>
+                        </c:Model>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.200000003"/>
+                          <Scale X="0.00600000005" Y="1" Z="0.00600000005"/>
+                          <Orientation X="1.57000005" Y="0" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Weapon">
+                      <Components>
+                        <c:ExplosionEffect>
+                          <ColorByDistance>true</ColorByDistance>
+                          <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
+                          <ExplosionDuration>3.7999999523162842</ExplosionDuration>
+                          <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
+                          <Randomness>true</Randomness>
+                        </c:ExplosionEffect>
+                        <c:Model>
+                          <Resource>Models/AssaultWeaponRed.mesh</Resource>
+                        </c:Model>
+                        <c:Transform>
+                          <Position X="0.180000007" Y="-0.183000013" Z="0"/>
+                          <Orientation X="0" Y="3.08300018" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="WeaponMuzzle">
+                      <Components>
+                        <c:Transform>
+                          <Position X="0.215000004" Y="-0.153000012" Z="-0.266000003"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="ThirdPersonCamera">
+              <Components>
+                <c:Camera/>
+                <c:Model>
+                  <Resource>Models/Camera.mesh</Resource>
+                  <Visible>false</Visible>
+                </c:Model>
+                <c:Transform>
+                  <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
+                  <Orientation X="5.95600033" Y="0" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="PlayerModel">
+              <Components>
+                <c:Animation>
+                  <Name>Hold Pos</Name>
+                  <Time>0.73506627647571587</Time>
+                  <Speed>1</Speed>
+                </c:Animation>
+                <c:HiddenForLocalPlayer/>
+                <c:Model>
+                  <Resource>Models/AssaultAnimated.mesh</Resource>
+                  <Color A="1" B="0" G="0" R="1"/>
+                </c:Model>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="AABBStanding">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitCube.mesh</Resource>
+                  <Color A="0.427450985" B="1" G="1" R="1"/>
+                  <Visible>false</Visible>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0" Y="0.772000015" Z="0"/>
+                  <Scale X="1" Y="1.60000002" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="AABBCrouching">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitCube.mesh</Resource>
+                  <Color A="0.745098054" B="1" G="0" R="1"/>
+                  <Visible>false</Visible>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0" Y="0.772000015" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundItemsOrigin">
+          <Components>
+            <c:Transform>
+              <Position X="-7.17760038" Y="0" Z="5.57545042"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Log">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Log.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Position X="-0.09513513" Y="0.53153497" Z="-0.127776429"/>
+                  <Orientation X="5.9920001" Y="0.640000045" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Bush">
+              <Components>
+                <c:Model>
+                  <Resource>Models/BushAlive.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Position X="-4.95900011" Y="0" Z="1.29897511"/>
+                  <Scale X="5" Y="5" Z="5"/>
+                  <Orientation X="0.407000005" Y="1.68700004" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="Text">
+          <Components>
+            <c:Text>
+              <Content>Defender Shield Test</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+            </c:Text>
+            <c:Transform>
+              <Position X="0" Y="4.20000029" Z="0"/>
+              <Orientation X="0" Y="2.15300012" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>