imon's fix to rule them all

might have solved dt anormalities

include/Engine/Core/Transform.h

@@ -4,11 +4,11 @@
 #include "../GLM.h"
 #include "World.h"
 #include "EntityWrapper.h"
-#include "System.h"
 
 namespace Transform
 {
 
+glm::mat4 AbsoluteTransformation(EntityWrapper entity);
 glm::vec3 AbsolutePosition(EntityWrapper entity);
 glm::vec3 AbsolutePosition(World* world, EntityID entity);
 glm::vec3 AbsoluteOrientationEuler(EntityWrapper entity);
@@ -20,16 +20,6 @@ glm::mat4 ModelMatrix(EntityWrapper entity);
 glm::mat4 ModelMatrix(EntityID entity, World* world);
 glm::vec3 TransformPoint(const glm::vec3& point, const glm::mat4& matrix);
 
-class ClearCache : public ImpureSystem
-{
-public:
-    ClearCache(SystemParams params)
-        : System(params)
-    { }
-
-    virtual void Update(double dt) override;
-};
-
 }
 
 #endif

include/Engine/Rendering/DrawBloomPass.h

@@ -33,14 +33,12 @@ public:
 		if (m_Quality == 0) { 
 			return m_BlackTexture->m_Texture;
 		} else { 
-			return m_FinalGaussianTexture;
+			return m_GaussianTexture_vert;
 		} 
 	}
 
 
 private:
-    void GaussianLodPass(GLuint mipMap, GLuint texture);
-    void CombineGaussianBlur();
     Texture* m_BlackTexture;
     Model* m_ScreenQuad;
 
@@ -49,19 +47,15 @@ private:
     //const LightCullingPass* m_LightCullingPass 
     int m_Iterations;
 	int m_Quality = 0;
-    int m_BloomLod = 5;
 
     GLuint m_GaussianTexture_horiz = 0;
     GLuint m_GaussianTexture_vert = 0;
-    GLuint m_FinalGaussianTexture = 0;
 
-    FrameBuffer* m_GaussianFrameBuffer_horiz = nullptr;
-    FrameBuffer* m_GaussianFrameBuffer_vert = nullptr;
-    FrameBuffer m_GaussianCombineBuffer;
+    FrameBuffer m_GaussianFrameBuffer_horiz;
+    FrameBuffer m_GaussianFrameBuffer_vert;
 
     ShaderProgram* m_GaussianProgram_horiz;
     ShaderProgram* m_GaussianProgram_vert;
-    ShaderProgram* m_GaussianCombineProgram;
 
 };
 

include/Engine/Rendering/EResolutionChanged.h

@@ -1,19 +0,0 @@
-#ifndef EResolutionChanged_h__
-#define EResolutionChanged_h__
-
-#include "../Core/Event.h"
-#include "../Core/Util/Rectangle.h"
-
-namespace Events
-{
-
-// Fired when the framebuffer size changes
-struct ResolutionChanged : Event
-{
-    Rectangle OldResolution;
-    Rectangle NewResolution;
-};
-
-}
-
-#endif

include/Engine/Rendering/ExplosionEffectJob.h

@@ -27,6 +27,8 @@ struct ExplosionEffectJob : ModelJob
         Velocity = (glm::vec2)explosionEffectComponent["Velocity"];
         ColorByDistance = (bool)explosionEffectComponent["ColorByDistance"];
         ExponentialAccelaration = (bool)explosionEffectComponent["ExponentialAccelaration"];
+		Reverse = (bool)explosionEffectComponent["Reverse"];
+		ColorDistanceScalar = (double)explosionEffectComponent["ColorDistanceScalar"];
     };
 
     glm::vec3 ExplosionOrigin;
@@ -38,12 +40,14 @@ struct ExplosionEffectJob : ModelJob
     glm::vec4 EndColor;
     bool Randomness = false;
     
-    float RandomnessScalar = 1.f;
+    double RandomnessScalar = 1.f;
     glm::vec2 Velocity;
     bool ColorByDistance = false;
     //bool ReverseAnimation = false;
     //bool Wireframe = false;
     bool ExponentialAccelaration = false;
+	bool Reverse = false;
+	double ColorDistanceScalar = 1.f;
 
     std::array<float, 50> RandomNumbers = {
         0.3257552917701f,

include/Engine/Rendering/FrameBuffer.h

@@ -7,12 +7,11 @@
 class BufferResource
 {
 public:
-    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod);
+    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment);
     
     GLuint* m_ResourceHandle;
     GLenum m_ResourceType;
     GLenum m_Attachment;
-    GLuint m_MipMapLod = 0;
 private:
     
 };
