From 430a008ab34a2d8d381108c4b697894dc7d691c0 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Mon, 19 Sep 2022 12:54:23 -0400 Subject: more recatoring, doesnt compile --- engine/xe_engine.hpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'engine/xe_engine.hpp') diff --git a/engine/xe_engine.hpp b/engine/xe_engine.hpp index 93d3f8b..7beb962 100644 --- a/engine/xe_engine.hpp +++ b/engine/xe_engine.hpp @@ -3,6 +3,8 @@ #include "xe_window.hpp" #include "xe_device.hpp" #include "xe_renderer.hpp" +#include "xe_render_system.hpp" +#include "xe_descriptors.hpp" namespace xe { @@ -16,25 +18,26 @@ class XeEngine { XeEngine(const XeEngine&) = delete; XeEngine operator=(const XeEngine&) = delete; - const XeWindow& getWindow() const { + XeWindow& getWindow() { return xeWindow; }; - const XeRenderer& getRenderer() const { + XeRenderer& getRenderer() { return xeRenderer; }; + std::unique_ptr createRenderSystem(const std::string &vert, const std::string &frag, uint32_t pushCunstantDataSize, uint32_t uniformBufferDataSize); private: - void loadDescriptorPool(); + void loadDescriptors(); XeWindow xeWindow; XeDevice xeDevice; XeRenderer xeRenderer; - std::unique_ptr xeDescriptorPool{}; - std::unique_ptr xeDescriptorSetLayout; + std::unique_ptr xeDescriptorPool; + std::unique_ptr xeDescriptorSetLayout; }; } \ No newline at end of file -- cgit v1.2.3-freya