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 /src/first_app.cpp | |
| 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 'src/first_app.cpp')
| -rwxr-xr-x | src/first_app.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/first_app.cpp b/src/first_app.cpp index 3de0a0b..b09134b 100755 --- a/src/first_app.cpp +++ b/src/first_app.cpp @@ -1,22 +1,5 @@ #include "first_app.hpp" -#include "xe_camera.hpp" -#include "xe_engine.hpp" -#include "xe_game_object.hpp" -#include "xe_model.hpp" -#include "xe_render_system.hpp" -#include "keyboard_movement_controller.hpp" -#include "simple_renderer.hpp" -#include "xe_sound.hpp" - -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include <glm/glm.hpp> -#include <glm/gtc/constants.hpp> -#include <array> - -#include <string> - namespace app { FirstApp::FirstApp() : xeEngine{WIDTH, HEIGHT, "Xenon Vulkan Engine"} { @@ -45,7 +28,7 @@ void FirstApp::run() { float frameTime = xeEngine.getFrameTime(); - cameraController.moveInPlaneXZ(xeEngine.getWindow().getGLFWwindow(), frameTime, viewerObject); + cameraController.update(xeEngine.getInput(), viewerObject, frameTime); xeEngine.getCamera().setViewYXZ(viewerObject.transform.translation, viewerObject.transform.rotation); if(xeEngine.beginFrame()) { |