@@ -21,15 +20,15 @@ template <GLenum RESOURCETYPE>
 class ResourceType : public BufferResource
 {
 public:
-    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod)
-        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod) { }
+    ResourceType(GLuint* resourceHandle, GLenum attachment)
+        : BufferResource(resourceHandle, RESOURCETYPE, attachment) { }
 };
 
 class Texture2D : public ResourceType<GL_TEXTURE_2D>
 {
 public:
-    Texture2D(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
-        : ResourceType(resourceHandle, attachment, mipMapLod) { };
+    Texture2D(GLuint* resourceHandle, GLenum attachment)
+        : ResourceType(resourceHandle, attachment) { };
 
     ~Texture2D();
 };
@@ -38,7 +37,7 @@ class RenderBuffer : public ResourceType<GL_RENDERBUFFER>
 {
 public:
     RenderBuffer(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment, 0)
+        : ResourceType(resourceHandle, attachment)
     { };
 
     ~RenderBuffer();
@@ -48,7 +47,7 @@ class Texture2DArray : public ResourceType<GL_TEXTURE_2D_ARRAY>
 {
 public:
 	Texture2DArray(GLuint* resourceHandle, GLenum attachment)
-		: ResourceType(resourceHandle, attachment, 0)
+		: ResourceType(resourceHandle, attachment)
 	{ };
 
 	~Texture2DArray();

include/Engine/Rendering/LightCullingPass.h

@@ -54,7 +54,7 @@ private:
     struct Frustum {
         Plane Planes[4];
     };
-    Frustum* m_Frustums = nullptr;
+    Frustum* m_Frustums;
 
     //This should be a component
     struct LightSource {
@@ -74,11 +74,11 @@ private:
         glm::vec2 Padding = glm::vec2(1.f, 2.f);
     };
 
-    LightGrid* m_LightGrid = nullptr;
+    LightGrid* m_LightGrid;
 
     int m_LightOffset = 0;
 
-    float* m_LightIndex = nullptr;
+    float* m_LightIndex;
 };
 
 

include/Engine/Rendering/RenderSystem.h

@@ -19,7 +19,6 @@
 #include "../Core/Octree.h"
 #include "../Collision/EntityAABB.h"
 #include "../Core/ConfigFile.h"
-#include "EResolutionChanged.h"
 
 class RenderSystem : public ImpureSystem
 {
@@ -37,8 +36,6 @@ private:
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     Octree<EntityAABB>* m_Octree;
 
-    EventRelay<RenderSystem, Events::ResolutionChanged> m_EResolutionChanged;
-    bool OnResolutionChanged(Events::ResolutionChanged &event);
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
     EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;

include/Engine/Rendering/Renderer.h

@@ -28,12 +28,10 @@
 #include "Util/CommonFunctions.h"
 #include "Core/PerformanceTimer.h"
 #include "ShadowPass.h"
-#include "EResolutionChanged.h"
 
 class Renderer : public IRenderer
 {
     static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);
-    static void glfwWindowSizeCallback(GLFWwindow* window, int width, int height);
 
 public:
 	Renderer(EventBroker* eventBroker, ConfigFile* config)
@@ -42,14 +40,13 @@ public:
     { }
 	~Renderer();
 
-    virtual void SetResolution(const Rectangle& resolution) override;
-
     virtual void Initialize() override;
     virtual void Update(double dt) override;
     virtual void Draw(RenderFrame& frame) override;
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
+
 private:
     //----------------------Variables----------------------//
 
@@ -93,14 +90,11 @@ private:
     void InputUpdate(double dt);
     //void PickingPass(RenderQueueCollection& rq);
     //void DrawScreenQuad(GLuint textureToDraw);
-    void setWindowSize(Rectangle size);
-    void updateFramebufferSize();
 
     static bool DepthSort(const std::shared_ptr<RenderJob> &i, const std::shared_ptr<RenderJob> &j) { return (i->Depth < j->Depth); }
     void SortRenderJobsByDepth(RenderScene &scene);
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-
-    //--------------------ShaderPrograms-------------------//
+	//--------------------ShaderPrograms-------------------//
     ShaderProgram* m_BasicForwardProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 

include/Engine/Rendering/SpriteJob.h

@@ -21,14 +21,13 @@ struct SpriteJob : RenderJob
     SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted, bool isIndicator)
         : RenderJob()
     {
-        Model = ResourceManager::Load<::Model>((std::string)cSprite["Model"]);
+        Model = ResourceManager::Load<::Model>("Models/Core/UnitQuad.mesh");
         ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
         TextureID = 0;
 
         DiffuseTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["DiffuseTexture"]);
-        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
-        Linear = (bool)cSprite["Linear"];
+        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;
@@ -49,26 +48,6 @@ struct SpriteJob : RenderJob
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
-
-        glm::vec3 scale = Transform::AbsoluteScale(world, cSprite.EntityID);
-
-        if((bool)cSprite["KeepRatio"] == true) {
-            if(scale.y >= scale.x) {
-                ScaleY = (scale.x)/(scale.y);
-                ScaleX = 1.f;
-            } else {
-                ScaleY = 1.f;
-                ScaleX = (scale.x)/(scale.y);
-            }
-        } else {
-            if ((bool)cSprite["KeepRatioX"] == true) {
-                ScaleX = scale.x;
-            }
-            if ((bool)cSprite["KeepRatioY"] == true) {
-                ScaleY = scale.y;
-            }
-        }
-
     };
 
     unsigned int TextureID;
@@ -90,9 +69,6 @@ struct SpriteJob : RenderJob
     bool Pickable;
 	bool IsIndicator = false;
     bool BlurBackground = false;
-    float ScaleX = 1;
-    float ScaleY = 1;
-    bool Linear = false;
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;

include/Engine/Rendering/Util/GLError.h

@@ -16,11 +16,7 @@ inline bool _GLERROR(const char* info, const char* file, const char* func, unsig
 	return false;
 }
 
-#ifdef DEBUG
 #define GLERROR(function) \
 	_GLERROR(function, __BASE_FILE__, __func__, __LINE__)
-#else
-#define GLERROR(function) false
-#endif
 
 #endif

include/Game/Systems/CapturePointSystem.h

@@ -30,7 +30,6 @@ private:
     bool CapturePointSystem::OnTriggerLeave(const Events::TriggerLeave& e);
     EventRelay<CapturePointSystem, Events::Captured> m_ECaptured;
     bool CapturePointSystem::OnCaptured(const Events::Captured& e);
-    void ChangeCapturePointModelsVisibility(EntityWrapper &capturePointModels, bool isOwner);
 
     bool m_WinnerWasFound = false;
     //need to track these variables for the captureSystem to work as per design!

include/Game/Systems/ExplosionEffectSystem.h

@@ -3,6 +3,7 @@
 
 #include "Common.h"
 #include "Core/System.h"
+#include "Engine/GLM.h"
 
 class ExplosionEffectSystem : public PureSystem
 {

resources/Schema/Components/Camera.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Camera xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Camera.xsd">
-	<FOV>59</FOV> <!-- 90 horizontal FOV at 1080p -->
+	<FOV>45</FOV>
 	<NearClip>0.01</NearClip>
 	<FarClip>5000</FarClip>
 </Camera>

resources/Schema/Components/ExplosionEffect.xml

@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <ExplosionEffect xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ExplosionEffect.xsd">
 	<ExplosionOrigin X="0" Y="0" Z="0"/>
-	<TimeSinceDeath>0</TimeSinceDeath>
-	<ExplosionDuration>2</ExplosionDuration>
+	<TimeSinceDeath>0.0</TimeSinceDeath>
+	<ExplosionDuration>2.0</ExplosionDuration>
 	<Speed>1</Speed>
 	<Delay>0</Delay>
 	<!--<Gravity>1</Gravity>-->
 	<!--<GravityForce>1</GravityForce>-->
 	<!--<ObjectRadius>2</ObjectRadius>-->
 	<EndColor R="0" G="0" B="0" A="0"/>
-	<Randomness>0</Randomness>
-	<RandomnessScalar>1</RandomnessScalar>
+	<Randomness>false</Randomness>
+	<RandomnessScalar>1.0</RandomnessScalar>
 	<Velocity X="2" Y="2"/>
-	<ColorByDistance>0</ColorByDistance>
-	<!--<ReverseAnimation>0</ReverseAnimation>-->
+	<ColorByDistance>false</ColorByDistance>
 	<!--<Wireframe>0</Wireframe>-->
-	<ExponentialAccelaration>0</ExponentialAccelaration>
+	<ExponentialAccelaration>false</ExponentialAccelaration>
+	<Pulsate>false</Pulsate>
+	<Reverse>false</Reverse>
+	<ColorDistanceScalar>1.0</ColorDistanceScalar>
 </ExplosionEffect>

resources/Schema/Components/ExplosionEffect.xsd

@@ -44,15 +44,21 @@
 				<xs:element name="ColorByDistance" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Change the color by its moved distance instead of by its time</xs:documentation></xs:annotation>
 				</xs:element>
-				<!--<xs:element name="ReverseAnimation" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Implosions are cooler</xs:documentation></xs:annotation>
-				</xs:element>-->
 				<!--<xs:element name="Wireframe" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Enable/disable wireframe</xs:documentation></xs:annotation>
 				</xs:element>-->
 				<xs:element name="ExponentialAccelaration" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Linear/Exponential accelaration</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Pulsate" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Pulsate the effect</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Reverse" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Reverse the effect</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ColorDistanceScalar" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Scale the distance of the color change</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/Model.xml

@@ -9,5 +9,5 @@
 	<SpecularMap>true</SpecularMap>
 	<GlowMap>true</GlowMap>
 	<Shadow>true</Shadow>
-	<GlowIntensity>1.0</GlowIntensity>
+	<GlowIntensity>3.0</GlowIntensity>
 </Model>

resources/Schema/Components/Sprite.xml

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Sprite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Sprite.xsd">
-	<Model>Models/Core/UnitQuad.mesh</Model>
 	<DiffuseTexture></DiffuseTexture>
 	<GlowMap></GlowMap>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>
 	<DepthSort>true</DepthSort>
-	<KeepRatioX>false</KeepRatioX>
-	<KeepRatioY>false</KeepRatioY>
-	<KeepRatio>false</KeepRatio>
-	<Linear>false</Linear>
 	<BlurBackground>false</BlurBackground>
 </Sprite>

resources/Schema/Components/Sprite.xsd

@@ -9,17 +9,14 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="Model" type="t:string" minOccurs="0">
-					<xs:annotation><xs:documentation>The model the sprite will use.</xs:documentation></xs:annotation>
-				</xs:element>
 				<xs:element name="DiffuseTexture" type="t:string" minOccurs="0">
-					<xs:annotation><xs:documentation>Diffuse Texture file.</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Diffuse Texture file</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="GlowMap" type="t:string" minOccurs="0">
-					<xs:annotation><xs:documentation>GlowMap file.</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>GlowMap file</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="Color" type="t:Color" minOccurs="0">
-					<xs:annotation><xs:documentation>Color tint.</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Color tint</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="Visible" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Whether the model is visible or not</xs:documentation></xs:annotation>
@@ -27,18 +24,6 @@
 				<xs:element name="DepthSort" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Whether the sprite should be sorted with depth or not. Only use false for textures that are on HUD</xs:documentation></xs:annotation>
 				</xs:element>
-				<xs:element name="KeepRatioX" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Wether the sprite should repeat in x instead of stretch when scaled.</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="KeepRatioY" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Wether the sprite should repeat in y instead of stretch when scaled.</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="KeepRatio" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Keep a 1:1 ratio between X and Y.</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="Linear" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>If it should use Linear or Nearest sampling method.</xs:documentation></xs:annotation>
-				</xs:element>
 				<xs:element name="BlurBackground" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Wether the background should be blurred begind this sprite.</xs:documentation></xs:annotation>
 				</xs:element>

resources/Schema/Entities/OverwatchCamera.xml

@@ -8,7 +8,7 @@
     </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="-4" Z="0"/>
-      <Orientation X="0" Y="58.3794823" Z="0"/>
+      <Orientation X="0" Y="55.3495064" Z="0"/>
     </c:Transform>
   </Components>
 
@@ -34,49 +34,13 @@
                 </c:Transform>
               </Components>
               <Children>
-                <Entity name="AssaultClassPick">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
-                      <DiffuseTexture>Textures/Icons/Classes/Assault-01.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:InputCmdButton>
-                      <Command>PickClass</Command>
-                      <PressValue>1</PressValue>
-                    </c:InputCmdButton>
-                    <c:Transform>
-                      <Position X="-0.150000006" Y="-0.0500000007" Z="0"/>
-                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="AssaultText">
-                      <Components>
-                        <c:Text>
-                          <Content>Assault</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="0" G="1" R="0.784313738"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="0" Y="0.800000012" Z="0"/>
-                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
                 <Entity name="DefenderClassPick">
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Icons/Classes/Defender-01.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
                     </c:Sprite>
                     <c:InputCmdButton>
                       <Command>PickClass</Command>
@@ -108,10 +72,9 @@
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Icons/Classes/Sniper-01.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
                     </c:Sprite>
                     <c:InputCmdButton>
                       <Command>PickClass</Command>
@@ -139,6 +102,40 @@
                     </Entity>
                   </Children>
                 </Entity>
+                <Entity name="AssaultClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Icons/Classes/Assault-01.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="-0.150000006" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="AssaultText">
+                      <Components>
+                        <c:Text>
+                          <Content>Assault</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Color A="1" B="0" G="1" R="0.784313738"/>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0.800000012" Z="0"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
                 <Entity name="ClassPickText">
                   <Components>
                     <c:Text>
@@ -157,10 +154,9 @@
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
                       <Color A="1" B="0" G="1" R="0.509803951"/>
                     </c:Sprite>
                     <c:InputCmdButton>
@@ -236,10 +232,9 @@
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
                       <Color A="1" B="0" G="1" R="0.509803951"/>
                     </c:Sprite>
                     <c:InputCmdButton>
@@ -271,11 +266,10 @@
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
                       <Color A="1" B="0" G="0.294117659" R="0.980392158"/>
-                      <Linear>true</Linear>
                     </c:Sprite>
                     <c:InputCmdButton>
                       <Command>PickTeam</Command>
@@ -306,12 +300,10 @@
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
                       <Color A="1" B="0.980392158" G="0.294117659" R="0"/>
-                      <Linear>true</Linear>
                     </c:Sprite>
                     <c:InputCmdButton>
                       <Command>PickTeam</Command>
@@ -342,10 +334,9 @@
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
                       <Color A="1" B="0" G="1" R="0.509803951"/>
                       <Visible>false</Visible>
                     </c:Sprite>
@@ -431,10 +422,9 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
                           <Color A="0.300000012" B="1" G="1" R="1"/>
                         </c:Sprite>
                         <c:Transform>
@@ -451,10 +441,9 @@
                               <CapturePointNumber>3</CapturePointNumber>
                             </c:CapturePointHUD>
                             <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -469,10 +458,9 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
                           <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                         </c:Sprite>
                         <c:Transform>
@@ -489,10 +477,9 @@
                               <CapturePointNumber>4</CapturePointNumber>
                             </c:CapturePointHUD>
                             <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -507,10 +494,9 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
                           <Color A="0.300000012" B="1" G="1" R="1"/>
                         </c:Sprite>
                         <c:Transform>
@@ -527,10 +513,9 @@
                               <CapturePointNumber>2</CapturePointNumber>
                             </c:CapturePointHUD>
                             <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -545,10 +530,9 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
                           <Color A="0.300000012" B="1" G="1" R="1"/>
                         </c:Sprite>
                         <c:Transform>
@@ -566,10 +550,9 @@
                               <CapturePointNumber>1</CapturePointNumber>
                             </c:CapturePointHUD>
                             <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -584,10 +567,9 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
                           <Color A="0.699999988" B="0" G="0" R="1"/>
                         </c:Sprite>
                         <c:Transform>
@@ -602,10 +584,9 @@
                             </c:Fill>
                             <c:CapturePointHUD/>
                             <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -623,10 +604,9 @@
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
                       <Color A="1" B="0" G="1" R="0.509803951"/>
                     </c:Sprite>
                     <c:InputCmdButton>
@@ -671,10 +651,9 @@
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
                       <Color A="1" B="0" G="1" R="0.509803951"/>
                     </c:Sprite>
                     <c:InputCmdButton>

resources/Schema/Entities/aim_rays_with_capturep.xml

@@ -99,7 +99,7 @@
         </c:Team>
         <c:PlayerSpawn/>
         <c:Spawner>
-          <EntityFile>Schema/Entities/PlayerRed.xml</EntityFile>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
         </c:Spawner>
         <c:Transform/>
       </Components>
@@ -225,11 +225,6 @@
               </Team>
             </c:Team>
             <c:Trigger/>
-            <c:Model>
-              <Resource></Resource>
-              <Color A="0.300000012" B="0" G="0" R="1"/>
-              <Visible>false</Visible>
-            </c:Model>
             <c:Transform>
               <Position X="0" Y="0" Z="-4.10000038"/>
             </c:Transform>
@@ -244,17 +239,7 @@
                   <Scale X="2.70000005" Y="3.4000001" Z="4.60000038"/>
                 </c:Transform>
               </Components>
-              <Children>
-                <Entity>
-                  <Components>
-                    <c:Model>
-                      <Resource></Resource>
-                    </c:Model>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
+              <Children/>
             </Entity>
             <Entity name="Blue">
               <Components>

resources/Shaders/CombineGaussianTexture.frag.glsl

@@ -1,21 +0,0 @@
-#version 430
-
-layout (binding = 0) uniform sampler2D Texture;
-uniform int MaxMipMap;
-
-
-in VertexData{
-	vec2 TextureCoordinate;
-}Input;
-
-out vec4 fragmentColor;
-
-void main()
-{
-	vec4 result = vec4(0.0, 0.0, 0.0, 0.0);
-
-	for(int i = 0; i < MaxMipMap; i++) {
-		result += textureLod(Texture, Input.TextureCoordinate, i);
-	}
-	fragmentColor = result;
-}

resources/Shaders/CombineGaussianTexture.vert.glsl

@@ -1,13 +0,0 @@
-#version 430
-
-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;
-}

resources/Shaders/ExplosionEffect.geom.glsl

@@ -15,6 +15,11 @@ uniform float RandomnessScalar;
 uniform vec2 Velocity;
 uniform bool ColorByDistance;
 uniform bool ExponentialAccelaration;
+uniform bool Reverse;
+uniform float ColorDistanceScalar;
+//uniform bool Gravity;
+//uniform bool Rotation;
+//uniform bool MaxRadius;
 
 in VertexData{
 	vec3 Position;
@@ -41,169 +46,136 @@ out VertexData{
 layout(triangles) in;
 layout(triangle_strip, max_vertices = 3) out;
 
+float EqualTo(float x, float y) {
+  return 1.0 - abs(sign(x - y));
+}
+
+float NotEqualTo(float x, float y) {
+  return abs(sign(x - y));
+}
+
+float GreaterThan(float x, float y) {
+  return max(sign(x - y), 0.0);
+}
+
+float LessThan(float x, float y) {
+  return max(sign(y - x), 0.0);
+}
+
+float GreaterEqualTo(float x, float y) {
+  return 1.0 - LessThan(x, y);
+}
+
+float LessEqualTo(float x, float y) {
+  return 1.0 - GreaterThan(x, y);
+}
+
 // returns a "random" number based on input parameter
 float GetRandomNumber(int polygon_index)
 {
-	int randomIndex = int(mod(polygon_index, 50));
-	
-	return RandomNumbers[randomIndex];
+	return RandomNumbers[int(mod(polygon_index, 50))];
 }
 
-float randomNumber = 0.0;
-float randomDistance = 0.0;
-
-void main()
+vec3 CalcCenterOfTriangle(vec3 vertex0, vec3 vertex1, vec3 vertex2)
 {
 	// calculate middle of vectors
-	vec3 v1 = Input[1].Position - Input[0].Position;
-	vec3 v2 = Input[2].Position - Input[0].Position;
-	vec3 v3 = Input[2].Position - (v1 / 2);
-	vec3 v4 = Input[1].Position - (v2 / 2);
+	vec3 dir1 = normalize(vertex1 - vertex0);
+	vec3 dir2 = normalize(vertex2 - vertex0);
 	
-	// calculate intersection
-	
-	// normalize direction
-	vec3 dir1 = normalize(v1);
-	vec3 dir2 = normalize(v2);
-	
-	vec3 vecA = Input[2].Position - Input[1].Position; //o2 - o1
+	vec3 vecA = vertex2 - vertex1; //o2 - o1
 	vec3 vecB = cross(dir1, dir2);
 	
 	mat3 matrisA = mat3(vecA, dir2, vecB);
 	
 	float lengthA = length(vecB);
 	lengthA = lengthA * lengthA;
-
+	
 	float s = determinant(matrisA) / lengthA;
 	
 	// center position of triangle
-	vec3 centerOfTriangle = Input[1].Position + (s * dir1);
-	
+	return vertex1 + (s * dir1);
+}
+
+void PassThingsThrough(int index)
+{
+	// pass through vertex data
+	Output.Normal = Input[index].Normal;
+	Output.Position = Input[index].Position;
+	Output.TextureCoordinate = Input[index].TextureCoordinate;
+	Output.Tangent = Input[index].Tangent;
+	Output.BiTangent = Input[index].BiTangent;
+	Output.ExplosionColor = EndColor;	
+}
+
+void main()
+{
+	vec3 centerOfTriangle = CalcCenterOfTriangle(Input[0].Position, Input[1].Position, Input[2].Position);
+		
 	// center position of triangle to origin vector
 	vec3 origin2TriangleCenterVector = centerOfTriangle - ExplosionOrigin;
 	vec3 normalizedOrigin2TriangleCenterVector = normalize(origin2TriangleCenterVector);
 	
+	// distance between origin and the center of the current triangle
+	float origin2TriangleCenterDistance = length(origin2TriangleCenterVector);	
+	
 	// time percentage until end of explosion (0.0-1.0)
 	float timePercetage = TimeSinceDeath / ExplosionDuration;
 	
-		// get a random number if randomness is enabled, otherwise the random number will be zero and won't affect the other algorithms
-	if (Randomness == true)
-	{
-		randomDistance = GetRandomNumber(gl_PrimitiveIDIn) * RandomnessScalar;
-	}
+	// get a random number if randomness is enabled, otherwise the random distance will be zero and won't affect the other algorithms
+	float randomDistance = float(Randomness) * GetRandomNumber(gl_PrimitiveIDIn) * RandomnessScalar;
 	
 	vec2 randomVelocity = Velocity * (randomDistance + 1.0);
 	
 	// accelaration to use on current frame. is a interpolation between start and end value
 	float currentVelocity = mix(randomVelocity.x, randomVelocity.y, timePercetage);
 	
-	if (ExponentialAccelaration == true)
-	{
-		currentVelocity = pow(currentVelocity, 2) / 2.0;
-	}
+	// if the accelaration should be exponential
+	currentVelocity = currentVelocity * max(currentVelocity * float(ExponentialAccelaration), 1.0);
 	
-	// distance between origin and the center of the current triangle
-	float origin2TriangleCenterDistance = length(origin2TriangleCenterVector);
+	// the distance the blast has moved since the beginning, i.e. its radius
+	float blastWave = TimeSinceDeath * currentVelocity;
 	
 	// the distance from origin to the triangle center with eventual randomness added
-	float fullDistanceWithRandomness = origin2TriangleCenterDistance + randomDistance;
-
-	// vector from the triangle center to the explosion's shockwave
-	vec3 triangleCenter2ExplosionRadius = (normalizedOrigin2TriangleCenterVector * (TimeSinceDeath * currentVelocity)) - (normalizedOrigin2TriangleCenterVector * fullDistanceWithRandomness);
+	float origin2TriangleCenterDistanceWithRandomness = origin2TriangleCenterDistance + randomDistance;
 	
-	// if the triangle is inside the blast radius...
-	if (fullDistanceWithRandomness <= (TimeSinceDeath * currentVelocity))
+	vec3 triangleCenter2ExplosionRadius = (normalizedOrigin2TriangleCenterVector * blastWave) - (normalizedOrigin2TriangleCenterVector * origin2TriangleCenterDistanceWithRandomness);
+
+	// if the triangle is inside the blast's radius...
+	float isInsideBlastRadius = LessEqualTo(origin2TriangleCenterDistanceWithRandomness, blastWave);
+	
+	// calculate the max distance (s) the triangle will move
+	float accelaration = (randomVelocity.y - randomVelocity.x) / ExplosionDuration;
+	float maxDistance = (randomVelocity.x * ExplosionDuration) + (0.5 * accelaration * ExplosionDuration * ExplosionDuration);
+	
+	// if explosion color should be affected by distance instead of time...
+	if (ColorByDistance == true)
 	{
-		float maxRadius = max(TimeSinceDeath * currentVelocity, (ExplosionDuration * currentVelocity));
-		
-		float a = (randomVelocity.y - randomVelocity.x) / ExplosionDuration;
-		//float t = sqrt((2 * origin2TriangleCenterDistance) / a);
-		
-		// if explosion color should be affected by distance instead of time...
-		if (ColorByDistance == true)
-		{
-			// calculate the max distance (s) the triangle will move
-			float s = (randomVelocity.x * ExplosionDuration) + (0.5 * a * pow(ExplosionDuration, 2));
-			float te = (length(triangleCenter2ExplosionRadius) / s);
-			
-			Output.ExplosionColor = EndColor;
-			Output.ExplosionPercentageElapsed = te;
-
-		}
-		else
-		{
-			Output.ExplosionColor = EndColor;
-			Output.ExplosionPercentageElapsed = timePercetage;
-
-		}
-		
-		// for every vertex on the triangle...
-		for (int i = 0; i < gl_in.length(); i++)
-		{
-			// move the triangle to the blast radius
-			vec3 ExplodedPosition = Input[i].Position + triangleCenter2ExplosionRadius;
-			
-			// pass through vertex data
-			Output.Normal = Input[i].Normal;
-			Output.Position = Input[i].Position;
-			Output.TextureCoordinate = Input[i].TextureCoordinate;
-			Output.Tangent = Input[i].Tangent;
-			Output.BiTangent = Input[i].BiTangent;
-			for (int j = 0; j < MAX_SPLITS; j++)
-			{
-				Output.PositionLightSpace[j] = Input[i].PositionLightSpace[j];
-			}
-			
-			// convert to model space for the gravity to always be in -y
-			vec4 ExplodedPositionInModelSpace = M * vec4(ExplodedPosition, 1.0);
-			
-			// if there is gravity, apply it
-			//if (Gravity == true)
-			//{				
-			//	// ---DO THIS----> //ExplodedPositionInModelSpace.y = ExplodedPositionInModelSpace.y - TimeSinceHit;
-			//	
-			//	ExplodedPositionInModelSpace.y = ExplodedPositionInModelSpace.y - pow(TimeSinceDeath, 2);
-			//}
-			
-			// convert to screen space 
-			gl_Position = P*V * ExplodedPositionInModelSpace;
-			EmitVertex();
-		}
+		Output.ExplosionPercentageElapsed = (length(triangleCenter2ExplosionRadius) / maxDistance) * isInsideBlastRadius * ColorDistanceScalar;
 	}
 	else
 	{
-		// if explosion color should be affected by distance instead of time...
-		if (ColorByDistance == true)
-		{
-			Output.ExplosionColor = EndColor;
-			Output.ExplosionPercentageElapsed = 0.0;
-		}
-		else
-		{
-			Output.ExplosionColor = EndColor;
-			Output.ExplosionPercentageElapsed = timePercetage;
+		Output.ExplosionPercentageElapsed = timePercetage;
+	}
+	
+	vec3 ExplodedPosition;
+	for (int i = 0; i < gl_in.length(); i++)
+	{
+		// move the triangle to the blast radius
+		ExplodedPosition = Input[i].Position + (triangleCenter2ExplosionRadius * isInsideBlastRadius);
 
-		}
-		
-		// for every vertex on the triangle...
-		for(int i = 0; i < gl_in.length(); i++)
-		{
-			// pass through vertex data
-			Output.Normal = Input[i].Normal;
-			Output.Position = Input[i].Position;
-			Output.TextureCoordinate = Input[i].TextureCoordinate;
-			Output.Tangent = Input[i].Tangent;
-			Output.BiTangent = Input[i].BiTangent;
+		// pass through vertex data
+		PassThingsThrough(i);
 			for (int j = 0; j < MAX_SPLITS; j++)
 			{
 				Output.PositionLightSpace[j] = Input[i].PositionLightSpace[j];
 			}
-
-			// no change in position, pass through vertex
-			gl_Position = gl_in[i].gl_Position;
-			EmitVertex();
-		}
+			for (int j = 0; j < MAX_SPLITS; j++)
+			{
+				Output.PositionLightSpace[j] = Input[i].PositionLightSpace[j];
+			}
+		
+		// convert to window space 
+		gl_Position = P * V * M * vec4(ExplodedPosition, 1.0);
+		EmitVertex();
 	}
-	
-	//EndPrimitive();
-}
+}

resources/Shaders/Gaussian_horiz.frag.glsl

@@ -2,7 +2,6 @@
 #extension GL_EXT_gpu_shader4 : enable
 
 layout (binding = 0) uniform sampler2D Texture;
-uniform int Lod;
 
 in VertexData{
 	vec2 TextureCoordinate;
@@ -11,14 +10,12 @@ in VertexData{
 out vec4 fragmentColor;
 
 uniform float weight[5] = float[](0.227027, 0.1945946, 0.1216216, 0.054054, 0.016216);
-//uniform float weight[3] = float[](0.265495, 0.226535, 0.140718);
 
 void main()
 {
-	vec2 tex_offset = 1.0 / textureSize(Texture, Lod);
+	vec2 tex_offset = 1.0 / textureSize2D(Texture, 0);
 	vec3 center = texture(Texture, Input.TextureCoordinate).rgb;
 	vec3 result = center * weight[0];
-
 	for(int i = 1; i < 5; ++i) {
 		vec4 eastFragments = texture(Texture, Input.TextureCoordinate + vec2(tex_offset.x * i, 0.0));
 		vec4 westFragments = texture(Texture, Input.TextureCoordinate - vec2(tex_offset.x * i, 0.0));

resources/Shaders/Gaussian_vert.frag.glsl

@@ -2,7 +2,6 @@
 #extension GL_EXT_gpu_shader4 : enable
 
 layout (binding = 0) uniform sampler2D Texture;
-uniform int Lod;
 
 in VertexData{
 	vec2 TextureCoordinate;
@@ -11,14 +10,12 @@ in VertexData{
 out vec4 fragmentColor;
 
 uniform float weight[5] = float[](0.227027, 0.1945946, 0.1216216, 0.054054, 0.016216);
-//uniform float weight[3] = float[](0.265495, 0.226535, 0.140718);
 
 void main()
 {
-	vec2 tex_offset = 1.0 / textureSize(Texture, Lod);
+	vec2 tex_offset = 1.0 / textureSize2D(Texture, 0);
 	vec3 center = texture(Texture, Input.TextureCoordinate).rgb;
 	vec3 result = center * weight[0];
-
     for(int i = 1; i < 5; ++i) {
     	vec4 northFragments = texture(Texture, Input.TextureCoordinate + vec2(0.0, tex_offset.y * i));
     	vec4 southFragments = texture(Texture, Input.TextureCoordinate - vec2(0.0, tex_offset.y * i));

resources/Shaders/Sprite.frag.glsl

@@ -3,8 +3,6 @@
 uniform vec4 Color;
 uniform vec4 FillColor;
 uniform float FillPercentage;
-uniform float ScaleX;
-uniform float ScaleY;
 uniform mat4 P;
 
 layout (binding = 1) uniform sampler2D DiffuseTexture;
@@ -23,16 +21,15 @@ out vec4 bloomColor;
 
 void main()
 {
-	vec4 diffuseTexel = texture2D(DiffuseTexture, vec2(Input.TextureCoordinate.x*ScaleX, Input.TextureCoordinate.y*ScaleY));
-	vec4 glowTexel = texture2D(GlowMapTexture, vec2(Input.TextureCoordinate.x*ScaleX, Input.TextureCoordinate.y*ScaleY));
+	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate);
+	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate);
 
 	vec4 color_result = Color * diffuseTexel;
 
 	float pos = ((P * vec4(Input.Position, 1)).y + 1.0)/2.0;
-	float fillResult = floor(pos*FillPercentage);
-
-	color_result = FillColor*diffuseTexel.a*fillResult + color_result*(1-fillResult);
-
+	if(pos <= FillPercentage) {
+		color_result = FillColor*diffuseTexel.a;
+	}
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
 
 	//bloomColor = vec4(clamp((glowTexel.xyz*3) - 1.0, 0, 100), 1.0);

src/Engine/Collision/Collision.cpp

@@ -621,7 +621,7 @@ boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeM
         ComponentWrapper& cAABB = entity["AABB"];
         modelSpaceBox = EntityAABB::FromOriginSize((glm::vec3)cAABB["Origin"], (glm::vec3)cAABB["Size"]);
     } else if (entity.HasComponent("Model")) {
-        const std::string& res = entity["Model"]["Resource"];
+        std::string res = entity["Model"]["Resource"];
         if (res.empty()) {
             return boost::none;
         }
@@ -638,7 +638,7 @@ boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeM
         return boost::none;
     }
 
-    glm::mat4 modelMat = Transform::ModelMatrix(entity);
+    glm::mat4 modelMat = Transform::AbsoluteTransformation(entity);
     glm::vec3 mini(INFINITY);
     glm::vec3 maxi(-INFINITY);
     glm::vec3 maxCorner = modelSpaceBox.MaxCorner();

src/Engine/Core/Transform.cpp

@@ -1,6 +1,16 @@
 #include "Core/Transform.h"
 
-static std::unordered_map<EntityWrapper, glm::mat4> MatrixCache;
+glm::mat4 Transform::AbsoluteTransformation(EntityWrapper entity)
+{
+    glm::mat4 t = glm::mat4(1.f);
+
+    while (entity.Valid()) {
+        t = glm::translate((glm::vec3&)entity["Transform"]["Position"]) * glm::toMat4(glm::quat((glm::vec3&)entity["Transform"]["Orientation"])) * glm::scale((glm::vec3&)entity["Transform"]["Scale"]) * t;
+        entity = entity.Parent();
+    }
+
+    return t;
+}
 
 glm::vec3 Transform::AbsolutePosition(EntityWrapper entity)
 {
@@ -70,36 +80,24 @@ glm::vec3 Transform::AbsoluteScale(World* world, EntityID entity)
     return scale;
 }
 
+glm::mat4 Transform::ModelMatrix(EntityWrapper entity)
+{
+    return ModelMatrix(entity.ID, entity.World);
+}
+
 glm::mat4 Transform::ModelMatrix(EntityID entity, World* world)
 {
-    return ModelMatrix(EntityWrapper(world, entity));
+    return AbsoluteTransformation(EntityWrapper(world, entity));
+
+    //glm::vec3 position = Transform::AbsolutePosition(world, entity);
+    //glm::quat orientation = Transform::AbsoluteOrientation(world, entity);
+    //glm::vec3 scale = Transform::AbsoluteScale(world, entity);
+
+    //glm::mat4 modelMatrix = glm::translate(glm::mat4(), position) * glm::toMat4(orientation) * glm::scale(scale);
+    //return modelMatrix;
 }
 
 glm::vec3 Transform::TransformPoint(const glm::vec3& point, const glm::mat4& matrix)
 {
     return glm::vec3(matrix * glm::vec4(point.x, point.y, point.z, 1));
-}
-
-glm::mat4 Transform::ModelMatrix(EntityWrapper entity)
-{
-    auto cacheIt = MatrixCache.find(entity);
-    if (cacheIt != MatrixCache.end()) {
-        return cacheIt->second;
-    }
-
-    ComponentWrapper cTransform = entity["Transform"];
-    glm::mat4 t = glm::translate((const glm::vec3&)cTransform["Position"]) * glm::toMat4(glm::quat((const glm::vec3&)cTransform["Orientation"])) * glm::scale((const glm::vec3&)cTransform["Scale"]);
-
-    EntityWrapper parent = entity.Parent();
-    if (parent.Valid()) {
-        t = ModelMatrix(parent) * t;
-    }
-
-    MatrixCache[entity] = t;
-    return t;
-}
-
-void Transform::ClearCache::Update(double dt)
-{
-    MatrixCache.clear();
-}
+}

src/Engine/Editor/EditorRenderSystem.cpp

@@ -86,7 +86,7 @@ bool EditorRenderSystem::OnSetCamera(Events::SetCamera& e)
 {
     ComponentWrapper cTransform = e.CameraEntity["Transform"];
     ComponentWrapper cCamera = e.CameraEntity["Camera"];
-    m_EditorCamera->SetFOV(glm::radians(static_cast<float>((double)cCamera["FOV"])));
+    m_EditorCamera->SetFOV(static_cast<float>((double)cCamera["FOV"]));
     m_EditorCamera->SetNearClip(static_cast<float>((double)cCamera["NearClip"]));
     m_EditorCamera->SetFarClip(static_cast<float>((double)cCamera["FarClip"]));
     m_EditorCamera->SetPosition(cTransform["Position"]);

src/Engine/Rendering/BlurHUD.cpp

@@ -97,14 +97,14 @@ void BlurHUD::ClearBuffer()
     glClearStencil(0x00);
     glStencilMask(~0);
     glDisable(GL_SCISSOR_TEST);
-    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     m_GaussianFrameBuffer_horiz.Unbind();
     m_GaussianFrameBuffer_vert.Bind();
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClearStencil(0x00);
     glStencilMask(~0);
     glDisable(GL_SCISSOR_TEST);
-    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     m_GaussianFrameBuffer_vert.Unbind();
 
     m_CombinedTextureBuffer.Bind();
@@ -211,16 +211,12 @@ void BlurHUD::FillStencil(RenderScene& scene)
     RenderState state;
 
     state.BindFramebuffer(m_GaussianFrameBuffer_horiz.GetHandle());
-    state.Enable(GL_DEPTH_TEST);
+    state.Disable(GL_DEPTH_TEST);
     state.Enable(GL_CULL_FACE);
     state.Enable(GL_STENCIL_TEST);
     state.StencilFunc(GL_ALWAYS, 1, 0xFF);
     state.StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
     state.StencilMask(0xFF);
-
-    state.AlphaFunc(GL_GEQUAL, 0.95f);
-    state.Enable(GL_ALPHA_TEST);
-
     glViewport(0, 0, m_Renderer->GetViewportSize().Width/m_BlurQuality, m_Renderer->GetViewportSize().Height/m_BlurQuality);
 
     m_FillDepthStencilProgram->Bind();

src/Engine/Rendering/DrawBloomPass.cpp

@@ -12,7 +12,6 @@ DrawBloomPass::DrawBloomPass(IRenderer* renderer, ConfigFile* config)
 DrawBloomPass::~DrawBloomPass() {
 	CommonFunctions::DeleteTexture(&m_GaussianTexture_horiz);
 	CommonFunctions::DeleteTexture(&m_GaussianTexture_vert);
-    CommonFunctions::DeleteTexture(&m_FinalGaussianTexture);
 }
 
 void DrawBloomPass::InitializeTextures()
@@ -31,8 +30,9 @@ void DrawBloomPass::ChangeQuality(int quality)
 
 	if (m_Quality == 0) {
 		CommonFunctions::DeleteTexture(&m_GaussianTexture_horiz);
-        CommonFunctions::DeleteTexture(&m_GaussianTexture_vert);
-        CommonFunctions::DeleteTexture(&m_FinalGaussianTexture);
+		CommonFunctions::DeleteTexture(&m_GaussianTexture_vert);
+		m_GaussianTexture_horiz = 0;
+		m_GaussianTexture_vert = 0;
 		return;
 	}
 	InitializeTextures();
@@ -62,50 +62,22 @@ void DrawBloomPass::InitializeShaderPrograms()
         m_GaussianProgram_vert->BindFragDataLocation(0, "fragmentColor");
 		m_GaussianProgram_vert->Link();
 	}
-
-    m_GaussianCombineProgram = ResourceManager::Load<ShaderProgram>("#GaussianCombineProgram");
-    if (m_GaussianCombineProgram->GetHandle() == 0) {
-        m_GaussianCombineProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/CombineGaussianTexture.vert.glsl")));
-        m_GaussianCombineProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/CombineGaussianTexture.frag.glsl")));
-        m_GaussianCombineProgram->Compile();
-        m_GaussianCombineProgram->BindFragDataLocation(0, "fragmentColor");
-        m_GaussianCombineProgram->Link();
-    }
 }
 
 void DrawBloomPass::InitializeBuffers()
 {
-    CommonFunctions::GenerateMipMapTexture(
-        &m_GaussianTexture_horiz, GL_CLAMP_TO_BORDER, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height)
-        , GL_RGB, GL_FLOAT, m_BloomLod);
-    CommonFunctions::GenerateMipMapTexture(
-        &m_GaussianTexture_vert, GL_CLAMP_TO_BORDER, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height)
-        , GL_RGB, GL_FLOAT, m_BloomLod);
-    CommonFunctions::GenerateTexture(&m_FinalGaussianTexture, GL_CLAMP_TO_BORDER, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
+    CommonFunctions::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_GaussianCombineBuffer.GetHandle() == 0) {
-        m_GaussianCombineBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_FinalGaussianTexture, GL_COLOR_ATTACHMENT0)));
-    }
-    m_GaussianCombineBuffer.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_horiz == nullptr) {
-        m_GaussianFrameBuffer_horiz = new FrameBuffer[m_BloomLod];
-    }
-    if (m_GaussianFrameBuffer_vert == nullptr) {
-        m_GaussianFrameBuffer_vert = new FrameBuffer[m_BloomLod];
-    }
-
-    for (int i = 0; i < m_BloomLod; i++) {
-        if(m_GaussianFrameBuffer_horiz[i].GetHandle() == 0) {
-            m_GaussianFrameBuffer_horiz[i].AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_horiz, GL_COLOR_ATTACHMENT0, i)));
-        }
-        m_GaussianFrameBuffer_horiz[i].Generate();
-
-        if (m_GaussianFrameBuffer_vert[i].GetHandle() == 0) {
-            m_GaussianFrameBuffer_vert[i].AddResource(std::shared_ptr<BufferResource>(new Texture2D(&m_GaussianTexture_vert, GL_COLOR_ATTACHMENT0, i)));
-        }
-        m_GaussianFrameBuffer_vert[i].Generate();
-    }
+    CommonFunctions::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();
 }
 
 
