WIP multi-weapon behaviours

2016-02-25 16:24:38 +01:00
44 changed files with 415 additions and 637 deletions
@@ -29,6 +29,7 @@ struct EntityWrapper
    EntityWrapper Parent();
    EntityWrapper FirstChildByName(const std::string& name);
    EntityWrapper FirstParentWithComponent(const std::string& componentType);
+    std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);
    bool IsChildOf(EntityWrapper potentialParent);
    bool Valid() const;

@@ -39,6 +40,7 @@ struct EntityWrapper

 private:
    EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);
+    void childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent);
 };

 namespace std
@@ -21,7 +21,6 @@
 #include "Core/ConfigFile.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
@@ -48,9 +47,7 @@ public:

    void Connect(std::string address, int port);
    void Update() override;
-private:
-    UDPClient m_Unreliable;
-    TCPClient m_Reliable;
+
    std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
    void parseSpawnEvents();
    // Save for children
@@ -104,9 +101,9 @@ private:
    void parseEntityDeletion(Packet& packet);
    void parsePlayerDamage(Packet& packet);
    void parseComponentDeletion(Packet& packet);
-    void parseDoubleJump(Packet& packet);
    void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
    void parseSnapshot(Packet& packet);
+    void UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD);
    void identifyPacketLoss();
    void hasServerTimedOut();
    EntityID createPlayer();
@@ -130,10 +127,11 @@ private:
    EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
    bool OnPlayerSpawned(const Events::PlayerSpawned& e);
    EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
-    EventRelay<Client, Events::DoubleJump> m_EDoubleJump;
-    bool OnDoubleJump(Events::DoubleJump & e);
    bool OnSearchForServers(const Events::SearchForServers& e);
+private:
+    UDPClient m_Unreliable;
    UDPClient m_ServerlistRequest;
+    TCPClient m_Reliable;
    std::vector<ServerInfo> m_Serverlist;
    bool m_SearchingForServers = false;
    std::clock_t m_StartSearchTime;
@@ -19,7 +19,6 @@ enum class MessageType
    EntityDeleted,
    ComponentDeleted,
    PlayerTransform,
-    OnDoubleJump,
    ServerlistRequest,
    Invalid
 };
@@ -8,6 +8,7 @@

 #include "Network/TCPServer.h"
 #include "Network/UDPServer.h"
+#include "Network/UDPClient.h" //LOL
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
@@ -17,7 +18,6 @@
 #include "Core/EPlayerDamage.h"
 #include "Network/EPlayerDisconnected.h"
 #include "Core/EPlayerSpawned.h"
-#include "../Game/Events/EDoubleJump.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"

@@ -81,9 +81,8 @@ private:
    void parseOnInputCommand(Packet& packet);
    void parseClientPing();
    void parsePing();
-    bool parseDoubleJump(Packet& packet);
-    void parseUDPConnect(Packet& packet);
-    void parseTCPConnect(Packet& packet);
+    void parseUDPConnect(Packet & packet);
+    void parseTCPConnect(Packet & packet);
    void parseDisconnect();
    void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
    bool shouldSendToClient(EntityWrapper childEntity);
@@ -25,9 +25,10 @@ private:
    std::unique_ptr<boost::asio::ip::tcp::acceptor> acceptor;
    boost::shared_ptr<boost::asio::ip::tcp::socket> lastReceivedSocket;

+    void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
+        int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+        const boost::system::error_code& error);
    int readBuffer(PlayerDefinition& playerDefinition);
-    PlayerID getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
-        boost::asio::ip::address address, unsigned short port);
    int GetPort();
    std::string GetAddress();
    int m_Port = 0;
@@ -12,7 +12,7 @@
 class DrawBloomPass
 {
 public:
-    DrawBloomPass(IRenderer* renderer, ConfigFile* config);
+    DrawBloomPass(IRenderer* renderer /* ,Texture or finalpass*/ );
    ~DrawBloomPass() { }
    void InitializeTextures();
    void InitializeFrameBuffers();
@@ -23,34 +23,23 @@ public:
    void FillGaussianBuffer(FrameBuffer* fb);

    void Draw(GLuint texture);
-	void ChangeQuality(int quality);

    void OnWindowResize();

    //Getters
    //Return the blurred result of the texture that was sent into draw
-	GLuint GaussianTexture() const {
-		if (m_Quality == 0) {
-			return m_BlackTexture->m_Texture;
-		}
-		else {
-			return m_GaussianTexture_vert;
-		}
-	}
-
+    GLuint GaussianTexture() const { return m_GaussianTexture_vert; }


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

-    Texture* m_BlackTexture;
+    Texture* m_WhiteTexture;
    Model* m_ScreenQuad;

    const IRenderer* m_Renderer;
-	ConfigFile* m_Config;
    //const LightCullingPass* m_LightCullingPass 
-	int m_Iterations = 7;
-	int m_Quality = 3;
+    GLuint m_iterations = 9;

    GLuint m_GaussianTexture_horiz;
    GLuint m_GaussianTexture_vert;
@@ -5,7 +5,6 @@
 #include "DrawFinalPassState.h"
 #include "LightCullingPass.h"
 #include "CubeMapPass.h"
-#include "SSAOPass.h"
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
@@ -15,12 +14,12 @@
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass);
    ~DrawFinalPass() { }
    void InitializeTextures();
    void InitializeFrameBuffers();
    void InitializeShaderPrograms();
-    void Draw(RenderScene& scene);
+    void Draw(RenderScene& scene, GLuint SSAOTexture);
    void ClearBuffer();
    void OnWindowResize();

@@ -39,7 +38,7 @@ private:
    void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;

    void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
-    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
+    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene, GLuint SSAOTexture);
    void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
    void DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
    void DrawToDepthBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
@@ -72,7 +71,6 @@ private:
    const IRenderer* m_Renderer;
    const LightCullingPass* m_LightCullingPass;
    const CubeMapPass* m_CubeMapPass;
-	const SSAOPass* m_SSAOPass;

    ShaderProgram* m_ForwardPlusProgram;
    ShaderProgram* m_ExplosionEffectProgram;
@@ -5,7 +5,6 @@
 #include "../OpenGL.h"
 #include "../GLM.h"
 #include "../Core/Util/Rectangle.h"
-#include "../Core/ConfigFile.h"
 #include "Util/ScreenCoords.h"
 #include "Camera.h"
 #include "RenderQueue.h"
@@ -32,9 +32,8 @@ class Renderer : public IRenderer
    static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);

 public:
-	Renderer(EventBroker* eventBroker, ConfigFile* config)
-		: m_EventBroker(eventBroker)
-		, m_Config(config)
+    Renderer(EventBroker* eventBroker) 
+        : m_EventBroker(eventBroker)
    { }

    virtual void Initialize() override;
@@ -48,7 +47,6 @@ private:
    //----------------------Variables----------------------//

    static std::unordered_map <GLFWwindow*, Renderer*> m_WindowToRenderer;
-	ConfigFile* m_Config;

    EventBroker* m_EventBroker;
    TextPass* m_TextPass;
@@ -63,8 +61,12 @@ private:
    int m_DebugTextureToDraw = 0;
    int m_CubeMapTexture = 0;
    bool m_ResizeWindow = false;
-	int m_SSAO_Quality = 0;
-	int m_GLOW_Quality = 2;
+	float m_SSAO_Radius = 1.0f;
+	float m_SSAO_Bias = 0.05f;
+	float m_SSAO_Contrast = 1.5f;
+	float m_SSAO_IntensityScale = 1.0f;
+	int m_SSAO_NumOfSamples = 24;
+	int m_SSAO_NumOfTurns = 7;

    PickingPass* m_PickingPass;
    LightCullingPass* m_LightCullingPass;
@@ -13,32 +13,18 @@
 class SSAOPass
 {
 public:
-	SSAOPass(IRenderer* renderer, ConfigFile* config);
-	~SSAOPass() { };
-
-	void ChangeQuality(int quality);
+	SSAOPass(IRenderer* rendere);
+	~SSAOPass() { 
+		delete m_DrawBloomPass;
+	};

 	void Draw(GLuint depthBuffer, Camera* camera);
-	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int numOfTurns, int iterations, int quality);
+	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 { 
-		if (m_Quality == 0) {
-			return m_WhiteTexture->m_Texture;
-		} else {
-			return m_GaussianTexture_vert;
-		}
-	}
-
-	int TextureQuality() const {
-		if (m_Quality == 0) {
-			return 13;
-		} else {
-			return m_TextureQuality;
-		}
-	}
+	GLuint SSAOTexture() const { return m_DrawBloomPass->GaussianTexture(); }

 private:
 	void InitializeTexture();
@@ -54,7 +40,6 @@ private:
 	Model* m_ScreenQuad;

 	const IRenderer* m_Renderer;
-	ConfigFile* m_Config;

 	float m_Radius;
 	float m_Bias;
@@ -62,11 +47,6 @@ private:
 	float m_IntensityScale;
 	int m_NumOfSamples;
 	int m_NumOfTurns;
-	int m_Iterations;
-	int m_TextureQuality;
-	int m_Quality = 0;
-
-	Texture* m_WhiteTexture;

 	GLuint m_SSAOTexture;
 	FrameBuffer m_SSAOFramBuffer;
@@ -74,16 +54,10 @@ private:
 	GLuint m_SSAOViewSpaceZTexture;
 	FrameBuffer m_SSAOViewSpaceZFramBuffer;

-	GLuint m_GaussianTexture_horiz;
-	GLuint m_GaussianTexture_vert;
-
-	FrameBuffer m_GaussianFrameBuffer_horiz;
-	FrameBuffer m_GaussianFrameBuffer_vert;
-
 	ShaderProgram* m_SSAOProgram;
 	ShaderProgram* m_SSAOViewSpaceZProgram;
-	ShaderProgram* m_GaussianProgram_horiz;
-	ShaderProgram* m_GaussianProgram_vert;
+
+	DrawBloomPass* m_DrawBloomPass;
 };

 #endif
@@ -8,7 +8,7 @@ namespace Events

 struct DoubleJump : public Event
 {
-    EntityID entityID;
+
 };

 }
@@ -34,13 +34,9 @@ private:
    glm::vec3 m_LastPosition = glm::vec3();
    // The logic for making the sound play when player is moving
    void playerStep(double dt);
-    // Spawn a hexagon at origin of an Entity
-    void spawnHexagon(EntityWrapper target);

    EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
    bool OnPlayerSpawned(Events::PlayerSpawned& e);
-    EventRelay<PlayerMovementSystem, Events::DoubleJump> m_EDoubleJump;
-    bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e);

    void updateMovementControllers(double dt);
    void updateVelocity(EntityWrapper player, double dt);
@@ -1,13 +1,14 @@
+#ifndef AssaultWeaponBehaviour_h__
+#define AssaultWeaponBehaviour_h__
+
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Collision/Collision.h"
-#include "Rendering/AnimationSystem.h"
 #include "Core/ConfigFile.h"
 #include "WeaponBehaviour.h"
 #include "../SpawnerSystem.h"
 #include "Core/EPlayerDamage.h"
 #include "Core/EShoot.h"

-
 class AssaultWeaponBehaviour : public WeaponBehaviour
 {
 public:
@@ -22,16 +23,13 @@ public:
 private:
    EntityWrapper m_FirstPersonModel;
    EntityWrapper m_ThirdPersonModel;
+
    // State
    bool m_Firing = false;
    bool m_Reloading = false;
    double m_ReloadTimer = 0.0;
-    EntityWrapper m_FirstPersonReloadImpersonator;
-    EntityWrapper m_ThirdPersonReloadImpersonator;
    double m_TimeSinceLastFire = 0.0;
-
-    EventRelay<WeaponBehaviour, Events::AnimationComplete> m_EAnimationComplete;
-    bool OnAnimationComplete(Events::AnimationComplete& e);
+    EntityWrapper m_FirstPersonReloadImpostor;

    bool hasAmmo();
    void fireRound();
@@ -47,3 +45,5 @@ private:
    bool shoot(double damage);
    void showHitMarker();
 };
+
+#endif
@@ -0,0 +1,16 @@
+#include "WeaponBehaviour.h"
+
+class DefenderWeaponBehaviour : public WeaponBehaviour
+{
+public:
+    DefenderWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity);
+
+    virtual void Fire() override;
+    //virtual void CeaseFire() override;
+    //virtual void Reload() override;
+
+    //virtual void Update(double dt) override;
+
+private:
+    double m_TimeSinceLastFire = 0.0;
+};
@@ -8,17 +8,21 @@

 class WeaponBehaviour : public System
 {
+    friend class WeaponSystem;
+
 public:
-    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player)
+    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player, EntityWrapper firstPersonWeapon, EntityWrapper thirdPersonWeapon)
        : System(systemParams)
        , m_Renderer(renderer)
        , m_CollisionOctree(collisionOctree)
        , m_Player(player)
+        , m_FirstPerson(firstPersonWeapon)
+        , m_ThirdPerson(thirdPersonWeapon)
    { }
    virtual ~WeaponBehaviour() = default;

    WeaponBehaviour(const WeaponBehaviour&) = delete;
-    WeaponBehaviour& operator=(const WeaponBehaviour &) = delete;
+    WeaponBehaviour& operator=(const WeaponBehaviour&) = delete;

    virtual void Fire() = 0;
    virtual void CeaseFire() { }
@@ -29,6 +33,8 @@ protected:
    IRenderer* m_Renderer;
    Octree<EntityAABB>* m_CollisionOctree;
    EntityWrapper m_Player;
+    EntityWrapper m_FirstPerson;
+    EntityWrapper m_ThirdPerson;
 };

 #endif
@@ -36,37 +36,4 @@ ResourceLoading=true
 [Sound]
 BGMVolume=1.0
 SFXVolume=1.0
-Announcer=female
-
-[SSAO]
-Quality=0
-
-[SSAO1]
-Radius=1.0
-Bias=0.02
-Contrast=1.5
-Intensity=1.0
-NumSamples=8
-NumTurns=3
-NumIterations=5
-TextureQuality=2
-
-[SSAO2]
-Radius=1.0
-Bias=0.02
-Contrast=1.5
-Intensity=1.0
-NumSamples=16
-NumTurns=13
-NumIterations=9
-TextureQuality=1
-
-[SSAO3]
-Radius=1.0
-Bias=0.02
-Contrast=1.5
-Intensity=1.0
-NumSamples=24
-NumTurns=17
-NumIterations=13
-TextureQuality=0
+Announcer=female
@@ -46,4 +46,5 @@
 	<xs:include schemaLocation="Components/Page.xsd"/>
 	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
+	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
 </xs:schema>
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Trigger xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Trigger.xsd">
-</Trigger>
@@ -1,17 +0,0 @@
-<?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="Weapon">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="MagSize" type="t:int" minOccurs="0"/>
-				<xs:element name="MaxAmmo" type="t:int" minOccurs="0"/>
-				<xs:element name="CurrentAmmoInMag" type="t:int" minOccurs="0"/>
-				<xs:element name="CurrentAmmo" type="t:int" minOccurs="0"/>
-				<xs:element name="RPM" type="t:double" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<WeaponAttachment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="WeaponAttachment.xsd">
+	<Person><FirstPerson/></Person>
+</WeaponAttachment>
@@ -0,0 +1,37 @@
+<?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:complexType name="PersonEnum" mixed="true">
+		<xs:complexContent>
+			<xs:extension base="t:enum">
+				<xs:choice>
+					<xs:element name="FirstPerson" type="t:int" fixed="0" minOccurs="0"/>
+					<xs:element name="ThirdPerson" type="t:int" fixed="1" minOccurs="0"/>
+				</xs:choice>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="WeaponSlotEnum" mixed="true">
+		<xs:complexContent>
+			<xs:extension base="t:enum">
+				<xs:choice>
+					<xs:element name="Primary" type="t:int" fixed="1" minOccurs="0"/>
+					<xs:element name="Secondary" type="t:int" fixed="2" minOccurs="0"/>
+				</xs:choice>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:element name="WeaponAttachment">
+		<xs:annotation><xs:documentation>Combine with a spawner to define a weapon attachment point</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Person" type="PersonEnum" minOccurs="0"/>
+				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
@@ -50,6 +50,7 @@
 							<xs:element ref="c:Menu" minOccurs="0"/>
 							<xs:element ref="c:Page" minOccurs="0"/>
 							<xs:element ref="c:Button" minOccurs="0"/>
+							<xs:element ref="c:WeaponAttachment" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>
@@ -13,7 +13,6 @@ uniform vec4 AmbientColor;
 uniform float FillPercentage;
 uniform float GlowIntensity = 10;
 uniform vec3 CameraPosition;
-uniform int SSAOQuality;

 uniform vec2 DiffuseUVRepeat;
 uniform vec2 NormalUVRepeat;
@@ -126,7 +125,7 @@ vec4 CalcNormalMappedValue(vec3 normal, vec3 tangent, vec3 bitangent, vec2 textu

 void main()
 {
-	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy) >> int(SSAOQuality), 0).r;
+	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy), 0).r;
 	ao = (clamp(1.0 - (1.0 - ao), 0.0, 1.0) + MIN_AMBIENT_LIGHT) /  (1.0 + MIN_AMBIENT_LIGHT);
 	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate * DiffuseUVRepeat);
 	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate * GlowUVRepeat);
@@ -11,7 +11,6 @@ uniform vec4 DiffuseColor;
 uniform vec4 FillColor;
 uniform vec4 Color;
 uniform vec4 AmbientColor;
-uniform int SSAOQuality;

 //Get bineded at the same time as the textures
 uniform vec2 DiffuseUVRepeat1;
@@ -178,7 +177,7 @@ vec4 CalcBlendedNormal(vec4 blendValue, sampler2D R, sampler2D G, sampler2D B,

 void main()
 {
-	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy) >> int(SSAOQuality), 0).r;
+	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy), 0).r;
 	ao = (clamp(1.0 - (1.0 - ao), 0.0, 1.0) + MIN_AMBIENT_LIGHT) /  (1.0 + MIN_AMBIENT_LIGHT);

 	vec4 splatTexel = texture2D(SplatMapTexture, Input.TextureCoordinate);
@@ -2,11 +2,11 @@

 //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;

@@ -16,16 +16,15 @@ uniform float           uProjScale;
 //#define ProjScale 500

 uniform float           uRadius;
-//#define uRadius 1.0f
+//#define Radius 1.0f

 uniform float           uBias;
-//#define uBias 0.05f
+//#define Bias 0.012f

 uniform float           uContrast;
-//#define uContrast 1.5f
+//#define IntensityDivR6 1

 uniform float           uIntensityScale;
-//#define uIntensityScale 1.0f

 out float				AO;

@@ -89,7 +88,13 @@ void main() {

 	vec3 origin = getVSPosition(originScreenCoord);

-	float radius = min(origin.z, uRadius);
+	float radius;
+	if(origin.z < uRadius){
+		radius = origin.z;
+	} else {
+		radius = uRadius;
+	}
+

 	vec3 originNormal = getVSFaceNormal(origin);

@@ -2,12 +2,7 @@

 layout (location = 0) in vec3 Position;

-out VertexData{
-	vec2 TextureCoordinate;
-}Output;
-
 void main()
 {
 	gl_Position = vec4(Position, 1.0);
-	Output.TextureCoordinate = (vec2(Position) + 1) / 2;
 }
@@ -3,15 +3,11 @@
 layout (binding = 0) uniform sampler2D DepthBuffer;
 uniform vec3 ClipInfo;

-in VertexData{
-	vec2 TextureCoordinate;
-}Input;
-
 out float depthLinear;
 //Just for Debug, should be depthLinear
 //out vec4 fragmentColor;
 void main() {
-	float depthSample = texture2D(DepthBuffer, Input.TextureCoordinate).r;
+	float depthSample = texelFetch(DepthBuffer, ivec2(gl_FragCoord.xy), 0).r;
 	depthLinear = ClipInfo[0] / (ClipInfo[1] * depthSample + ClipInfo[2]);
 	//float depthLinear = (NearClip) / ( -depthSample + 1.0f);
 	//fragmentColor = vec4(depthLinear, depthLinear, depthLinear, 1.0f);
@@ -51,6 +51,13 @@ EntityWrapper EntityWrapper::FirstParentWithComponent(const std::string& compone
    return EntityWrapper::Invalid;
 }

+std::vector<EntityWrapper> EntityWrapper::ChildrenWithComponent(const std::string& componentType)
+{
+    std::vector<EntityWrapper> childrenWithComponent;
+    childrenWithComponentRecursive(componentType, *this, childrenWithComponent);
+    return childrenWithComponent;
+}
+
 bool EntityWrapper::IsChildOf(EntityWrapper potentialParent)
 {
    EntityWrapper entity = *this;
@@ -131,3 +138,18 @@ EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name,
    return EntityWrapper::Invalid;
 }

+void EntityWrapper::childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent)
+{
+    auto itPair = this->World->GetChildren(entity.ID);
+    if (itPair.first == itPair.second) {
+        return;
+    }
+
+    for (auto it = itPair.first; it != itPair.second; ++it) {
+        if (entity.HasComponent(componentType)) {
+            childrenWithComponent.push_back(entity);
+        }
+        childrenWithComponentRecursive(componentType, entity, childrenWithComponent);
+    }
+}
+
@@ -32,7 +32,6 @@ void Client::Connect(std::string address, int port)
    EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Client::OnInputCommand);
    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Client::OnPlayerDamage);
    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Client::OnPlayerSpawned);
