Merge branch 'develop' into 89-mehrere-fenster-abhangigkeiten-von-core-zu-fenster-swapchain-etc
# Conflicts: # projects/mesh_shader/.gitignore # src/vkcv/Window.cpp
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 4 additions, 4 deletions.gitlab-ci.yml
- .gitmodules 0 additions, 3 deletions.gitmodules
- include/vkcv/Buffer.hpp 2 additions, 2 deletionsinclude/vkcv/Buffer.hpp
- include/vkcv/BufferManager.hpp 1 addition, 1 deletioninclude/vkcv/BufferManager.hpp
- include/vkcv/Core.hpp 10 additions, 2 deletionsinclude/vkcv/Core.hpp
- include/vkcv/DrawcallRecording.hpp 13 additions, 2 deletionsinclude/vkcv/DrawcallRecording.hpp
- include/vkcv/Logger.hpp 4 additions, 2 deletionsinclude/vkcv/Logger.hpp
- modules/asset_loader/CMakeLists.txt 2 additions, 2 deletionsmodules/asset_loader/CMakeLists.txt
- modules/asset_loader/include/vkcv/asset/asset_loader.hpp 215 additions, 93 deletionsmodules/asset_loader/include/vkcv/asset/asset_loader.hpp
- modules/asset_loader/src/vkcv/asset/asset_loader.cpp 756 additions, 359 deletionsmodules/asset_loader/src/vkcv/asset/asset_loader.cpp
- modules/camera/include/vkcv/camera/PilotCameraController.hpp 0 additions, 36 deletionsmodules/camera/include/vkcv/camera/PilotCameraController.hpp
- modules/camera/src/vkcv/camera/CameraManager.cpp 2 additions, 2 deletionsmodules/camera/src/vkcv/camera/CameraManager.cpp
- modules/camera/src/vkcv/camera/PilotCameraController.cpp 16 additions, 47 deletionsmodules/camera/src/vkcv/camera/PilotCameraController.cpp
- modules/camera/src/vkcv/camera/TrackballCameraController.cpp 6 additions, 11 deletionsmodules/camera/src/vkcv/camera/TrackballCameraController.cpp
- modules/shader_compiler/src/vkcv/shader/GLSLCompiler.cpp 5 additions, 5 deletionsmodules/shader_compiler/src/vkcv/shader/GLSLCompiler.cpp
- projects/CMakeLists.txt 1 addition, 0 deletionsprojects/CMakeLists.txt
- projects/first_mesh/src/main.cpp 0 additions, 1 deletionprojects/first_mesh/src/main.cpp
- projects/first_triangle/src/main.cpp 0 additions, 2 deletionsprojects/first_triangle/src/main.cpp
- projects/indirect_dispatch/.gitignore 1 addition, 0 deletionsprojects/indirect_dispatch/.gitignore
- projects/indirect_dispatch/CMakeLists.txt 44 additions, 0 deletionsprojects/indirect_dispatch/CMakeLists.txt
Loading
Please register or sign in to comment