From 68a9b401779ed02d2bb299fdeb64cdabc7c874a4 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Tue, 30 Aug 2022 13:45:01 +0200
Subject: [PATCH] Reduced code in first triangle even more
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
projects/first_triangle/src/main.cpp | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/projects/first_triangle/src/main.cpp b/projects/first_triangle/src/main.cpp
index aef3ffde..7a8fa04b 100644
--- a/projects/first_triangle/src/main.cpp
+++ b/projects/first_triangle/src/main.cpp
@@ -5,7 +5,6 @@
#include <GLFW/glfw3.h>
#include <vkcv/camera/CameraManager.hpp>
#include <vkcv/shader/GLSLCompiler.hpp>
-#include <chrono>
int main(int argc, const char** argv) {
const char* applicationName = "First Triangle";
@@ -35,8 +34,7 @@ int main(int argc, const char** argv) {
{ vk::Format::eUndefined }
);
- if (!trianglePass)
- {
+ if (!trianglePass) {
std::cout << "Error. Could not create renderpass. Exiting." << std::endl;
return EXIT_FAILURE;
}
@@ -60,8 +58,7 @@ int main(int argc, const char** argv) {
)
);
- if (!trianglePipeline)
- {
+ if (!trianglePipeline) {
std::cout << "Error. Could not create graphics pipeline. Exiting." << std::endl;
return EXIT_FAILURE;
}
@@ -74,12 +71,9 @@ int main(int argc, const char** argv) {
const vkcv::ImageHandle swapchainInput = vkcv::ImageHandle::createSwapchainImageHandle();
vkcv::camera::CameraManager cameraManager(window);
- uint32_t camIndex0 = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT);
- uint32_t camIndex1 = cameraManager.addCamera(vkcv::camera::ControllerType::TRACKBALL);
+ uint32_t camIndex = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT);
- cameraManager.getCamera(camIndex0).setPosition(glm::vec3(0, 0, -2));
- cameraManager.getCamera(camIndex1).setPosition(glm::vec3(0.0f, 0.0f, 0.0f));
- cameraManager.getCamera(camIndex1).setCenter(glm::vec3(0.0f, 0.0f, -1.0f));
+ cameraManager.getCamera(camIndex).setPosition(glm::vec3(0, 0, -2));
core.run([&](const vkcv::WindowHandle &windowHandle, double t, double dt,
uint32_t swapchainWidth, uint32_t swapchainHeight) {
--
GitLab