-
- Downloads
Merge branch 'develop' into 69-partikelsystem
# Conflicts: # projects/voxelization/src/Voxelization.cpp
No related branches found
No related tags found
Showing
- Doxyfile 4 additions, 3 deletionsDoxyfile
- include/vkcv/DescriptorWrites.hpp 3 additions, 1 deletioninclude/vkcv/DescriptorWrites.hpp
- include/vkcv/Event.hpp 8 additions, 4 deletionsinclude/vkcv/Event.hpp
- include/vkcv/Image.hpp 5 additions, 1 deletioninclude/vkcv/Image.hpp
- include/vkcv/Logger.hpp 1 addition, 1 deletioninclude/vkcv/Logger.hpp
- include/vkcv/Window.hpp 0 additions, 7 deletionsinclude/vkcv/Window.hpp
- modules/camera/include/vkcv/camera/CameraController.hpp 2 additions, 1 deletionmodules/camera/include/vkcv/camera/CameraController.hpp
- modules/camera/include/vkcv/camera/CameraManager.hpp 1 addition, 0 deletionsmodules/camera/include/vkcv/camera/CameraManager.hpp
- modules/camera/include/vkcv/camera/PilotCameraController.hpp 2 additions, 1 deletionmodules/camera/include/vkcv/camera/PilotCameraController.hpp
- modules/camera/include/vkcv/camera/TrackballCameraController.hpp 2 additions, 1 deletion.../camera/include/vkcv/camera/TrackballCameraController.hpp
- modules/camera/src/vkcv/camera/CameraManager.cpp 10 additions, 5 deletionsmodules/camera/src/vkcv/camera/CameraManager.cpp
- modules/camera/src/vkcv/camera/PilotCameraController.cpp 20 additions, 20 deletionsmodules/camera/src/vkcv/camera/PilotCameraController.cpp
- modules/camera/src/vkcv/camera/TrackballCameraController.cpp 27 additions, 31 deletionsmodules/camera/src/vkcv/camera/TrackballCameraController.cpp
- modules/gui/src/vkcv/gui/GUI.cpp 9 additions, 9 deletionsmodules/gui/src/vkcv/gui/GUI.cpp
- projects/voxelization/CMakeLists.txt 2 additions, 2 deletionsprojects/voxelization/CMakeLists.txt
- projects/voxelization/resources/shaders/lightInfo.inc 6 additions, 0 deletionsprojects/voxelization/resources/shaders/lightInfo.inc
- projects/voxelization/resources/shaders/shader.frag 9 additions, 26 deletionsprojects/voxelization/resources/shaders/shader.frag
- projects/voxelization/resources/shaders/shadowMapping.inc 16 additions, 0 deletionsprojects/voxelization/resources/shaders/shadowMapping.inc
- projects/voxelization/resources/shaders/tonemapping.comp 4 additions, 3 deletionsprojects/voxelization/resources/shaders/tonemapping.comp
- projects/voxelization/resources/shaders/voxel.inc 23 additions, 6 deletionsprojects/voxelization/resources/shaders/voxel.inc
Loading
Please register or sign in to comment