From f81d611f0e298baffad68d83f208e2306fe38739 Mon Sep 17 00:00:00 2001 From: tylermurphy534 Date: Sat, 24 Sep 2022 21:16:13 -0400 Subject: remove Xe From engine class names --- src/first_app.cpp | 14 +++++++------- src/first_app.hpp | 4 ++-- src/keyboard_movement_controller.cpp | 2 +- src/keyboard_movement_controller.hpp | 2 +- src/simple_renderer.cpp | 6 +++--- src/simple_renderer.hpp | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/first_app.cpp b/src/first_app.cpp index 423012a..5b2d23d 100755 --- a/src/first_app.cpp +++ b/src/first_app.cpp @@ -27,16 +27,16 @@ FirstApp::~FirstApp() {} void FirstApp::run() { - std::shared_ptr image = xeEngine.loadImage("res/image/texture.png"); - std::shared_ptr image2 = xeEngine.loadImage("res/image/scaly.png"); + std::shared_ptr image = xeEngine.loadImage("res/image/texture.png"); + std::shared_ptr image2 = xeEngine.loadImage("res/image/ltt."); SimpleRenderer renderer{xeEngine, image.get()}; - xe::XeSound sound{"res/sound/when_the_world_ends.wav"}; + xe::Sound sound{"res/sound/when_the_world_ends.wav"}; sound.setLooping(true); sound.play(); - auto viewerObject = xe::XeGameObject::createGameObject(); + auto viewerObject = xe::GameObject::createGameObject(); viewerObject.transform.translation = {-7.f, 3.f, -7.f}; viewerObject.transform.rotation.y = glm::radians(45.f); KeyboardMovementController cameraController{}; @@ -60,15 +60,15 @@ void FirstApp::run() { } void FirstApp::loadGameObjects() { - std::shared_ptr xeModel = xeEngine.loadModelFromFile("res/models/stanford-dragon.obj"); + std::shared_ptr xeModel = xeEngine.loadModelFromFile("res/models/stanford-dragon.obj"); - auto dragon = xe::XeGameObject::createGameObject(); + auto dragon = xe::GameObject::createGameObject(); dragon.model = xeModel; dragon.transform.translation = {.0f, .0f, 2.5f}; dragon.transform.scale = {.5f, .5f, .5f}; gameObjects.push_back(std::move(dragon)); - auto dragon2 = xe::XeGameObject::createGameObject(); + auto dragon2 = xe::GameObject::createGameObject(); dragon2.model = xeModel; dragon2.transform.translation = {5.0f, .0f, -1.5f}; dragon2.transform.rotation.y = glm::radians(90.f); diff --git a/src/first_app.hpp b/src/first_app.hpp index d8942ab..d7beb78 100755 --- a/src/first_app.hpp +++ b/src/first_app.hpp @@ -26,8 +26,8 @@ class FirstApp { void loadGameObjects(); - xe::XeEngine xeEngine; + xe::Engine xeEngine; - std::vector gameObjects; + std::vector gameObjects; }; } \ No newline at end of file diff --git a/src/keyboard_movement_controller.cpp b/src/keyboard_movement_controller.cpp index 325693e..d1613ee 100644 --- a/src/keyboard_movement_controller.cpp +++ b/src/keyboard_movement_controller.cpp @@ -6,7 +6,7 @@ namespace app { -void KeyboardMovementController::moveInPlaneXZ(GLFWwindow* window, float dt, xe::XeGameObject& gameObject) { +void KeyboardMovementController::moveInPlaneXZ(GLFWwindow* window, float dt, xe::GameObject& gameObject) { glm::vec3 rotate{0}; if(glfwGetKey(window, keys.lookRight) == GLFW_PRESS) rotate.y += 1.f; if(glfwGetKey(window, keys.lookLeft) == GLFW_PRESS) rotate.y -= 1.f; diff --git a/src/keyboard_movement_controller.hpp b/src/keyboard_movement_controller.hpp index b3e3a15..0df841e 100644 --- a/src/keyboard_movement_controller.hpp +++ b/src/keyboard_movement_controller.hpp @@ -21,7 +21,7 @@ namespace app { int lookDown = GLFW_KEY_DOWN; }; - void moveInPlaneXZ(GLFWwindow* window, float dt, xe::XeGameObject& gameObject); + void moveInPlaneXZ(GLFWwindow* window, float dt, xe::GameObject& gameObject); KeyMappings keys{}; float moveSpeed{3.f}; diff --git a/src/simple_renderer.cpp b/src/simple_renderer.cpp index 921019a..43c933d 100644 --- a/src/simple_renderer.cpp +++ b/src/simple_renderer.cpp @@ -5,8 +5,8 @@ namespace app { -SimpleRenderer::SimpleRenderer(xe::XeEngine &xeEngine, xe::XeImage *xeImage) { - xeRenderSystem = xe::XeRenderSystem::Builder(xeEngine, "res/shaders/simple_shader.vert.spv", "res/shaders/simple_shader.frag.spv") +SimpleRenderer::SimpleRenderer(xe::Engine &xeEngine, xe::Image *xeImage) { + xeRenderSystem = xe::RenderSystem::Builder(xeEngine, "res/shaders/simple_shader.vert.spv", "res/shaders/simple_shader.frag.spv") .addPushConstant(sizeof(PushConstant)) .addUniformBinding(0, sizeof(UniformBuffer)) .addTextureBinding(1, xeImage) @@ -14,7 +14,7 @@ SimpleRenderer::SimpleRenderer(xe::XeEngine &xeEngine, xe::XeImage *xeImage) { .build(); } -void SimpleRenderer::render(std::vector &gameObjects, xe::XeCamera &xeCamera, xe::XeImage *xeImage) { +void SimpleRenderer::render(std::vector &gameObjects, xe::Camera &xeCamera, xe::Image *xeImage) { xeRenderSystem->loadTexture(1, xeImage); diff --git a/src/simple_renderer.hpp b/src/simple_renderer.hpp index d9be7b2..59c1e60 100644 --- a/src/simple_renderer.hpp +++ b/src/simple_renderer.hpp @@ -19,17 +19,17 @@ class SimpleRenderer { public: - SimpleRenderer(xe::XeEngine &xeEngine, xe::XeImage *xeImage); + SimpleRenderer(xe::Engine &xeEngine, xe::Image *xeImage); ~SimpleRenderer() {}; SimpleRenderer(const SimpleRenderer&) = delete; SimpleRenderer operator=(const SimpleRenderer&) = delete; - void render(std::vector &gameObjects, xe::XeCamera &xeCamera, xe::XeImage *xeImage); + void render(std::vector &gameObjects, xe::Camera &xeCamera, xe::Image *xeImage); private: - std::unique_ptr xeRenderSystem; + std::unique_ptr xeRenderSystem; }; -- cgit v1.2.3-freya