Skip to content

Commit dfd1445

Browse files
committed
-Dev: basic scene loader done
1 parent e8ad02b commit dfd1445

File tree

12 files changed

+436
-97135
lines changed

12 files changed

+436
-97135
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/build
22
/.vscode
33
/.vs
4-
/imgui.ini
4+
/imgui.ini
5+
/examples/sponza/assets

examples/CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,21 @@ file(GLOB APPRT_SOURCES
2929
)
3030
add_executable(RaytracingApp ${APPRT_SOURCES})
3131

32+
#DEMO 4
33+
# --- Raytracing Example ---
34+
file(GLOB SPONZA_SOURCES
35+
"sponza/*.cpp"
36+
"sponza/*.h"
37+
)
38+
add_executable(SponzaApp ${SPONZA_SOURCES})
39+
3240
# Link projects against Engine lib
3341
target_link_libraries(RendererApp PRIVATE VulkanEngine)
3442
target_link_libraries(RotatingKabuto PRIVATE VulkanEngine)
3543
target_link_libraries(LightingTest PRIVATE VulkanEngine)
3644
target_link_libraries(RaytracingApp PRIVATE VulkanEngine)
45+
target_link_libraries(SponzaApp PRIVATE VulkanEngine)
3746

3847
target_compile_definitions(VulkanEngine PUBLIC EXAMPLES_RESOURCES_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/")
3948

40-
set_property(TARGET RendererApp RotatingKabuto LightingTest RaytracingApp PROPERTY FOLDER "examples")
49+
set_property(TARGET RendererApp RotatingKabuto LightingTest RaytracingApp SponzaApp PROPERTY FOLDER "examples")

examples/raytracing/application.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,6 @@ void Application::setup() {
261261
sky->set_color_intensity(0.25f);
262262
m_scene->set_skybox(sky);
263263

264-
Tools::Loaders::SceneLoader sceneLoader;
265-
sceneLoader.load_scene(m_scene, MESH_PATH + "scene.xml");
266-
267264
m_controller = new Tools::Controller(camera, m_window, ControllerMovementType::ORBITAL);
268265
}
269266

examples/resources/meshes/scene.xml

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)