Skip to content
Snippets Groups Projects
Commit 6f65d9fd authored by Sebastian Gaida's avatar Sebastian Gaida
Browse files

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
parents 9d931fc6 b44d10ca
No related branches found
No related tags found
1 merge request!90Resolve "Mehrere Fenster, Abhängigkeiten von Core zu Fenster+Swapchain etc"
Pipeline #27048 failed
Showing
with 4 additions and 4 deletions
......@@ -30,16 +30,16 @@ bool App::initialize() {
if (!loadSkyPrePass(m_core, &m_skyPrePass))
return false;
if (!loadComputePass(m_core, "resources/shaders/gammaCorrection.comp", &m_gammaCorrectionPass))
if (!loadComputePass(m_core, "assets/shaders/gammaCorrection.comp", &m_gammaCorrectionPass))
return false;
if (!loadMesh(m_core, "resources/models/cube.gltf", &m_cubeMesh))
if (!loadMesh(m_core, "assets/models/cube.gltf", &m_cubeMesh))
return false;
if (!loadMesh(m_core, "resources/models/ground.gltf", &m_groundMesh))
if (!loadMesh(m_core, "assets/models/ground.gltf", &m_groundMesh))
return false;
if(!loadImage(m_core, "resources/models/grid.png", &m_gridTexture))
if(!loadImage(m_core, "assets/models/grid.png", &m_gridTexture))
return false;
if (!m_motionBlur.initialize(&m_core, m_windowWidth, m_windowHeight))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment