From 249f6c9fa384e9e3265cafb1357e502ea7db72f7 Mon Sep 17 00:00:00 2001
From: tylermurphy534 <tylermurphy534@gmail.com>
Date: Tue, 20 Sep 2022 22:02:58 -0400
Subject: texture loading

---
 engine/xe_engine.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'engine/xe_engine.hpp')

diff --git a/engine/xe_engine.hpp b/engine/xe_engine.hpp
index d3862d4..5731b50 100644
--- a/engine/xe_engine.hpp
+++ b/engine/xe_engine.hpp
@@ -5,8 +5,9 @@
 #include "xe_renderer.hpp"
 #include "xe_camera.hpp"
 #include "xe_descriptors.hpp"
-#include <chrono> 
+#include "xe_image.hpp"
 
+#include <chrono> 
 #include <string>
 namespace xe {
 
@@ -26,7 +27,8 @@ class XeEngine {
 
     std::shared_ptr<XeModel> loadModelFromFile(const std::string &filename);
     std::shared_ptr<XeModel> loadModelFromData(std::vector<XeModel::Vertex> vertices, std::vector<uint32_t> indices);
-
+    std::shared_ptr<XeImage> loadImage(const std::string &filename);
+    
     bool beginFrame() { return xeRenderer.beginFrame(); }
     void endFrame() { xeRenderer.endFrame(); }
     void close() { vkDeviceWaitIdle(xeDevice.device()); }
@@ -36,7 +38,7 @@ class XeEngine {
 
   private:
 
-    void loadDescriptors();
+    void loadDescriptorPool();
 
     XeWindow xeWindow;
     XeDevice xeDevice;
@@ -49,7 +51,6 @@ class XeEngine {
     float FOV = 50.f;
 
     std::unique_ptr<XeDescriptorPool> xeDescriptorPool;
-    std::unique_ptr<XeDescriptorSetLayout> xeDescriptorSetLayout;
 
     friend class XeRenderSystem;
 };
-- 
cgit v1.2.3-freya