diff options
| author | tylermurphy534 <tylermurphy534@gmail.com> | 2022-09-25 12:13:07 -0400 |
|---|---|---|
| committer | tylermurphy534 <tylermurphy534@gmail.com> | 2022-09-25 12:13:07 -0400 |
| commit | ffd2d8220d57587da9a73183f9aa1bdaff303f3f (patch) | |
| tree | 32202311cfb74c2a2d522b7192480bed87b1cab8 /engine/xe_engine.hpp | |
| parent | vertex data no longer hard coded (diff) | |
| parent | delete unused folder (diff) | |
| download | minecraftvulkan-ffd2d8220d57587da9a73183f9aa1bdaff303f3f.tar.gz minecraftvulkan-ffd2d8220d57587da9a73183f9aa1bdaff303f3f.tar.bz2 minecraftvulkan-ffd2d8220d57587da9a73183f9aa1bdaff303f3f.zip | |
merge in input
Diffstat (limited to 'engine/xe_engine.hpp')
| -rw-r--r-- | engine/xe_engine.hpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engine/xe_engine.hpp b/engine/xe_engine.hpp index aa1c774..28974cb 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 Engine { @@ -22,7 +27,7 @@ class Engine { Engine(const Engine&) = delete; Engine operator=(const Engine&) = delete; - Window& getWindow() {return xeWindow;} + Input& getInput() {return xeInput;} Camera& getCamera() {return xeCamera;} std::shared_ptr<Model> loadModelFromFile(const std::string &filename); @@ -44,6 +49,7 @@ class Engine { Device xeDevice; Renderer xeRenderer; Camera xeCamera; + Input xeInput; std::chrono::_V2::system_clock::time_point currentTime; float frameTime; |