-    EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &Client::OnDoubleJump);
    EVENT_SUBSCRIBE_MEMBER(m_ESearchForServers, &Client::OnSearchForServers);
    auto config = ResourceManager::Load<ConfigFile>("Config.ini");
    m_Address = address;
@@ -141,9 +140,6 @@ void Client::parseMessageType(Packet& packet)
    case MessageType::OnPlayerDamage:
        parsePlayerDamage(packet);
        break;
-    case MessageType::OnDoubleJump:
-        parseDoubleJump(packet);
-        break;
    default:
        break;
    }
@@ -276,20 +272,6 @@ void Client::parseComponentDeletion(Packet & packet)
    }
 }

-void Client::parseDoubleJump(Packet & packet)
-{
-    EntityID serverID = packet.ReadPrimitive<EntityID>();
-    if (!serverClientMapsHasEntity(serverID)) {
-        return;
-    }
-    Events::DoubleJump e;
-    e.entityID = m_ServerIDToClientID.at(serverID);
-    // If player is local player do not publish to prevent infinite feedback loop
-    if (e.entityID != m_LocalPlayer.ID) {
-        m_EventBroker->Publish(e);
-    }
-}
-
 void Client::updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID)
 {
    for (auto field : componentInfo.FieldsInOrder) {
@@ -366,7 +348,9 @@ void Client::parseSnapshot(Packet& packet)
                EntityWrapper localEntity(m_World, localEntityID);
                // Update entity
                if (m_World->HasComponent(localEntityID, componentType)) {
-                    // TODO Fix memory leak here
+                    if (localEntity.Name() == "CapturePointHUD") {
+                        UpdateLocalCapturePointHUD(localEntity);
+                    }
                    SharedComponentWrapper newComponent = createSharedComponent(packet, localEntityID, componentInfo);
                    bool shouldApply = true;
                    // Apply potential filter function
@@ -377,7 +361,6 @@ void Client::parseSnapshot(Packet& packet)
                        ComponentWrapper currentComponent = m_World->GetComponent(localEntityID, componentType);
                        memcpy(currentComponent.Data, newComponent.Data, componentInfo.Stride);
                    }
-
                    //if (localEntity != m_LocalPlayer && !localEntity.IsChildOf(m_LocalPlayer)) {
                    //    updateFields(packet, componentInfo, localEntityID);
                    //} else {
@@ -394,11 +377,7 @@ void Client::parseSnapshot(Packet& packet)
                if (serverParentID == EntityID_Invalid) {
                    newLocalEntityID = m_World->CreateEntity(EntityID_Invalid);
                } else {
-                    if (serverClientMapsHasEntity(serverParentID)) {
-                        newLocalEntityID = m_World->CreateEntity(m_ServerIDToClientID.at(serverParentID));
-                    } else {
-                        newLocalEntityID = m_World->CreateEntity(EntityID_Invalid);
-                    }
+                    newLocalEntityID = m_World->CreateEntity(m_ServerIDToClientID.at(serverParentID));
                }
                m_World->SetName(newLocalEntityID, serverEntityName);
                insertIntoServerClientMaps(serverEntityID, newLocalEntityID);
@@ -408,16 +387,26 @@ void Client::parseSnapshot(Packet& packet)
        }
        // Parent logic
        // This should be enough beacause we know that the entities arives in pre-order (there will always be a parent)
-        if (serverParentID != EntityID_Invalid && serverClientMapsHasEntity(serverParentID)) {
+        if (serverParentID != EntityID_Invalid) {
            EntityID localEntityID = m_ServerIDToClientID.at(serverEntityID);
-            if (m_World->GetParent(localEntityID) != m_ServerIDToClientID.at(serverParentID)) {
-                m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
-            }
+            m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
        }
    }
    parseSpawnEvents();
 }

+
+void Client::UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD)
+{
+    //auto children = m_World->GetChildren(capturePointHUD.ID);
+    //for (auto it = children.first; it != children.second; it++) {
+    //    it->first
+    //}
+    //
+    //EntityWrapper& localHUD = m_LocalPlayer.FirstChildByName("HUD").FirstChildByName("CapturePointHUD");
+    //m_World->GetComponentPools()
+}
+
 void Client::disconnect()
 {
    m_IsConnected = false;
@@ -480,11 +469,6 @@ bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
    if (e.Inflictor != m_LocalPlayer) {
        return false;
    }
-    // Could this happen?
-    //if (!clientServerMapsHasEntity(e.Inflictor.ID) 
-    //    || !clientServerMapsHasEntity(e.Victim.ID)) {
-    //    return;
-    //}

    Packet packet(MessageType::OnPlayerDamage, m_SendPacketID);
    packet.WritePrimitive(m_ClientIDToServerID.at(e.Inflictor.ID));
@@ -519,7 +503,7 @@ void Client::parsePlayerDamage(Packet& packet)
    Events::PlayerDamage e;
    PlayerID victimID = packet.ReadPrimitive<EntityID>();
    PlayerID inflictorID = packet.ReadPrimitive<EntityID>();
-    if (!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)) {
+    if(!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)){
        return;
    }
    e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID));
@@ -531,17 +515,6 @@ void Client::parsePlayerDamage(Packet& packet)
    }
 }

-bool Client::OnDoubleJump(Events::DoubleJump & e)
-{
-    if (!clientServerMapsHasEntity(e.entityID) || e.entityID != m_LocalPlayer.ID) {
-        return false;
-    }
-    Packet packet(MessageType::OnDoubleJump);
-    packet.WritePrimitive(m_ClientIDToServerID.at(e.entityID));
-    m_Reliable.Send(packet);
-    return true;
-}
-
 void Client::sendLocalPlayerTransform()
 {
    if (!m_LocalPlayer.Valid()) {
@@ -29,8 +29,9 @@ Server::~Server()

 void Server::Update()
 {
-    m_Reliable.AcceptNewConnections(m_NextPlayerID, m_ConnectedPlayers);
+    PlayerDefinition pd;

+    m_Reliable.AcceptNewConnections(m_NextPlayerID, m_ConnectedPlayers);
    for (auto& kv : m_ConnectedPlayers) {
        while (kv.second.TCPSocket->available()) {
            // Packet will get real data in receive
@@ -46,7 +47,6 @@ void Server::Update()
        }
    }

-    PlayerDefinition pd;
    while (m_Unreliable.IsSocketAvailable()) {
        // Packet will get real data in receive
        Packet packet(MessageType::Invalid);
@@ -65,7 +65,7 @@ void Server::Update()
        PlayerDefinition localArea;
        localArea.Endpoint = boost::asio::ip::udp::endpoint();
        m_ServerlistRequest.Receive(packet, localArea);
-        if (packet.GetMessageType() == MessageType::ServerlistRequest) {
+        if(packet.GetMessageType() == MessageType::ServerlistRequest) {
            packet.ReadPrimitive<int>(); // Pop size
            packet.ReadPrimitive<int>(); // Pop MsgType
            packet.ReadPrimitive<int>(); // Pop packet ID
@@ -76,7 +76,7 @@ void Server::Update()
    }

    // Check if players have disconnected
-    for (int i = 0; i < m_PlayersToDisconnect.size(); i++) {
+     for (int i = 0; i < m_PlayersToDisconnect.size(); i++) {
        disconnect(m_PlayersToDisconnect.at(i));
    }
    m_PlayersToDisconnect.clear();
@@ -136,10 +136,7 @@ void Server::parseMessageType(Packet& packet)
        parseOnPlayerDamage(packet);
        break;
    case MessageType::PlayerTransform:
-        parsePlayerTransform(packet);
-        break;
-    case MessageType::OnDoubleJump:
-        parseDoubleJump(packet);
+       parsePlayerTransform(packet);
        break;
    default:
        break;
@@ -194,41 +191,43 @@ void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
        // HACK: Only sync players for now, since the map turned out to be TOO LARGE to send in one snapshot and Simon's computer shits itself
        // HACK: Also checked CapturePointHUD for now. (this would get out of sync);
        EntityWrapper childEntity(m_World, childEntityID);
-        if (shouldSendToClient(childEntity)) {
-            // Write EntityID and parentsID and Entity name
-            packet.WritePrimitive(childEntityID);
-            packet.WritePrimitive(entityID);
-            packet.WriteString(m_World->GetName(childEntityID));
-            // Write components to child
-            int numberOfComponents = 0;
-            for (auto& i : worldComponentPools) {
-                if (i.second->KnowsEntity(childEntityID)) {
-                    numberOfComponents++;
-                }
+        if (!shouldSendToClient(childEntity)) {
+            continue;
+        }
+
+        // Write EntityID and parentsID and Entity name
+        packet.WritePrimitive(childEntityID);
+        packet.WritePrimitive(entityID);
+        packet.WriteString(m_World->GetName(childEntityID));
+        // Write components to child
+        int numberOfComponents = 0;
+        for (auto& i : worldComponentPools) {
+            if (i.second->KnowsEntity(childEntityID)) {
+                numberOfComponents++;
            }
-            // Write how many components should be read
-            packet.WritePrimitive(numberOfComponents);
-            for (auto& i : worldComponentPools) {
-                // If the entity exist in the pool
-                if (i.second->KnowsEntity(childEntityID)) {
-                    ComponentWrapper componentWrapper = i.second->GetByEntity(childEntityID);
-                    // ComponentType
-                    packet.WriteString(componentWrapper.Info.Name);
-                    // Loop through fields
-                    for (auto& componentField : componentWrapper.Info.FieldsInOrder) {
-                        ComponentInfo::Field_t fieldInfo = componentWrapper.Info.Fields.at(componentField);
-                        if (fieldInfo.Type == "string") {
-                            std::string& value = componentWrapper[componentField];
-                            packet.WriteString(value);
-                        } else {
-                            packet.WriteData(componentWrapper.Data + fieldInfo.Offset, fieldInfo.Stride);
-                        }
+        }
+        // Write how many components should be read
+        packet.WritePrimitive(numberOfComponents);
+        for (auto& i : worldComponentPools) {
+            // If the entity exist in the pool
+            if (i.second->KnowsEntity(childEntityID)) {
+                ComponentWrapper componentWrapper = i.second->GetByEntity(childEntityID);
+                // ComponentType
+                packet.WriteString(componentWrapper.Info.Name);
+                // Loop through fields
+                for (auto& componentField : componentWrapper.Info.FieldsInOrder) {
+                    ComponentInfo::Field_t fieldInfo = componentWrapper.Info.Fields.at(componentField);
+                    if (fieldInfo.Type == "string") {
+                        std::string& value = componentWrapper[componentField];
+                        packet.WriteString(value);
+                    } else {
+                        packet.WriteData(componentWrapper.Data + fieldInfo.Offset, fieldInfo.Stride);
                    }
                }
            }
        }
        // Go to to your children
-        addPlayersToPacket(packet, childEntityID);
+        addChildrenToPacket(packet, childEntityID);
    }
 }

@@ -344,7 +343,7 @@ void Server::parseTCPConnect(Packet & packet)
    // Read packet ID 
    m_PreviousPacketID = m_PacketID;    // Set previous packet id
    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-
+    
    LOG_INFO("Parsing connections");
    // Check if player is already connected
    // Ska vara till lagd i TCPServer receive
@@ -456,7 +455,8 @@ bool Server::OnInputCommand(const Events::InputCommand & e)
        }
        isReadingData = !isReadingData;
        m_SaveDataTimer = std::clock();
-    } else if (e.Command == "KickPlayer" && e.Value > 0) {
+    }
+    else if (e.Command == "KickPlayer" && e.Value > 0) {
        kick(0);
    }

@@ -507,7 +507,7 @@ bool Server::OnPlayerDamage(const Events::PlayerDamage& e)
    packet.WritePrimitive(e.Damage);
    reliableBroadcast(packet);

-    return true;
+    return false;
 }

 void Server::parseClientPing()
@@ -536,12 +536,6 @@ void Server::parsePing()
    }
 }

-bool Server::parseDoubleJump(Packet & packet)
-{
-    reliableBroadcast(packet);
-    return true;
-}
-
 void Server::parseOnInputCommand(Packet& packet)
 {
    PlayerID player = -1;
@@ -601,15 +595,8 @@ void Server::parsePlayerTransform(Packet& packet)

 bool Server::shouldSendToClient(EntityWrapper childEntity)
 {
-    auto children = m_World->GetChildren(childEntity.ID);
-    for (auto it = children.first; it != children.second; it++) {
-        EntityWrapper child(m_World, it->second);
-        if(child.HasComponent("CapturePoint")) {
-            return true;
-        }
-    }
    return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint");
+        || childEntity.HasComponent("CapturePoint") || childEntity.FirstParentWithComponent("CapturePoint").Valid();
 }

 PlayerID Server::GetPlayerIDFromEndpoint()
@@ -4,8 +4,6 @@ using namespace boost::asio::ip;
 TCPServer::TCPServer() 
 {
    acceptor = std::unique_ptr<tcp::acceptor>(new tcp::acceptor(m_IOService, tcp::endpoint(tcp::v4(), 27666)));
-    // Make the acceptor non-blocking so we wont get stuck in AcceptNewConnections().
-    acceptor->non_blocking(true);
    m_Port = GetPort();
    m_Address = GetAddress();
 }
@@ -15,24 +13,14 @@ TCPServer::~TCPServer()

 void TCPServer::AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers)
 {
-    boost::system::error_code error;
    boost::shared_ptr<tcp::socket> newSocket = boost::shared_ptr<tcp::socket>(new tcp::socket(m_IOService));
-    acceptor->accept(*newSocket, error);
-    // If no error occured add new tcp connection
-    if (!error) {
-        // Add tcp socket to connections
-        boost::asio::ip::tcp::no_delay option(true);
-        newSocket->set_option(option);
-        PlayerDefinition pd;
-        pd.StopTime = std::clock();
-        pd.TCPSocket = newSocket;
-        pd.TCPAddress = newSocket.get()->remote_endpoint().address();
-        pd.TCPPort = newSocket.get()->remote_endpoint().port();
-        connectedPlayers[nextPlayerID++] = pd;
-    }
+    m_IOService.poll();
+    acceptor->async_accept(*newSocket,
+        boost::bind(&TCPServer::handle_accept, this, newSocket, boost::ref(nextPlayerID), boost::ref(connectedPlayers),
+            boost::asio::placeholders::error));
 }

-PlayerID TCPServer::getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+PlayerID GetPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
    boost::asio::ip::address address, unsigned short port)
 {
    for (auto& kv : connectedPlayers) {
@@ -44,6 +32,24 @@ PlayerID TCPServer::getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefin
    return -1;
 }

+void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket,
+    int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+    const boost::system::error_code& error)
+{
+    if (!error && GetPlayerIDFromEndpoint(connectedPlayers, socket->remote_endpoint().address(),
+        socket->remote_endpoint().port()) == -1) {
+        // Add tcp socket to connections
+        boost::asio::ip::tcp::no_delay option(true);
+        socket->set_option(option);
+        PlayerDefinition pd;
+        pd.StopTime = std::clock();
+        pd.TCPSocket = socket;
+        pd.TCPAddress = socket.get()->remote_endpoint().address();
+        pd.TCPPort = socket.get()->remote_endpoint().port();
+        connectedPlayers[nextPlayerID++] = pd;
+    }
+}
+
 void TCPServer::Send(Packet & packet, PlayerDefinition & playerDefinition)
 {
    packet.UpdateSize();
@@ -17,7 +17,6 @@ void CubeMapPass::LoadTextures(std::string input)
            m_CubeMapTextures.push_back(img);
        }
        GenerateCubeMapTexture();
-		m_PreviusCubeMapTexture = input;
    }
 }

@@ -1,42 +1,19 @@
 #include "Rendering/DrawBloomPass.h"

-DrawBloomPass::DrawBloomPass(IRenderer* renderer, ConfigFile* config)
-	: m_Renderer(renderer)
-	, m_Config(config)
+DrawBloomPass::DrawBloomPass(IRenderer* renderer)
 {
-	InitializeTextures();
+    m_Renderer = renderer;

-	ChangeQuality(m_Config->Get<int>("GLOW.Quality", 2));
+    m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");
+
+    InitializeTextures();
+    InitializeBuffers();
+    InitializeShaderPrograms();
 }

 void DrawBloomPass::InitializeTextures()
 {
-    m_BlackTexture = CommonFunctions::LoadTexture("Textures/Core/Black.png", false);
-}
-
-void DrawBloomPass::ChangeQuality(int quality)
-{
-	if (m_Quality == quality) {
-		return;
-	}
-	m_Quality = quality;
-
-	m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh");
-
-	if (m_Quality == 0) {
-		glDeleteTextures(1, &m_GaussianTexture_horiz);
-		glDeleteTextures(1, &m_GaussianTexture_vert);
-		return;
-	}
-
-	InitializeTextures();
-	InitializeBuffers();
-	InitializeShaderPrograms();
-	std::string qStr = std::to_string(m_Quality);
-	m_Iterations = m_Config->Get<float>("GLOW" + qStr + ".NumIterations", 0);
-
-	InitializeBuffers();
-	InitializeShaderPrograms();
+    m_WhiteTexture = CommonFunctions::LoadTexture("Textures/Core/White.png", false);
 }

 void DrawBloomPass::InitializeShaderPrograms()
@@ -63,25 +40,18 @@ void DrawBloomPass::InitializeBuffers()
 {
    GenerateTexture(&m_GaussianTexture_horiz, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);

-	if (m_GaussianFrameBuffer_horiz.GetHandle() == 0) {
-		m_GaussianFrameBuffer_horiz.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_horiz, GL_COLOR_ATTACHMENT0)));
-	}
-	m_GaussianFrameBuffer_horiz.Generate();
+    m_GaussianFrameBuffer_horiz.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_horiz, GL_COLOR_ATTACHMENT0)));
+    m_GaussianFrameBuffer_horiz.Generate();

    GenerateTexture(&m_GaussianTexture_vert, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);

-	if (m_GaussianFrameBuffer_vert.GetHandle() == 0) {
-		m_GaussianFrameBuffer_vert.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_vert, GL_COLOR_ATTACHMENT0)));
-	}
-	m_GaussianFrameBuffer_vert.Generate();
+    m_GaussianFrameBuffer_vert.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_vert, GL_COLOR_ATTACHMENT0)));
+    m_GaussianFrameBuffer_vert.Generate();
 }


 void DrawBloomPass::ClearBuffer()
 {
-	if (m_Quality == 0) {
-		return;
-	}
    GLERROR("PRE");
    m_GaussianFrameBuffer_horiz.Bind();
    glClearColor(0.f, 0.f, 0.f, 0.f);
@@ -96,9 +66,6 @@ void DrawBloomPass::ClearBuffer()

 void DrawBloomPass::Draw(GLuint texture)
 {
-	if (m_Quality == 0) {
-		return;
-	}
    GLERROR("DrawBloomPass::Draw: Pre");

    DrawBloomPassState state;
@@ -117,7 +84,7 @@ void DrawBloomPass::Draw(GLuint texture)
    glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex +1
        , GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
    //Iterate some times to make it more gaussian.
-    for (int i = 1; i < m_Iterations; i++) {
+    for (int i = 1; i < m_iterations; i++) {
        //Vertical pass
        m_GaussianFrameBuffer_vert.Bind();
        m_GaussianProgram_vert->Bind();
@@ -158,9 +125,6 @@ void DrawBloomPass::Draw(GLuint texture)

 void DrawBloomPass::OnWindowResize()
 {
-	if (m_Quality == 0) {
-		return;
-	}
    GenerateTexture(&m_GaussianTexture_vert, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
    m_GaussianFrameBuffer_vert.Generate();
    GenerateTexture(&m_GaussianTexture_horiz, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
@@ -169,7 +133,6 @@ void DrawBloomPass::OnWindowResize()

 void DrawBloomPass::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const
 {
-	glDeleteTextures(1, texture);
    glGenTextures(1, texture);
    glBindTexture(GL_TEXTURE_2D, *texture);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapping);
@@ -1,9 +1,9 @@
 #include "Rendering/DrawFinalPass.h"
-DrawFinalPass::DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass)
-	: m_Renderer(renderer)
-	, m_LightCullingPass(lightCullingPass)
-	, m_CubeMapPass(cubeMapPass)
-	, m_SSAOPass(ssaoPass)
+
+DrawFinalPass::DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass)
+    : m_Renderer(renderer)
+    , m_LightCullingPass(lightCullingPass)
+    , m_CubeMapPass(cubeMapPass)
 {
    //TODO: Make sure that uniforms are not sent into shader if not needed.
    m_ShieldPixelRate = 8;
@@ -162,20 +162,20 @@ void DrawFinalPass::InitializeShaderPrograms()

    m_FillDepthBufferProgram = ResourceManager::Load<ShaderProgram>("#FillDepthBufferProgram");
    m_FillDepthBufferProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/FillDepthBuffer.vert.glsl")));
-   // m_FillDepthBufferProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/FillDepthBuffer.frag.glsl")));
+    m_FillDepthBufferProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/FillDepthBuffer.frag.glsl")));
    m_FillDepthBufferProgram->Compile();
    m_FillDepthBufferProgram->Link();
    GLERROR("Creating DepthFill program");

    m_FillDepthBufferSkinnedProgram = ResourceManager::Load<ShaderProgram>("#FillDepthBufferProgramSkinned");
    m_FillDepthBufferSkinnedProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/FillDepthBufferSkinned.vert.glsl")));
-   // m_FillDepthBufferSkinnedProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/FillDepthBuffer.frag.glsl")));
+    m_FillDepthBufferSkinnedProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/FillDepthBuffer.frag.glsl")));
    m_FillDepthBufferSkinnedProgram->Compile();
    m_FillDepthBufferSkinnedProgram->Link();
    GLERROR("Creating DepthFill program");
 }

-void DrawFinalPass::Draw(RenderScene& scene)
+void DrawFinalPass::Draw(RenderScene& scene, GLuint SSAOTexture)
 {
    GLERROR("Pre");
    DrawFinalPassState* state = new DrawFinalPassState(m_FinalPassFrameBuffer.GetHandle());
@@ -191,10 +191,10 @@ void DrawFinalPass::Draw(RenderScene& scene)
    //Fill depth buffer
 	
    state->StencilMask(0x00);
-    DrawModelRenderQueues(scene.Jobs.OpaqueObjects, scene);
+    DrawModelRenderQueues(scene.Jobs.OpaqueObjects, scene, SSAOTexture);
    GLERROR("OpaqueObjects");
    state->BlendFunc(GL_ONE, GL_ONE);
-    DrawModelRenderQueues(scene.Jobs.TransparentObjects, scene);
+    DrawModelRenderQueues(scene.Jobs.TransparentObjects, scene, SSAOTexture);
    GLERROR("TransparentObjects");
    state->BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    DrawSprites(scene.Jobs.SpriteJob, scene);
@@ -210,11 +210,11 @@ void DrawFinalPass::Draw(RenderScene& scene)
    //Draw Opaque shielded objects
    state->StencilFunc(GL_NOTEQUAL, 1, 0xFF);
    state->StencilMask(0x00);
-    DrawModelRenderQueues(scene.Jobs.OpaqueShieldedObjects, scene); //might need changing
+    DrawModelRenderQueues(scene.Jobs.OpaqueShieldedObjects, scene, SSAOTexture); //might need changing
    GLERROR("Shielded Opaque object");

    //Draw Transparen Shielded objects
-    DrawModelRenderQueues(scene.Jobs.TransparentShieldedObjects, scene); //might need changing
+    DrawModelRenderQueues(scene.Jobs.TransparentShieldedObjects, scene, SSAOTexture); //might need changing
    GLERROR("Shielded Transparent objects");

    GLERROR("END");
@@ -250,9 +250,9 @@ void DrawFinalPass::Draw(RenderScene& scene)
    stateLowRes->Enable(GL_DEPTH_TEST);
    stateLowRes->StencilFunc(GL_LEQUAL, 1, 0xFF);
    stateLowRes->StencilMask(0x00);
-    DrawModelRenderQueues(scene.Jobs.OpaqueObjects, scene);
+    DrawModelRenderQueues(scene.Jobs.OpaqueObjects, scene, SSAOTexture);
    GLERROR("OpaqueObjects");
-    DrawModelRenderQueues(scene.Jobs.TransparentObjects, scene);
+    DrawModelRenderQueues(scene.Jobs.TransparentObjects, scene, SSAOTexture);
    GLERROR("TransparentObjects");
    glViewport(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
    glScissor(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
@@ -340,7 +340,7 @@ void DrawFinalPass::GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm:
    GLERROR("MipMap Texture initialization failed");
 }

-void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene)
+void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene, GLuint SSAOTexture)
 {
    GLuint forwardHandle = m_ForwardPlusProgram->GetHandle();
    GLERROR("forwardHandle");
@@ -364,7 +364,7 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightCullingPass->LightIndexSSBO());

 	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, m_SSAOPass->SSAOTexture());
+	glBindTexture(GL_TEXTURE_2D, SSAOTexture);

    for (auto &job : jobs) {
        auto explosionEffectJob = std::dynamic_pointer_cast<ExplosionEffectJob>(job);
@@ -383,7 +383,7 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
                    BindExplosionTextures(explosionSkinnedHandle, explosionEffectJob);
                    glActiveTexture(GL_TEXTURE5);
                    glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
-                    glUniform3fv(glGetUniformLocation(explosionSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
+                    glUniform3fv(glGetUniformLocation(forwardHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));

                    std::vector<glm::mat4> frameBones;
                    if (explosionEffectJob->AnimationOffset.animation != nullptr) {
@@ -401,7 +401,7 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
                    BindExplosionTextures(explosionHandle, explosionEffectJob);
                    glActiveTexture(GL_TEXTURE5);
                    glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
-                    glUniform3fv(glGetUniformLocation(explosionHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
+                    glUniform3fv(glGetUniformLocation(forwardHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));

                }
                break;
@@ -463,7 +463,7 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
                            BindModelTextures(forwardSkinnedHandle, modelJob);
                            glActiveTexture(GL_TEXTURE5);
                            glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
-                            glUniform3fv(glGetUniformLocation(forwardSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
+                            glUniform3fv(glGetUniformLocation(forwardHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));

                            std::vector<glm::mat4> frameBones;
                            if (modelJob->AnimationOffset.animation != nullptr) {
@@ -753,7 +753,6 @@ void DrawFinalPass::DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, Rend

 void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<ExplosionEffectJob>& job, RenderScene& scene)
 {
-	glUniform1i(glGetUniformLocation(shaderHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
 	GLERROR("Bind 1 uniform");
    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(job->Matrix));
 	GLERROR("Bind 2 uniform");
@@ -802,7 +801,6 @@ void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<E

 void DrawFinalPass::BindModelUniforms(GLuint shaderHandle, std::shared_ptr<ModelJob>& job, RenderScene& scene)
 {
-	glUniform1i(glGetUniformLocation(shaderHandle, "SSAOQuality"), m_SSAOPass->TextureQuality());
 	GLERROR("Bind 1 uniform");
 	GLint Location_M = glGetUniformLocation(shaderHandle, "M");
 	glUniformMatrix4fv(Location_M, 1, GL_FALSE, glm::value_ptr(job->Matrix));
@@ -9,7 +9,6 @@ DrawFinalPassState::DrawFinalPassState(GLuint frameBuffer)
    BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    Enable(GL_DEPTH_TEST);
    Enable(GL_CULL_FACE);
-	glDepthFunc(GL_LEQUAL);
    Enable(GL_STENCIL_TEST);
    StencilFunc(GL_NOTEQUAL, 1, 0xFF);
    StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
@@ -42,33 +42,33 @@ void FrameBuffer::Generate()
    GLERROR("PRE");

    std::vector<GLenum> attachments;
-	if (m_BufferHandle == 0) {
-		glGenFramebuffers(1, &m_BufferHandle);
-	}
+
+    glGenFramebuffers(1, &m_BufferHandle);
    glBindFramebuffer(GL_FRAMEBUFFER, m_BufferHandle);
    GLERROR("1");

-	for (auto it = m_Resources.begin(); it != m_Resources.end(); it++) {
-		switch ((*it)->m_ResourceType) {
-		case GL_TEXTURE_2D:
-			glFramebufferTexture2D(GL_FRAMEBUFFER, (*it)->m_Attachment, (*it)->m_ResourceType, *(*it)->m_ResourceHandle, 0);
-			GLERROR("FrameBuffer generate: glFramebufferTexture2D");
+    for (auto it = m_Resources.begin(); it != m_Resources.end(); it++) {
+        switch ((*it)->m_ResourceType) {
+        case GL_TEXTURE_2D:
+            glFramebufferTexture2D(GL_FRAMEBUFFER, (*it)->m_Attachment, (*it)->m_ResourceType, *(*it)->m_ResourceHandle, 0);
+            GLERROR("FrameBuffer generate: glFramebufferTexture2D");

-			break;
-		case GL_RENDERBUFFER:
-			glFramebufferRenderbuffer(GL_FRAMEBUFFER, (*it)->m_Attachment, (*it)->m_ResourceType, *(*it)->m_ResourceHandle);
-			GLERROR("FrameBuffer generate: glFramebufferRenderbuffer");
-			break;
-		}
-		GLERROR("2");
+            break;
+        case GL_RENDERBUFFER:
+            glFramebufferRenderbuffer(GL_FRAMEBUFFER, (*it)->m_Attachment, (*it)->m_ResourceType, *(*it)->m_ResourceHandle);
+            GLERROR("FrameBuffer generate: glFramebufferRenderbuffer");
+            break;
+        }
+        GLERROR("2");

-		if ((*it)->m_Attachment != GL_DEPTH_ATTACHMENT && (*it)->m_Attachment != GL_STENCIL_ATTACHMENT && (*it)->m_Attachment != GL_DEPTH_STENCIL_ATTACHMENT) {
-			attachments.push_back((*it)->m_Attachment);
-		}
-		GLERROR("Attachment");
+        if ((*it)->m_Attachment != GL_DEPTH_ATTACHMENT && (*it)->m_Attachment != GL_STENCIL_ATTACHMENT && (*it)->m_Attachment != GL_DEPTH_STENCIL_ATTACHMENT) {
+            attachments.push_back((*it)->m_Attachment);
+        }
+        GLERROR("Attachment");
+
+    }
+    GLERROR("3");

-	}
-	GLERROR("3");

    GLenum* bufferTextures = &attachments[0];
    glDrawBuffers(attachments.size(), bufferTextures);
@@ -4,8 +4,6 @@ std::unordered_map<GLFWwindow*, Renderer*> Renderer::m_WindowToRenderer;

 void Renderer::Initialize()
 {
-	m_SSAO_Quality = m_Config->Get<int>("SSAO.Quality", 0);
-	m_GLOW_Quality = m_Config->Get<int>("GLOW.Quality", 0);
 	InitializeWindow();
    
    InitializeRenderPasses();
@@ -109,7 +107,6 @@ void Renderer::Update(double dt)
 void Renderer::Draw(RenderFrame& frame)
 {
    GLERROR("PRE");
-	glBindFramebuffer(GL_FRAMEBUFFER, 0);
    ImGui::Combo("Draw textures", &m_DebugTextureToDraw, "Final\0Scene\0Bloom\0SceneLowRes\0BloomLowRes\0Gaussian\0Picking\0Ambient Occlusion");
    ImGui::Combo("CubeMap", &m_CubeMapTexture, "Nevada(512)\0Sky(1024)");
    if(m_CubeMapTexture == 0) {
@@ -118,16 +115,19 @@ void Renderer::Draw(RenderFrame& frame)
        m_CubeMapPass->LoadTextures("Sky");
    }

-	ImGui::SliderInt("SSAO Quality", &m_SSAO_Quality, 0, 3);
-	ImGui::SliderInt("Glow Quality", &m_GLOW_Quality, 0, 3);
-	m_SSAOPass->ChangeQuality(m_SSAO_Quality);
-	m_DrawBloomPass->ChangeQuality(m_GLOW_Quality);
+	ImGui::SliderFloat("SSAO sample radius", &m_SSAO_Radius, 0.01f, 5.0f);
+	ImGui::SliderFloat("SSAO bias", &m_SSAO_Bias, 0.0f, 0.1f);
+	ImGui::SliderFloat("SSAO contrast", &m_SSAO_Contrast, 0.0f, 10.0f);
+	ImGui::SliderFloat("SSAO IntensityScale", &m_SSAO_IntensityScale, 0.0f, 10.0f);
+	ImGui::SliderInt("SSAO Number of Samples", &m_SSAO_NumOfSamples, 2, 100);
+	ImGui::SliderInt("SSAO Number of Turns", &m_SSAO_NumOfTurns, 0, 50);
+	m_SSAOPass->Setting(m_SSAO_Radius, m_SSAO_Bias, m_SSAO_Contrast, m_SSAO_IntensityScale, m_SSAO_NumOfSamples, m_SSAO_NumOfTurns);
    GLERROR("SSAO Settings");
    //clear buffer 0
    glClearColor(0.f, 0.f, 0.f, 0.f);
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

-    //Clear other buffers 
+    //Clear other buffers
    PerformanceTimer::StartTimer("Renderer-ClearBuffers");
    m_PickingPass->ClearPicking();
    m_DrawFinalPass->ClearBuffer();
@@ -141,10 +141,10 @@ void Renderer::Draw(RenderFrame& frame)
 		GLERROR("Drawing pickingpass");
 		PerformanceTimer::StopTimer("Renderer-Depth");
 	}
-	PerformanceTimer::StartTimer("Renderer-AO generation");
+	PerformanceTimer::StartTimer("AO generation");
 	m_SSAOPass->Draw(m_PickingPass->DepthBuffer(), frame.RenderScenes.front()->Camera);
 	GLuint ao = m_SSAOPass->SSAOTexture();
-	PerformanceTimer::StopTimer("Renderer-AO generation");
+	PerformanceTimer::StopTimer("AO generation");
    for (auto scene : frame.RenderScenes){
        
        PerformanceTimer::StartTimer("Renderer-Drawing PickingPass");
@@ -159,7 +159,7 @@ void Renderer::Draw(RenderFrame& frame)
        PerformanceTimer::StartTimerAndStopPrevious("Renderer-Light Culling");
        m_LightCullingPass->CullLights(*scene);
        GLERROR("LightCulling");
-		m_DrawFinalPass->Draw(*scene);
+		m_DrawFinalPass->Draw(*scene, ao);
        PerformanceTimer::StartTimerAndStopPrevious("Renderer-Draw Geometry+Light");
        GLERROR("Draw Geometry+Light");
        //m_DrawScenePass->Draw(*scene);
@@ -248,10 +248,9 @@ void Renderer::InitializeRenderPasses()
    m_PickingPass = new PickingPass(this, m_EventBroker);
    m_LightCullingPass = new LightCullingPass(this);
    m_CubeMapPass = new CubeMapPass(this);
-	m_SSAOPass = new SSAOPass(this, m_Config);
-    m_DrawFinalPass = new DrawFinalPass(this, m_LightCullingPass, m_CubeMapPass, m_SSAOPass);
+    m_DrawFinalPass = new DrawFinalPass(this, m_LightCullingPass, m_CubeMapPass);
    m_DrawScreenQuadPass = new DrawScreenQuadPass(this);
-    m_DrawBloomPass = new DrawBloomPass(this, m_Config);
+    m_DrawBloomPass = new DrawBloomPass(this);
    m_DrawColorCorrectionPass = new DrawColorCorrectionPass(this);
-  
+    m_SSAOPass = new SSAOPass(this);
 }
@@ -1,130 +1,50 @@
 #include "Rendering/SSAOPass.h"

-SSAOPass::SSAOPass(IRenderer* renderer, ConfigFile* config)
-	: m_Renderer(renderer)
-	, m_Config(config)
+SSAOPass::SSAOPass(IRenderer* renderer)
 {
-	m_WhiteTexture = CommonFunctions::LoadTexture("Textures/Core/White.png", false);
-
-	ChangeQuality(m_Config->Get<int>("SSAO.Quality", 0));
-}
-
-void SSAOPass::ChangeQuality(int quality)
-{
-	if (m_Quality == quality) {
-		return;
-	}
-
-	m_Quality = quality;
-
-	if (m_Quality == 0) {	
-		glDeleteTextures(1, &m_SSAOTexture);
-		glDeleteTextures(1, &m_SSAOViewSpaceZTexture);
-		glDeleteTextures(1, &m_GaussianTexture_horiz);
-		glDeleteTextures(1, &m_GaussianTexture_vert);
-		return;
-	}
-
-	std::string qStr = std::to_string(m_Quality);
-	Setting(
-		m_Config->Get<float>("SSAO" + qStr + ".Radius", 0.01),
-		m_Config->Get<float>("SSAO" + qStr + ".Bias", 0.012),
-		m_Config->Get<float>("SSAO" + qStr + ".Contrast", 1.0),
-		m_Config->Get<float>("SSAO" + qStr + ".Intensity", 1.0),
-		m_Config->Get<int>("SSAO" + qStr + ".NumSamples", 0),
-		m_Config->Get<int>("SSAO" + qStr + ".NumTurns", 0),
-		m_Config->Get<int>("SSAO" + qStr + ".NumIterations", 0),
-		m_Config->Get<int>("SSAO" + qStr + ".TextureQuality", 4)
-		);
-
-
+	m_Renderer = renderer;

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

 	InitializeTexture();
 	InitializeBuffer();
 	InitializeShaderProgram();
+	Setting(0.1f, 0.012f, 1.0f, 1.0f, 13, 7);

-
+	m_DrawBloomPass = new DrawBloomPass(renderer);
 }

 void SSAOPass::InitializeShaderProgram()
 {
 	m_SSAOProgram = ResourceManager::Load<ShaderProgram>("##SSAOProgram");
-	if (m_SSAOProgram->GetHandle() == 0) {
-		m_SSAOProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/SSAO.vert.glsl")));
-		m_SSAOProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/SSAO.frag.glsl")));
-		m_SSAOProgram->Compile();
-		m_SSAOProgram->Link();
-	}
+	m_SSAOProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/SSAO.vert.glsl")));
+	m_SSAOProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/SSAO.frag.glsl")));
+	m_SSAOProgram->Compile();
+	m_SSAOProgram->Link();

 	m_SSAOViewSpaceZProgram = ResourceManager::Load<ShaderProgram>("##SSAOViewSpaceZProgram");
-	if (m_SSAOViewSpaceZProgram->GetHandle() == 0) {
-		m_SSAOViewSpaceZProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/SSAO.vert.glsl")));
-		m_SSAOViewSpaceZProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/SSAOViewSpaceZ.frag.glsl")));
-		m_SSAOViewSpaceZProgram->Compile();
-		m_SSAOViewSpaceZProgram->Link();
-	}
-
-	m_GaussianProgram_horiz = ResourceManager::Load<ShaderProgram>("##GaussianProgramHoriz");
-	if (m_GaussianProgram_horiz->GetHandle() == 0) {
-		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_horiz.vert.glsl")));
-		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_horiz.frag.glsl")));
-		m_GaussianProgram_horiz->Compile();
-		m_GaussianProgram_horiz->Link();
-	}
-
-	m_GaussianProgram_vert = ResourceManager::Load<ShaderProgram>("##GaussianProgramVert");
-	if (m_GaussianProgram_vert->GetHandle() == 0) {
-		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_vert.vert.glsl")));
-		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_vert.frag.glsl")));
-		m_GaussianProgram_vert->Compile();
-		m_GaussianProgram_vert->Link();
-	}
+	m_SSAOViewSpaceZProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/SSAO.vert.glsl")));
+	m_SSAOViewSpaceZProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/SSAOViewSpaceZ.frag.glsl")));
+	m_SSAOViewSpaceZProgram->Compile();
+	m_SSAOViewSpaceZProgram->Link();
 }

 void SSAOPass::InitializeTexture() {
-	GenerateTexture(&m_SSAOTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width >> m_TextureQuality, m_Renderer->GetViewportSize().Height >> m_TextureQuality), GL_R8, GL_RED, GL_FLOAT);
-	GenerateTexture(&m_SSAOViewSpaceZTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width >> m_TextureQuality, m_Renderer->GetViewportSize().Height >> m_TextureQuality), GL_R32F, GL_RED, GL_FLOAT);
-
-	GenerateTexture(&m_GaussianTexture_horiz, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width >> m_TextureQuality, m_Renderer->GetViewportSize().Height >> m_TextureQuality), GL_R8, GL_RGB, GL_FLOAT);
-	GenerateTexture(&m_GaussianTexture_vert, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width >> m_TextureQuality, m_Renderer->GetViewportSize().Height >> m_TextureQuality), GL_R8, GL_RGB, GL_FLOAT);
+	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()
 {
-	if (m_SSAOFramBuffer.GetHandle() == 0) {
-		m_SSAOFramBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SSAOTexture, GL_COLOR_ATTACHMENT0)));
-	}
-		m_SSAOFramBuffer.Generate();
-
-
-	if (m_SSAOViewSpaceZFramBuffer.GetHandle() == 0) {
-		m_SSAOViewSpaceZFramBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SSAOViewSpaceZTexture, GL_COLOR_ATTACHMENT0)));
-	}
-		m_SSAOViewSpaceZFramBuffer.Generate();
-
-
-
-	if (m_GaussianFrameBuffer_horiz.GetHandle() == 0) {
-		m_GaussianFrameBuffer_horiz.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_horiz, GL_COLOR_ATTACHMENT0)));
-	}
-		m_GaussianFrameBuffer_horiz.Generate();
-
-
-	if (m_GaussianFrameBuffer_vert.GetHandle() == 0) {
-		m_GaussianFrameBuffer_vert.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_vert, GL_COLOR_ATTACHMENT0)));
-	}
-		m_GaussianFrameBuffer_vert.Generate();
+	m_SSAOFramBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SSAOTexture, GL_COLOR_ATTACHMENT0)));
+	m_SSAOFramBuffer.Generate();

+	m_SSAOViewSpaceZFramBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_SSAOViewSpaceZTexture, GL_COLOR_ATTACHMENT0)));
+	m_SSAOViewSpaceZFramBuffer.Generate();
 }

 void SSAOPass::ClearBuffer()
 {
-	if (m_Quality == 0) {
-		return;
-	}
-
 	m_SSAOFramBuffer.Bind();
 	glClearColor(1.f, 1.f, 1.f, 1.f);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -134,32 +54,19 @@ void SSAOPass::ClearBuffer()
 	glClearColor(1.f, 1.f, 1.f, 1.f);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	m_SSAOViewSpaceZFramBuffer.Unbind();
-
-	m_GaussianFrameBuffer_horiz.Bind();
-	glClearColor(1.f, 1.f, 1.f, 1.f);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-	m_GaussianFrameBuffer_horiz.Unbind();
-
-	m_GaussianFrameBuffer_vert.Bind();
-	glClearColor(1.f, 1.f, 1.f, 1.f);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-	m_GaussianFrameBuffer_vert.Unbind();
 }

-void SSAOPass::Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int numOfTurns, int iterations, int quality) {
+void SSAOPass::Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int NumOfTurns) {
 	m_Radius = radius;
 	m_Bias = bias;
 	m_Contrast = contrast;
 	m_IntensityScale = intensityScale;
 	m_NumOfSamples = numOfSamples;
-	m_NumOfTurns = numOfTurns;
-	m_Iterations = iterations;
-	m_TextureQuality = quality;
+	m_NumOfTurns = NumOfTurns;
 }

 void SSAOPass::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const
 {
-	glDeleteTextures(1, texture);
 	glGenTextures(1, texture);
 	glBindTexture(GL_TEXTURE_2D, *texture);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapping);
