Resolve "Kamera - Erstellung und Handling" (!26) · Merge requests · Vulkan2021 / VkCV Framework · GitLab

Snippets Groups Projects

Merged Ghost User requested to merge 35-kamera-erstellung-und-handling into develop 3 years ago

1 unresolved thread

Viewing commit 639f5f75

Show latest version

7 files

+ 194

− 9

639f5f75

Merge remote-tracking branch 'origin/14-eventpoll-mit-lambdas' into... · 639f5f75

Katharina Krämer authored 3 years ago

Merge remote-tracking branch 'origin/14-eventpoll-mit-lambdas' into 35-kamera-erstellung-und-handling

# Conflicts:
#	projects/first_triangle/src/main.cpp

config/Sources.cmake

+ 2

− 0

@@ -51,4 +51,6 @@ set(vkcv_sources
        
        ${vkcv_source}/vkcv/Framebuffer.hpp
        ${vkcv_source}/vkcv/Framebuffer.cpp

		${vkcv_include}/vkcv/Event.hpp
)