@@ -115,75 +87,33 @@ void DrawBloomPass::ClearBuffer()
 		return;
 	}
     GLERROR("PRE");
-    for (int i = 0; i < m_BloomLod; i++) {
-        m_GaussianFrameBuffer_horiz[i].Bind();
-        glClearColor(0.f, 0.f, 0.f, 0.f);
-        glClear(GL_COLOR_BUFFER_BIT);
-        m_GaussianFrameBuffer_horiz[i].Unbind();
-        m_GaussianFrameBuffer_vert[i].Bind();
-        glClearColor(0.f, 0.f, 0.f, 0.f);
-        glClear(GL_COLOR_BUFFER_BIT);
-        m_GaussianFrameBuffer_vert[i].Unbind();
-
-    }
-    m_GaussianCombineBuffer.Bind();
+    m_GaussianFrameBuffer_horiz.Bind();
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT);
-    m_GaussianCombineBuffer.Unbind();
+    m_GaussianFrameBuffer_horiz.Unbind();
+    m_GaussianFrameBuffer_vert.Bind();
+    glClearColor(0.f, 0.f, 0.f, 0.f);
+    glClear(GL_COLOR_BUFFER_BIT);
+    m_GaussianFrameBuffer_vert.Unbind();
     GLERROR("END");
 }
 
 void DrawBloomPass::Draw(GLuint texture)
-{
-    if (m_Quality == 0) {
-        return;
-    }
-
-    for (int i = 0; i < m_BloomLod; i++) {
-        GaussianLodPass(i, texture);
-    }
-    CombineGaussianBlur();
-}
-
-
-void DrawBloomPass::OnWindowResize()
 {
 	if (m_Quality == 0) {
 		return;
 	}
-    CommonFunctions::GenerateMipMapTexture(
-        &m_GaussianTexture_vert, GL_CLAMP_TO_BORDER, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height)
-        , GL_RGB, GL_FLOAT, m_BloomLod);
-    CommonFunctions::GenerateMipMapTexture(
-        &m_GaussianTexture_horiz, GL_CLAMP_TO_BORDER, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height)
-        , GL_RGB, GL_FLOAT, m_BloomLod);
-    for (int i = 0; i < m_BloomLod; i++) {
-        m_GaussianFrameBuffer_vert[i].Generate();
-        m_GaussianFrameBuffer_horiz[i].Generate();
-
-    }
-
-}
-
-void DrawBloomPass::GaussianLodPass(GLuint mipMap, GLuint texture)
-{
     GLERROR("DrawBloomPass::Draw: Pre");
-    glViewport(0, 0, m_Renderer->GetViewportSize().Width/(glm::pow(2, mipMap)), m_Renderer->GetViewportSize().Height/(glm::pow(2, mipMap)));
+
     DrawBloomPassState state;
 
     GLuint shaderHandle_horiz = m_GaussianProgram_horiz->GetHandle();
     GLuint shaderHandle_vert = m_GaussianProgram_vert->GetHandle();
 
-    m_GaussianProgram_vert->Bind();
-    glUniform1i(glGetUniformLocation(shaderHandle_vert, "Lod"), mipMap);
-    m_GaussianProgram_horiz->Bind();
-    glUniform1i(glGetUniformLocation(shaderHandle_horiz, "Lod"), mipMap);
-
 
     //Horizontal pass, first use the given texture then save it to the horizontal framebuffer.
-    m_GaussianFrameBuffer_horiz[mipMap].Bind();
-
-
+    m_GaussianFrameBuffer_horiz.Bind();
+    m_GaussianProgram_horiz->Bind();
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, texture);
     glBindVertexArray(m_ScreenQuad->VAO);