@@ -172,10 +79,6 @@ void SSAOPass::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filterin

 void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 {
-	if (m_Quality == 0) {
-		return;
-	}
-
 	SSAOPassState state;
 	GLuint viewSpaceZPShaderHandle = m_SSAOViewSpaceZProgram->GetHandle();
 	GLuint SSAOShaderHandle = m_SSAOProgram->GetHandle();
@@ -195,7 +98,6 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 		(-1.0f),
 		(+1.0f)
 		);*/
-	glViewport(0, 0, (m_Renderer->GetViewportSize().Width >> m_TextureQuality), (m_Renderer->GetViewportSize().Height >> m_TextureQuality)); //JOHAN TODO: Get this into state
 	glUniform3fv(glGetUniformLocation(viewSpaceZPShaderHandle, "ClipInfo"), 1, glm::value_ptr(clipInfo));

 	glBindVertexArray(m_ScreenQuad->VAO);
@@ -205,9 +107,9 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 	
 	glm::vec4 projInfo = glm::vec4(
 		((1.0 - camera->ProjectionMatrix()[0][2]) / camera->ProjectionMatrix()[0][0]),
-		(-2.0 / ((m_Renderer->GetViewportSize().Width >> m_TextureQuality) * camera->ProjectionMatrix()[0][0])),
+		(-2.0 / (m_Renderer->GetViewportSize().Width * camera->ProjectionMatrix()[0][0])),
 		((1.0 + camera->ProjectionMatrix()[1][2]) / camera->ProjectionMatrix()[1][1]),
-		(-2.0 / ((m_Renderer->GetViewportSize().Height >> m_TextureQuality) * camera->ProjectionMatrix()[1][1]))
+		(-2.0 / (m_Renderer->GetViewportSize().Height * camera->ProjectionMatrix()[1][1]))
 		);


@@ -218,76 +120,26 @@ 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 >> m_TextureQuality) / (-2.0f * glm::tan(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);
 	glUniform1f(glGetUniformLocation(SSAOShaderHandle, "uContrast"), m_Contrast);
 	glUniform1f(glGetUniformLocation(SSAOShaderHandle, "uIntensityScale"), m_IntensityScale);
 	glUniform1i(glGetUniformLocation(SSAOShaderHandle, "uNumOfSamples"), m_NumOfSamples);
-	glUniform1i(glGetUniformLocation(SSAOShaderHandle, "uNumOfTurns"), m_NumOfTurns);
+	glUniform1i(glGetUniformLocation(SSAOShaderHandle, "uNumOfTurns"), m_NumOfTurns);;

 	glUniform4fv(glGetUniformLocation(SSAOShaderHandle, "uProjInfo"), 1, glm::value_ptr(projInfo));
 	glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex + 1
 		, GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);

-	DrawBloomPassState BloomState;
-	GLuint shaderHandle_horiz = m_GaussianProgram_horiz->GetHandle();
-	GLuint shaderHandle_vert = m_GaussianProgram_vert->GetHandle();
-
-	m_GaussianFrameBuffer_horiz.Bind();
-	m_GaussianProgram_horiz->Bind();
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, m_SSAOTexture);
-
-	glBindVertexArray(m_ScreenQuad->VAO);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
-	glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex + 1
-		, GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
-	//Iterate some times to make it more gaussian.
-	for (int i = 1; i < m_Iterations; i++) {
-		//Vertical pass
-		m_GaussianFrameBuffer_vert.Bind();
-		m_GaussianProgram_vert->Bind();
-
-		glBindTexture(GL_TEXTURE_2D, m_GaussianTexture_horiz);
-
-		glBindVertexArray(m_ScreenQuad->VAO);
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
-		glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex + 1
-			, GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
-		//horizontal pass
-
-		m_GaussianFrameBuffer_horiz.Bind();
-		m_GaussianProgram_horiz->Bind();
-
-		glBindTexture(GL_TEXTURE_2D, m_GaussianTexture_vert);
-
-		glBindVertexArray(m_ScreenQuad->VAO);
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
-		glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex + 1
-			, GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
-	}
-
-	//final vertical gaussian after the iterations are done
-
-	m_GaussianFrameBuffer_vert.Bind();
-	m_GaussianProgram_vert->Bind();
-
-	glBindTexture(GL_TEXTURE_2D, m_GaussianTexture_horiz);
-	glBindVertexArray(m_ScreenQuad->VAO);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
-	glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].material->EndIndex - m_ScreenQuad->MaterialGroups()[0].material->StartIndex + 1
-		, GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].material->StartIndex);
-
-	glViewport(0, 0, (m_Renderer->GetViewportSize().Width), (m_Renderer->GetViewportSize().Height));
+	m_DrawBloomPass->ClearBuffer();
+	m_DrawBloomPass->Draw(m_SSAOTexture);
 }

 void SSAOPass::OnWindowResize() {
-	if (m_Quality == 0) {
-		return;
-	}
-
+	m_DrawBloomPass->OnWindowResize();
 	InitializeTexture();
+	m_SSAOFramBuffer.Generate();
+	m_SSAOViewSpaceZFramBuffer.Generate();
 }
@@ -54,7 +54,7 @@ Game::Game(int argc, char* argv[])
    m_EventBroker = new EventBroker();

    // Create the renderer
-    m_Renderer = new Renderer(m_EventBroker, m_Config);
+    m_Renderer = new Renderer(m_EventBroker);
    m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
    m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
    m_Renderer->SetResolution(Rectangle::Rectangle(
@@ -6,11 +6,9 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
    , PureSystem("CapturePoint")
 {
    //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)
-    if (!IsClient) {
-        EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
-        EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
-        EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
-    }
+    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
+    EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
+    EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);

 }

@@ -18,9 +16,6 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
 //NOTE: needs to run each frame, since we're possibly modifying the captureTimer for the capturePoints by dt
 void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, ComponentWrapper& cCapturePoint, double dt)
 {
-    if (IsClient) {
-        return;
-    }
    if (m_WinnerWasFound) {
        return;
    }
@@ -4,7 +4,6 @@ PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
    : System(params)
 {
    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);
-    EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &PlayerMovementSystem::OnDoubleJump);
 }

 PlayerMovementSystem::~PlayerMovementSystem()
