Skip to content
Snippets Groups Projects
Commit 056c3aac authored by Vanessa Karolek's avatar Vanessa Karolek
Browse files

Merge branch 'develop' into 42-kamera-trackballkamera and update all main.cpp... 

Merge branch 'develop' into 42-kamera-trackballkamera and update all main.cpp so that they can work with the current camera objects

# Conflicts:
#	modules/camera/include/vkcv/camera/Camera.hpp
#	modules/camera/include/vkcv/camera/CameraManager.hpp
#	modules/camera/src/vkcv/camera/Camera.cpp
#	modules/camera/src/vkcv/camera/CameraManager.cpp
#	projects/first_mesh/src/main.cpp
#	projects/first_triangle/src/main.cpp
parents 1bd7ed1e f6111135
No related branches found
No related tags found
1 merge request!35Resolve "Kamera - Trackballkamera"
Pipeline #25671 canceled
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 441 additions and 135 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment