Merge branch 'develop' into 89-mehrere-fenster-abhangigkeiten-von-core-zu-fenster-swapchain-etc
# Conflicts: # projects/first_mesh/src/main.cpp # projects/first_scene/src/main.cpp # projects/first_triangle/src/main.cpp # projects/mesh_shader/src/main.cpp # projects/particle_simulation/src/main.cpp # projects/voxelization/src/main.cpp
No related branches found
No related tags found
Showing
- projects/voxelization/assets/shaders/voxelVisualisation.geom 0 additions, 0 deletionsprojects/voxelization/assets/shaders/voxelVisualisation.geom
- projects/voxelization/assets/shaders/voxelVisualisation.vert 0 additions, 0 deletionsprojects/voxelization/assets/shaders/voxelVisualisation.vert
- projects/voxelization/assets/shaders/voxelization.frag 0 additions, 0 deletionsprojects/voxelization/assets/shaders/voxelization.frag
- projects/voxelization/assets/shaders/voxelization.geom 0 additions, 0 deletionsprojects/voxelization/assets/shaders/voxelization.geom
- projects/voxelization/assets/shaders/voxelization.vert 0 additions, 0 deletionsprojects/voxelization/assets/shaders/voxelization.vert
- projects/voxelization/assets/triangle/Triangle.bin 0 additions, 0 deletionsprojects/voxelization/assets/triangle/Triangle.bin
- projects/voxelization/assets/triangle/Triangle.blend 0 additions, 0 deletionsprojects/voxelization/assets/triangle/Triangle.blend
- projects/voxelization/assets/triangle/Triangle.glb 0 additions, 0 deletionsprojects/voxelization/assets/triangle/Triangle.glb
- projects/voxelization/assets/triangle/Triangle.gltf 0 additions, 0 deletionsprojects/voxelization/assets/triangle/Triangle.gltf
- projects/voxelization/src/BloomAndFlares.cpp 6 additions, 6 deletionsprojects/voxelization/src/BloomAndFlares.cpp
- projects/voxelization/src/ShadowMapping.cpp 5 additions, 5 deletionsprojects/voxelization/src/ShadowMapping.cpp
- projects/voxelization/src/Voxelization.cpp 9 additions, 9 deletionsprojects/voxelization/src/Voxelization.cpp
- projects/voxelization/src/main.cpp 59 additions, 33 deletionsprojects/voxelization/src/main.cpp
- src/vkcv/Context.cpp 4 additions, 0 deletionssrc/vkcv/Context.cpp
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment