Implement graphics/windowing separation layer

.gitmodules

@@ -1,21 +1,24 @@
+[submodule "Submodules/angelscript_addons_impl"]
+ path = Submodules/angelscript_addons_impl
+ url = https://github.com/NeoDoa-Collective/angelscript_addons_impl
+[submodule "Submodules/detector"]
+ path = Submodules/detector
+ url = https://github.com/NeoDoa-Collective/detector
 [submodule "Submodules/EZEasing"]
  path = Submodules/EZEasing
  url = https://github.com/NeoDoa-Collective/EZEasing
 [submodule "Submodules/IconFontCppHeaders"]
  path = Submodules/IconFontCppHeaders
  url = https://github.com/NeoDoa-Collective/IconFontCppHeaders
-[submodule "Submodules/detector"]
- path = Submodules/detector
- url = https://github.com/NeoDoa-Collective/detector
-[submodule "Submodules/libtinyfiledialogs"]
- path = Submodules/libtinyfiledialogs
- url = https://github.com/NeoDoa-Collective/libtinyfiledialogs
 [submodule "Submodules/imgInspect"]
  path = Submodules/imgInspect
  url = https://github.com/NeoDoa-Collective/imgInspect
+[submodule "Submodules/libtinyfiledialogs"]
+ path = Submodules/libtinyfiledialogs
+ url = https://github.com/NeoDoa-Collective/libtinyfiledialogs
 [submodule "Submodules/stb_impl"]
  path = Submodules/stb_impl
  url = https://github.com/NeoDoa-Collective/stb_impl
-[submodule "Submodules/angelscript_addons_impl"]
- path = Submodules/angelscript_addons_impl
- url = https://github.com/NeoDoa-Collective/angelscript_addons_impl
+[submodule "Submodules/debugbreak"]
+ path = Submodules/debugbreak
+ url = https://github.com/NeoDoa-Collective/debugbreak

CMakeLists.txt

@@ -1,36 +1,68 @@
 cmake_minimum_required(VERSION 3.26.4)
 
+set(VCPKG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg" CACHE STRING "vcpkg dir")
+
 function(copy_folder_post_build folder)
  add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
  COMMAND ${CMAKE_COMMAND} -E copy_directory
  ${CMAKE_CURRENT_SOURCE_DIR}/${folder}
  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${folder})
 endfunction()
 
-if (MSVC AND WIN32 AND NOT MSVC_VERSION VERSION_LESS 142)
- add_link_option($<$<CONFIG:Debug>:/INCREMENTAL>)
- add_compile_option($<$<CONFIG:Debug>:/ZI>)
-endif()
-
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Editor)
-set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
+set(CMAKE_TOOLCHAIN_FILE ${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
 
 project(NeoDoa)
 
+message("Generating for ${CMAKE_CXX_COMPILER_ID}")
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+ if(WIN32 AND NOT MSVC_VERSION VERSION_LESS 142)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ add_compile_options(/W4)
+ add_compile_options(/wd4456) # declaration of 'LOCAL_VARIABLE_NAME' hides previous local declaration
+ add_compile_options(/wd4457) # declaration of 'LOCAL_VARIABLE_NAME' hides function parameter
+ add_compile_options(/wd4458) # declaration of 'FUNCTION_PARAMETER_NAME' hides class member
+ add_compile_options(/wd4459) # declaration of 'FUNCTION_PARAMETER_NAME' hides global declaration
+ add_compile_options($<$<CONFIG:Debug>:/ZI>)
+ add_link_options($<$<CONFIG:Debug>:/INCREMENTAL>)
+ endif()
+else()
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ add_compile_options(-fmax-errors=0)
+ add_compile_options(-Wall)
+ add_compile_options(-Wextra)
+ add_compile_options(-Wpedantic)
+ add_compile_options(-Wno-changes-meaning)
+ endif()
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ add_compile_options(-ferror-limit=0)
+ add_compile_options(-Wall)
+ add_compile_options(-Wextra)
+ add_compile_options(-Wpedantic)
+ add_compile_options(-Wno-invalid-utf8)
+ add_compile_options(-Wno-braced-scalar-init)
+ add_compile_options(-Wno-missing-field-initializers)
+ add_compile_options(-Wno-gnu-zero-variadic-macro-arguments)
+ endif()
+endif()
+
 add_compile_options("$<$<CONFIG:DEBUG>:-DDEBUG>")
 add_compile_options("$<$<CONFIG:DEBUG>:-D_DEBUG>")
 add_compile_options("$<$<CONFIG:RELEASE>:-DNDEBUG>")
 add_compile_options("$<$<CONFIG:RELEASE>:-D_NDEBUG>")
 add_compile_definitions(ASSIMP_BUILD_ZLIB=ON)
 add_compile_definitions(IMGUI_DEFINE_MATH_OPERATORS)
+add_compile_definitions(GLFW_INCLUDE_NONE)
 add_compile_definitions(GLM_ENABLE_EXPERIMENTAL)
+add_compile_definitions(OPENGL_4_6_SUPPORT)
 
 add_subdirectory(Submodules/angelscript_addons_impl)
+add_subdirectory(Submodules/debugbreak)
 add_subdirectory(Submodules/detector)
 add_subdirectory(Submodules/EZEasing)
 add_subdirectory(Submodules/IconFontCppHeaders)
@@ -42,6 +74,7 @@ add_subdirectory(Editor)
 add_subdirectory(Launcher)
 
 set_target_properties(angelscript_addons_impl PROPERTIES FOLDER Submodules)
+set_target_properties(debugbreak PROPERTIES FOLDER Submodules)
 set_target_properties(detector PROPERTIES FOLDER Submodules)
 set_target_properties(EZEasing PROPERTIES FOLDER Submodules)
 set_target_properties(IconFontCppHeaders PROPERTIES FOLDER Submodules)

Editor/AssetFilter.cpp

@@ -0,0 +1,69 @@
+#include <Editor/AssetFilter.hpp>
+
+#include <Engine/Assets.hpp>
+
+bool AssetFilters::IncludeSceneAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ AssetHandle handle = assets.FindAsset(assetID);
+ assert(handle.HasValue());
+ return handle->IsScene();
+}
+bool AssetFilters::IncludeComponentAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ AssetHandle handle = assets.FindAsset(assetID);
+ assert(handle.HasValue());
+ return handle->IsComponentDefinition();
+}
+bool AssetFilters::IncludeSamplerAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ AssetHandle handle = assets.FindAsset(assetID);
+ assert(handle.HasValue());
+ return handle->IsSampler();
+}
+bool AssetFilters::IncludeTextureAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ AssetHandle handle = assets.FindAsset(assetID);
+ assert(handle.HasValue());
+ return handle->IsTexture();
+}
+bool AssetFilters::IncludeShaderAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ AssetHandle handle = assets.FindAsset(assetID);
+ assert(handle.HasValue());
+ return handle->IsShader();
+}
+bool AssetFilters::IncludeShaderProgramAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ AssetHandle handle = assets.FindAsset(assetID);
+ assert(handle.HasValue());
+ return handle->IsShaderProgram();
+}
+bool AssetFilters::IncludeMaterialAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ AssetHandle handle = assets.FindAsset(assetID);
+ assert(handle.HasValue());
+ return handle->IsMaterial();
+}
+bool AssetFilters::IncludeModelAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ AssetHandle handle = assets.FindAsset(assetID);
+ assert(handle.HasValue());
+ return handle->IsModel();
+}
+
+bool AssetFilters::ExcludeSceneAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ return !IncludeSceneAssets()(assetID, assets);
+}
+bool AssetFilters::ExcludeComponentAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ return !IncludeComponentAssets()(assetID, assets);
+}
+bool AssetFilters::ExcludeSamplerAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ return !IncludeSamplerAssets()(assetID, assets);
+}
+bool AssetFilters::ExcludeTextureAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ return !IncludeTextureAssets()(assetID, assets);
+}
+bool AssetFilters::ExcludeShaderAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ return !IncludeShaderAssets()(assetID, assets);
+}
+bool AssetFilters::ExcludeShaderProgramAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ return !IncludeShaderProgramAssets()(assetID, assets);
+}
+bool AssetFilters::ExcludeMaterialAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ return !IncludeMaterialAssets()(assetID, assets);
+}
+bool AssetFilters::ExcludeModelAssets::operator()(UUID assetID, const Assets& assets) const noexcept {
+ return !IncludeModelAssets()(assetID, assets);
+}

Editor/AssetFilter.hpp

@@ -0,0 +1,90 @@
+#pragma once
+
+#include <concepts>
+#include <functional>
+
+#include <Engine/UUID.hpp>
+
+struct Assets;
+
+template<typename Callable>
+concept AssetFilter = requires (Callable& c, UUID assetID, const Assets& assets) {
+ { std::invoke(c, assetID, assets) } -> std::convertible_to<bool>;
+};
+
+template<AssetFilter T1, AssetFilter T2>
+auto operator|(const T1& f1, const T2& f2) {
+ return [f1, f2](UUID assetID, const Assets& assets) {
+ return std::invoke(f1, assetID, assets) || std::invoke(f2, assetID, assets);
+ };
+}
+
+namespace AssetFilters {
+ struct IncludeSceneAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct IncludeComponentAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct IncludeSamplerAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct IncludeTextureAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct IncludeShaderAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct IncludeShaderProgramAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct IncludeMaterialAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct IncludeModelAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+
+ struct ExcludeSceneAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct ExcludeComponentAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct ExcludeSamplerAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct ExcludeTextureAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct ExcludeShaderAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct ExcludeShaderProgramAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct ExcludeMaterialAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+ struct ExcludeModelAssets {
+ bool operator()(UUID assetID, const Assets& assets) const noexcept;
+ };
+}
+
+static_assert(AssetFilter<AssetFilters::IncludeSceneAssets >);
+static_assert(AssetFilter<AssetFilters::IncludeComponentAssets >);
+static_assert(AssetFilter<AssetFilters::IncludeSamplerAssets >);
+static_assert(AssetFilter<AssetFilters::IncludeTextureAssets >);
+static_assert(AssetFilter<AssetFilters::IncludeShaderAssets >);
+static_assert(AssetFilter<AssetFilters::IncludeShaderProgramAssets>);
+static_assert(AssetFilter<AssetFilters::IncludeMaterialAssets >);
+static_assert(AssetFilter<AssetFilters::IncludeModelAssets >);
+
+static_assert(AssetFilter<AssetFilters::ExcludeSceneAssets >);
+static_assert(AssetFilter<AssetFilters::ExcludeComponentAssets >);
+static_assert(AssetFilter<AssetFilters::ExcludeSamplerAssets >);
+static_assert(AssetFilter<AssetFilters::ExcludeTextureAssets >);
+static_assert(AssetFilter<AssetFilters::ExcludeShaderAssets >);
+static_assert(AssetFilter<AssetFilters::ExcludeShaderProgramAssets>);
+static_assert(AssetFilter<AssetFilters::ExcludeMaterialAssets >);
+static_assert(AssetFilter<AssetFilters::ExcludeModelAssets >);

Editor/AssetManager.cpp

@@ -23,7 +23,7 @@ AssetManager::AssetManager(GUI& gui) noexcept :
 }
 
 bool AssetManager::Begin() {
- const GUI& gui = this->gui;
+ [[maybe_unused]] const GUI& gui = this->gui;
  ImGui::PushID(WindowStrings::AssetManagerWindowName);
  bool visible = ImGui::Begin(WindowStrings::AssetManagerWindowTitleID, nullptr, ImGuiWindowFlags_MenuBar);
 
@@ -399,7 +399,7 @@ void AssetManager::RenderSelectedFolderContent() {
 
 void AssetManager::RenderContextMenu() {
  GUI& gui = this->gui.get();
- Assets& assets = *gui.CORE->GetAssets();
+ [[maybe_unused]] Assets& assets = *gui.CORE->GetAssets();
 
  bool isDisabled = !hasContent;
  if (isDisabled) { ImGui::BeginDisabled(); }
@@ -464,7 +464,14 @@ void AssetManager::RenderContextMenu() {
  if (ImGui::MenuItem(shaderProgram)) {
  gui.ShowNewShaderProgramAssetModal(*currentFolder);
  }
-
+ static constexpr auto material = cat(FileIcons::MATERIAL_ICON, " ", "Material");
+ if (ImGui::MenuItem(material)) {
+ gui.ShowNewMaterialAssetModal(*currentFolder);
+ }
+ static constexpr auto sampler = cat(FileIcons::SAMPLER_ICON, " ", "Sampler");
+ if (ImGui::MenuItem(sampler)) {
+ gui.ShowNewSamplerAssetModal(*currentFolder);
+ }
  ImGui::EndMenu();
  }
 
@@ -515,7 +522,6 @@ void AssetManager::SetCurrentFolder(FNode* folder) {
  }
 
  if (!folder->IsDirectory()) { return; }
- GUI& gui = this->gui;
 
  if (folder == root || folder == currentFolder->ParentNode()) {
  SetSelectedNode(nullptr);
@@ -545,7 +551,7 @@ bool AssetManager::FileFilter::CheckVisibility(const FNode& file) const {
  return true;
 }
 
-void AssetManager::OnProjectLoaded(Project& project) {
+void AssetManager::OnProjectLoaded([[maybe_unused]] Project& project) {
  hasContent = true;
  assets = gui.get().CORE->GetAssets().get();
  root = &assets->Root();

Editor/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.26.4)
 
 project(Editor LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_executable(Editor)
 
@@ -12,12 +12,12 @@ target_link_libraries(Editor PUBLIC Engine)
 
 find_package(argparse CONFIG REQUIRED)
 find_package(cppzmq CONFIG REQUIRED)
-find_package(unofficial-imguizmo CONFIG REQUIRED)
+find_package(imguizmo CONFIG REQUIRED)
 find_package(unofficial-lunasvg CONFIG REQUIRED)
 
 target_link_libraries(Editor PUBLIC argparse::argparse)
 target_link_libraries(Editor PUBLIC cppzmq cppzmq-static)
-target_link_libraries(Editor PUBLIC unofficial::imguizmo::imguizmo)
+target_link_libraries(Editor PUBLIC imguizmo::imguizmo)
 target_link_libraries(Editor PUBLIC unofficial::lunasvg::lunasvg)
 
 set(GROUP_LIST
@@ -46,6 +46,8 @@ set(GROUP_LIST
  "Language/CodeGenerator.cpp"
  "Language/CodeGenerator.hpp"
 
+ "UI/AssetFilter/AssetFilter.cpp"
+ "UI/AssetFilter/AssetFilter.hpp"
  "UI/Colors/Colors.hpp"
  "UI/Components/ComponentUI.cpp"
  "UI/Components/ComponentUI.hpp"
@@ -92,6 +94,20 @@ set(GROUP_LIST
  "UI/GUI/Modals/NewAssetModal.hpp"
  "UI/GUI/Observer/Observer.cpp"
  "UI/GUI/Observer/Observer.hpp"
+ "UI/GUI/Observer/Displays/DisplayTargetRenderer.cpp"
+ "UI/GUI/Observer/Displays/DisplayTargetRenderer.hpp"
+ "UI/GUI/Observer/Displays/SceneDisplay/SceneDisplay.cpp"
+ "UI/GUI/Observer/Displays/SceneDisplay/SceneDisplay.hpp"
+ "UI/GUI/Observer/Displays/ComponentDefinitionDisplay/ComponentDefinitionDisplay.cpp"
+ "UI/GUI/Observer/Displays/ComponentDefinitionDisplay/ComponentDefinitionDisplay.hpp"
+ "UI/GUI/Observer/Displays/SamplerDisplay/SamplerDisplay.cpp"
+ "UI/GUI/Observer/Displays/SamplerDisplay/SamplerDisplay.hpp"
+ "UI/GUI/Observer/Displays/ShaderDisplay/ShaderDisplay.cpp"
+ "UI/GUI/Observer/Displays/ShaderDisplay/ShaderDisplay.hpp"
+ "UI/GUI/Observer/Displays/ShaderProgramDisplay/ShaderProgramDisplay.cpp"
+ "UI/GUI/Observer/Displays/ShaderProgramDisplay/ShaderProgramDisplay.hpp"
+ "UI/GUI/Observer/Displays/MaterialDisplay/MaterialDisplay.cpp"
+ "UI/GUI/Observer/Displays/MaterialDisplay/MaterialDisplay.hpp"
  "UI/GUI/SceneHierarchy/SceneHierarchy.cpp"
  "UI/GUI/SceneHierarchy/SceneHierarchy.hpp"
  "UI/GUI/SceneSettings/SceneSettings.cpp"