@@ -193,56 +123,55 @@ void DrawBloomPass::GaussianLodPass(GLuint mipMap, GLuint texture)
     //Iterate some times to make it more gaussian.
     for (int i = 1; i < m_Iterations; i++) {
         //Vertical pass
-        m_GaussianFrameBuffer_vert[mipMap].Bind();
+        m_GaussianFrameBuffer_vert.Bind();
         m_GaussianProgram_vert->Bind();
 
-
-        glActiveTexture(GL_TEXTURE0);
+		glActiveTexture(GL_TEXTURE0);
         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_vert[mipMap].Unbind();
+		m_GaussianFrameBuffer_vert.Unbind();
 
-        m_GaussianFrameBuffer_horiz[mipMap].Bind();
+        m_GaussianFrameBuffer_horiz.Bind();
         m_GaussianProgram_horiz->Bind();
 
-        glActiveTexture(GL_TEXTURE0);
+		glActiveTexture(GL_TEXTURE0);
         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);
-        m_GaussianFrameBuffer_horiz[mipMap].Unbind();
+		m_GaussianFrameBuffer_horiz.Unbind();
     }
 
     //final vertical gaussian after the iterations are done
 
-    m_GaussianFrameBuffer_vert[mipMap].Bind();
+    m_GaussianFrameBuffer_vert.Bind();
     m_GaussianProgram_vert->Bind();
 
