Merge remote-tracking branch 'origin/master' into Rendering

# Conflicts:
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Game/Game.cpp

include/Engine/Rendering/EPicking.h

@@ -34,6 +34,8 @@ public:
         EntityID Entity;
         //World position of the "pick"
         glm::vec3 Position;
+        // Depth
+        float Depth;
     };
 
     PickData Pick(glm::vec2 screenCoord) const
@@ -43,6 +45,7 @@ public:
         // Invert screen y coordinate
         screenCoord.y = Resolution.Height - screenCoord.y;
         ScreenCoords::PixelData data = ScreenCoords::ToPixelData(screenCoord, PickingBuffer, *DepthBuffer);
+        pickData.Depth = data.Depth;
 
         auto it = PickingColorsToEntity->find(glm::vec2(data.Color[0], data.Color[1]));
         if (it != PickingColorsToEntity->end()) {

include/Engine/Rendering/ImGuiRenderPass.h

@@ -1,6 +1,7 @@
 #include <imgui/imgui.h>
 #include "../OpenGL.h"
 #include "IRenderer.h"
+#include "RenderState.h"
 #include "../Core/EventBroker.h"
 #include "../Core/EMousePress.h"
 #include "../Core/EMouseRelease.h"
@@ -10,6 +11,22 @@
 #include "../Core/EKeyUp.h"
 #include "../Core/EKeyboardChar.h"
 
+class ImGuiRenderState : public RenderState
+{
+public:
+    ImGuiRenderState()
+        : RenderState()
+    {
+        BindFramebuffer(0);
+        Enable(GL_BLEND);
+        BlendEquation(GL_FUNC_ADD);
+        BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        Disable(GL_CULL_FACE);
+        Disable(GL_DEPTH_TEST);
+        Enable(GL_SCISSOR_TEST);
+    }
+};
+
 class ImGuiRenderPass
 {
 public:

include/Engine/Rendering/RenderState.h

@@ -1,6 +1,7 @@
 #ifndef RenderState_h__
 #define RenderState_h__
 
+#include <functional>
 #include "../Common.h"
 #include "../OpenGL.h"
 #include "../GLM.h"
@@ -8,16 +9,19 @@
 class RenderState 
 {
 public:
-    RenderState();
+    RenderState() = default;
     ~RenderState();
-    bool Enable(GLenum GLEnable);
-    bool CullFace(GLenum GlFaceToCull);
+
+    bool Enable(GLenum cap);
+    bool Disable(GLenum cap);
+    bool CullFace(GLenum mode);
     bool ClearColor(glm::vec4 color);
     bool Clear(GLbitfield mask);
-    bool BindBuffer(GLint buffer);
+    bool BindFramebuffer(GLint framebuffer);
+    bool BlendEquation(GLenum mode);
+    bool BlendFunc(GLenum sfactor, GLenum dfactor);
+
 private:
-    std::vector<GLenum> m_Enables;
-    float m_preClearColor[4];
-    int m_preBuffer;
+    std::vector<std::function<void(void)>> m_ResetFunctions;
 };
 #endif