From b837000b88e34cf297380c99ea608a1517fdf26d Mon Sep 17 00:00:00 2001 From: LaG1924 Date: Sat, 20 Nov 2021 00:09:45 +0500 Subject: Added framebuffer to Gal --- src/Render.hpp | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'src/Render.hpp') diff --git a/src/Render.hpp b/src/Render.hpp index 9a9feee..cf9b9f9 100644 --- a/src/Render.hpp +++ b/src/Render.hpp @@ -10,9 +10,9 @@ #include "Utility.hpp" #include "Renderer.hpp" #include "Event.hpp" +#include "Gal.hpp" class RendererWorld; -class Framebuffer; class RmlRenderInterface; class RmlSystemInterface; class RmlFileInterface; @@ -35,16 +35,21 @@ class Render { std::map isKeyPressed; bool HasFocus=true; float sensetivity = 0.1f; - bool isWireframe = false; - std::unique_ptr framebuffer; - EventListener listener; + bool isWireframe = false; + std::shared_ptr framebuffer; + std::shared_ptr fbDepthStencil; + std::shared_ptr fbColor; + std::shared_ptr fbPipeline; + std::shared_ptr fbPipelineInstance; + std::shared_ptr fbBuffer; + EventListener listener; std::string stateString; - std::unique_ptr rmlRender; - std::unique_ptr rmlSystem; - std::unique_ptr rmlFile; - Rml::Context* rmlContext; - unsigned short sdlKeyMods = 0; - bool hideRml = false; + std::unique_ptr rmlRender; + std::unique_ptr rmlSystem; + std::unique_ptr rmlFile; + Rml::Context* rmlContext; + unsigned short sdlKeyMods = 0; + bool hideRml = false; void SetMouseCapture(bool IsCaptured); -- cgit v1.2.3 From 83c61036966c4c358a094cabe27c8de60082200d Mon Sep 17 00:00:00 2001 From: LaG1924 Date: Sat, 20 Nov 2021 00:29:28 +0500 Subject: Removed every reference to OpenGL except GalOgl.cpp --- src/Render.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/Render.hpp') diff --git a/src/Render.hpp b/src/Render.hpp index cf9b9f9..87494fa 100644 --- a/src/Render.hpp +++ b/src/Render.hpp @@ -8,7 +8,6 @@ #include #include "Utility.hpp" -#include "Renderer.hpp" #include "Event.hpp" #include "Gal.hpp" @@ -31,7 +30,7 @@ class Render { float mouseXDelta, mouseYDelta; std::unique_ptr world; bool renderWorld = false; - RenderState renderState; + size_t windowWidth, windowHeight; std::map isKeyPressed; bool HasFocus=true; float sensetivity = 0.1f; -- cgit v1.2.3