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-22 16:40:11 +01:00 · 2016-02-17 18:04:49 +01:00
13 changed files with 262 additions and 200 deletions
@@ -184,7 +184,7 @@ struct ModelJob : RenderJob

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

@@ -29,6 +29,8 @@ private:
 	void InitializeShaderProgram();
 	void InitializeBuffer();

+	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);
@@ -36,7 +38,7 @@ private:
 	Model* m_ScreenQuad;

 	const IRenderer* m_Renderer;
-	static const GLint MAX_MIP_LEVEL = 5;
+
 	float m_Radius;
 	float m_Bias;
 	float m_Contrast;
@@ -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>
@@ -1,15 +1,12 @@
 #version 430

-#define MIP_MAPS_LEVELS (3)
-
-#define MAX_PIXEL_BEFOR_LOWER_MIP_LEVEL (3)
 //Number of samples per pixel
 uniform int           uNumOfSamples;
-//#define uNumOfSamples (11)
+//#define NUM_SAMPLES (11)

 //Number of turns around the cirle
 uniform int           uNumOfTurns;
-//#define uNumOfTurns (7)
+//#define NUM_TURNS (7)

 layout (binding = 0) uniform sampler2D ViewSpaceZ;

@@ -45,41 +42,42 @@ vec3 getVSFaceNormal(vec3 ViewSpacePosition) {


 vec3 getSampleViewSpacePos(ivec2 ScreenSpaceCoord, int SampleIndex, float RotationAngle, float ScreenSpaceSampleRadius){
-	// SampleIndex + 0.5f so that we alpha != 0, since if alpha = 0 then screenSpaceSampleTexel will be the same texel as origin. 
-	float alpha = float(SampleIndex + 0.5f) * (1.0f / uNumOfSamples);
+	// Pure Magic...
+	float alpha = float(SampleIndex) * (1.0 / uNumOfSamples);

 	// Angle to where to sample
-    float angle = alpha * (uNumOfTurns * 6.28f) + RotationAngle;
+    float angle = alpha * (uNumOfTurns * 6.28) + RotationAngle;

 	//Lenght to were to sample
    ScreenSpaceSampleRadius = ScreenSpaceSampleRadius * alpha;

    vec2 screenSpaceSampleOffsetVecor = vec2(cos(angle), sin(angle));

-    //int mipmapLevel = clamp(int(floor(log2(-ScreenSpaceSampleRadius))) - MAX_PIXEL_BEFOR_LOWER_MIP_LEVEL, 0, MIP_MAPS_LEVELS);
-
    // Get texel coordinate on where to sample by going screenSpaceSampleOffsetVecor direction in ScreenSpaceSampleRadius units from ScreenSpaceCoord (the point being shaded);
-    ivec2 screenSpaceSampleTexel = (ivec2(ScreenSpaceSampleRadius * screenSpaceSampleOffsetVecor) + ScreenSpaceCoord);// >> mipmapLevel;
+    ivec2 screenSpaceSampleTexel = ivec2(ScreenSpaceSampleRadius * screenSpaceSampleOffsetVecor) + ScreenSpaceCoord;

    return getVSPosition(screenSpaceSampleTexel);
 }



-float sampleAO(ivec2 ScreenSpaceCoord, vec3 Origin, vec3 OriginNormal, float ScreenSpaceSampleRadius, int SampleIndex, float RotationAngle, float Radius, float Radius2) {
+float sampleAO(ivec2 ScreenSpaceCoord, vec3 Origin, vec3 OriginNormal, float ScreenSpaceSampleRadius, int SampleIndex, float RotationAngle, float Radius) {
+	float radius2 = Radius * Radius;
 	vec3 sampleViewSpacePosition = getSampleViewSpacePos(ScreenSpaceCoord, SampleIndex, RotationAngle, ScreenSpaceSampleRadius);
+
 	vec3 sampleVector = Origin - sampleViewSpacePosition;
+
 	// vv = sampleVectorLenght ^ 2
 	float vv = dot(sampleVector, sampleVector);
 	// vn = angle between sampleVector and Normal
 	float vn = dot(sampleVector, OriginNormal);

-	const float epsilon = 0.01f;
+	const float epsilon = 0.0001f;

 	// vv < radius2 if the vector is shorter then the radius;
 	// vn - bias, offset the angle to reduse self occlusion. 
 	// epsilon is here to make divison by 0 impossible.
-	return float(vv < Radius2) * max((vn - uBias) / (epsilon + vv), 0.0);
+	return float(vv < radius2) * max((vn - uBias) / (epsilon + vv), 0.0);
 	//float f = max(radius2 - vv, 0.0); 
 	//return f * f * f * max((vn - uBias) / (epsilon + vv), 0.0);
 }
@@ -88,11 +86,9 @@ float sampleAO(ivec2 ScreenSpaceCoord, vec3 Origin, vec3 OriginNormal, float Scr
 void main() {
 	ivec2 originScreenCoord = ivec2(gl_FragCoord.xy);

-	// We always get the Orginin from the level 0 of the mipmaps
 	vec3 origin = getVSPosition(originScreenCoord);

 	float radius;
-
 	if(origin.z < uRadius){
 		radius = origin.z;
 	} else {
@@ -100,24 +96,19 @@ void main() {
 	}


-	float radius2 = radius * radius;
-
 	vec3 originNormal = getVSFaceNormal(origin);

-	//screenSpaceSampleRadius is in pixels
 	float screenSpaceSampleRadius = -uProjScale * radius / origin.z;
-	//screenSpaceSampleRadius = clamp(screenSpaceSampleRadius, 0.0f, -uProjScale * radius);

 	float rotationAngleOffset = 30 * originScreenCoord.x ^ originScreenCoord.y + 10 * originScreenCoord.x * originScreenCoord.y;

-	float sum = 0.0f;
-    for(int i = 0; i < uNumOfSamples; i++) {
-        sum += sampleAO(originScreenCoord, origin, originNormal, screenSpaceSampleRadius, i, rotationAngleOffset, radius, radius2);
+	float sum = 0.0;
+    for (int i = 0; i < uNumOfSamples; i++) {
+        sum += sampleAO(originScreenCoord, origin, originNormal, screenSpaceSampleRadius, i, rotationAngleOffset, radius);
    }

    //float A = max(0.0, 1.0 - sum * (2.0f / uNumOfSamples));
-    float A = 1.0f - sum * (2.0f * uIntensityScale / float(uNumOfSamples));
+    float A = 1.0 - sum * (2.0f * uIntensityScale / float(uNumOfSamples));
    AO = clamp(pow(A, uContrast), 0.0f, 1.0f);
-    //AO = screenSpaceSampleRadius;
 	//AO = vec4(originNormal, 1.0f);
 }
@@ -1,123 +0,0 @@
-#version 430
-
-#define MIP_MAPS_LEVELS (5)
-
-#define LOWER_MIP_LEVEL (2)
-//Number of samples per pixel
-uniform int           uNumOfSamples;
-//#define uNumOfSamples (11)
-
-//Number of turns around the cirle
-uniform int           uNumOfTurns;
-//#define uNumOfTurns (7)
-
-layout (binding = 0) uniform sampler2D ViewSpaceZ;
-
-uniform vec4 uProjInfo;
-
-uniform float           uProjScale;
-//#define ProjScale 500
-
-uniform float           uRadius;
-//#define Radius 1.0f
-
-uniform float           uBias;
-//#define Bias 0.012f
-
-uniform float           uContrast;
-//#define IntensityDivR6 1
-
-uniform float           uIntensityScale;
-
-out float				AO;
-
-vec3 getVSPosition(ivec2 ScreenSpaceCoord, int mipmaplevel) {
-    float z = texelFetch(ViewSpaceZ, ScreenSpaceCoord, mipmaplevel).r;
-    //Get the xy view space coordinates and add the z value from ViewSpaceZ buffer.
-    return vec3((uProjInfo[0] + (ScreenSpaceCoord.x * uProjInfo[1])) * z, (uProjInfo[2] + (ScreenSpaceCoord.y * uProjInfo[3])) * z, z);
-}
-
-vec3 getVSFaceNormal(vec3 ViewSpacePosition) {
-	// Get tangets vector for the plane and ViewSpacePositin... don't ask how this functions works. It's pure magic. 
-	// They do this and it just works... I would guess that they approximate the function of a plane from pixels close to the pixel were on now.
-	return normalize(cross(dFdx(ViewSpacePosition), dFdy(ViewSpacePosition)));
-}
-
-
-vec3 getSampleViewSpacePos(ivec2 ScreenSpaceCoord, int SampleIndex, float RotationAngle, float ScreenSpaceSampleRadius){
-	// SampleIndex + 0.5f so that we alpha != 0, since if alpha = 0 then screenSpaceSampleTexel will be the same texel as origin. 
-	float alpha = float(SampleIndex + 0.5f) * (1.0f / uNumOfSamples);
-
-	// Angle to where to sample
-    float angle = alpha * (uNumOfTurns * 6.28f) + RotationAngle;
-
-	//Lenght to were to sample
-    ScreenSpaceSampleRadius = ScreenSpaceSampleRadius * alpha;
-
-    vec2 screenSpaceSampleOffsetVecor = vec2(cos(angle), sin(angle));
-
-    int mipmapLevel = clamp(int(floor(log2(-ScreenSpaceSampleRadius))) - LOWER_MIP_LEVEL, 0, MIP_MAPS_LEVELS);
-    // Get texel coordinate on where to sample by going screenSpaceSampleOffsetVecor direction in ScreenSpaceSampleRadius units from ScreenSpaceCoord (the point being shaded);
-    ivec2 screenSpaceSampleTexel = (ivec2(ScreenSpaceSampleRadius * screenSpaceSampleOffsetVecor) + ScreenSpaceCoord) >> mipmapLevel;
-
-    return getVSPosition(screenSpaceSampleTexel, mipmapLevel);
-}
-
-
-
-float sampleAO(ivec2 ScreenSpaceCoord, vec3 Origin, vec3 OriginNormal, float ScreenSpaceSampleRadius, int SampleIndex, float RotationAngle, float Radius, float Radius2) {
-	vec3 sampleViewSpacePosition = getSampleViewSpacePos(ScreenSpaceCoord, SampleIndex, RotationAngle, ScreenSpaceSampleRadius);
-	vec3 sampleVector = Origin - sampleViewSpacePosition;
-	// vv = sampleVectorLenght ^ 2
-	float vv = dot(sampleVector, sampleVector);
-	// vn = angle between sampleVector and Normal
-	float vn = dot(sampleVector, OriginNormal);
-
-	const float epsilon = 0.01f;
-
-	// vv < radius2 if the vector is shorter then the radius;
-	// vn - bias, offset the angle to reduse self occlusion. 
-	// epsilon is here to make divison by 0 impossible.
-	return float(vv < Radius2) * max((vn - uBias) / (epsilon + vv), 0.0);
-}
-
-
-void main() {
-	ivec2 originScreenCoord = ivec2(gl_FragCoord.xy);
-
-	// We always get the Orginin from the level 0 of the mipmaps
-	vec3 origin = getVSPosition(originScreenCoord, 0);
-
-	float radius;
-
-	if(origin.z < uRadius){
-		radius = origin.z;
-	} else {
-		radius = uRadius;
-	}
-
-	float radius2 = radius * radius;
-
-	vec3 originNormal = getVSFaceNormal(origin);
-	//AO = originNormal;
-	//return;
-
-	//screenSpaceSampleRadius is in pixels
-	float screenSpaceSampleRadius = -uProjScale * radius / origin.z;
-
-	//screenSpaceSampleRadius = clamp(screenSpaceSampleRadius, 0.0f, pow(2, MIP_MAPS_LEVELS * LOWER_MIP_LEVEL + 1));
-	//AO = clamp(int(floor(log2(screenSpaceSampleRadius))) - LOWER_MIP_LEVEL, 0, MIP_MAPS_LEVELS);
-	//return;
-
-	float rotationAngleOffset = 30 * originScreenCoord.x ^ originScreenCoord.y + 10 * originScreenCoord.x * originScreenCoord.y;
-
-	float sum = 0.0f;
-    for(int i = 0; i < uNumOfSamples; i++) {
-        sum += sampleAO(originScreenCoord, origin, originNormal, screenSpaceSampleRadius, i, rotationAngleOffset, radius, radius2);
-    }
-
-    //float A = max(0.0, 1.0 - sum * (2.0f / uNumOfSamples));
-    float A = 1.0f - sum * (2.0f * uIntensityScale / float(uNumOfSamples));
-    AO = clamp(pow(A, uContrast), 0.0f, 1.0f);
-	//AO = vec4(originNormal, 1.0f);
-}
@@ -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;
 }

@@ -31,30 +31,12 @@ void SSAOPass::InitializeShaderProgram()

 void SSAOPass::InitializeBuffer()
 {
-	glGenTextures(1, &m_SSAOTexture);
-	glBindTexture(GL_TEXTURE_2D, m_SSAOTexture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height, 0, GL_RED, GL_FLOAT, nullptr);
-	//glTexImage2D(GL_TEXTURE_2D, 0, GL_R32I, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height, 0, GL_RED_INTEGER, GL_INT, nullptr);
-	//glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height, 0, GL_RGB, GL_FLOAT, nullptr);
+	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();

-	glGenTextures(1, &m_SSAOViewSpaceZTexture);
-	glBindTexture(GL_TEXTURE_2D, m_SSAOViewSpaceZTexture);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_R32F, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height, 0, GL_RED, GL_FLOAT, nullptr);
-	//glTexStorage2D(GL_TEXTURE_2D, MAX_MIP_LEVEL, GL_R32F, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);;
-	//glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height, GL_RED, GL_FLOAT, nullptr);
-	//glGenerateMipmap(GL_TEXTURE_2D);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	//glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, GL_TRUE);
+	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();
@@ -63,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();
 }
@@ -82,6 +64,17 @@ void SSAOPass::Setting(float radius, float bias, float contrast, float intensity
 	m_NumOfTurns = NumOfTurns;
 }

+void SSAOPass::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const
+{
+	glGenTextures(1, texture);
+	glBindTexture(GL_TEXTURE_2D, *texture);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapping);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapping);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);
+	glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, dimensions.x, dimensions.y, 0, format, type, nullptr);
+	GLERROR("Texture initialization failed");
+}

 void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 {
@@ -118,11 +111,6 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 		(-2.0 / (m_Renderer->GetViewportSize().Height * camera->ProjectionMatrix()[1][1]))
 		);

-	m_SSAOViewSpaceZFramBuffer.Unbind();
-
-	//glBindTexture(GL_TEXTURE_2D, m_SSAOViewSpaceZTexture);
-	//glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height, GL_RED, GL_FLOAT, &m_SSAOViewSpaceZTexture);
-	//glGenerateMipmap(GL_TEXTURE_2D); 

 	m_SSAOFramBuffer.Bind();
 	m_SSAOProgram->Bind();
@@ -131,7 +119,7 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 	glBindTexture(GL_TEXTURE_2D, m_SSAOViewSpaceZTexture);

 	// How many pixel there are in a 1m long object 1m away from the camera
-	glUniform1f(glGetUniformLocation(SSAOShaderHandle, "uProjScale"), m_Renderer->GetViewportSize().Height / (-2.0f * glm::tan(glm::radians(camera->FOV()) * 0.5f)));
+	glUniform1f(glGetUniformLocation(SSAOShaderHandle, "uProjScale"), m_Renderer->GetViewportSize().Height / (-2.0f * glm::tan(camera->FOV() * 0.5f)));

 	glUniform1f(glGetUniformLocation(SSAOShaderHandle, "uRadius"), m_Radius);
 	glUniform1f(glGetUniformLocation(SSAOShaderHandle, "uBias"), m_Bias);
@@ -147,3 +135,7 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 	m_DrawBloomPass->ClearBuffer();
 	m_DrawBloomPass->Draw(m_SSAOTexture);
 }
+
+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
Viktor Ljung	2c18068059	Merge pull request #126 from teamfisk/SSAO SSAO	2016-02-22 16:40:11 +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