Tweaked values for the effect to look better

added safety ifs and renamed dasheffect to sprinteffect
Player cannot see their own sprint effect.
2016-03-04 03:28:58 +01:00 · 2016-03-04 03:19:41 +01:00 · 2016-03-03 22:09:51 +01:00 · 2016-03-03 21:57:27 +01:00 · 2016-03-03 21:24:31 +01:00 · 2016-03-03 18:49:42 +01:00
16 changed files with 2437 additions and 2124 deletions
@@ -30,6 +30,7 @@ public:
    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID);
    virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
    virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
+    bool SpecialAbilityKeyDown() const { return m_SpecialAbilityKeyDown; }

 protected:
    const int m_PlayerID;
@@ -145,10 +146,10 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
            if (m_NumberOfMovementKeysDown == 0) {
                m_MovementKeyDown = false;
            }
-                //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-                m_AssaultDashTapDirection = m_CurrentDirectionVector;
-                m_AssaultDashDoubleTapDeltaTime = 0.f;
-            
+            //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
+            m_AssaultDashTapDirection = m_CurrentDirectionVector;
+            m_AssaultDashDoubleTapDeltaTime = 0.f;
+
        }
    }

@@ -161,18 +162,11 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
    }

    if (e.Command == "SpecialAbility") {
-        if (e.Value > 0) {
-            m_SpecialAbilityKeyDown = true;
-        } else {
-            m_SpecialAbilityKeyDown = false;
-        }
-    }
-    if (m_SpecialAbilityKeyDown && m_MovementKeyDown) {
-        m_ShiftDashing = true;
-    } else {
-        m_ShiftDashing = false;
+        m_SpecialAbilityKeyDown = e.Value > 0;
    }

+    m_ShiftDashing = m_SpecialAbilityKeyDown && m_MovementKeyDown;
+
    return true;
 }

@@ -30,6 +30,8 @@ private:
    bool m_LeftFoot = false;
    // To get a difference when calculating the walking state.
    glm::vec3 m_LastPosition = glm::vec3();
+    // Used to track afterimages for sprint effect.
+    float m_SprintEffectTimer;
    // The logic for making the sound play when player is moving
    void playerStep(double dt);
    // Spawn a hexagon at origin of an Entity
@@ -27,4 +27,5 @@ M=SwitchToClient
 P=SwitchToPlayer
 K=TakeDamage,1500
 F2=PerformanceTimingResetAllTimers
-F3=PerformanceTimingCreateExcelData
+F3=PerformanceTimingCreateExcelData
+F4=SwapToClassPick
@@ -59,4 +59,5 @@
 	<xs:include schemaLocation="Components/CapturePointArrowHUD.xsd"/>
 	<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
 	<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
+	<xs:include schemaLocation="Components/InputCmdButton.xsd"/>
 </xs:schema>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<InputCmdButton xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="InputCmdButton.xsd">
+	<Command></Command>
+	<PressValue>0.0</PressValue>
+</InputCmdButton>
@@ -0,0 +1,19 @@
+<?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="InputCmdButton">
+		<xs:annotation><xs:documentation>Used with a Button component, the button will send an inputCommand event instead of ButtonPressed/Released event.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Command" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>The command name for the inputCommand.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="PressValue" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>The value in inputCommand.Value that will be sent on button press.</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <SprintAbility xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SprintAbility.xsd">
-	<CoolDownMaxTimer>2.0</CoolDownMaxTimer>
+	<StrengthOfEffect>1.3</StrengthOfEffect>
+	<Active>false</Active>
 </SprintAbility>
