From 6ede8534cecac382631bd341292c3aae4a6e4582 Mon Sep 17 00:00:00 2001
From: Vanessa Karolek <vaka1997@uni-koblenz.de>
Date: Tue, 13 Jul 2021 18:37:25 +0200
Subject: [PATCH] [#94] add ppm texture as png file, load png file
---
projects/saf_r/src/main.cpp | 3 +--
projects/saf_r/textures/texture.png | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 projects/saf_r/textures/texture.png
diff --git a/projects/saf_r/src/main.cpp b/projects/saf_r/src/main.cpp
index d683a01b..97de405f 100644
--- a/projects/saf_r/src/main.cpp
+++ b/projects/saf_r/src/main.cpp
@@ -153,13 +153,12 @@ int main(int argc, const char** argv) {
{ "VK_KHR_swapchain" }
);
- vkcv::asset::TextureData texData = vkcv::asset::loadTexture("textures/texture.ppm");
+ vkcv::asset::TextureData texData = vkcv::asset::loadTexture("textures/texture.png");
vkcv::Image texture = core.createImage(vk::Format::eR8G8B8A8Srgb, 800, 600);
texture.fill( texData.data.data());
texture.generateMipChainImmediate();
texture.switchLayout(vk::ImageLayout::eShaderReadOnlyOptimal);
-
const auto& context = core.getContext();
auto triangleIndexBuffer = core.createBuffer<uint16_t>(vkcv::BufferType::INDEX, 3, vkcv::BufferMemoryType::DEVICE_LOCAL);
diff --git a/projects/saf_r/textures/texture.png b/projects/saf_r/textures/texture.png
new file mode 100644
index 00000000..21218eb9
--- /dev/null
+++ b/projects/saf_r/textures/texture.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96ed4d23207c69c92d5b53f595bc755ed3d8476ca379bf60de9d174f92fccf3e
+size 33386
--
GitLab