-    glActiveTexture(GL_TEXTURE0);
+	glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, m_GaussianTexture_horiz);
-
-    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);
-
-    GLERROR("DrawBloomPass::Draw: END");
-    glViewport(0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height);
-    m_GaussianFrameBuffer_vert[mipMap].Unbind();
-
-}
-
-void DrawBloomPass::CombineGaussianBlur()
-{
-    m_GaussianCombineBuffer.Bind();
-    m_GaussianCombineProgram->Bind();
-    glUniform1i(glGetUniformLocation(m_GaussianCombineProgram->GetHandle(), "MaxMipMap"), m_BloomLod);
-
-    glActiveTexture(GL_TEXTURE0);
-    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);
+
+    GLERROR("DrawBloomPass::Draw: END");
+}
+
+
+void DrawBloomPass::OnWindowResize()
+{
+	if (m_Quality == 0) {
+		return;
+	}
+    CommonFunctions::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();
+    CommonFunctions::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);
+    m_GaussianFrameBuffer_horiz.Generate();
 }

src/Engine/Rendering/DrawFinalPass.cpp

@@ -32,9 +32,9 @@ void DrawFinalPass::InitializeTextures()
 
 void DrawFinalPass::InitializeFrameBuffers()
 {
-	CommonFunctions::GenerateTexture(&m_SceneTexture, GL_CLAMP_TO_BORDER, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
+	CommonFunctions::GenerateTexture(&m_SceneTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
     //GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
-	CommonFunctions::GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_BORDER, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
+	CommonFunctions::GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
     //GenerateMipMapTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, glm::vec2(m_Renderer->GetViewPortSize().Width, m_Renderer->GetViewPortSize().Height), GL_RGB16F, GL_FLOAT, 4);
     //GenerateTexture(&m_StencilTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_STENCIL, GL_STENCIL_INDEX8, GL_INT);
 
@@ -311,8 +311,6 @@ void DrawFinalPass::Draw(RenderScene& scene, BlurHUD* blurHUDPass)
 	GLERROR("TransparentObjects");
 	//state->BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     stateSprite->Enable(GL_DEPTH_TEST);
-    //stateSprite->AlphaFunc(GL_GEQUAL, 0.05f);
-    //stateSprite->Enable(GL_ALPHA_TEST);
 	DrawSprites(scene.Jobs.SpriteJob, scene);
 	GLERROR("SpriteJobs");
 
@@ -345,8 +343,8 @@ void DrawFinalPass::OnWindowResize()
     //InitializeFrameBuffers();
 	CommonFunctions::GenerateTexture(&m_DepthBuffer, GL_CLAMP_TO_BORDER, GL_NEAREST,
 		glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8);
-    CommonFunctions::GenerateTexture(&m_SceneTexture, GL_CLAMP_TO_BORDER, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
-	CommonFunctions::GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_BORDER, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
+    CommonFunctions::GenerateTexture(&m_SceneTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
+	CommonFunctions::GenerateTexture(&m_BloomTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RGB16F, GL_RGB, GL_FLOAT);
     m_FinalPassFrameBuffer.Generate();
 
     GLERROR("Error changing texture resolutions");
@@ -1271,34 +1269,23 @@ void DrawFinalPass::DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, Rend
 
 	glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
 	glUniform3fv(glGetUniformLocation(shaderHandle, "CameraPos"), 1, glm::value_ptr(scene.Camera->Position()));
-    RenderState* jobState = new RenderState();
-
 
     for(auto& job : jobs) {
         auto spriteJob = std::dynamic_pointer_cast<SpriteJob>(job);
+        RenderState jobState;
 
         if (spriteJob) {
             if(spriteJob->Depth == 0) {
-                jobState->Disable(GL_DEPTH_TEST);
+                jobState.Disable(GL_DEPTH_TEST);
             }
             glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * spriteJob->Matrix));
             glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(spriteJob->Color));
             glUniform4fv(glGetUniformLocation(shaderHandle, "FillColor"), 1, glm::value_ptr(spriteJob->FillColor));
             glUniform1f(glGetUniformLocation(shaderHandle, "FillPercentage"), spriteJob->FillPercentage);
-            glUniform1f(glGetUniformLocation(shaderHandle, "ScaleX"), spriteJob->ScaleX);
-            glUniform1f(glGetUniformLocation(shaderHandle, "ScaleY"), spriteJob->ScaleY);
 
             glActiveTexture(GL_TEXTURE1);
             if (spriteJob->DiffuseTexture != nullptr) {
                 glBindTexture(GL_TEXTURE_2D, spriteJob->DiffuseTexture->m_Texture);
-                if (spriteJob->Linear) {
-                    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-                    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-                } else {
-                    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
-                    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                }
-
             } else {
                 glBindTexture(GL_TEXTURE_2D, m_ErrorTexture->m_Texture);
             }
@@ -1316,7 +1303,6 @@ void DrawFinalPass::DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, Rend
             glDrawElements(GL_TRIANGLES, spriteJob->EndIndex - spriteJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(spriteJob->StartIndex*sizeof(unsigned int)));
         }
     }
-    delete jobState;
    // m_SpriteProgram->Unbind();
 }
 
@@ -1333,7 +1319,12 @@ void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<E
 
     glUniform3fv(glGetUniformLocation(shaderHandle, "ExplosionOrigin"), 1, glm::value_ptr(job->ExplosionOrigin));
 	GLERROR("Bind 6 uniform");
-    glUniform1f(glGetUniformLocation(shaderHandle, "TimeSinceDeath"), job->TimeSinceDeath);
+	if (job->Reverse == false) {
+		glUniform1f(glGetUniformLocation(shaderHandle, "TimeSinceDeath"), job->TimeSinceDeath);
+	}
+	else {
+		glUniform1f(glGetUniformLocation(shaderHandle, "TimeSinceDeath"), (job->ExplosionDuration - job->TimeSinceDeath));
+	}
 	GLERROR("Bind 7 uniform");
     glUniform1f(glGetUniformLocation(shaderHandle, "ExplosionDuration"), job->ExplosionDuration);
 	GLERROR("Bind 8 uniform");
@@ -1351,6 +1342,10 @@ void DrawFinalPass::BindExplosionUniforms(GLuint shaderHandle, std::shared_ptr<E
 	GLERROR("Bind 14 uniform");
     glUniform1i(glGetUniformLocation(shaderHandle, "ExponentialAccelaration"), job->ExponentialAccelaration);
 	GLERROR("Bind 15 uniform");
+	glUniform1i(glGetUniformLocation(shaderHandle, "Reverse"), job->Reverse);
+	GLERROR("Bind 15-2 uniform");
+	glUniform1f(glGetUniformLocation(shaderHandle, "ColorDistanceScalar"), job->ColorDistanceScalar);
+	GLERROR("Bind 15-3 uniform");
 
     glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(job->Color));
 	GLERROR("Bind 16 uniform");

src/Engine/Rendering/DrawFinalPassState.cpp

@@ -10,8 +10,6 @@ DrawFinalPassState::DrawFinalPassState(GLuint frameBuffer)
     Enable(GL_DEPTH_TEST);
 	DepthMask(GL_TRUE);
     Enable(GL_CULL_FACE);
-	Enable(GL_ALPHA_TEST);
-	AlphaFunc(GL_GEQUAL, 0.05f);
    // Enable(GL_STENCIL_TEST);
    // StencilFunc(GL_NOTEQUAL, 1, 0xFF);
    // StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);

src/Engine/Rendering/FrameBuffer.cpp

@@ -2,12 +2,11 @@
 #include "Rendering/FrameBuffer.h"
 
 
-BufferResource::BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod)
+BufferResource::BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment)
 {
     m_ResourceHandle = resourceHandle;
     m_ResourceType = resourceType;
     m_Attachment = attachment;
-    m_MipMapLod = mipMapLod;
 }
 
 Texture2D::~Texture2D()
