Skip to content
Snippets Groups Projects
Verified Commit 96b15160 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

[#73] Fixed initial camera projection matrix

parent fa6e2c1e
No related branches found
No related tags found
1 merge request!60Resolve "Runtime shader compilation"
Pipeline #25740 passed
...@@ -105,10 +105,8 @@ namespace vkcv::camera { ...@@ -105,10 +105,8 @@ namespace vkcv::camera {
/** /**
* @brief The constructor of the #CameraManager. * @brief The constructor of the #CameraManager.
* @param[in] window The window. * @param[in] window The window.
* @param[in] width The width of the window.
* @param[in] height The height of the window.
*/ */
CameraManager(Window &window, float width, float height); CameraManager(Window &window);
/** /**
* @brief The destructor of the #CameraManager. Destroying the #CameraManager leads to deletion of all stored * @brief The destructor of the #CameraManager. Destroying the #CameraManager leads to deletion of all stored
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
namespace vkcv::camera { namespace vkcv::camera {
CameraManager::CameraManager(Window &window, float width, float height) CameraManager::CameraManager(Window& window)
: m_window(window) : m_window(window)
{ {
bindCameraToEvents(); bindCameraToEvents();
...@@ -82,8 +82,10 @@ namespace vkcv::camera { ...@@ -82,8 +82,10 @@ namespace vkcv::camera {
} }
uint32_t CameraManager::addCamera(ControllerType controllerType) { uint32_t CameraManager::addCamera(ControllerType controllerType) {
const float ratio = static_cast<float>(m_window.getWidth()) / static_cast<float>(m_window.getHeight());
Camera camera; Camera camera;
camera.setPerspective(glm::radians(60.0f), m_window.getWidth() / m_window.getHeight(), 0.1f, 10.0f); camera.setPerspective(glm::radians(60.0f), ratio, 0.1f, 10.0f);
return addCamera(controllerType, camera); return addCamera(controllerType, camera);
} }
......
...@@ -18,7 +18,7 @@ int main(int argc, const char** argv) { ...@@ -18,7 +18,7 @@ int main(int argc, const char** argv) {
true true
); );
vkcv::camera::CameraManager cameraManager(window, windowWidth, windowHeight); vkcv::camera::CameraManager cameraManager(window);
uint32_t camIndex = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT); uint32_t camIndex = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT);
uint32_t camIndex2 = cameraManager.addCamera(vkcv::camera::ControllerType::TRACKBALL); uint32_t camIndex2 = cameraManager.addCamera(vkcv::camera::ControllerType::TRACKBALL);
......
...@@ -146,7 +146,7 @@ int main(int argc, const char** argv) { ...@@ -146,7 +146,7 @@ int main(int argc, const char** argv) {
vkcv::DescriptorSetUsage descriptorUsage(0, core.getDescriptorSet(descriptorSet).vulkanHandle); vkcv::DescriptorSetUsage descriptorUsage(0, core.getDescriptorSet(descriptorSet).vulkanHandle);
vkcv::DrawcallInfo drawcall(renderMesh, { descriptorUsage }); vkcv::DrawcallInfo drawcall(renderMesh, { descriptorUsage });
vkcv::camera::CameraManager cameraManager(window, windowWidth, windowHeight); vkcv::camera::CameraManager cameraManager(window);
uint32_t camIndex0 = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT); uint32_t camIndex0 = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT);
uint32_t camIndex1 = cameraManager.addCamera(vkcv::camera::ControllerType::TRACKBALL); uint32_t camIndex1 = cameraManager.addCamera(vkcv::camera::ControllerType::TRACKBALL);
......
...@@ -169,7 +169,7 @@ int main(int argc, const char** argv) { ...@@ -169,7 +169,7 @@ int main(int argc, const char** argv) {
const vkcv::ImageHandle swapchainInput = vkcv::ImageHandle::createSwapchainImageHandle(); const vkcv::ImageHandle swapchainInput = vkcv::ImageHandle::createSwapchainImageHandle();
vkcv::camera::CameraManager cameraManager(window, windowWidth, windowHeight); vkcv::camera::CameraManager cameraManager(window);
uint32_t camIndex = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT); uint32_t camIndex = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT);
uint32_t camIndex2 = cameraManager.addCamera(vkcv::camera::ControllerType::TRACKBALL); uint32_t camIndex2 = cameraManager.addCamera(vkcv::camera::ControllerType::TRACKBALL);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment