1 files changed, 17 insertions, 17 deletions

diff --git a/engine/xe_engine.hpp b/engine/xe_engine.hpp
index 422f4c8..28974cb 100644
--- a/engine/xe_engine.hpp
+++ b/engine/xe_engine.hpp
@@ -16,23 +16,23 @@
 
 namespace xe {
 
-class XeEngine {
+class Engine {
 
   public:
 
-    XeEngine(int width, int height, std::string name);
+    Engine(int width, int height, std::string name);
 
-    ~XeEngine();
+    ~Engine();
 
-    XeEngine(const XeEngine&) = delete;
-    XeEngine operator=(const XeEngine&) = delete;
+    Engine(const Engine&) = delete;
+    Engine operator=(const Engine&) = delete;
 
-    XeInput& getInput() {return xeInput;}
-    XeCamera& getCamera() {return xeCamera;}
+    Input& getInput() {return xeInput;}
+    Camera& getCamera() {return xeCamera;}
 
-    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);
+    std::shared_ptr<Model> loadModelFromFile(const std::string &filename);
+    std::shared_ptr<Model> loadModelFromData(std::vector<float> vertexData, uint32_t vertexSize, std::vector<uint32_t> indices);
+    std::shared_ptr<Image> loadImageFromFile(const std::string &filename);
     
     bool beginFrame() { return xeRenderer.beginFrame(); }
     void endFrame() { xeRenderer.endFrame(); }
@@ -45,20 +45,20 @@ class XeEngine {
 
     void loadDescriptorPool();
 
-    XeWindow xeWindow;
-    XeDevice xeDevice;
-    XeRenderer xeRenderer;
-    XeCamera xeCamera;
-    XeInput xeInput;
+    Window xeWindow;
+    Device xeDevice;
+    Renderer xeRenderer;
+    Camera xeCamera;
+    Input xeInput;
 
     std::chrono::_V2::system_clock::time_point currentTime;
     float frameTime;
 
     float FOV = 50.f;
 
-    std::unique_ptr<XeDescriptorPool> xeDescriptorPool;
+    std::unique_ptr<DescriptorPool> xeDescriptorPool;
 
-    friend class XeRenderSystem;
+    friend class RenderSystem;
 };
 
 }
\ No newline at end of file