diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 3747ed83..1f21a877 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -78,7 +78,7 @@ jobs: -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ - -DCMAKE_INSTALL_RPATH="\$ORIGIN:\$ORIGIN/engine/native" + -DCMAKE_INSTALL_RPATH="\$ORIGIN:\$ORIGIN/engine" - name: Compile Target Binary run: | diff --git a/.gitmodules b/.gitmodules index 88865010..b3d54461 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ -[submodule "engine/native/thirdparty/bx"] - path = engine/native/thirdparty/bx - url = https://github.com/bkaradzic/bx -[submodule "engine/native/thirdparty/bimg"] - path = engine/native/thirdparty/bimg - url = https://github.com/bkaradzic/bimg -[submodule "engine/native/thirdparty/bgfx"] - path = engine/native/thirdparty/bgfx - url = https://github.com/bkaradzic/bgfx -[submodule "engine/native/thirdparty/sdl"] - path = engine/native/thirdparty/sdl - url = https://github.com/libsdl-org/SDL +[submodule "engine/thirdparty/bgfx"] + path = engine/thirdparty/bgfx + url = https://github.com/bkaradzic/bgfx.git +[submodule "engine/thirdparty/bx"] + path = engine/thirdparty/bx + url = https://github.com/bkaradzic/bx.git +[submodule "engine/thirdparty/bimg"] + path = engine/thirdparty/bimg + url = https://github.com/bkaradzic/bimg.git +[submodule "engine/thirdparty/sdl"] + path = engine/thirdparty/sdl + url = https://github.com/libsdl-org/SDL.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 99a70261..4081c1c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,11 +29,11 @@ include(Shaders) add_subdirectory(engine) # Main Executable -add_executable(draconic engine/native/main/main.cpp) +add_executable(draconic engine/runtime/main/main.cpp) target_link_libraries(draconic PRIVATE - native + runtime bgfx bx bimg diff --git a/cmake/Modules.cmake b/cmake/Modules.cmake index 45a14f3c..c45b83d7 100644 --- a/cmake/Modules.cmake +++ b/cmake/Modules.cmake @@ -1,6 +1,6 @@ include_guard(GLOBAL) -set(NATIVE_SOURCE_DIR "${PROJECT_SOURCE_DIR}/engine/native") +set(NATIVE_SOURCE_DIR "${PROJECT_SOURCE_DIR}/engine") set(NATIVE_THIRD_PARTY_DIR "${NATIVE_SOURCE_DIR}/thirdparty") diff --git a/cmake/Shaders.cmake b/cmake/Shaders.cmake index 2eab7355..5bc3428e 100644 --- a/cmake/Shaders.cmake +++ b/cmake/Shaders.cmake @@ -1,8 +1,8 @@ include_guard(GLOBAL) -set(SHADER_SRC_DIR "${CMAKE_SOURCE_DIR}/engine/native/rendering/shaders") +set(SHADER_SRC_DIR "${CMAKE_SOURCE_DIR}/engine/runtime/rendering/shaders") set(SHADER_BIN_DIR "${CMAKE_BINARY_DIR}") -set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/native/thirdparty/bgfx/src") +set(BGFX_INCLUDE "${CMAKE_SOURCE_DIR}/engine/thirdparty/bgfx/src") function(compile_shaders TARGET_NAME) file(MAKE_DIRECTORY ${SHADER_BIN_DIR}) diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index b2417e14..00beac13 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -1,2 +1,11 @@ -add_modules_library(native) -target_link_libraries(native PUBLIC platform core input scene rendering) \ No newline at end of file +add_subdirectory(thirdparty SYSTEM) + +add_modules_library(platform) +add_modules_library(core SHARED) +add_modules_library(input) +add_modules_library(runtime) + +target_link_libraries(platform PUBLIC platform_impl) +target_link_libraries(core PUBLIC definitions math io memory) +target_link_libraries(input PRIVATE SDL3::SDL3-static platform core) +target_link_libraries(runtime PUBLIC platform core input scene rendering) \ No newline at end of file diff --git a/engine/native/core/CMakeLists.txt b/engine/core/CMakeLists.txt similarity index 100% rename from engine/native/core/CMakeLists.txt rename to engine/core/CMakeLists.txt diff --git a/engine/native/core/core.cppm b/engine/core/core.cppm similarity index 100% rename from engine/native/core/core.cppm rename to engine/core/core.cppm diff --git a/engine/native/core/definitions/definitions.cppm b/engine/core/definitions/definitions.cppm similarity index 100% rename from engine/native/core/definitions/definitions.cppm rename to engine/core/definitions/definitions.cppm diff --git a/engine/native/core/definitions/stdtypes.cppm b/engine/core/definitions/stdtypes.cppm similarity index 100% rename from engine/native/core/definitions/stdtypes.cppm rename to engine/core/definitions/stdtypes.cppm diff --git a/engine/native/core/definitions/version.cppm b/engine/core/definitions/version.cppm similarity index 100% rename from engine/native/core/definitions/version.cppm rename to engine/core/definitions/version.cppm diff --git a/engine/native/core/io/filesystem.cpp b/engine/core/io/filesystem.cpp similarity index 100% rename from engine/native/core/io/filesystem.cpp rename to engine/core/io/filesystem.cpp diff --git a/engine/native/core/io/filesystem.cppm b/engine/core/io/filesystem.cppm similarity index 100% rename from engine/native/core/io/filesystem.cppm rename to engine/core/io/filesystem.cppm diff --git a/engine/native/core/io/image_loader.cpp b/engine/core/io/image_loader.cpp similarity index 100% rename from engine/native/core/io/image_loader.cpp rename to engine/core/io/image_loader.cpp diff --git a/engine/native/core/io/image_loader.cppm b/engine/core/io/image_loader.cppm similarity index 100% rename from engine/native/core/io/image_loader.cppm rename to engine/core/io/image_loader.cppm diff --git a/engine/native/core/io/io.cppm b/engine/core/io/io.cppm similarity index 100% rename from engine/native/core/io/io.cppm rename to engine/core/io/io.cppm diff --git a/engine/native/core/math/constants.cppm b/engine/core/math/constants.cppm similarity index 100% rename from engine/native/core/math/constants.cppm rename to engine/core/math/constants.cppm diff --git a/engine/native/core/math/functions.cppm b/engine/core/math/functions.cppm similarity index 100% rename from engine/native/core/math/functions.cppm rename to engine/core/math/functions.cppm diff --git a/engine/native/core/math/math.cppm b/engine/core/math/math.cppm similarity index 100% rename from engine/native/core/math/math.cppm rename to engine/core/math/math.cppm diff --git a/engine/native/core/math/math.test.cpp b/engine/core/math/math.test.cpp similarity index 100% rename from engine/native/core/math/math.test.cpp rename to engine/core/math/math.test.cpp diff --git a/engine/native/core/math/transform.cpp b/engine/core/math/transform.cpp similarity index 100% rename from engine/native/core/math/transform.cpp rename to engine/core/math/transform.cpp diff --git a/engine/native/core/math/transform.cppm b/engine/core/math/transform.cppm similarity index 100% rename from engine/native/core/math/transform.cppm rename to engine/core/math/transform.cppm diff --git a/engine/native/core/math/types.cppm b/engine/core/math/types.cppm similarity index 100% rename from engine/native/core/math/types.cppm rename to engine/core/math/types.cppm diff --git a/engine/native/core/math/types_common.cppm b/engine/core/math/types_common.cppm similarity index 100% rename from engine/native/core/math/types_common.cppm rename to engine/core/math/types_common.cppm diff --git a/engine/native/core/math/vector2.cppm b/engine/core/math/vector2.cppm similarity index 100% rename from engine/native/core/math/vector2.cppm rename to engine/core/math/vector2.cppm diff --git a/engine/native/core/math/vector3.cppm b/engine/core/math/vector3.cppm similarity index 100% rename from engine/native/core/math/vector3.cppm rename to engine/core/math/vector3.cppm diff --git a/engine/native/core/math/vector4.cppm b/engine/core/math/vector4.cppm similarity index 100% rename from engine/native/core/math/vector4.cppm rename to engine/core/math/vector4.cppm diff --git a/engine/native/core/memory/allocator.cpp b/engine/core/memory/allocator.cpp similarity index 100% rename from engine/native/core/memory/allocator.cpp rename to engine/core/memory/allocator.cpp diff --git a/engine/native/core/memory/allocator.cppm b/engine/core/memory/allocator.cppm similarity index 100% rename from engine/native/core/memory/allocator.cppm rename to engine/core/memory/allocator.cppm diff --git a/engine/native/core/memory/bumpAllocator.cpp b/engine/core/memory/bumpAllocator.cpp similarity index 100% rename from engine/native/core/memory/bumpAllocator.cpp rename to engine/core/memory/bumpAllocator.cpp diff --git a/engine/native/core/memory/bumpAllocator.cppm b/engine/core/memory/bumpAllocator.cppm similarity index 100% rename from engine/native/core/memory/bumpAllocator.cppm rename to engine/core/memory/bumpAllocator.cppm diff --git a/engine/native/core/memory/bumpAllocator.test.cpp b/engine/core/memory/bumpAllocator.test.cpp similarity index 100% rename from engine/native/core/memory/bumpAllocator.test.cpp rename to engine/core/memory/bumpAllocator.test.cpp diff --git a/engine/native/core/memory/fixedAllocator.cpp b/engine/core/memory/fixedAllocator.cpp similarity index 100% rename from engine/native/core/memory/fixedAllocator.cpp rename to engine/core/memory/fixedAllocator.cpp diff --git a/engine/native/core/memory/fixedAllocator.cppm b/engine/core/memory/fixedAllocator.cppm similarity index 100% rename from engine/native/core/memory/fixedAllocator.cppm rename to engine/core/memory/fixedAllocator.cppm diff --git a/engine/native/core/memory/fixedAllocator.test.cpp b/engine/core/memory/fixedAllocator.test.cpp similarity index 100% rename from engine/native/core/memory/fixedAllocator.test.cpp rename to engine/core/memory/fixedAllocator.test.cpp diff --git a/engine/native/core/memory/handle.cppm b/engine/core/memory/handle.cppm similarity index 100% rename from engine/native/core/memory/handle.cppm rename to engine/core/memory/handle.cppm diff --git a/engine/native/core/memory/handle_registry.cppm b/engine/core/memory/handle_registry.cppm similarity index 100% rename from engine/native/core/memory/handle_registry.cppm rename to engine/core/memory/handle_registry.cppm diff --git a/engine/native/core/memory/pageAllocator.cpp b/engine/core/memory/pageAllocator.cpp similarity index 100% rename from engine/native/core/memory/pageAllocator.cpp rename to engine/core/memory/pageAllocator.cpp diff --git a/engine/native/core/memory/pageAllocator.cppm b/engine/core/memory/pageAllocator.cppm similarity index 100% rename from engine/native/core/memory/pageAllocator.cppm rename to engine/core/memory/pageAllocator.cppm diff --git a/engine/native/core/memory/root.cppm b/engine/core/memory/root.cppm similarity index 100% rename from engine/native/core/memory/root.cppm rename to engine/core/memory/root.cppm diff --git a/engine/native/core/memory/slice.cppm b/engine/core/memory/slice.cppm similarity index 100% rename from engine/native/core/memory/slice.cppm rename to engine/core/memory/slice.cppm diff --git a/engine/native/core/memory/slot_array.cppm b/engine/core/memory/slot_array.cppm similarity index 100% rename from engine/native/core/memory/slot_array.cppm rename to engine/core/memory/slot_array.cppm diff --git a/engine/native/core/memory/trackingAllocator.cpp b/engine/core/memory/trackingAllocator.cpp similarity index 100% rename from engine/native/core/memory/trackingAllocator.cpp rename to engine/core/memory/trackingAllocator.cpp diff --git a/engine/native/core/memory/trackingAllocator.cppm b/engine/core/memory/trackingAllocator.cppm similarity index 100% rename from engine/native/core/memory/trackingAllocator.cppm rename to engine/core/memory/trackingAllocator.cppm diff --git a/engine/native/core/memory/trackingAllocator.test.cpp b/engine/core/memory/trackingAllocator.test.cpp similarity index 100% rename from engine/native/core/memory/trackingAllocator.test.cpp rename to engine/core/memory/trackingAllocator.test.cpp diff --git a/engine/native/input/input.cpp b/engine/input/input.cpp similarity index 100% rename from engine/native/input/input.cpp rename to engine/input/input.cpp diff --git a/engine/native/input/input.cppm b/engine/input/input.cppm similarity index 100% rename from engine/native/input/input.cppm rename to engine/input/input.cppm diff --git a/engine/native/CMakeLists.txt b/engine/native/CMakeLists.txt deleted file mode 100644 index a8974d19..00000000 --- a/engine/native/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_subdirectory(thirdparty SYSTEM) - -add_modules_library(platform) -add_modules_library(core SHARED) -add_modules_library(input) -add_modules_library(rendering) -add_modules_library(scene) - -target_link_libraries(platform PUBLIC platform_impl) -target_link_libraries(core PUBLIC definitions math io memory) -target_link_libraries(input PRIVATE SDL3::SDL3-static platform core) -target_link_libraries(rendering PUBLIC rhi rendergraph mesh material quad_renderer renderer) -target_link_libraries(scene PUBLIC renderable transform_component camera) diff --git a/engine/native/thirdparty/bgfx b/engine/native/thirdparty/bgfx deleted file mode 160000 index 8532b2c4..00000000 --- a/engine/native/thirdparty/bgfx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8532b2c45d2f4332a9ac9734b85c2ea2253cb8d5 diff --git a/engine/native/thirdparty/bimg b/engine/native/thirdparty/bimg deleted file mode 160000 index 9114b47f..00000000 --- a/engine/native/thirdparty/bimg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9114b47f532ce59cd0c6c9f8932df2c48888d4c1 diff --git a/engine/native/thirdparty/bx b/engine/native/thirdparty/bx deleted file mode 160000 index cac72f6c..00000000 --- a/engine/native/thirdparty/bx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cac72f6cfa0893393ea12692ebfacb4495f8c826 diff --git a/engine/native/thirdparty/sdl b/engine/native/thirdparty/sdl deleted file mode 160000 index 1aa72247..00000000 --- a/engine/native/thirdparty/sdl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1aa72247af95802d897dabd51b29311e87c41ae0 diff --git a/engine/native/platform/CMakeLists.txt b/engine/platform/CMakeLists.txt similarity index 100% rename from engine/native/platform/CMakeLists.txt rename to engine/platform/CMakeLists.txt diff --git a/engine/native/platform/cpu/cpu_info.h b/engine/platform/cpu/cpu_info.h similarity index 100% rename from engine/native/platform/cpu/cpu_info.h rename to engine/platform/cpu/cpu_info.h diff --git a/engine/native/platform/cpu/cpu_info_neon.cpp b/engine/platform/cpu/cpu_info_neon.cpp similarity index 100% rename from engine/native/platform/cpu/cpu_info_neon.cpp rename to engine/platform/cpu/cpu_info_neon.cpp diff --git a/engine/native/platform/cpu/cpu_info_x64.cpp b/engine/platform/cpu/cpu_info_x64.cpp similarity index 100% rename from engine/native/platform/cpu/cpu_info_x64.cpp rename to engine/platform/cpu/cpu_info_x64.cpp diff --git a/engine/native/platform/impl/CMakeLists.txt b/engine/platform/impl/CMakeLists.txt similarity index 100% rename from engine/native/platform/impl/CMakeLists.txt rename to engine/platform/impl/CMakeLists.txt diff --git a/engine/native/platform/impl/linux/linux.cpp b/engine/platform/impl/linux/linux.cpp similarity index 100% rename from engine/native/platform/impl/linux/linux.cpp rename to engine/platform/impl/linux/linux.cpp diff --git a/engine/native/platform/impl/mac/mac.mm b/engine/platform/impl/mac/mac.mm similarity index 100% rename from engine/native/platform/impl/mac/mac.mm rename to engine/platform/impl/mac/mac.mm diff --git a/engine/native/platform/impl/platform_impl.h b/engine/platform/impl/platform_impl.h similarity index 100% rename from engine/native/platform/impl/platform_impl.h rename to engine/platform/impl/platform_impl.h diff --git a/engine/native/platform/impl/win32/win32.cpp b/engine/platform/impl/win32/win32.cpp similarity index 100% rename from engine/native/platform/impl/win32/win32.cpp rename to engine/platform/impl/win32/win32.cpp diff --git a/engine/native/platform/platform.cppm b/engine/platform/platform.cppm similarity index 100% rename from engine/native/platform/platform.cppm rename to engine/platform/platform.cppm diff --git a/engine/native/platform/simd.h b/engine/platform/simd.h similarity index 100% rename from engine/native/platform/simd.h rename to engine/platform/simd.h diff --git a/engine/runtime/CMakeLists.txt b/engine/runtime/CMakeLists.txt new file mode 100644 index 00000000..e9e9af46 --- /dev/null +++ b/engine/runtime/CMakeLists.txt @@ -0,0 +1,5 @@ +add_modules_library(rendering) +add_modules_library(scene) + +target_link_libraries(rendering PUBLIC rhi rendergraph mesh material quad_renderer renderer) +target_link_libraries(scene PUBLIC renderable transform_component camera) diff --git a/engine/native/draconic.cppm b/engine/runtime/draconic.cppm similarity index 100% rename from engine/native/draconic.cppm rename to engine/runtime/draconic.cppm diff --git a/engine/native/main/main.cpp b/engine/runtime/main/main.cpp similarity index 100% rename from engine/native/main/main.cpp rename to engine/runtime/main/main.cpp diff --git a/engine/native/rendering/CMakeLists.txt b/engine/runtime/rendering/CMakeLists.txt similarity index 100% rename from engine/native/rendering/CMakeLists.txt rename to engine/runtime/rendering/CMakeLists.txt diff --git a/engine/native/rendering/material/material.cppm b/engine/runtime/rendering/material/material.cppm similarity index 100% rename from engine/native/rendering/material/material.cppm rename to engine/runtime/rendering/material/material.cppm diff --git a/engine/native/rendering/mesh/mesh.cpp b/engine/runtime/rendering/mesh/mesh.cpp similarity index 100% rename from engine/native/rendering/mesh/mesh.cpp rename to engine/runtime/rendering/mesh/mesh.cpp diff --git a/engine/native/rendering/mesh/mesh.cppm b/engine/runtime/rendering/mesh/mesh.cppm similarity index 100% rename from engine/native/rendering/mesh/mesh.cppm rename to engine/runtime/rendering/mesh/mesh.cppm diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cpp b/engine/runtime/rendering/quad_renderer/quad_renderer.cpp similarity index 100% rename from engine/native/rendering/quad_renderer/quad_renderer.cpp rename to engine/runtime/rendering/quad_renderer/quad_renderer.cpp diff --git a/engine/native/rendering/quad_renderer/quad_renderer.cppm b/engine/runtime/rendering/quad_renderer/quad_renderer.cppm similarity index 100% rename from engine/native/rendering/quad_renderer/quad_renderer.cppm rename to engine/runtime/rendering/quad_renderer/quad_renderer.cppm diff --git a/engine/native/rendering/renderer/renderer.cpp b/engine/runtime/rendering/renderer/renderer.cpp similarity index 100% rename from engine/native/rendering/renderer/renderer.cpp rename to engine/runtime/rendering/renderer/renderer.cpp diff --git a/engine/native/rendering/renderer/renderer.cppm b/engine/runtime/rendering/renderer/renderer.cppm similarity index 100% rename from engine/native/rendering/renderer/renderer.cppm rename to engine/runtime/rendering/renderer/renderer.cppm diff --git a/engine/native/rendering/rendergraph/rendergraph.cpp b/engine/runtime/rendering/rendergraph/rendergraph.cpp similarity index 100% rename from engine/native/rendering/rendergraph/rendergraph.cpp rename to engine/runtime/rendering/rendergraph/rendergraph.cpp diff --git a/engine/native/rendering/rendergraph/rendergraph.cppm b/engine/runtime/rendering/rendergraph/rendergraph.cppm similarity index 100% rename from engine/native/rendering/rendergraph/rendergraph.cppm rename to engine/runtime/rendering/rendergraph/rendergraph.cppm diff --git a/engine/native/rendering/rendering.cppm b/engine/runtime/rendering/rendering.cppm similarity index 100% rename from engine/native/rendering/rendering.cppm rename to engine/runtime/rendering/rendering.cppm diff --git a/engine/native/rendering/rhi/buffers.cpp b/engine/runtime/rendering/rhi/buffers.cpp similarity index 100% rename from engine/native/rendering/rhi/buffers.cpp rename to engine/runtime/rendering/rhi/buffers.cpp diff --git a/engine/native/rendering/rhi/commands.cpp b/engine/runtime/rendering/rhi/commands.cpp similarity index 100% rename from engine/native/rendering/rhi/commands.cpp rename to engine/runtime/rendering/rhi/commands.cpp diff --git a/engine/native/rendering/rhi/core.cpp b/engine/runtime/rendering/rhi/core.cpp similarity index 100% rename from engine/native/rendering/rhi/core.cpp rename to engine/runtime/rendering/rhi/core.cpp diff --git a/engine/native/rendering/rhi/macros.h b/engine/runtime/rendering/rhi/macros.h similarity index 100% rename from engine/native/rendering/rhi/macros.h rename to engine/runtime/rendering/rhi/macros.h diff --git a/engine/native/rendering/rhi/pipelines.cpp b/engine/runtime/rendering/rhi/pipelines.cpp similarity index 100% rename from engine/native/rendering/rhi/pipelines.cpp rename to engine/runtime/rendering/rhi/pipelines.cpp diff --git a/engine/native/rendering/rhi/rhi.cppm b/engine/runtime/rendering/rhi/rhi.cppm similarity index 100% rename from engine/native/rendering/rhi/rhi.cppm rename to engine/runtime/rendering/rhi/rhi.cppm diff --git a/engine/native/rendering/rhi/texture.cpp b/engine/runtime/rendering/rhi/texture.cpp similarity index 100% rename from engine/native/rendering/rhi/texture.cpp rename to engine/runtime/rendering/rhi/texture.cpp diff --git a/engine/native/rendering/rhi/uniform_registry.cppm b/engine/runtime/rendering/rhi/uniform_registry.cppm similarity index 100% rename from engine/native/rendering/rhi/uniform_registry.cppm rename to engine/runtime/rendering/rhi/uniform_registry.cppm diff --git a/engine/native/rendering/rhi/vertex.cppm b/engine/runtime/rendering/rhi/vertex.cppm similarity index 100% rename from engine/native/rendering/rhi/vertex.cppm rename to engine/runtime/rendering/rhi/vertex.cppm diff --git a/engine/native/rendering/shaders/fs.sc b/engine/runtime/rendering/shaders/fs.sc similarity index 100% rename from engine/native/rendering/shaders/fs.sc rename to engine/runtime/rendering/shaders/fs.sc diff --git a/engine/native/rendering/shaders/fs_quad.sc b/engine/runtime/rendering/shaders/fs_quad.sc similarity index 100% rename from engine/native/rendering/shaders/fs_quad.sc rename to engine/runtime/rendering/shaders/fs_quad.sc diff --git a/engine/native/rendering/shaders/varying.def.sc b/engine/runtime/rendering/shaders/varying.def.sc similarity index 100% rename from engine/native/rendering/shaders/varying.def.sc rename to engine/runtime/rendering/shaders/varying.def.sc diff --git a/engine/native/rendering/shaders/varying_quad.def.sc b/engine/runtime/rendering/shaders/varying_quad.def.sc similarity index 100% rename from engine/native/rendering/shaders/varying_quad.def.sc rename to engine/runtime/rendering/shaders/varying_quad.def.sc diff --git a/engine/native/rendering/shaders/vs.sc b/engine/runtime/rendering/shaders/vs.sc similarity index 100% rename from engine/native/rendering/shaders/vs.sc rename to engine/runtime/rendering/shaders/vs.sc diff --git a/engine/native/rendering/shaders/vs_quad.sc b/engine/runtime/rendering/shaders/vs_quad.sc similarity index 100% rename from engine/native/rendering/shaders/vs_quad.sc rename to engine/runtime/rendering/shaders/vs_quad.sc diff --git a/engine/native/scene/CMakeLists.txt b/engine/runtime/scene/CMakeLists.txt similarity index 100% rename from engine/native/scene/CMakeLists.txt rename to engine/runtime/scene/CMakeLists.txt diff --git a/engine/native/scene/camera/camera_controller.cpp b/engine/runtime/scene/camera/camera_controller.cpp similarity index 100% rename from engine/native/scene/camera/camera_controller.cpp rename to engine/runtime/scene/camera/camera_controller.cpp diff --git a/engine/native/scene/camera/camera_controller.cppm b/engine/runtime/scene/camera/camera_controller.cppm similarity index 100% rename from engine/native/scene/camera/camera_controller.cppm rename to engine/runtime/scene/camera/camera_controller.cppm diff --git a/engine/native/scene/renderable/renderable.cppm b/engine/runtime/scene/renderable/renderable.cppm similarity index 100% rename from engine/native/scene/renderable/renderable.cppm rename to engine/runtime/scene/renderable/renderable.cppm diff --git a/engine/native/scene/scene.cppm b/engine/runtime/scene/scene.cppm similarity index 100% rename from engine/native/scene/scene.cppm rename to engine/runtime/scene/scene.cppm diff --git a/engine/native/scene/transform_component/transform_component.cpp b/engine/runtime/scene/transform_component/transform_component.cpp similarity index 100% rename from engine/native/scene/transform_component/transform_component.cpp rename to engine/runtime/scene/transform_component/transform_component.cpp diff --git a/engine/native/scene/transform_component/transform_component.cppm b/engine/runtime/scene/transform_component/transform_component.cppm similarity index 100% rename from engine/native/scene/transform_component/transform_component.cppm rename to engine/runtime/scene/transform_component/transform_component.cppm diff --git a/engine/native/thirdparty/CMakeLists.txt b/engine/thirdparty/CMakeLists.txt similarity index 100% rename from engine/native/thirdparty/CMakeLists.txt rename to engine/thirdparty/CMakeLists.txt diff --git a/engine/thirdparty/bgfx b/engine/thirdparty/bgfx new file mode 160000 index 00000000..5abee1a2 --- /dev/null +++ b/engine/thirdparty/bgfx @@ -0,0 +1 @@ +Subproject commit 5abee1a2832a22d1c82bd56a483ae2d7c08af877 diff --git a/engine/thirdparty/bimg b/engine/thirdparty/bimg new file mode 160000 index 00000000..7a12ad7e --- /dev/null +++ b/engine/thirdparty/bimg @@ -0,0 +1 @@ +Subproject commit 7a12ad7e4daaf9fd5d5c4dea9c85fed10c6d88d1 diff --git a/engine/thirdparty/bx b/engine/thirdparty/bx new file mode 160000 index 00000000..771ce6a8 --- /dev/null +++ b/engine/thirdparty/bx @@ -0,0 +1 @@ +Subproject commit 771ce6a8e84be776940280763c65f55d6706d076 diff --git a/engine/native/thirdparty/cmake/Config.cmake.in b/engine/thirdparty/cmake/Config.cmake.in similarity index 100% rename from engine/native/thirdparty/cmake/Config.cmake.in rename to engine/thirdparty/cmake/Config.cmake.in diff --git a/engine/native/thirdparty/cmake/bgfx/3rdparty/dear-imgui.cmake b/engine/thirdparty/cmake/bgfx/3rdparty/dear-imgui.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/3rdparty/dear-imgui.cmake rename to engine/thirdparty/cmake/bgfx/3rdparty/dear-imgui.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/3rdparty/fcpp.cmake b/engine/thirdparty/cmake/bgfx/3rdparty/fcpp.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/3rdparty/fcpp.cmake rename to engine/thirdparty/cmake/bgfx/3rdparty/fcpp.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/3rdparty/glsl-optimizer.cmake b/engine/thirdparty/cmake/bgfx/3rdparty/glsl-optimizer.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/3rdparty/glsl-optimizer.cmake rename to engine/thirdparty/cmake/bgfx/3rdparty/glsl-optimizer.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/3rdparty/glslang.cmake b/engine/thirdparty/cmake/bgfx/3rdparty/glslang.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/3rdparty/glslang.cmake rename to engine/thirdparty/cmake/bgfx/3rdparty/glslang.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/3rdparty/meshoptimizer.cmake b/engine/thirdparty/cmake/bgfx/3rdparty/meshoptimizer.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/3rdparty/meshoptimizer.cmake rename to engine/thirdparty/cmake/bgfx/3rdparty/meshoptimizer.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/3rdparty/spirv-cross.cmake b/engine/thirdparty/cmake/bgfx/3rdparty/spirv-cross.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/3rdparty/spirv-cross.cmake rename to engine/thirdparty/cmake/bgfx/3rdparty/spirv-cross.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/3rdparty/spirv-opt.cmake b/engine/thirdparty/cmake/bgfx/3rdparty/spirv-opt.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/3rdparty/spirv-opt.cmake rename to engine/thirdparty/cmake/bgfx/3rdparty/spirv-opt.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/3rdparty/tint.cmake b/engine/thirdparty/cmake/bgfx/3rdparty/tint.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/3rdparty/tint.cmake rename to engine/thirdparty/cmake/bgfx/3rdparty/tint.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/3rdparty/webgpu.cmake b/engine/thirdparty/cmake/bgfx/3rdparty/webgpu.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/3rdparty/webgpu.cmake rename to engine/thirdparty/cmake/bgfx/3rdparty/webgpu.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/CMakeLists.txt b/engine/thirdparty/cmake/bgfx/CMakeLists.txt similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/CMakeLists.txt rename to engine/thirdparty/cmake/bgfx/CMakeLists.txt diff --git a/engine/native/thirdparty/cmake/bgfx/bgfx.cmake b/engine/thirdparty/cmake/bgfx/bgfx.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/bgfx.cmake rename to engine/thirdparty/cmake/bgfx/bgfx.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/examples.cmake b/engine/thirdparty/cmake/bgfx/examples.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/examples.cmake rename to engine/thirdparty/cmake/bgfx/examples.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/generated/bounds.cpp.in b/engine/thirdparty/cmake/bgfx/generated/bounds.cpp.in similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/generated/bounds.cpp.in rename to engine/thirdparty/cmake/bgfx/generated/bounds.cpp.in diff --git a/engine/native/thirdparty/cmake/bgfx/generated/shader.cpp.in b/engine/thirdparty/cmake/bgfx/generated/shader.cpp.in similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/generated/shader.cpp.in rename to engine/thirdparty/cmake/bgfx/generated/shader.cpp.in diff --git a/engine/native/thirdparty/cmake/bgfx/generated/vertexlayout.cpp.in b/engine/thirdparty/cmake/bgfx/generated/vertexlayout.cpp.in similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/generated/vertexlayout.cpp.in rename to engine/thirdparty/cmake/bgfx/generated/vertexlayout.cpp.in diff --git a/engine/native/thirdparty/cmake/bgfx/geometryc.cmake b/engine/thirdparty/cmake/bgfx/geometryc.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/geometryc.cmake rename to engine/thirdparty/cmake/bgfx/geometryc.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/geometryv.cmake b/engine/thirdparty/cmake/bgfx/geometryv.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/geometryv.cmake rename to engine/thirdparty/cmake/bgfx/geometryv.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/shaderc.cmake b/engine/thirdparty/cmake/bgfx/shaderc.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/shaderc.cmake rename to engine/thirdparty/cmake/bgfx/shaderc.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/shared.cmake b/engine/thirdparty/cmake/bgfx/shared.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/shared.cmake rename to engine/thirdparty/cmake/bgfx/shared.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/texturev.cmake b/engine/thirdparty/cmake/bgfx/texturev.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/texturev.cmake rename to engine/thirdparty/cmake/bgfx/texturev.cmake diff --git a/engine/native/thirdparty/cmake/bgfx/util/ConfigureDebugging.cmake b/engine/thirdparty/cmake/bgfx/util/ConfigureDebugging.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfx/util/ConfigureDebugging.cmake rename to engine/thirdparty/cmake/bgfx/util/ConfigureDebugging.cmake diff --git a/engine/native/thirdparty/cmake/bgfxToolUtils.cmake b/engine/thirdparty/cmake/bgfxToolUtils.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bgfxToolUtils.cmake rename to engine/thirdparty/cmake/bgfxToolUtils.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/astc_encoder.cmake b/engine/thirdparty/cmake/bimg/3rdparty/astc_encoder.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/astc_encoder.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/astc_encoder.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/edtaa3.cmake b/engine/thirdparty/cmake/bimg/3rdparty/edtaa3.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/edtaa3.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/edtaa3.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/etc1.cmake b/engine/thirdparty/cmake/bimg/3rdparty/etc1.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/etc1.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/etc1.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/etc2.cmake b/engine/thirdparty/cmake/bimg/3rdparty/etc2.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/etc2.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/etc2.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/iqa.cmake b/engine/thirdparty/cmake/bimg/3rdparty/iqa.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/iqa.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/iqa.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/libsquish.cmake b/engine/thirdparty/cmake/bimg/3rdparty/libsquish.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/libsquish.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/libsquish.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/loadpng.cmake b/engine/thirdparty/cmake/bimg/3rdparty/loadpng.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/loadpng.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/loadpng.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/miniz.cmake b/engine/thirdparty/cmake/bimg/3rdparty/miniz.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/miniz.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/miniz.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/nvtt.cmake b/engine/thirdparty/cmake/bimg/3rdparty/nvtt.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/nvtt.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/nvtt.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/pvrtc.cmake b/engine/thirdparty/cmake/bimg/3rdparty/pvrtc.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/pvrtc.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/pvrtc.cmake diff --git a/engine/native/thirdparty/cmake/bimg/3rdparty/tinyexr.cmake b/engine/thirdparty/cmake/bimg/3rdparty/tinyexr.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/3rdparty/tinyexr.cmake rename to engine/thirdparty/cmake/bimg/3rdparty/tinyexr.cmake diff --git a/engine/native/thirdparty/cmake/bimg/CMakeLists.txt b/engine/thirdparty/cmake/bimg/CMakeLists.txt similarity index 100% rename from engine/native/thirdparty/cmake/bimg/CMakeLists.txt rename to engine/thirdparty/cmake/bimg/CMakeLists.txt diff --git a/engine/native/thirdparty/cmake/bimg/bimg.cmake b/engine/thirdparty/cmake/bimg/bimg.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/bimg.cmake rename to engine/thirdparty/cmake/bimg/bimg.cmake diff --git a/engine/native/thirdparty/cmake/bimg/bimg_decode.cmake b/engine/thirdparty/cmake/bimg/bimg_decode.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/bimg_decode.cmake rename to engine/thirdparty/cmake/bimg/bimg_decode.cmake diff --git a/engine/native/thirdparty/cmake/bimg/bimg_encode.cmake b/engine/thirdparty/cmake/bimg/bimg_encode.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/bimg_encode.cmake rename to engine/thirdparty/cmake/bimg/bimg_encode.cmake diff --git a/engine/native/thirdparty/cmake/bimg/texturec.cmake b/engine/thirdparty/cmake/bimg/texturec.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bimg/texturec.cmake rename to engine/thirdparty/cmake/bimg/texturec.cmake diff --git a/engine/native/thirdparty/cmake/bx/CMakeLists.txt b/engine/thirdparty/cmake/bx/CMakeLists.txt similarity index 100% rename from engine/native/thirdparty/cmake/bx/CMakeLists.txt rename to engine/thirdparty/cmake/bx/CMakeLists.txt diff --git a/engine/native/thirdparty/cmake/bx/bin2c.cmake b/engine/thirdparty/cmake/bx/bin2c.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bx/bin2c.cmake rename to engine/thirdparty/cmake/bx/bin2c.cmake diff --git a/engine/native/thirdparty/cmake/bx/bx.cmake b/engine/thirdparty/cmake/bx/bx.cmake similarity index 100% rename from engine/native/thirdparty/cmake/bx/bx.cmake rename to engine/thirdparty/cmake/bx/bx.cmake diff --git a/engine/native/thirdparty/cmake/version.cmake b/engine/thirdparty/cmake/version.cmake similarity index 100% rename from engine/native/thirdparty/cmake/version.cmake rename to engine/thirdparty/cmake/version.cmake diff --git a/engine/native/thirdparty/doctest/doctest.h b/engine/thirdparty/doctest/doctest.h similarity index 100% rename from engine/native/thirdparty/doctest/doctest.h rename to engine/thirdparty/doctest/doctest.h diff --git a/engine/thirdparty/sdl b/engine/thirdparty/sdl new file mode 160000 index 00000000..4f031ea5 --- /dev/null +++ b/engine/thirdparty/sdl @@ -0,0 +1 @@ +Subproject commit 4f031ea5da370762469f977ee115a4d874d3de63 diff --git a/engine/native/thirdparty/stb/CMakeLists.txt b/engine/thirdparty/stb/CMakeLists.txt similarity index 100% rename from engine/native/thirdparty/stb/CMakeLists.txt rename to engine/thirdparty/stb/CMakeLists.txt diff --git a/engine/native/thirdparty/stb/stb_image.h b/engine/thirdparty/stb/stb_image.h similarity index 100% rename from engine/native/thirdparty/stb/stb_image.h rename to engine/thirdparty/stb/stb_image.h