Skip to content

feat: decouple engine from renderer #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Satvik-Singh192 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

feat: decouple engine from renderer #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 125 additions & 72 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,101 +1,154 @@
cmake_minimum_required(VERSION 3.20)

project(Aether_Test)
project(Aether LANGUAGES CXX)

set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

set(CMAKE_CXX_STANDARD 20)

set(AETHER_BUILD_TARGET_DEFAULT "Desktop")
if(EMSCRIPTEN OR CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
set(AETHER_BUILD_TARGET_DEFAULT "WASM")
endif()

set(AETHER_BUILD_TARGET "${AETHER_BUILD_TARGET_DEFAULT}" CACHE STRING "Build target: Desktop or WASM")
set_property(CACHE AETHER_BUILD_TARGET PROPERTY STRINGS Desktop WASM)

include(FetchContent)

FetchContent_Declare(
glfw
GIT_REPOSITORY https://github.com/glfw/glfw.git
GIT_TAG 3.3.8
)
set(_aether_deps_root "${CMAKE_BINARY_DIR}/_deps")

FetchContent_MakeAvailable(glfw)
function(aether_use_local_fetchcontent dependency_name source_dir_name)
string(TOUPPER "${dependency_name}" dependency_name_upper)
if(NOT DEFINED "FETCHCONTENT_SOURCE_DIR_${dependency_name_upper}")
if(EXISTS "${_aether_deps_root}/${source_dir_name}/CMakeLists.txt")
set("FETCHCONTENT_SOURCE_DIR_${dependency_name_upper}" "${_aether_deps_root}/${source_dir_name}" CACHE PATH "Local source dir for ${dependency_name}" FORCE)
endif()
endif()
endfunction()

FetchContent_Declare(
glad
GIT_REPOSITORY https://github.com/Dav1dde/glad.git
GIT_TAG v0.1.36
)
aether_use_local_fetchcontent(glfw glfw-src)
aether_use_local_fetchcontent(glad glad-src)
aether_use_local_fetchcontent(glm glm-src)

FetchContent_Declare(
glm
GIT_REPOSITORY https://github.com/g-truc/glm.git
GIT_TAG 0.9.9.8
)
FetchContent_Declare(
imgui
GIT_REPOSITORY https://github.com/ocornut/imgui.git
GIT_TAG v1.90.8
)

FetchContent_MakeAvailable(imgui)

FetchContent_MakeAvailable(glad)
FetchContent_MakeAvailable(glm)

find_package(OpenGL REQUIRED)

add_executable(Aether_Test
engine/engine_configs.cpp
app/main.cpp
app/test_scenarios.cpp
engine/math/vec3.cpp
engine/math/mat.cpp
engine/math/quat.cpp
engine/core/rigidbody.cpp
engine/core/buoyancy.cpp
engine/world/physicsworld.cpp
engine/collision/sphere_sphere.cpp
engine/collision/box_box.cpp
engine/collision/sphere_box.cpp
engine/collision/box_ramp.cpp
engine/collision/ramp_sphere.cpp
engine/collision/ramp_ramp.cpp
engine/collision/manifolds/buildBoxBoxManifold.cpp
engine/collision/manifolds/buildBoxSphereManifold.cpp
engine/collision/manifolds/buildSphereSphereManifold.cpp
engine/collision/manifolds/buildRampBoxManifold.cpp
engine/collision/manifolds/buildRampSphereManifold.cpp
engine/collision/manifolds/buildRampRampManifold.cpp
engine/collision/obb.hpp
renderer/window.cpp
renderer/camera.cpp
renderer/drawbodies.cpp
renderer/drawconstraints.cpp
renderer/bodyshaders.cpp
renderer/bodymenu.cpp
renderer/aether_theme.cpp
file(GLOB_RECURSE AETHER_ENGINE_SOURCES CONFIGURE_DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/engine/*.cpp"
)

add_library(imgui STATIC
${imgui_SOURCE_DIR}/imgui.cpp
${imgui_SOURCE_DIR}/imgui_draw.cpp
${imgui_SOURCE_DIR}/imgui_tables.cpp
${imgui_SOURCE_DIR}/imgui_widgets.cpp
${imgui_SOURCE_DIR}/backends/imgui_impl_glfw.cpp
${imgui_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp
file(GLOB_RECURSE AETHER_RENDERER_SOURCES CONFIGURE_DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/renderer/*.cpp"
)

target_include_directories(imgui PUBLIC
${imgui_SOURCE_DIR}
${imgui_SOURCE_DIR}/backends
add_library(AetherEngine STATIC
${AETHER_ENGINE_SOURCES}
engine/api/AetherAPI.hpp
engine/api/RenderBody.hpp
)

target_compile_definitions(imgui PRIVATE IMGUI_IMPL_OPENGL_LOADER_GLAD)

target_link_libraries(imgui PRIVATE glfw OpenGL::GL)

target_include_directories(Aether_Test PRIVATE engine)
target_include_directories(AetherEngine PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/engine
)

target_link_libraries(Aether_Test
glfw
glad
OpenGL::GL
target_link_libraries(AetherEngine PRIVATE
glm
imgui
)

if(AETHER_BUILD_TARGET STREQUAL "Desktop")
aether_use_local_fetchcontent(imgui imgui-src)

FetchContent_Declare(
glfw
GIT_REPOSITORY https://github.com/glfw/glfw.git
GIT_TAG 3.3.8
)

FetchContent_MakeAvailable(glfw)

FetchContent_Declare(
glad
GIT_REPOSITORY https://github.com/Dav1dde/glad.git
GIT_TAG v0.1.36
)

FetchContent_Declare(
imgui
GIT_REPOSITORY https://github.com/ocornut/imgui.git
GIT_TAG v1.90.8
)

FetchContent_MakeAvailable(imgui)

FetchContent_MakeAvailable(glad)

find_package(OpenGL REQUIRED)

add_library(imgui STATIC
${imgui_SOURCE_DIR}/imgui.cpp
${imgui_SOURCE_DIR}/imgui_draw.cpp
${imgui_SOURCE_DIR}/imgui_tables.cpp
${imgui_SOURCE_DIR}/imgui_widgets.cpp
${imgui_SOURCE_DIR}/backends/imgui_impl_glfw.cpp
${imgui_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp
)

target_include_directories(imgui PUBLIC
${imgui_SOURCE_DIR}
${imgui_SOURCE_DIR}/backends
)

target_compile_definitions(imgui PRIVATE IMGUI_IMPL_OPENGL_LOADER_GLAD)

target_link_libraries(imgui PRIVATE glfw OpenGL::GL)

add_executable(AetherDesktop
app/main.cpp
app/test_scenarios.cpp
${AETHER_RENDERER_SOURCES}
)

target_include_directories(AetherDesktop PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/app
${CMAKE_CURRENT_SOURCE_DIR}/renderer
)

target_link_libraries(AetherDesktop PRIVATE
AetherEngine
glfw
glad
OpenGL::GL
glm
imgui
)
elseif(AETHER_BUILD_TARGET STREQUAL "WASM")

add_executable(AetherWasm
wasm/main.cpp
)

target_link_libraries(AetherWasm PRIVATE
AetherEngine
)

if(EMSCRIPTEN)
target_link_options(AetherWasm PRIVATE
"-sWASM=1"
"-sMODULARIZE=1"
"-sEXPORT_ES6=1"
"-sALLOW_MEMORY_GROWTH=1"
"-sENVIRONMENT=web"
"-sEXPORTED_FUNCTIONS=['_Init','_Step']"
"-sEXPORTED_RUNTIME_METHODS=['ccall']"
)
endif()

else()
message(FATAL_ERROR "Unknown AETHER_BUILD_TARGET value: ${AETHER_BUILD_TARGET}. Use Desktop or WASM.")
endif()
6 changes: 3 additions & 3 deletions app/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "world/physicsworld.hpp"
#include "api/AetherAPI.hpp"
#include "../renderer/window.hpp"

// BoxRamp
int main()
{
PhysicsWorld world;
AetherAPI api;

CreateWindow(world);
CreateWindow(api);
return 0;
}
Loading