From 6a001c4840140e71ba1672a4576d52d1a62c0922 Mon Sep 17 00:00:00 2001
From: tylermurphy534 <tylermurphy534@gmail.com>
Date: Sat, 1 Oct 2022 14:35:16 -0400
Subject: rename src files, move .o to /bin

---
 engine/xe_render_system.cpp | 5 ++---
 engine/xe_render_system.hpp | 7 ++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'engine')

diff --git a/engine/xe_render_system.cpp b/engine/xe_render_system.cpp
index 770bfd5..ff745e6 100644
--- a/engine/xe_render_system.cpp
+++ b/engine/xe_render_system.cpp
@@ -3,7 +3,6 @@
 namespace xe {
 
 RenderSystem::RenderSystem(
-  Engine &xeEngine,
   std::string vert,
   std::string frag,
   std::map<uint32_t, uint32_t> uniformBindings,
@@ -13,8 +12,8 @@ RenderSystem::RenderSystem(
   bool cullingEnabled,
   std::vector<VkVertexInputAttributeDescription> attributeDescptions,
   uint32_t vertexSize
-) : xeDevice{xeEngine.xeDevice}, 
-    xeRenderer{xeEngine.xeRenderer},
+) : xeDevice{Engine::getInstance()->xeDevice}, 
+    xeRenderer{Engine::getInstance()->xeRenderer},
     pushCunstantDataSize{pushCunstantDataSize},
     uniformBindings{uniformBindings},
     imageBindings{imageBindings},
diff --git a/engine/xe_render_system.hpp b/engine/xe_render_system.hpp
index bbf96f8..a07b5c0 100644
--- a/engine/xe_render_system.hpp
+++ b/engine/xe_render_system.hpp
@@ -22,7 +22,7 @@ class RenderSystem {
   
     class Builder {
       public:
-        Builder(Engine &xeEngine, std::string vert, std::string frag) : xeEngine{xeEngine}, vert{vert}, frag{frag} {}
+        Builder(std::string vert, std::string frag) : vert{vert}, frag{frag} {}
 
         Builder& addVertexBindingf(uint32_t binding, uint32_t dimension, uint32_t offset){
           if(dimension == 1)
@@ -75,7 +75,7 @@ class RenderSystem {
         }
 
         std::unique_ptr<RenderSystem> build() {
-          return std::make_unique<RenderSystem>(xeEngine, std::move(vert), std::move(frag), std::move(uniformBindings), std::move(imageBindings), std::move(imageArrayBindings), std::move(pushCunstantDataSize), std::move(cullingEnabled), std::move(attributeDescptions), std::move(vertexSize));
+          return std::make_unique<RenderSystem>(std::move(vert), std::move(frag), std::move(uniformBindings), std::move(imageBindings), std::move(imageArrayBindings), std::move(pushCunstantDataSize), std::move(cullingEnabled), std::move(attributeDescptions), std::move(vertexSize));
         }
 
       private:
@@ -92,12 +92,9 @@ class RenderSystem {
         std::string frag;
 
         bool cullingEnabled{false};
-
-        Engine &xeEngine;
     };
 
     RenderSystem(
-      Engine &xeEngine,
       std::string vert,
       std::string frag,
       std::map<uint32_t, uint32_t> uniformBindings,
-- 
cgit v1.2.3-freya