summaryrefslogtreecommitdiff
path: root/engine/xe_engine.hpp
diff options
context:
space:
mode:
authorTyler Murphy <tylermurphy534@gmail.com>2022-09-23 13:20:30 -0400
committerTyler Murphy <tylermurphy534@gmail.com>2022-09-23 13:20:30 -0400
commit9b7d14361904a9c2bceb8de335fd5da169fabd59 (patch)
tree231348855310530145f8ce4bb35931d36bd74438 /engine/xe_engine.hpp
parentdelete old files (diff)
downloadminecraftvulkan-9b7d14361904a9c2bceb8de335fd5da169fabd59.tar.gz
minecraftvulkan-9b7d14361904a9c2bceb8de335fd5da169fabd59.tar.bz2
minecraftvulkan-9b7d14361904a9c2bceb8de335fd5da169fabd59.zip
abstract user input, refactor #include's
Diffstat (limited to '')
-rw-r--r--engine/xe_engine.hpp10
1 files changed, 8 insertions, 2 deletions
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 <chrono>
#include <string>
+#include <iostream>
+#include <AL/alc.h>
+#include <AL/alut.h>
+
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<XeModel> 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;