From 9b7d14361904a9c2bceb8de335fd5da169fabd59 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Fri, 23 Sep 2022 13:20:30 -0400 Subject: abstract user input, refactor #include's --- engine/xe_engine.hpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'engine/xe_engine.hpp') diff --git a/engine/xe_engine.hpp b/engine/xe_engine.hpp index d86c6a9..422f4c8 100644 --- a/engine/xe_engine.hpp +++ b/engine/xe_engine.hpp @@ -1,14 +1,19 @@ #pragma once -#include "xe_window.hpp" #include "xe_device.hpp" #include "xe_renderer.hpp" #include "xe_camera.hpp" #include "xe_descriptors.hpp" #include "xe_image.hpp" +#include "xe_input.hpp" +#include "xe_sound.hpp" #include #include +#include +#include +#include + namespace xe { class XeEngine { @@ -22,7 +27,7 @@ class XeEngine { XeEngine(const XeEngine&) = delete; XeEngine operator=(const XeEngine&) = delete; - XeWindow& getWindow() {return xeWindow;} + XeInput& getInput() {return xeInput;} XeCamera& getCamera() {return xeCamera;} std::shared_ptr loadModelFromFile(const std::string &filename); @@ -44,6 +49,7 @@ class XeEngine { XeDevice xeDevice; XeRenderer xeRenderer; XeCamera xeCamera; + XeInput xeInput; std::chrono::_V2::system_clock::time_point currentTime; float frameTime; -- cgit v1.2.3-freya