Skip to content

Commit a1306e4

Browse files
authored
Decouple scene from render, merge context into engine (#45)
* Merge context and editor into engine * Move SceneRenderer to engine, update dependency graph * Add Ptr alias, use in Scene; remove redundant parts of function names * Render in one shot; log full swapchain spec Engine now performs the entire render in one function call, instead of splitting acquiring and submitting into two parts. * Remove commented / legacy code
1 parent 44b2dca commit a1306e4

File tree

29 files changed

+348
-361
lines changed

29 files changed

+348
-361
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ target_sources(${PROJECT_NAME} PRIVATE
5555
)
5656

5757
target_link_libraries(${PROJECT_NAME} PRIVATE
58-
facade::context
58+
facade::engine
5959
facade::compile-options
6060
)
6161

lib/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ add_subdirectory(glfw)
1818
add_subdirectory(render)
1919
add_subdirectory(scene)
2020
add_subdirectory(engine)
21-
add_subdirectory(context)

lib/context/CMakeLists.txt

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

lib/context/include/facade/context/context.hpp

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

lib/context/src/context.cpp

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

lib/engine/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ target_include_directories(${PROJECT_NAME}
2020
target_link_libraries(${PROJECT_NAME}
2121
PUBLIC
2222
${target_prefix}::render
23+
${target_prefix}::scene
2324
${target_prefix}::dear_imgui
2425

2526
PRIVATE
@@ -34,6 +35,18 @@ endif()
3435

3536
target_sources(${PROJECT_NAME} PRIVATE
3637
include/${target_prefix}/engine/engine.hpp
38+
include/${target_prefix}/engine/scene_renderer.hpp
3739

40+
include/${target_prefix}/engine/editor/common.hpp
41+
include/${target_prefix}/engine/editor/inspector.hpp
42+
include/${target_prefix}/engine/editor/log.hpp
43+
include/${target_prefix}/engine/editor/scene_tree.hpp
44+
45+
src/scene_renderer.cpp
3846
src/engine.cpp
47+
48+
src/editor/common.cpp
49+
src/editor/inspector.cpp
50+
src/editor/log.cpp
51+
src/editor/scene_tree.cpp
3952
)

lib/context/include/facade/context/editor/inspector.hpp renamed to lib/engine/include/facade/engine/editor/inspector.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include <facade/context/editor/common.hpp>
2+
#include <facade/engine/editor/common.hpp>
33
#include <facade/scene/material.hpp>
44
#include <facade/scene/node.hpp>
55
#include <limits>

lib/context/include/facade/context/editor/log.hpp renamed to lib/engine/include/facade/engine/editor/log.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include <facade/context/editor/common.hpp>
2+
#include <facade/engine/editor/common.hpp>
33
#include <facade/util/enum_array.hpp>
44
#include <facade/util/logger.hpp>
55
#include <vector>

lib/context/include/facade/context/editor/scene_tree.hpp renamed to lib/engine/include/facade/engine/editor/scene_tree.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include <facade/context/editor/common.hpp>
2+
#include <facade/engine/editor/common.hpp>
33
#include <facade/scene/id.hpp>
44
#include <facade/util/fixed_string.hpp>
55

0 commit comments

Comments
 (0)