diff options
author | tylermurphy534 <tylermurphy534@gmail.com> | 2022-09-20 22:02:58 -0400 |
---|---|---|
committer | tylermurphy534 <tylermurphy534@gmail.com> | 2022-09-20 22:02:58 -0400 |
commit | 249f6c9fa384e9e3265cafb1357e502ea7db72f7 (patch) | |
tree | 0c80d9a375453e9178dd5d45807302b00f57bd59 /src/first_app.cpp | |
parent | destroy pipline layout (diff) | |
download | minecraftvulkan-249f6c9fa384e9e3265cafb1357e502ea7db72f7.tar.gz minecraftvulkan-249f6c9fa384e9e3265cafb1357e502ea7db72f7.tar.bz2 minecraftvulkan-249f6c9fa384e9e3265cafb1357e502ea7db72f7.zip |
texture loading
Diffstat (limited to 'src/first_app.cpp')
-rwxr-xr-x | src/first_app.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/first_app.cpp b/src/first_app.cpp index cff92db..40a5681 100755 --- a/src/first_app.cpp +++ b/src/first_app.cpp @@ -14,6 +14,8 @@ #include <glm/gtc/constants.hpp> #include <array> +#include <string> + namespace app { FirstApp::FirstApp() : xeEngine{WIDTH, HEIGHT, "Hello, Vulkan!"} { @@ -24,7 +26,12 @@ FirstApp::~FirstApp() {} void FirstApp::run() { - SimpleRenderer renderer{xeEngine}; + const std::string s = "res/image/texture.png"; + + std::shared_ptr<xe::XeImage> image = xeEngine.loadImage("res/image/texture.png"); + std::shared_ptr<xe::XeImage> image2 = xeEngine.loadImage("res/image/scaly.png"); + + SimpleRenderer renderer{xeEngine, image.get()}; auto viewerObject = xe::XeGameObject::createGameObject(); viewerObject.transform.translation = {-7.f, 3.f, -7.f}; @@ -39,7 +46,7 @@ void FirstApp::run() { xeEngine.getCamera().setViewYXZ(viewerObject.transform.translation, viewerObject.transform.rotation); if(xeEngine.beginFrame()) { - renderer.render(gameObjects, xeEngine.getCamera()); + renderer.render(gameObjects, xeEngine.getCamera(), image2.get()); xeEngine.endFrame(); } } |