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/first_mesh/assets/Szene/Szene.bin 0 additions, 0 deletionsprojects/first_mesh/assets/Szene/Szene.bin
- projects/first_mesh/assets/Szene/Szene.gltf 0 additions, 0 deletionsprojects/first_mesh/assets/Szene/Szene.gltf
- projects/first_mesh/assets/Szene/boards2_vcyc.jpg 0 additions, 0 deletionsprojects/first_mesh/assets/Szene/boards2_vcyc.jpg
- projects/first_mesh/assets/Szene/boards2_vcyc_jpg.jpg 0 additions, 0 deletionsprojects/first_mesh/assets/Szene/boards2_vcyc_jpg.jpg
- projects/first_mesh/assets/cube/boards2_vcyc_jpg.jpg 0 additions, 0 deletionsprojects/first_mesh/assets/cube/boards2_vcyc_jpg.jpg
- projects/first_mesh/assets/cube/cube.bin 0 additions, 0 deletionsprojects/first_mesh/assets/cube/cube.bin
- projects/first_mesh/assets/cube/cube.blend 0 additions, 0 deletionsprojects/first_mesh/assets/cube/cube.blend
- projects/first_mesh/assets/cube/cube.blend1 0 additions, 0 deletionsprojects/first_mesh/assets/cube/cube.blend1
- projects/first_mesh/assets/cube/cube.glb 0 additions, 0 deletionsprojects/first_mesh/assets/cube/cube.glb
- projects/first_mesh/assets/cube/cube.gltf 0 additions, 0 deletionsprojects/first_mesh/assets/cube/cube.gltf
- projects/first_mesh/assets/shaders/shader.frag 0 additions, 0 deletionsprojects/first_mesh/assets/shaders/shader.frag
- projects/first_mesh/assets/shaders/shader.vert 0 additions, 0 deletionsprojects/first_mesh/assets/shaders/shader.vert
- projects/first_mesh/assets/triangle/Triangle.bin 0 additions, 0 deletionsprojects/first_mesh/assets/triangle/Triangle.bin
- projects/first_mesh/assets/triangle/Triangle.blend 0 additions, 0 deletionsprojects/first_mesh/assets/triangle/Triangle.blend
- projects/first_mesh/assets/triangle/Triangle.glb 0 additions, 0 deletionsprojects/first_mesh/assets/triangle/Triangle.glb
- projects/first_mesh/assets/triangle/Triangle.gltf 0 additions, 0 deletionsprojects/first_mesh/assets/triangle/Triangle.gltf
- projects/first_mesh/src/main.cpp 15 additions, 8 deletionsprojects/first_mesh/src/main.cpp
- projects/first_scene/assets/Cutlery/Cutlery_chrome_BaseColor.png 0 additions, 0 deletions...s/first_scene/assets/Cutlery/Cutlery_chrome_BaseColor.png
- projects/first_scene/assets/Cutlery/Cutlery_chrome_Normal.png 0 additions, 0 deletions...ects/first_scene/assets/Cutlery/Cutlery_chrome_Normal.png
- projects/first_scene/assets/Cutlery/Cutlery_details_BaseColor.png 0 additions, 0 deletions.../first_scene/assets/Cutlery/Cutlery_details_BaseColor.png
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
Please register or sign in to comment