Merge branch '60-kamera-steuerung-mittels-controller' into 69-partikelsystem
# Conflicts: # projects/CMakeLists.txt
Showing
- .gitignore 3 additions, 4 deletions.gitignore
- .gitlab-ci.yml 3 additions, 3 deletions.gitlab-ci.yml
- .gitmodules 7 additions, 1 deletion.gitmodules
- CMakeLists.txt 3 additions, 3 deletionsCMakeLists.txt
- config/Sources.cmake 2 additions, 3 deletionsconfig/Sources.cmake
- include/vkcv/BufferManager.hpp 3 additions, 0 deletionsinclude/vkcv/BufferManager.hpp
- include/vkcv/Core.hpp 24 additions, 15 deletionsinclude/vkcv/Core.hpp
- include/vkcv/Event.hpp 47 additions, 12 deletionsinclude/vkcv/Event.hpp
- include/vkcv/Image.hpp 10 additions, 4 deletionsinclude/vkcv/Image.hpp
- include/vkcv/PipelineConfig.hpp 5 additions, 21 deletionsinclude/vkcv/PipelineConfig.hpp
- include/vkcv/ShaderProgram.hpp 1 addition, 1 deletioninclude/vkcv/ShaderProgram.hpp
- include/vkcv/Swapchain.hpp 32 additions, 31 deletionsinclude/vkcv/Swapchain.hpp
- include/vkcv/VertexLayout.hpp 1 addition, 1 deletioninclude/vkcv/VertexLayout.hpp
- include/vkcv/Window.hpp 38 additions, 13 deletionsinclude/vkcv/Window.hpp
- modules/CMakeLists.txt 2 additions, 0 deletionsmodules/CMakeLists.txt
- modules/asset_loader/include/vkcv/asset/asset_loader.hpp 104 additions, 35 deletionsmodules/asset_loader/include/vkcv/asset/asset_loader.hpp
- modules/asset_loader/src/vkcv/asset/asset_loader.cpp 308 additions, 149 deletionsmodules/asset_loader/src/vkcv/asset/asset_loader.cpp
- modules/camera/CMakeLists.txt 5 additions, 2 deletionsmodules/camera/CMakeLists.txt
- modules/camera/include/vkcv/camera/Camera.hpp 152 additions, 54 deletionsmodules/camera/include/vkcv/camera/Camera.hpp
- modules/camera/include/vkcv/camera/CameraController.hpp 71 additions, 0 deletionsmodules/camera/include/vkcv/camera/CameraController.hpp
Loading
Please register or sign in to comment