From 4284c4d9592e846d277383a1e3088c72717bd677 Mon Sep 17 00:00:00 2001
From: Alexander Gauggel <agauggel@uni-koblenz.de>
Date: Tue, 6 Jul 2021 14:42:10 +0200
Subject: [PATCH] [#87] Bunny now upright
---
projects/mesh_shader/resources/Bunny/Bunny.glb | 3 +++
projects/mesh_shader/resources/Bunny/Bunny.gltf | 3 ---
projects/mesh_shader/src/main.cpp | 6 ++++--
3 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 projects/mesh_shader/resources/Bunny/Bunny.glb
delete mode 100644 projects/mesh_shader/resources/Bunny/Bunny.gltf
diff --git a/projects/mesh_shader/resources/Bunny/Bunny.glb b/projects/mesh_shader/resources/Bunny/Bunny.glb
new file mode 100644
index 00000000..181f1f92
--- /dev/null
+++ b/projects/mesh_shader/resources/Bunny/Bunny.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8bc6fab11929ca11bdf4e892ffb03b621b10307f705cdea17d82d3dee3b9aae
+size 4045836
diff --git a/projects/mesh_shader/resources/Bunny/Bunny.gltf b/projects/mesh_shader/resources/Bunny/Bunny.gltf
deleted file mode 100644
index 3b5eefbc..00000000
--- a/projects/mesh_shader/resources/Bunny/Bunny.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97970b941a690d4538c8d8989dd5a8bfae180bb117ba7e22c59e0a4d119e5a2f
-size 5395743
diff --git a/projects/mesh_shader/src/main.cpp b/projects/mesh_shader/src/main.cpp
index a956d6f3..884581ef 100644
--- a/projects/mesh_shader/src/main.cpp
+++ b/projects/mesh_shader/src/main.cpp
@@ -38,7 +38,7 @@ int main(int argc, const char** argv) {
const vk::Device& device = context.getDevice();
vkcv::asset::Scene mesh;
- const char* path = argc > 1 ? argv[1] : "resources/Bunny/Bunny.gltf";
+ const char* path = argc > 1 ? argv[1] : "resources/Bunny/Bunny.glb";
vkcv::asset::loadScene(path, mesh);
assert(!mesh.vertexGroups.empty());
@@ -207,7 +207,9 @@ int main(int argc, const char** argv) {
start = end;
cameraManager.update(0.000001 * static_cast<double>(deltatime.count()));
- glm::mat4 mvp = cameraManager.getActiveCamera().getMVP();
+
+ glm::mat4 modelMatrix = *reinterpret_cast<glm::mat4*>(&mesh.meshes.front().modelMatrix);
+ glm::mat4 mvp = cameraManager.getActiveCamera().getMVP() * modelMatrix;
vkcv::PushConstantData pushConstantData((void*)&mvp, sizeof(glm::mat4));
--
GitLab