Commitiing assets

Changed SpritIndicator values on player
Changed name from Indicator to SpriteIndicator. Can now be an indicator for a single team or every one
2016-02-24 17:42:55 +01:00 · 2016-02-22 18:45:02 +01:00 · 2016-02-22 18:35:00 +01:00 · 2016-02-22 16:43:18 +01:00 · 2016-02-17 18:04:49 +01:00 · 2016-02-17 18:00:30 +01:00
13 changed files with 248 additions and 44 deletions
@@ -184,7 +184,7 @@ struct ModelJob : RenderJob

    void CalculateHash() override
    {
-        Hash = TextureID + ModelID << 10 + ShaderID << 20;
+        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
    }
 };

@@ -14,14 +14,11 @@ class SSAOPass
 {
 public:
 	SSAOPass(IRenderer* rendere);
-	~SSAOPass() { 
-		delete m_DrawBloomPass;
-	};
+	~SSAOPass() { };

 	void Draw(GLuint depthBuffer, Camera* camera);
 	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int NumOfTurns);
 	void ClearBuffer();
-	void OnWindowResize();

 	//Return the SSAO of the texture sent to Draw
 	GLuint SSAOTexture() const { return m_DrawBloomPass->GaussianTexture(); }
@@ -34,6 +31,7 @@ private:

 	void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;

+	void ComputeAO(GLuint depthBuffer, Camera* camera);
 	//void blurHorizontal(GLuint depthBuffer);
 	//void blurVertical(GLuint depthBuffer);

@@ -17,7 +17,7 @@

 struct SpriteJob : RenderJob
 {
-    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted)
+    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted, bool isIndicator)
        : RenderJob()
    {
        Model = ResourceManager::Load<::Model>("Models/Core/UnitQuad.mesh");
@@ -30,7 +30,7 @@ struct SpriteJob : RenderJob

        StartIndex = matProp.material->StartIndex;
        EndIndex = matProp.material->EndIndex;
-        Matrix = matrix;
+		Matrix = matrix;
        Color = cSprite["Color"];
        Entity = cSprite.EntityID;
        Position = Transform::AbsolutePosition(world, cSprite.EntityID);
@@ -41,7 +41,8 @@ struct SpriteJob : RenderJob
        }
        World = world;
        Pickable = world->HasComponent(cSprite.EntityID, "Button");
-        
+		IsIndicator = isIndicator;
+
        FillColor = fillColor;
        FillPercentage = fillPercentage;
    };
@@ -61,7 +62,9 @@ struct SpriteJob : RenderJob
    unsigned int StartIndex = 0;
    unsigned int EndIndex = 0;
    World* World;
+
    bool Pickable;
+	bool IsIndicator = false;

    glm::vec4 FillColor = glm::vec4(0);
    float FillPercentage = 0.0;
@@ -44,5 +44,6 @@
 	<xs:include schemaLocation="Components/Menu.xsd"/>
 	<xs:include schemaLocation="Components/KillFeed.xsd"/>
 	<xs:include schemaLocation="Components/Page.xsd"/>
+	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
 </xs:schema>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<SpriteIndicator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SpriteIndicator.xsd">
+	<MinScale>10</MinScale>
+	<VisibleForSingleTeamOnly>false</VisibleForSingleTeamOnly>
+</SpriteIndicator>
@@ -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="SpriteIndicator">
+		<xs:annotation>
+			<xs:documentation>Billbord a Sprite around global Y axis</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="MinScale" type="t:double" minOccurs="0"/>
+				<xs:element name="VisibleForSingleTeamOnly" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Add a Team component to this Entity or Parent to make it visible only for that team</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
@@ -13,6 +13,7 @@
    <c:DashAbility/>
    <c:Health/>
    <c:Physics>
+      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
    </c:Physics>
    <c:Player>
@@ -60,6 +61,7 @@
                <c:Sprite>
                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
                  <DepthSort>false</DepthSort>
+                  <GlowMap></GlowMap>
                </c:Sprite>
                <c:Transform>
                  <Position X="0" Y="0" Z="0.200000003"/>
@@ -110,6 +112,7 @@
                    </c:Fill>
                    <c:Sprite>
                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                      <Color A="0.588235319" B="0" G="0" R="0"/>
                    </c:Sprite>
                    <c:HealthHUD/>
@@ -135,6 +138,7 @@
                  <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>
@@ -152,6 +156,7 @@
                        </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"/>
@@ -167,6 +172,7 @@
                  <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>
@@ -185,6 +191,7 @@
                        </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"/>
@@ -200,6 +207,7 @@
                  <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>
@@ -217,6 +225,7 @@
                        </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"/>
@@ -232,6 +241,7 @@
                  <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>
@@ -249,6 +259,7 @@
                        </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"/>
@@ -264,6 +275,7 @@
                  <Components>
                    <c:Sprite>
                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                      <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                    </c:Sprite>
                    <c:Transform>
@@ -279,6 +291,7 @@
                        </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"/>
@@ -304,6 +317,7 @@
                <Entity name="KillFeed1">
                  <Components>
                    <c:Text>
+                      <Content></Content>
                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                      <Alignment>
                        <Right/>
@@ -316,6 +330,7 @@
                <Entity name="KillFeed2">
                  <Components>
                    <c:Text>
+                      <Content></Content>
                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                      <Alignment>
                        <Right/>
@@ -330,6 +345,7 @@
                <Entity name="KillFeed3">
                  <Components>
                    <c:Text>
+                      <Content></Content>
                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                      <Alignment>
                        <Right/>
@@ -349,8 +365,10 @@
          <Components>
            <c:Animation>
              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8314163732853146</Time1>
+              <Time1>0.97725610639912475</Time1>
              <Speed1>1</Speed1>
+              <AnimationName2></AnimationName2>
+              <AnimationName3></AnimationName3>
            </c:Animation>
            <c:Model>
              <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
@@ -368,8 +386,8 @@
                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
                </c:Model>
                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229687244" Z="-0.181454629"/>
-                  <Orientation X="0.0104048112" Y="-0.0026817855" Z="0.0428442657"/>
+                  <Position X="0.12043038" Y="-0.244988307" Z="-0.181454808"/>
+                  <Orientation X="0.010404544" Y="-0.00268173823" Z="0.0428441577"/>
                </c:Transform>
              </Components>
              <Children>
@@ -406,6 +424,7 @@
                      <Components>
                        <c:Sprite>
                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                          <Color A="0.588235319" B="0" G="0" R="0"/>
                        </c:Sprite>
                        <c:Transform>
@@ -475,8 +494,10 @@
      <Components>
        <c:Animation>
          <AnimationName1>Idle</AnimationName1>
-          <Time1>0.16333512901638159</Time1>
+          <Time1>0.87583812735846323</Time1>
          <Speed1>1</Speed1>
+          <AnimationName2></AnimationName2>
+          <AnimationName3></AnimationName3>
        </c:Animation>
        <c:AnimationOffset>
          <AnimationName>AimRifle</AnimationName>
@@ -499,8 +520,8 @@
              <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
            </c:Model>
            <c:Transform>
-              <Position X="0.158296332" Y="1.03131664" Z="-0.21615544"/>
-              <Orientation X="-0.0626514703" Y="-0.0352048129" Z="0.12013837"/>
+              <Position X="0.163429111" Y="1.0235405" Z="-0.215489209"/>
+              <Orientation X="-0.0631071255" Y="-0.0576644838" Z="0.118255548"/>
            </c:Transform>
          </Components>
          <Children>
@@ -570,6 +591,26 @@
      </Components>
      <Children/>
    </Entity>
+    <Entity name="Indicator">
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
+          <DepthSort>false</DepthSort>
+          <GlowMap></GlowMap>
+          <Color A="1" B="1" G="0.309803933" R="0"/>
+        </c:Sprite>
+        <c:HiddenForLocalPlayer/>
+        <c:SpriteIndicator>
+          <MinScale>50</MinScale>
+          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
+        </c:SpriteIndicator>
+        <c:Transform>
+          <Position X="0" Y="1.84019077" Z="0"/>
+          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
  </Children>

 </Entity>
@@ -13,6 +13,7 @@
    <c:DashAbility/>
    <c:Health/>
    <c:Physics>
+      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
    </c:Physics>
    <c:Player>
@@ -60,6 +61,7 @@
                <c:Sprite>
                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
                  <DepthSort>false</DepthSort>
+                  <GlowMap></GlowMap>
                </c:Sprite>
                <c:Transform>
                  <Position X="0" Y="0" Z="0.200000003"/>
@@ -110,6 +112,7 @@
                    </c:Fill>
                    <c:Sprite>
                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                      <Color A="0.588235319" B="0" G="0" R="0"/>
                    </c:Sprite>
                    <c:HealthHUD/>
@@ -135,6 +138,7 @@
                  <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>
@@ -152,6 +156,7 @@
                        </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"/>
@@ -167,6 +172,7 @@
                  <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>
@@ -185,6 +191,7 @@
                        </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"/>
@@ -200,6 +207,7 @@
                  <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>
@@ -217,6 +225,7 @@
                        </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"/>
@@ -232,6 +241,7 @@
                  <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>
@@ -249,6 +259,7 @@
                        </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"/>
@@ -264,6 +275,7 @@
                  <Components>
                    <c:Sprite>
                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                      <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                    </c:Sprite>
                    <c:Transform>
@@ -279,6 +291,7 @@
                        </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"/>
@@ -304,6 +317,7 @@
                <Entity name="KillFeed1">
                  <Components>
                    <c:Text>
+                      <Content></Content>
                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                      <Alignment>
                        <Right/>
@@ -316,6 +330,7 @@
                <Entity name="KillFeed2">
                  <Components>
                    <c:Text>
+                      <Content></Content>
                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                      <Alignment>
                        <Right/>
@@ -330,6 +345,7 @@
                <Entity name="KillFeed3">
                  <Components>
                    <c:Text>
+                      <Content></Content>
                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                      <Alignment>
                        <Right/>
@@ -349,8 +365,10 @@
          <Components>
            <c:Animation>
              <AnimationName1>Idle</AnimationName1>
-              <Time1>0.018170670865885086</Time1>
+              <Time1>1.2667383999985162</Time1>
              <Speed1>1</Speed1>
+              <AnimationName2></AnimationName2>
+              <AnimationName3></AnimationName3>
            </c:Animation>
            <c:Model>
              <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
@@ -368,8 +386,8 @@
                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
                </c:Model>
                <c:Transform>
-                  <Position X="0.120430693" Y="-0.2284486" Z="-0.181454509"/>
-                  <Orientation X="0.0104046017" Y="-0.00268172775" Z="0.0428442247"/>
+                  <Position X="0.120430425" Y="-0.242105931" Z="-0.181454822"/>
+                  <Orientation X="0.010404665" Y="-0.00268179877" Z="0.0428443067"/>
                </c:Transform>
              </Components>
              <Children>
@@ -406,6 +424,7 @@
                      <Components>
                        <c:Sprite>
                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                          <Color A="0.588235319" B="0" G="0" R="0"/>
                        </c:Sprite>
                        <c:Transform>
@@ -475,8 +494,10 @@
      <Components>
        <c:Animation>
          <AnimationName1>Idle</AnimationName1>
-          <Time1>0.11675631578762591</Time1>
+          <Time1>0.26532318661337229</Time1>
          <Speed1>1</Speed1>
+          <AnimationName2></AnimationName2>
+          <AnimationName3></AnimationName3>
        </c:Animation>
        <c:AnimationOffset>
          <AnimationName>AimRifle</AnimationName>
@@ -499,8 +520,8 @@
              <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
            </c:Model>
            <c:Transform>
-              <Position X="0.157842755" Y="1.03184748" Z="-0.216178894"/>
-              <Orientation X="-0.0626459867" Y="-0.0335309952" Z="0.120309927"/>
+              <Position X="0.159282878" Y="1.0300566" Z="-0.216084003"/>
+              <Orientation X="-0.0626799241" Y="-0.0390551724" Z="0.119761385"/>
            </c:Transform>
          </Components>
          <Children>
@@ -570,6 +591,26 @@
      </Components>
      <Children/>
    </Entity>
+    <Entity>
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
+          <DepthSort>false</DepthSort>
+          <GlowMap></GlowMap>
+          <Color A="1" B="0" G="0" R="1"/>
+        </c:Sprite>
+        <c:HiddenForLocalPlayer/>
+        <c:SpriteIndicator>
+          <MinScale>50</MinScale>
+          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
+        </c:SpriteIndicator>
+        <c:Transform>
+          <Position X="0" Y="1.84000003" Z="0"/>
+          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
  </Children>

 </Entity>
@@ -21,13 +21,23 @@ void PickingPass::InitializeTextures()
 {
    GenerateTexture(&m_PickingTexture, GL_CLAMP_TO_BORDER, GL_LINEAR,
        glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RG8, GL_RG, GL_UNSIGNED_BYTE);
-
-	GenerateTexture(&m_DepthBuffer, GL_CLAMP_TO_BORDER, GL_NEAREST,
-		glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8);
 }

 void PickingPass::InitializeFrameBuffers()
 {
+   /* glGenRenderbuffers(1, &m_DepthBuffer);
+    glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBuffer);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);*/
+
+	glGenTextures(1, &m_DepthBuffer);
+
+	glBindTexture(GL_TEXTURE_2D, m_DepthBuffer);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, (int)(m_Renderer->GetViewportSize().Width), (int)(m_Renderer->GetViewportSize().Height), 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+
    m_PickingBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_DepthBuffer, GL_DEPTH_ATTACHMENT)));
    m_PickingBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_PickingTexture, GL_COLOR_ATTACHMENT0)));
    m_PickingBuffer.Generate();
@@ -372,6 +382,8 @@ void PickingPass::ClearPicking()
 void PickingPass::OnWindowResize()
 {
    InitializeTextures();
+    glBindRenderbuffer(GL_RENDERBUFFER, m_DepthBuffer);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
    m_PickingBuffer.Generate();
 }

@@ -52,6 +52,101 @@ void RenderSystem::fillSprites(std::list<std::shared_ptr<RenderJob>>& jobs, Worl
            continue;
        }