@@ -59,7 +58,7 @@ void FrameBuffer::Generate()
 	for (auto it = m_Resources.begin(); it != m_Resources.end(); it++) {
 		switch ((*it)->m_ResourceType) {
 		case GL_TEXTURE_2D:
-			glFramebufferTexture(GL_FRAMEBUFFER, (*it)->m_Attachment, *(*it)->m_ResourceHandle, (*it)->m_MipMapLod);
+			glFramebufferTexture2D(GL_FRAMEBUFFER, (*it)->m_Attachment, (*it)->m_ResourceType, *(*it)->m_ResourceHandle, 0);
 			GLERROR("FrameBuffer generate: glFramebufferTexture2D");
 			break;
 		case GL_RENDERBUFFER:

src/Engine/Rendering/LightCullingPass.cpp

@@ -42,15 +42,6 @@ void LightCullingPass::SetSSBOSizes()
 {
     m_NumberOfTiles = (int)(m_Renderer->GetViewportSize().Width/TILE_SIZE) * (int)(m_Renderer->GetViewportSize().Height/TILE_SIZE);
 
-	if (m_Frustums != nullptr) {
-		delete[] m_Frustums;
-	}
-	if (m_LightGrid != nullptr) {
-		delete[] m_LightGrid;
-	}
-	if (m_LightIndex != nullptr) {
-		delete[] m_LightIndex;
-	}
     m_Frustums = new Frustum[m_NumberOfTiles];
     m_LightGrid = new LightGrid[m_NumberOfTiles];
     m_LightIndex = new float[m_NumberOfTiles*MAX_LIGHTS_PER_TILE];

src/Engine/Rendering/PickingPass.cpp

@@ -24,7 +24,7 @@ void PickingPass::InitializeTextures()
         glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_RG8, GL_RG, GL_UNSIGNED_BYTE);
 
 	CommonFunctions::GenerateTexture(&m_DepthBuffer, GL_CLAMP_TO_BORDER, GL_NEAREST,
-		glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT);
+		glm::vec2(m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height), GL_DEPTH_COMPONENT32, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT);
 }
 
 void PickingPass::InitializeFrameBuffers()

src/Engine/Rendering/RenderSystem.cpp

@@ -9,11 +9,10 @@ RenderSystem::RenderSystem(SystemParams params, const IRenderer* renderer, Rende
     , m_Octree(frustumCullOctree)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &RenderSystem::OnSetCamera);
-    EVENT_SUBSCRIBE_MEMBER(m_EResolutionChanged, &RenderSystem::OnResolutionChanged);
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &RenderSystem::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &RenderSystem::OnPlayerSpawned);
 
-    m_Camera = new Camera((float)m_Renderer->GetViewportSize().Width / m_Renderer->GetViewportSize().Height, glm::radians(45.f), 0.01f, 5000.f);
+    m_Camera = new Camera((float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height, glm::radians(45.f), 0.01f, 5000.f);
 }
 
 RenderSystem::~RenderSystem()
@@ -21,18 +20,11 @@ RenderSystem::~RenderSystem()
     delete m_Camera;
 }
 
-bool RenderSystem::OnResolutionChanged(Events::ResolutionChanged& e)
-{
-    // Update camera aspect ration on resolution change
-    m_Camera->SetAspectRatio((float)e.NewResolution.Width / e.NewResolution.Height);
-    return true;
-}
-
 bool RenderSystem::OnSetCamera(Events::SetCamera& e)
 {
     ComponentWrapper cTransform = e.CameraEntity["Transform"];
     ComponentWrapper cCamera = e.CameraEntity["Camera"];
-    m_Camera->SetFOV(glm::radians((double)cCamera["FOV"]));
+    m_Camera->SetFOV((double)cCamera["FOV"]);
     m_Camera->SetNearClip((double)cCamera["NearClip"]);
     m_Camera->SetFarClip((double)cCamera["FarClip"]);
     m_Camera->SetPosition(cTransform["Position"]);
@@ -184,7 +176,7 @@ bool RenderSystem::isEntityVisible(EntityWrapper& entity)
     }
 
     // Hide things parented to local player if they have the HiddenFromLocalPlayer component
-    bool outOfBodyExperience = false; // ResourceManager::Load<ConfigFile>("Config.ini")->Get<bool>("Debug.OutOfBodyExperience", false); // APPARENTLY THIS IS REALLY SLOW
+    bool outOfBodyExperience = ResourceManager::Load<ConfigFile>("Config.ini")->Get<bool>("Debug.OutOfBodyExperience", false);
     if (
         (entity.HasComponent("HiddenForLocalPlayer") || entity.FirstParentWithComponent("HiddenForLocalPlayer").Valid()) 
         && (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer)) 

src/Engine/Rendering/Renderer.cpp

@@ -36,24 +36,16 @@ void Renderer::Initialize()
     m_ImGuiRenderPass = new ImGuiRenderPass(this, m_EventBroker);
 }
 
