Merge branch 'develop' into 120-include-fsr-2-0-in-the-upscaling-module
Signed-off-by:
Tobias Frisch <tfrisch@uni-koblenz.de>
No related branches found
No related tags found
Showing
- config/Sources.cmake 3 additions, 0 deletionsconfig/Sources.cmake
- include/vkcv/Core.hpp 15 additions, 15 deletionsinclude/vkcv/Core.hpp
- include/vkcv/Image.hpp 17 additions, 0 deletionsinclude/vkcv/Image.hpp
- include/vkcv/ImageConfig.hpp 160 additions, 0 deletionsinclude/vkcv/ImageConfig.hpp
- modules/effects/src/vkcv/effects/BloomAndFlaresEffect.cpp 9 additions, 12 deletionsmodules/effects/src/vkcv/effects/BloomAndFlaresEffect.cpp
- modules/geometry/include/vkcv/geometry/Geometry.hpp 13 additions, 0 deletionsmodules/geometry/include/vkcv/geometry/Geometry.hpp
- modules/geometry/src/vkcv/geometry/Cuboid.cpp 73 additions, 5 deletionsmodules/geometry/src/vkcv/geometry/Cuboid.cpp
- modules/geometry/src/vkcv/geometry/Cylinder.cpp 65 additions, 9 deletionsmodules/geometry/src/vkcv/geometry/Cylinder.cpp
- modules/geometry/src/vkcv/geometry/Geometry.cpp 14 additions, 0 deletionsmodules/geometry/src/vkcv/geometry/Geometry.cpp
- modules/geometry/src/vkcv/geometry/Sphere.cpp 47 additions, 1 deletionmodules/geometry/src/vkcv/geometry/Sphere.cpp
- modules/geometry/src/vkcv/geometry/Teapot.cpp 68 additions, 1 deletionmodules/geometry/src/vkcv/geometry/Teapot.cpp
- modules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp 7 additions, 6 deletionsmodules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp
- projects/bindless_textures/resources/Szene/Szene.bin 0 additions, 3 deletionsprojects/bindless_textures/resources/Szene/Szene.bin
- projects/bindless_textures/resources/Szene/Szene.gltf 0 additions, 3 deletionsprojects/bindless_textures/resources/Szene/Szene.gltf
- projects/bindless_textures/resources/Szene/boards2_vcyc.jpg 0 additions, 3 deletionsprojects/bindless_textures/resources/Szene/boards2_vcyc.jpg
- projects/bindless_textures/resources/Szene/boards2_vcyc_jpg.jpg 0 additions, 3 deletions...ts/bindless_textures/resources/Szene/boards2_vcyc_jpg.jpg
- projects/bindless_textures/resources/triangle/Triangle.bin 0 additions, 3 deletionsprojects/bindless_textures/resources/triangle/Triangle.bin
- projects/bindless_textures/resources/triangle/Triangle.blend 0 additions, 3 deletionsprojects/bindless_textures/resources/triangle/Triangle.blend
- projects/bindless_textures/resources/triangle/Triangle.glb 0 additions, 3 deletionsprojects/bindless_textures/resources/triangle/Triangle.glb
- projects/bindless_textures/resources/triangle/Triangle.gltf 0 additions, 3 deletionsprojects/bindless_textures/resources/triangle/Triangle.gltf
Loading
Please register or sign in to comment