+		glm::mat4 modelMatrix;
+
+		// See a sprite is an SpriteIndicator
+		bool isIndicator = false;
+		if (world->HasComponent(entity.ID, "SpriteIndicator"))
+		{
+			auto indicator = entity["SpriteIndicator"];
+
+			float minScale = (float)(double)indicator["MinScale"];
+			bool hasTeam = indicator["VisibleForSingleTeamOnly"];
+			isIndicator = true;
+			glm::vec3 pos = Transform::AbsolutePosition(entity);
+
+
+			EntityWrapper entityTeam;
+			if (hasTeam && (entity.HasComponent("Team") || entity.FirstParentWithComponent("Team").Valid()) && m_LocalPlayer.World != nullptr) {
+				if (!entity.HasComponent("Team")) {
+					entityTeam = entity.FirstParentWithComponent("Team");
+				}
+				else {
+					entityTeam = entity;
+				}
+
+				ComponentWrapper& entityTeamComponent = entityTeam["Team"];
+				ComponentWrapper& localComponent = m_LocalPlayer["Team"];
+				int entityTeamInt = entityTeamComponent["Team"];
+				int localComponentInt = localComponent["Team"];
+				int SpectatorInt = localComponent["Team"].Enum("Spectator");
+				if (entityTeamInt != localComponentInt && localComponentInt != SpectatorInt) {
+					continue;
+				}
+			}
+
+			// Code for check if sprite is inside or outside of screen
+			//glm::vec4 projectedPos = m_Camera->ProjectionMatrix() * m_Camera->ViewMatrix() * glm::vec4(pos, 1.0f);
+			//projectedPos /= projectedPos.w;
+			//// Check if inside of outside of screen.
+			//if (projectedPos.x < -1.0f || projectedPos.x > 1.0f || projectedPos.y < -1.0f || projectedPos.y > 1.0f) {
+			//	// is outside of screen
+			//} else {
+			//	// is inside of screen
+			//}
+
+
+			glm::vec3 zAxis = glm::vec3(0.0f, 1.0f, 0.0f);
+			glm::vec3 normal = pos - m_Camera->Position();
+
+			//float distance = glm::length(normal);
+			//if (distance < minDistance) {
+			//	pos = pos - glm::normalize(normal) * (distance - minDistance);
+			//} else if (distance > maxDistance) {
+			//	pos = pos - glm::normalize(normal) * (distance - maxDistance);
+			//}
+			normal.y = 0;
+			normal = glm::normalize(normal);
+			glm::vec3 right = glm::cross(normal, zAxis);
+			glm::vec3 up = glm::cross(right, normal);
+
+			modelMatrix[0][0] = right.x;
+			modelMatrix[0][1] = right.y;
+			modelMatrix[0][2] = right.z;
+			modelMatrix[0][3] = 0.0f;
+
+			modelMatrix[1][0] = zAxis.x;
+			modelMatrix[1][1] = zAxis.y;
+			modelMatrix[1][2] = zAxis.z;
+			modelMatrix[1][3] = 0.0f;
+
+			modelMatrix[2][0] = normal.x;
+			modelMatrix[2][1] = normal.y;
+			modelMatrix[2][2] = normal.z;
+			modelMatrix[2][3] = 0.0f;
+
+			modelMatrix[3][0] = pos.x;
+			modelMatrix[3][1] = pos.y;
+			modelMatrix[3][2] = pos.z;
+			modelMatrix[3][3] = 1.0f;
+
+			glm::mat4 tranformationMatrix = modelMatrix * glm::scale(Transform::AbsoluteScale(entity));
+			glm::vec4 tmp = tranformationMatrix * glm::vec4(glm::vec3(0.5, 0.5, 0), 1.0f);
+			glm::vec2 projectedTopRight = m_Camera->WorldToScreen(glm::vec3(tmp), m_Renderer->GetViewportSize());
+			tmp = tranformationMatrix * glm::vec4(glm::vec3(-0.5, -0.5, 0), 1.0f);
+			glm::vec2 projectedBottomLeft = m_Camera->WorldToScreen(glm::vec3(tmp), m_Renderer->GetViewportSize());
+
+			float diag = glm::length(projectedBottomLeft - projectedTopRight);
+			if (diag < minScale) {
+				tranformationMatrix = tranformationMatrix * glm::scale(glm::vec3(minScale / diag, minScale / diag, minScale / diag));
+			}
+			modelMatrix = tranformationMatrix;
+		}
+		else {
+			modelMatrix = Transform::ModelMatrix(entity.ID, world);
+		}
+
+
        std::string diffuseResource = cSprite["DiffuseTexture"];
        std::string glowResource = cSprite["GlowMap"];
        bool depthSorted = cSprite["DepthSort"];
@@ -67,11 +162,7 @@ void RenderSystem::fillSprites(std::list<std::shared_ptr<RenderJob>>& jobs, Worl
            fillColor = (glm::vec4)fillComponent["Color"];
        }

-        glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, world);
-        //modelMatrix *= m_Camera->BillboardMatrix();
-
-
-        std::shared_ptr<SpriteJob> spriteJob = std::shared_ptr<SpriteJob>(new SpriteJob(cSprite, m_Camera, modelMatrix, world, fillColor, fillPercentage, depthSorted));
+        std::shared_ptr<SpriteJob> spriteJob = std::shared_ptr<SpriteJob>(new SpriteJob(cSprite, m_Camera, modelMatrix, world, fillColor, fillPercentage, depthSorted, isIndicator));
        
        jobs.push_back(spriteJob);
    }
@@ -93,7 +184,6 @@ bool RenderSystem::isEntityVisible(EntityWrapper& entity)
    ) {
        return false;
    }
-
    return true;
 }

@@ -30,7 +30,6 @@ void Renderer::glfwFrameBufferCallback(GLFWwindow* window, int width, int height
    currentRenderer->m_LightCullingPass->OnWindowResize();
    currentRenderer->m_PickingPass->OnWindowResize();
    currentRenderer->m_DrawBloomPass->OnWindowResize();
-	currentRenderer->m_SSAOPass->OnWindowResize();
 }

 void Renderer::InitializeWindow()
@@ -127,7 +126,6 @@ void Renderer::Draw(RenderFrame& frame)
    m_PickingPass->ClearPicking();
    m_DrawFinalPass->ClearBuffer();
    m_DrawBloomPass->ClearBuffer();
-	m_SSAOPass->ClearBuffer();
    PerformanceTimer::StopTimer("Renderer-ClearBuffers");
 	for (auto scene : frame.RenderScenes) {
 		PerformanceTimer::StartTimer("Renderer-Depth");
@@ -6,7 +6,6 @@ SSAOPass::SSAOPass(IRenderer* renderer)

 	m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");

-	InitializeTexture();
 	InitializeBuffer();
 	InitializeShaderProgram();
 	Setting(0.1f, 0.012f, 1.0f, 1.0f, 13, 7);
@@ -29,16 +28,16 @@ void SSAOPass::InitializeShaderProgram()
 	m_SSAOViewSpaceZProgram->Link();
 }

-void SSAOPass::InitializeTexture() {
-	GenerateTexture(&m_SSAOTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_R8, GL_RED, GL_FLOAT);
-	GenerateTexture(&m_SSAOViewSpaceZTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_R32F, GL_RED, GL_FLOAT);
-}

 void SSAOPass::InitializeBuffer()
 {
+	GenerateTexture(&m_SSAOTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_R8, GL_RED, GL_FLOAT);
+
 	m_SSAOFramBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SSAOTexture, GL_COLOR_ATTACHMENT0)));
 	m_SSAOFramBuffer.Generate();

+	GenerateTexture(&m_SSAOViewSpaceZTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_R32F, GL_RED, GL_FLOAT);
+
 	m_SSAOViewSpaceZFramBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SSAOViewSpaceZTexture, GL_COLOR_ATTACHMENT0)));
 	m_SSAOViewSpaceZFramBuffer.Generate();
 }
@@ -46,12 +45,12 @@ void SSAOPass::InitializeBuffer()
 void SSAOPass::ClearBuffer()
 {
 	m_SSAOFramBuffer.Bind();
-	glClearColor(1.f, 1.f, 1.f, 1.f);
+	glClearColor(0.f, 0.f, 0.f, 0.f);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	m_SSAOFramBuffer.Unbind();

 	m_SSAOViewSpaceZFramBuffer.Bind();
-	glClearColor(1.f, 1.f, 1.f, 1.f);
+	glClearColor(0.f, 0.f, 0.f, 0.f);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	m_SSAOViewSpaceZFramBuffer.Unbind();
 }
@@ -137,9 +136,6 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 	m_DrawBloomPass->Draw(m_SSAOTexture);
 }

-void SSAOPass::OnWindowResize() {
-	m_DrawBloomPass->OnWindowResize();
-	InitializeTexture();
-	m_SSAOFramBuffer.Generate();
-	m_SSAOViewSpaceZFramBuffer.Generate();
+void ComputeAO(GLuint depthBuffer, Camera* camera) {
+
 }
Author	SHA1	Message	Date
Teejoon	09249c970a	Commitiing assets	2016-02-24 17:42:55 +01:00
Teejoon	fe3e0bac5b	Changed SpritIndicator values on player	2016-02-22 18:45:02 +01:00
Teejoon	fa4f007604	Changed name from Indicator to SpriteIndicator. Can now be an indicator for a single team or every one	2016-02-22 18:35:00 +01:00
Teejoon	6fab971734	Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates Conflicts: include/Engine/Rendering/SpriteJob.h resources/Schema/Components.xsd resources/Schema/Entities/Player.xml resources/Schema/Entities/PlayerRed.xml	2016-02-22 16:43:18 +01:00
Teejoon	c4d3c515e4	Marge with Master	2016-02-17 18:04:49 +01:00
Teejoon	7cc58dc94c	Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates	2016-02-17 18:00:30 +01:00
Teejoon	5e3af7ac5d	Player Indicator now working OK. Scaling depending on how far away you are makes the Indicator to hide players head behind it. Shields are making indicators to disappear.	2016-02-17 17:58:01 +01:00
Teejoon	4fd0108443	Working billbording	2016-02-17 16:50:24 +01:00
Teejoon	17da9a8036	WIP	2016-02-16 15:56:58 +01:00