-void Renderer::glfwWindowSizeCallback(GLFWwindow* window, int width, int height)
-{
-    m_WindowToRenderer[window]->setWindowSize(Rectangle(width, height));
-}
-
 void Renderer::glfwFrameBufferCallback(GLFWwindow* window, int width, int height)
 {
-    m_WindowToRenderer[window]->updateFramebufferSize();
-}
-
-void Renderer::SetResolution(const Rectangle& resolution)
-{
-    m_Resolution = resolution;
-
-    if (m_Window != nullptr) {
-        setWindowSize(resolution);
-        updateFramebufferSize();
-    }
+    glViewport(0, 0, width, height);
+    Renderer* currentRenderer = m_WindowToRenderer[window];
+    currentRenderer->m_ViewportSize = Rectangle(width, height);
+	currentRenderer->m_PickingPass->OnWindowResize();
+    currentRenderer->m_DrawFinalPass->OnWindowResize();
+    currentRenderer->m_LightCullingPass->OnWindowResize();
+    currentRenderer->m_DrawBloomPass->OnWindowResize();
+	currentRenderer->m_SSAOPass->OnWindowResize();
 }
 
 void Renderer::InitializeWindow()
@@ -75,7 +67,6 @@ void Renderer::InitializeWindow()
 		LOG_ERROR("GLFW: Failed to create window");
 		exit(EXIT_FAILURE);
 	}
-    glfwSetWindowSizeCallback(m_Window, &glfwWindowSizeCallback);
     glfwSetFramebufferSizeCallback(m_Window, &glfwFrameBufferCallback);
 	glfwMakeContextCurrent(m_Window);
 
@@ -120,31 +111,6 @@ void Renderer::InputUpdate(double dt)
    
 }
 
-void Renderer::setWindowSize(Rectangle size)
-{
-    m_Resolution = size;
-    glfwSetWindowSize(m_Window, size.Width, size.Height);
-}
-
-void Renderer::updateFramebufferSize()
-{
-    Events::ResolutionChanged e;
-    e.OldResolution = m_ViewportSize;
-
-    int width, height;
-    glfwGetFramebufferSize(m_Window, &width, &height);
-    glViewport(0, 0, width, height);
-    m_ViewportSize = Rectangle(width, height);
-    m_PickingPass->OnWindowResize();
-    m_DrawFinalPass->OnWindowResize();
-    m_LightCullingPass->OnWindowResize();
-    m_DrawBloomPass->OnWindowResize();
-    m_SSAOPass->OnWindowResize();
-    
-    e.NewResolution = m_ViewportSize;
-    m_EventBroker->Publish(e);
-}
-
 void Renderer::Update(double dt)
 {
     m_EventBroker->Process<Renderer>();
@@ -297,7 +263,6 @@ void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filterin
     GLERROR("Texture initialization failed");
 }
 
-
 void Renderer::InitializeRenderPasses()
 {
     m_PickingPass = new PickingPass(this, m_EventBroker);

src/Engine/Rendering/SSAOPass.cpp

@@ -233,11 +233,6 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 	GLuint shaderHandle_horiz = m_GaussianProgram_horiz->GetHandle();
 	GLuint shaderHandle_vert = m_GaussianProgram_vert->GetHandle();
 
-    m_GaussianProgram_vert->Bind();
-    glUniform1i(glGetUniformLocation(shaderHandle_vert, "Lod"), 0);
-    m_GaussianProgram_horiz->Bind();
-    glUniform1i(glGetUniformLocation(shaderHandle_horiz, "Lod"), 0);
-
 	m_GaussianFrameBuffer_horiz.Bind();
 	m_GaussianProgram_horiz->Bind();
 
@@ -257,6 +252,8 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, m_Gaussian_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
@@ -268,6 +265,8 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, m_Gaussian_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);
 		m_GaussianFrameBuffer_horiz.Unbind();
@@ -280,7 +279,8 @@ void SSAOPass::Draw(GLuint depthBuffer, Camera* camera)
 
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, m_Gaussian_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);
 

src/Engine/Rendering/TextureSprite.cpp

@@ -3,9 +3,9 @@
 TextureSprite::TextureSprite(std::string path)
     :Texture(path)
 {
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST_MIPMAP_NEAREST);
     GLERROR("Texture load");
 }

src/Engine/Rendering/Util/CommonFunctions.cpp

@@ -25,12 +25,10 @@ void CommonFunctions::GenerateMultiSampleTexture(GLuint* texture, int numSamples
 
 void CommonFunctions::GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps)
 {
-    glDeleteTextures(1, texture);
 	glGenTextures(1, texture);
 	glBindTexture(GL_TEXTURE_2D, *texture);
 	glTexStorage2D(GL_TEXTURE_2D, numMipMaps, GL_RGBA8, dimensions.x, dimensions.y);
-	//glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, dimensions.x, dimensions.y, format, type, NULL);
-    GLERROR("MipMap Texture glTexSubImage2D failed");
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, dimensions.x, dimensions.y, format, type, texture);
 	glGenerateMipmap(GL_TEXTURE_2D);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapping);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapping);

src/Engine/Rendering/Util/ScreenCoords.cpp

@@ -36,6 +36,10 @@ ScreenCoords::PixelData ScreenCoords::ToPixelData(float x, float y, FrameBuffer*
     unsigned char pdata[3];
     glReadPixels(x, y, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pdata);
 	GLERROR("glReadPixels(pdata) Error");
+    PickDataBuffer->Unbind();
+	GLERROR("Unbind Error");
+    glBindFramebuffer(GL_FRAMEBUFFER, DepthBuffer); 
+	GLERROR("glBindFramebuffer(DepthBuffer) Error");
     float depthData;
     glReadPixels(x, y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depthData);
 	GLERROR("glReadPixels(depthData) Error");

src/Game/Game.cpp

@@ -42,6 +42,7 @@
 #include "Game/Systems/StartSystem.h"
 #include "Rendering/TextureSprite.h"
 
+
 Game::Game(int argc, char* argv[])
 {
     parseArgs(argc, argv);
@@ -158,8 +159,6 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<StartSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<Transform::ClearCache>(updateOrderLevel);
-    ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
     m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);
@@ -175,8 +174,6 @@ Game::Game(int argc, char* argv[])
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillFrustumOctreeSystem>(updateOrderLevel, m_OctreeFrustrumCulling);
     ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<Transform::ClearCache>(updateOrderLevel);
-    ++updateOrderLevel;
     m_SystemPipeline->AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame, m_OctreeFrustrumCulling);
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<EditorSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);

src/Game/Systems/CapturePointSystem.cpp

@@ -108,10 +108,10 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
         //change what model is displaying (change all in case 2 capturepoints has been captured on the same frame)
         for (int i = 0; i < m_NumberOfCapturePoints; i++) {
             auto owner = (int)m_CapturePointNumberToEntityMap[i]["Team"]["Team"];
-            if (m_CapturePointNumberToEntityMap[i].FirstChildByName("Red").Valid()) {
-                ChangeCapturePointModelsVisibility(m_CapturePointNumberToEntityMap[i].FirstChildByName("Red"), owner == redTeam);
-                ChangeCapturePointModelsVisibility(m_CapturePointNumberToEntityMap[i].FirstChildByName("Blue"), owner == blueTeam);
-                ChangeCapturePointModelsVisibility(m_CapturePointNumberToEntityMap[i].FirstChildByName("Spectator"), owner == spectatorTeam);
+            if (m_CapturePointNumberToEntityMap[i].FirstChildByName("Red").ID != EntityID_Invalid) {
+                (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Red")["Model"]["Visible"] = owner == redTeam ? true : false;
+                (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Blue")["Model"]["Visible"] = owner == blueTeam ? true : false;
+                (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Spectator")["Model"]["Visible"] = owner == spectatorTeam ? true : false;
             }
         }
         //save the next cap points and publish the captured event
@@ -232,14 +232,6 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
 
 }
 
-void CapturePointSystem::ChangeCapturePointModelsVisibility(EntityWrapper &capturePointModels, bool isOwner) {
-    (bool&)capturePointModels["Model"]["Visible"] = isOwner;
-    for (auto& capModel : capturePointModels.ChildrenWithComponent("Model"))
-    {
-        (bool&)capModel["Model"]["Visible"] = isOwner;
-    }
-}
-
 bool CapturePointSystem::OnTriggerTouch(const Events::TriggerTouch& e)
 {
     //personEntered = e.Entity, thingEntered = e.Trigger

src/Game/Systems/ExplosionEffectSystem.cpp

@@ -7,12 +7,15 @@ void ExplosionEffectSystem::UpdateComponent(EntityWrapper& entity, ComponentWrap
         delay = std::max(0.0, delay - dt);
     }
 
-    if (delay <= 0) {
-        double& timeSinceDeath = component["TimeSinceDeath"];
-        timeSinceDeath += (double)component["Speed"] * dt;
-        if (timeSinceDeath < 0 || timeSinceDeath > (double)component["ExplosionDuration"]) {
-            timeSinceDeath = 0.0;
-        }
-    }
+	if (delay <= 0) {
+		double& timeSinceDeath = component["TimeSinceDeath"];
+		timeSinceDeath += (double)component["Speed"] * dt;
+		if (timeSinceDeath < 0) {
+			timeSinceDeath = 0.0;
+		}
+		else if (timeSinceDeath >(double)component["ExplosionDuration"]) {
+			timeSinceDeath = (double)component["ExplosionDuration"];
+		}
+	}
 }