@@ -9,8 +9,11 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>This is the cooldown on sprint</xs:documentation></xs:annotation>
+				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the strength of the sprint effect</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Active" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>True if currently sprinting.</xs:documentation></xs:annotation>
 				</xs:element>
 			</xs:all>
 		</xs:complexType>
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="OverwatchCamera" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:RaptorCopter>
+      <Speed>0.049999997019767761</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
+    <c:Transform>
+      <Position X="0" Y="-4" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="CameraAnchor">
+      <Components>
+        <c:Transform>
+          <Position X="66" Y="59.2180023" Z="0"/>
+          <Orientation X="5.89000034" Y="1.57079637" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="SpectatorCamera">
+          <Components>
+            <c:Camera/>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="SpectatorHUD">
+              <Components>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-0.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="CapturePointHUD">
+                  <Components>
+                    <c:Transform>
+                      <Position X="0" Y="0.190541431" Z="0"/>
+                      <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="BackgroundHexagon">
+                      <Components>
+                        <c:Sprite>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <Color A="0.300000012" B="1" G="1" R="1"/>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Position X="0" Y="0.919596612" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="ProgressionHexagon">
+                          <Components>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>2</CapturePointNumber>
+                            </c:CapturePointHUD>
+                            <c:Fill>
+                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0" Y="0" Z="0.00999999978"/>
+                              <Orientation X="0" Y="0" Z="1.57079637"/>
+                              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="BackgroundHexagon">
+                      <Components>
+                        <c:Sprite>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <Color A="0.300000012" B="1" G="1" R="1"/>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="ProgressionHexagon">
+                          <Components>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>3</CapturePointNumber>
+                            </c:CapturePointHUD>
+                            <c:Fill>
+                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0" Y="0" Z="0.00999999978"/>
+                              <Orientation X="0" Y="0" Z="1.57079637"/>
+                              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="BackgroundHexagon">
+                      <Components>
+                        <c:Sprite>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Position X="1.62788737" Y="0.919596612" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="ProgressionHexagon">
+                          <Components>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>4</CapturePointNumber>
+                            </c:CapturePointHUD>
+                            <c:Fill>
+                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0" Y="0" Z="0.00999999978"/>
+                              <Orientation X="0" Y="0" Z="1.57079637"/>
+                              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="BackgroundHexagon">
+                      <Components>
+                        <c:Sprite>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <Color A="0.300000012" B="1" G="1" R="1"/>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="ProgressionHexagon">
+                          <Components>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>1</CapturePointNumber>
+                            </c:CapturePointHUD>
+                            <c:Fill>
+                              <Percentage>0.10332605343919568</Percentage>
+                              <Color A="0.699999988" B="0" G="0" R="1"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0" Y="0" Z="0.00999999978"/>
+                              <Orientation X="0" Y="0" Z="4.71238899"/>
+                              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="BackgroundHexagon">
+                      <Components>
+                        <c:Sprite>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <Color A="0.699999988" B="0" G="0" R="1"/>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Position X="-1.58304751" Y="0.919596612" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="ProgressionHexagon">
+                          <Components>
+                            <c:CapturePointHUD/>
+                            <c:Fill>
+                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0" Y="0" Z="0.00999999978"/>
+                              <Orientation X="0" Y="0" Z="1.57079637"/>
+                              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="RespawnTimer">
+                  <Components>
+                    <c:Text>
+                      <Content>16</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="1" B="0" G="1" R="0.784313738"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0" Y="0.178199276" Z="0"/>
+                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="PickClassCamera">
+          <Components>
+            <c:Camera/>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="PickClassHUD">
+              <Components>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-0.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="DefenderClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>2</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="AssaultClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitRaptor.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="0.149504215" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="SniperClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Test/aM4ME4GR.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>3</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="SpectatorCamera" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Camera/>
-    <c:Transform>
-      <Position X="0" Y="0" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="SpectatorHUD">
-      <Components>
-        <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="RespawnTimer">
-          <Components>
-            <c:Text>
-              <Content>Time to respawn: 0</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Color A="1" B="0" G="1" R="0.784313738"/>
-              <Alignment>
-                <Left/>
-              </Alignment>
-            </c:Text>
-            <c:Transform>
-              <Position X="-0.115000000" Y="0.15304254" Z="0"/>
-              <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="CapturePointHUD">
-          <Components>
-            <c:Transform>
-              <Position X="0" Y="0.190541431" Z="0"/>
-              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="BackgroundHexagon">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <Color A="0.300000012" B="1" G="1" R="1"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0.919596612" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="ProgressionHexagon">
-                  <Components>
-                    <c:CapturePointHUD>
-                      <CapturePointNumber>2</CapturePointNumber>
-                    </c:CapturePointHUD>
-                    <c:Fill>
-                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                    </c:Fill>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="0.00999999978"/>
-                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                      <Orientation X="0" Y="0" Z="1.57079637"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="BackgroundHexagon">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <Color A="0.300000012" B="1" G="1" R="1"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="ProgressionHexagon">
-                  <Components>
-                    <c:CapturePointHUD>
-                      <CapturePointNumber>3</CapturePointNumber>
-                    </c:CapturePointHUD>
-                    <c:Fill>
-                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                    </c:Fill>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="0.00999999978"/>
-                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                      <Orientation X="0" Y="0" Z="1.57079637"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="BackgroundHexagon">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="1.62788737" Y="0.919596612" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="ProgressionHexagon">
-                  <Components>
-                    <c:CapturePointHUD>
-                      <CapturePointNumber>4</CapturePointNumber>
-                    </c:CapturePointHUD>
-                    <c:Fill>
-                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                    </c:Fill>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="0.00999999978"/>
-                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                      <Orientation X="0" Y="0" Z="1.57079637"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="BackgroundHexagon">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <Color A="0.300000012" B="1" G="1" R="1"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="ProgressionHexagon">
-                  <Components>
-                    <c:CapturePointHUD>
-                      <CapturePointNumber>1</CapturePointNumber>
-                    </c:CapturePointHUD>
-                    <c:Fill>
-                      <Percentage>0.59265931447347009</Percentage>
-                      <Color A="0.699999988" B="0" G="0" R="1"/>
-                    </c:Fill>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="0.00999999978"/>
-                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                      <Orientation X="0" Y="0" Z="4.71238899"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="BackgroundHexagon">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <Color A="0.699999988" B="0" G="0" R="1"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="-1.58304751" Y="0.919596612" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="ProgressionHexagon">
-                  <Components>
-                    <c:CapturePointHUD/>
-                    <c:Fill>
-                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                    </c:Fill>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="0.00999999978"/>
-                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                      <Orientation X="0" Y="0" Z="1.57079637"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SprintEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Animation>
+      <AnimationName1></AnimationName1>
+      <AnimationName2></AnimationName2>
+      <AnimationName3></AnimationName3>
+    </c:Animation>
+    <c:Lifetime>
+      <Lifetime>0.15</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <Velocity X="0" Y="0" Z="0"/>
+      <ExplosionDuration>0.15</ExplosionDuration>
+    </c:ExplosionEffect>
+    <c:Model>
+      <Resource></Resource>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children/>
+
+</Entity>
@@ -62,6 +62,7 @@
 							<xs:element ref="c:DoubleJump" minOccurs="0"/>
 							<xs:element ref="c:HealthHUD" minOccurs="0"/>
 							<xs:element ref="c:SpriteIndicator" minOccurs="0"/>
+							<xs:element ref="c:InputCmdButton" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>
@@ -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) {
@@ -2,6 +2,7 @@

 PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
    : System(params)
+    , m_SprintEffectTimer(0.f)
 {
    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);
    EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &PlayerMovementSystem::OnDoubleJump);
@@ -19,8 +20,48 @@ void PlayerMovementSystem::Update(double dt)
 {
    updateMovementControllers(dt);
    // Only do physics calculations on client and only for themselves.
-    if (IsClient && LocalPlayer.Valid()) {
-        updateVelocity(LocalPlayer, dt);
+    if (IsClient) {
+        if (LocalPlayer.Valid()){
+            updateVelocity(LocalPlayer, dt);
+        }
+        m_SprintEffectTimer += dt;
+        if (m_SprintEffectTimer < 0.016f) {
+            return;
+        }
+        m_SprintEffectTimer = 0.f;
+        const ComponentPool* pool = m_World->GetComponents("SprintAbility");
+        if (pool == nullptr) {
+            return;
+        }
+        for (auto cSprint : *pool) {
+            if (cSprint.EntityID != LocalPlayer.ID && (bool)cSprint["Active"]) {
+                // Spawn one afterimage for each player that sprints.
+                EntityWrapper player(m_World, cSprint.EntityID);
+                auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/SprintEffect.xml");
+                EntityWrapper sprintEffect = entityFile->MergeInto(m_World);
+                auto playerModel = player.FirstChildByName("PlayerModel");
+                if (!playerModel.Valid()) {
+                    continue;
+                }
+                if (!playerModel.HasComponent("Model")) {
+                    continue;
+                }
+                if (!playerModel.HasComponent("Animation")) {
+                    continue;
+                }
+                auto playerEntityModel = playerModel["Model"];
+                auto playerEntityAnimation = playerModel["Animation"];
+                playerEntityModel.Copy(sprintEffect["Model"]);
+                playerEntityAnimation.Copy(sprintEffect["Animation"]);
+                sprintEffect["ExplosionEffect"]["EndColor"] = (glm::vec4)playerEntityModel["Color"];
+                ((glm::vec4&)sprintEffect["ExplosionEffect"]["EndColor"]).w = 0.f;
+                sprintEffect["Animation"]["Speed1"] = 0.0;
+                sprintEffect["Animation"]["Speed2"] = 0.0;
+                sprintEffect["Animation"]["Speed3"] = 0.0;
+                sprintEffect["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
+                sprintEffect["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
+            }
+        }
    }
 }

@@ -62,7 +103,15 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
            playerMovementSpeed *= (double)playerBoostAssaultEntity["BoostAssault"]["StrengthOfEffect"];
            playerCrouchSpeed *= (double)playerBoostAssaultEntity["BoostAssault"]["StrengthOfEffect"];
        }
-
+        bool sniperSprinting = false;
+        if (player.HasComponent("SprintAbility")) {
+            (bool)player["SprintAbility"]["Active"] = controller->SpecialAbilityKeyDown();
+            if (controller->SpecialAbilityKeyDown()) {
+                playerMovementSpeed *= (double)player["SprintAbility"]["StrengthOfEffect"];
+                playerCrouchSpeed *= (double)player["SprintAbility"]["StrengthOfEffect"];
+                sniperSprinting = true;
+            }
+        }

        if (player.HasComponent("Physics")) {
            ComponentWrapper cPhysics = player["Physics"];
@@ -118,6 +167,9 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
                if (playerBoostAssaultEntity.Valid()) {
                    accelerationSpeed *= (double)playerBoostAssaultEntity["BoostAssault"]["StrengthOfEffect"];
                }
+                if (sniperSprinting) {
+                    accelerationSpeed *= (double)player["SprintAbility"]["StrengthOfEffect"];
+                }
                velocity += accelerationSpeed * wishDirection;
                ImGui::Text("velocity: (%f, %f, %f) |%f|", velocity.x, velocity.y, velocity.z, glm::length(velocity));
            }
@@ -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;
Author	SHA1	Message	Date
Jocke	2507516a85	Tweaked values for the effect to look better	2016-03-04 03:28:58 +01:00
Jocke	0398006fdc	added safety ifs and renamed dasheffect to sprinteffect	2016-03-04 03:19:41 +01:00
Jocke	ae13a2db6b	Player cannot see their own sprint effect.	2016-03-03 22:09:51 +01:00
Jocke	984b8ad3e9	SprintEffect defaults to 30% extra speed.	2016-03-03 21:57:27 +01:00
Jocke	b1148c0c6c	Added a afterimage SprintEffect for the Sniper.	2016-03-03 21:24:31 +01:00
Jocke	a5c1e34b8d	Merge remote-tracking branch 'origin/master' into SniperSprintBranch	2016-03-03 18:49:42 +01:00
Jace	e55a399bad	Merge pull request #165 from teamfisk/PickClassCamera Pick class camera	2016-03-03 18:41:04 +01:00
Jocke	06b7052bf2	Merge remote-tracking branch 'origin/master' into SniperSprintBranch	2016-03-03 18:26:47 +01:00
Joachim Pettersson	2dfcd3ad95	Merge pull request #158 from teamfisk/SniperSprintBranch Looks good// William	2016-03-03 18:25:38 +01:00
Adam Byléhn	44924ea1f9	Merge pull request #166 from teamfisk/FixNetworkBugs Hot fix: Infinite loop when a player disconnected from the server.	2016-03-03 18:22:13 +01:00
verysecrethero	be331cb778	fixed	2016-03-03 18:05:10 +01:00
verysecrethero	a72dc94d5d	Merge branch 'SniperSprintBranch' of github.com:teamfisk/TacticalZ into SniperSprintBranch # Conflicts: # include/Engine/Input/FirstPersonInputController.h	2016-03-03 17:35:17 +01:00
verysecrethero	c5f3bfc0cd	Fixed the stuff in comments	2016-03-03 17:33:41 +01:00
William Moberg	98366ec038	PickClass used for class-picking, SwapToClassPick to swap camera.	2016-03-03 16:59:17 +01:00
William Moberg	398bc725b6	When pick class buttons are clicked they send an InputCommand, not an ButtonClicked event.	2016-03-03 16:32:24 +01:00
Tobias Dahl	fe36e8b423	Merge pull request #164 from teamfisk/FixNetworkBugs Fixed invisible players and connect crash.	2016-03-03 15:57:02 +01:00
William Moberg	8859f652b9	Input ClassPick now switches to a camera with class buttons, they do nothing now and have test textures.	2016-03-03 15:48:55 +01:00
Tobias Dahl	bfcf7b240e	Merge pull request #163 from teamfisk/revert-145-Shadows Revert "Shadows"	2016-03-03 14:25:10 +01:00
Tobias Dahl	73b8bff1f3	Revert "Shadows"	2016-03-03 14:24:43 +01:00
Tobias Dahl	1deb506fb2	Merge pull request #145 from teamfisk/Shadows Shadows	2016-03-03 14:06:48 +01:00
Jocke	da81f21799	Merge remote-tracking branch 'origin/master' into SniperSprintBranch # Conflicts: # include/Engine/Input/FirstPersonInputController.h	2016-03-03 12:16:09 +01:00
FakeShemp	7ea26d10ee	Rewritten. Works as a charm now.	2016-03-03 03:28:21 +01:00
FakeShemp	28e9ba1208	Merge branch 'master' into Shadows # Conflicts: # include/Engine/Rendering/DrawFinalPass.h # src/Engine/Rendering/DrawFinalPass.cpp # src/Engine/Rendering/FrameBuffer.cpp # src/Engine/Rendering/Renderer.cpp	2016-03-03 03:00:05 +01:00
verysecrethero	f84d1ac4a1	Merge remote-tracking branch 'origin/master' into SniperSprintBranch # Conflicts: # include/Engine/Input/FirstPersonInputController.h	2016-03-02 17:11:36 +01:00
FakeShemp	5a6374f013	Fix the remainder of errors. Might have borked splatmap in the process.	2016-03-02 10:57:22 +01:00
FakeShemp	1ae2f3f5f3	Begin clean-up	2016-03-01 19:10:13 +01:00
FakeShemp	1961c16fe2	add weight slider	2016-03-01 13:27:52 +01:00
FakeShemp	d32a483bb4	remove farclip override	2016-03-01 13:17:17 +01:00
FakeShemp	e23ea78aeb	Merge remote-tracking branch 'origin/master' into Shadows # Conflicts: # resources/Shaders/ForwardPlus.frag.glsl	2016-03-01 13:04:11 +01:00
FakeShemp	4153a31e3a	Fix goof.	2016-02-29 19:47:24 +01:00
FakeShemp	0908be1e02	Shadows are pretty much done.	2016-02-29 19:45:56 +01:00
FakeShemp	2ed5fad699	The shadows are working	2016-02-29 19:17:16 +01:00
FakeShemp	70374fa10e	It compiles, but no shadows	2016-02-29 18:20:32 +01:00
FakeShemp	20468cba1b	Merge branch 'master' into Shadows # Conflicts: # assets # include/Engine/Rendering/DrawFinalPass.h # include/Engine/Rendering/Renderer.h # resources/Shaders/ForwardPlus.frag.glsl # resources/Shaders/ForwardPlus.vert.glsl # src/Engine/Rendering/DrawFinalPass.cpp # src/Engine/Rendering/FrameBuffer.cpp # src/Engine/Rendering/Renderer.cpp	2016-02-29 18:03:00 +01:00
FakeShemp	7749fc5474	Small fixing up	2016-02-28 19:46:50 +01:00
FakeShemp	6dd7f1a657	Buggy transparent shadows. Transparent textures might glow.	2016-02-28 18:00:23 +01:00
FakeShemp	14b0a64720	begin fixing transparent object's shadows	2016-02-27 18:42:51 +01:00
FakeShemp	8647267cad	Make code less dumb, save 7 fps	2016-02-27 18:04:33 +01:00
FakeShemp	ecab5de056	Various shadow calculation methods implemented and ready for use.	2016-02-27 16:35:15 +01:00
FakeShemp	38d8cdded2	Texture Array is now working. Enjoy your single Bind().	2016-02-27 15:53:28 +01:00
FakeShemp	22c391df54	Initial work on texture arrays	2016-02-26 17:40:35 +01:00
FakeShemp	f220d8088c	Begin clean-up	2016-02-26 10:53:16 +01:00
FakeShemp	df2e4abb52	WE HAVE WORKING CASCADE SHADOWS	2016-02-25 21:21:38 +01:00
FakeShemp	8867e7ac3c	Working shadows, no cascade blend yet	2016-02-25 20:29:41 +01:00
FakeShemp	73a4336206	Try some stuff	2016-02-18 23:33:10 +01:00
FakeShemp	f2ab02d860	More WIP Switching between levels seem to work, but I borked all matrices	2016-02-18 22:38:50 +01:00
FakeShemp	bf376f54b6	WIP I think this is now finding the different segments of the cascade	2016-02-18 20:48:39 +01:00
verysecrethero	b81bb9eeea	Changed SprintAbility to take StrengthOfEffect. PlayerMovementSystem: if Sniper is sprinting he will now move faster.	2016-02-18 15:17:19 +01:00
FakeShemp	178402e964	cascade shadow wip	2016-02-18 10:08:29 +01:00
FakeShemp	36043010af	wip for shadows they work, but will be shit until we get cascaded.	2016-02-10 20:51:33 +01:00
FakeShemp	cb77c1ff97	Working pcf, not optimized	2016-02-10 16:16:41 +01:00
FakeShemp	69db32337d	Shado wip	2016-02-10 15:16:58 +01:00
Ayumiwii	6af167675d	Shadow WIP stage 2 - fix cel-shading	2016-02-10 11:48:44 +01:00
Ayumiwii	ecd823cb9f	Shadow WIP stage 2 - Soft shadow	2016-02-09 16:15:11 +01:00
FakeShemp	847c539373	Fix viewport	2016-02-09 14:44:12 +01:00
Ayumiwii	cb7f06573f	Shadows stage 2 WIP	2016-02-09 14:08:57 +01:00
Ayumiwii	6542d1b444	Shadow WIP - DepthTexture working	2016-02-05 17:29:53 +01:00
Ayumiwii	bbf6058c17	Shadow WIP - fixed file placing of ShadowPass.cpp	2016-02-05 16:13:46 +01:00
Ayumiwii	0e51ae7dc9	shadow wip	2016-02-05 15:31:20 +01:00
Ayumiwii	c912cd7a42	Shadows wip	2016-02-05 15:12:17 +01:00
Ayumiwii	7f1016476b	Shadows WIP - create 2D texture (depthmap)	2016-02-05 15:08:56 +01:00