@@ -37,6 +36,7 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
        if (!player.Valid()) {
            continue;
        }
+
        // Aim pitch
        EntityWrapper cameraEntity = player.FirstChildByName("Camera");
        if (cameraEntity.Valid()) {
@@ -122,14 +122,15 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
                if (isOnGround) {
                    controller->SetDoubleJumping(false);
                } else {
-                    // If IsServer and network is off this will not work
                    if (IsClient) {
                        //put a hexagon at the players feet
-                        spawnHexagon(player);
+                        auto hexagonEffect = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
+                        EntityFileParser parser(hexagonEffect);
+                        EntityID hexagonEffectID = parser.MergeEntities(m_World);
+                        EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
+                        hexagonEW["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
                        controller->SetDoubleJumping(true);
-                        // Publish event for client to listen to
                        Events::DoubleJump e;
-                        e.entityID = player.ID;
                        m_EventBroker->Publish(e);
                    }
                }
@@ -294,26 +295,3 @@ bool PlayerMovementSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
    }
    return true;
 }
-
-bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e)
-{
-    // If entity does not exist, exit
-    if (!EntityWrapper(m_World, e.entityID).Valid()) { 
-        return false;
-    }
-    // If entity IsLocalPlayer, exit
-    if (e.entityID == m_LocalPlayer.ID) { 
-        return false;
-    }
-    spawnHexagon(EntityWrapper(m_World, e.entityID));
-}
-
-void PlayerMovementSystem::spawnHexagon(EntityWrapper target)
-{ 
-    //put a hexagon at the entitys... feet?
-    auto hexagonEffect = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
-    EntityFileParser parser(hexagonEffect);
-    EntityID hexagonEffectID = parser.MergeEntities(m_World);
-    EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
-    hexagonEW["Transform"]["Position"] = (glm::vec3)target["Transform"]["Position"];
-}
@@ -5,7 +5,6 @@ AssaultWeaponBehaviour::AssaultWeaponBehaviour(SystemParams systemParams, IRende
 {
    m_FirstPersonModel = m_Player.FirstChildByName("Hands");
    m_ThirdPersonModel = m_Player.FirstChildByName("PlayerModel");
-    EVENT_SUBSCRIBE_MEMBER(m_EAnimationComplete, &AssaultWeaponBehaviour::OnAnimationComplete);
 }

 void AssaultWeaponBehaviour::Fire()
@@ -36,7 +35,7 @@ void AssaultWeaponBehaviour::Reload()
        return;
    }

-    // Don't reload if we're completly out of ammo
+    // Don't reload if we're completely out of ammo
    if (ammo == 0) {
        playEmptySound();
        m_TimeSinceLastFire = -0.0f; // HACK: To make empty sound play with interval
@@ -56,14 +55,14 @@ void AssaultWeaponBehaviour::Update(double dt)
 {
    if (m_Reloading) {
        m_ReloadTimer -= dt;
-        // Re-enable glow on reload impersonator half-way through the animation
+        // Re-enable glow on reload impostor half-way through the animation
        if (IsClient) {
            if (m_ReloadTimer <= (double)m_Player["AssaultWeapon"]["ReloadTime"] / 2.0) {
-                if (m_FirstPersonReloadImpersonator.Valid()) {
-                    m_FirstPersonReloadImpersonator["Model"]["GlowMap"] = true;
+                if (m_FirstPersonReloadImpostor.Valid()) {
+                    m_FirstPersonReloadImpostor["Model"]["GlowMap"] = true;
                }
-                if (m_ThirdPersonReloadImpersonator.Valid()) {
-                    m_ThirdPersonReloadImpersonator["Model"]["GlowMap"] = true;
+                if (m_ThirdPersonReloadImpostor.Valid()) {
+                    m_ThirdPersonReloadImpostor["Model"]["GlowMap"] = true;
                }
            }
        }
@@ -96,21 +95,6 @@ void AssaultWeaponBehaviour::Update(double dt)
    }
 }

-bool AssaultWeaponBehaviour::OnAnimationComplete(Events::AnimationComplete& e)
-{
-    if (e.Entity != m_FirstPersonModel) {
-        return false;
-    }
-
-    //if (e.Name == "ShootRifle") {
-    //    if (!m_Firing) {
-    //        playIdleAnimation();
-    //    }
-    //}
-
-    return true;
-}
-
 bool AssaultWeaponBehaviour::hasAmmo()
 {
    ComponentWrapper& cAssaultWeapon = m_Player["AssaultWeapon"];
@@ -215,6 +199,12 @@ void AssaultWeaponBehaviour::playEmptySound()

 void AssaultWeaponBehaviour::viewPunch()
 {
+    // Since we send absolute client orientations to server, running this server side would
+    // cause aim desync.
+    if (!IsClient) {
+        return;
+    }
+
    EntityWrapper playerCamera = m_Player.FirstChildByName("Camera");
    if (!playerCamera.Valid()) {
        return;
@@ -323,8 +313,8 @@ void AssaultWeaponBehaviour::playReloadAnimation()
        EntityWrapper firstPersonWeaponModel = m_Player.FirstChildByName("WeaponModel");
        EntityWrapper reloadSpawner = m_Player.FirstChildByName("FirstPersonReloadSpawner");
        if (IsClient) {
-            m_FirstPersonReloadImpersonator = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
-            firstPersonWeaponModel["Model"].Copy(m_FirstPersonReloadImpersonator["Model"]);
+            m_FirstPersonReloadImpostor = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
+            firstPersonWeaponModel["Model"].Copy(m_FirstPersonReloadImpostor["Model"]);
        }
        firstPersonWeaponModel["Model"]["Visible"] = false;
    }
@@ -332,8 +322,8 @@ void AssaultWeaponBehaviour::playReloadAnimation()
        EntityWrapper thirdPersonWeaponModel = m_Player.FirstChildByName("ThirdPersonWeaponModel");
        EntityWrapper reloadSpawner = m_Player.FirstChildByName("ThirdPersonReloadSpawner");
        if (IsClient) {
-            m_ThirdPersonReloadImpersonator = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
-            thirdPersonWeaponModel["Model"].Copy(m_ThirdPersonReloadImpersonator["Model"]);
+            m_ThirdPersonReloadImpostor = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
+            thirdPersonWeaponModel["Model"].Copy(m_ThirdPersonReloadImpostor["Model"]);
        }
        thirdPersonWeaponModel["Model"]["Visible"] = false;
    }
@@ -371,7 +361,7 @@ bool AssaultWeaponBehaviour::shoot(double damage)
        return false;
    }

-    // Don't let us shoot ourselves in the foot
+    // Don't let us shoot ourselves in the foot somehow
    if (victim == LocalPlayer) {
        return false;
    }
@@ -0,0 +1,10 @@
+#include "Systems/Weapon/DefenderWeaponBehaviour.h"
+
+DefenderWeaponBehaviour::DefenderWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity)
+    : WeaponBehaviour(systemParams, renderer, collisionOctree, weaponEntity) { }
+
+void DefenderWeaponBehaviour::Fire()
+{
+
+}
+
@@ -13,7 +13,7 @@ WeaponSystem::WeaponSystem(SystemParams params, IRenderer* renderer, Octree<Enti

 void WeaponSystem::Update(double dt)
 {
-
+    // TODO: Clear inactive weapons
 }

 void WeaponSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt)
@@ -72,20 +72,64 @@ bool WeaponSystem::OnInputCommand(Events::InputCommand& e)

 void WeaponSystem::selectWeapon(EntityWrapper player, ComponentInfo::EnumType slot)
 {
+    std::vector<EntityWrapper> weaponAttachments = player.ChildrenWithComponent("WeaponAttachment");
+
+    // Find the weapon attachments matching the slot selected
+    EntityWrapper firstPersonAttachment;
+    EntityWrapper thirdPersonAttachment;
+    for (auto& attachment : weaponAttachments) {
+        ComponentWrapper cWeaponAttachment = attachment["WeaponAttachment"];
+        if ((ComponentInfo::EnumType)cWeaponAttachment["Slot"] == slot) {
+            ComponentWrapper::SubscriptProxy person = cWeaponAttachment["Person"];
+            if (person == person.Enum("FirstPerson")) {
+                firstPersonAttachment = attachment;
+            } else if (person == person.Enum("ThirdPerson")) {
+                thirdPersonAttachment = attachment;
+            }
+        }
+    }
+
+    if (firstPersonAttachment.Valid() && thirdPersonAttachment.Valid()) {
+        LOG_WARNING("No weapon attachment found for slot %i of player #%i", slot, player.ID);
+        return;
+    }
+
+    // TODO: Delete old weapons
+
+    // Spawn the weapon(s)
+    EntityWrapper firstPersonWeapon;
+    EntityWrapper thirdPersonWeapon;
+    if (firstPersonAttachment.Valid()) {
+        firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+    }
+    if (thirdPersonAttachment.Valid()) {
+        firstPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
+    }
+
+    // Create the correct behaviour
+    if (firstPersonWeapon.Valid()) {
+        if (firstPersonWeapon.HasComponent("AssaultWeapon") { 
+
+        }
+    }
+
    // Primary
    if (slot == 1) {
        // TODO: if class...
-        if (m_ActiveWeapons.count(player) == 0) {
-            m_ActiveWeapons.insert(std::make_pair(player, std::make_shared<AssaultWeaponBehaviour>(m_SystemParams, m_Renderer, m_CollisionOctree, player)));
-        } else {
-            //m_ActiveWeapons.erase(player);
-        }
+        nextBehaviour = std::make_shared<AssaultWeaponBehaviour>(m_SystemParams, m_Renderer, m_CollisionOctree, player);
    }

    // Secondary
    if (slot == 2) {
        //m_ActiveWeapons[player] = std::make_shared<PistolWeaponBehaviour>();
    }
+
+    if (nextBehaviour != nullptr) {
+        // TODO: Destroy previous behaviour and make new
+        if (m_ActiveWeapons.count(player) == 0) {
+            m_ActiveWeapons[player] = nextBehaviour;
+        }
+    }
 }

 bool WeaponSystem::OnPlayerSpawned(Events::PlayerSpawned& e)