diff --git a/.idea/EtrediaEmpires.iml b/.idea/EtrediaEmpires.iml index f08604b..4c94235 100644 --- a/.idea/EtrediaEmpires.iml +++ b/.idea/EtrediaEmpires.iml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/.idea/editor.xml b/.idea/editor.xml new file mode 100644 index 0000000..8d0e15e --- /dev/null +++ b/.idea/editor.xml @@ -0,0 +1,345 @@ + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index bbce9cb..c5c4b0f 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,11 +1,28 @@ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index dc80d29..3d3e78b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,11 @@ -cmake_minimum_required (VERSION 4.2.3) +cmake_minimum_required (VERSION 4.1) +set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "d0edc3af-4c50-42ea-a356-e2862fe7a444") set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_SCAN_FOR_MODULES ON) set(CMAKE_POSITION_INDEPENDENT_CODE OFF) +set(CMAKE_CXX_MODULE_STD ON) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/CMakePresets.json b/CMakePresets.json index b38212e..f832ed8 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -10,7 +10,8 @@ "cacheVariables": { "CMAKE_C_COMPILER": "cl.exe", "CMAKE_CXX_COMPILER": "cl.exe", - "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", + "VCPKG_OVERLAY_PORTS": "${sourceDir}/ports" }, "condition": { "type": "equals", diff --git a/engine/src/main.cpp b/engine/src/main.cpp index 3efadd6..24f9483 100644 --- a/engine/src/main.cpp +++ b/engine/src/main.cpp @@ -1,3 +1,8 @@ +#include "Logger.h" +#include "compile_config.hpp" +#include +#include + import utils; import Engine; @@ -5,10 +10,6 @@ import Actions; import MagnumRender; import GLFWInput; -#include "Logger.h" -#include "compile_config.hpp" -#include -#include IP7_Trace* Logger::trace; int main(int argc, char **argv) diff --git a/ports/corrade/build-corrade-rc-always.patch b/ports/corrade/build-corrade-rc-always.patch new file mode 100644 index 0000000..0e46a52 --- /dev/null +++ b/ports/corrade/build-corrade-rc-always.patch @@ -0,0 +1,27 @@ +--- a/src/Corrade/Utility/CMakeLists.txt ++++ b/src/Corrade/Utility/CMakeLists.txt +@@ -185,13 +185,12 @@ + # corrade-rc when generating WinRT targets by setting + # set_target_properties(corrade-rc PROPERTIES VS_WINRT_COMPONENT OFF) + # Then this would be if(NOT CMAKE_CROSSCOMPILING OR CORRADE_TARGET_WINDOWS_RT). + # However, it seems like this feature never materialized, as doing this will + # result in corrade-rc that's looking for vcruntime140_app.dll in order to be + # run. Last checked: Nov 2019. +-if(NOT CMAKE_CROSSCOMPILING) + # Sources for standalone corrade-rc + set(CorradeUtilityRc_SRCS + Arguments.cpp + Debug.cpp + Directory.cpp + Configuration.cpp +@@ -235,9 +234,10 @@ + if(CORRADE_TARGET_UNIX) + target_link_libraries(corrade-rc PRIVATE ${CMAKE_DL_LIBS}) + endif() + set_target_properties(corrade-rc PROPERTIES FOLDER "Corrade/Utility") + install(TARGETS corrade-rc DESTINATION ${CORRADE_BINARY_INSTALL_DIR}) + ++if(NOT CMAKE_CROSSCOMPILING) + # Corrade::rc target alias for superprojects + add_executable(Corrade::rc ALIAS corrade-rc) + endif() diff --git a/ports/corrade/clang-16.patch b/ports/corrade/clang-16.patch new file mode 100644 index 0000000..a6e6fe1 --- /dev/null +++ b/ports/corrade/clang-16.patch @@ -0,0 +1,32 @@ +diff --git a/src/Corrade/Utility/StlForwardArray.h b/src/Corrade/Utility/StlForwardArray.h +index 0e78d61..363fafb 100644 +--- a/src/Corrade/Utility/StlForwardArray.h ++++ b/src/Corrade/Utility/StlForwardArray.h +@@ -55,7 +55,11 @@ possible or is unknown is equivalent to @cpp #include @ce. + + #ifdef CORRADE_TARGET_LIBCXX + /* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L223 */ ++#if _LIBCPP_VERSION < 160000 + #include <__tuple> ++#else ++#include <__fwd/array.h> ++#endif + #elif defined(CORRADE_TARGET_DINKUMWARE) + /* MSVC has it defined next to std::pair */ + #include +diff --git a/src/Corrade/Utility/StlForwardTuple.h b/src/Corrade/Utility/StlForwardTuple.h +index 5701bc0..3292ec8 100644 +--- a/src/Corrade/Utility/StlForwardTuple.h ++++ b/src/Corrade/Utility/StlForwardTuple.h +@@ -55,7 +55,11 @@ is equivalent to @cpp #include @ce. + + #ifdef CORRADE_TARGET_LIBCXX + /* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L163 */ ++#if _LIBCPP_VERSION < 160000 + #include <__tuple> ++#else ++#include <__fwd/tuple.h> ++#endif + #elif defined(CORRADE_TARGET_LIBSTDCXX) + /* https://github.com/gcc-mirror/gcc/blob/c014d57d57a03e6061a57fa8534e90979567392b/libstdc%2B%2B-v3/include/std/type_traits#L2465-L2466 */ + #include diff --git a/ports/corrade/fix-vs2019.patch b/ports/corrade/fix-vs2019.patch new file mode 100644 index 0000000..b7e6599 --- /dev/null +++ b/ports/corrade/fix-vs2019.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0cc288..e5a4648 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,7 +195,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set(MSVC2017_COMPATIBILITY ON) + message(WARNING "MSVC 2017 detected, automatically enabling MSVC2017_COMPATIBILITY. Note that some features may not be available with this compiler.") + endif() +- elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.30") ++ elseif(CMAKE_CXX_COMPILER_VERSION GREATER "19.20") + if(NOT MSVC2019_COMPATIBILITY) + set(MSVC2019_COMPATIBILITY ON) + message(WARNING "MSVC 2019 detected, automatically enabling MSVC2019_COMPATIBILITY. Note that some features may not be available with this compiler.") diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake new file mode 100644 index 0000000..9119825 --- /dev/null +++ b/ports/corrade/portfile.cmake @@ -0,0 +1,76 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mosra/corrade + REF 2b7251d + SHA512 46497fd8f7a883047e402d4f737d5e34fdd296c342359ba24ef4d5d95f7b3de6f137fda3c8b2181f8baa65ff536aeea98177b9b1323396eb048cace4d82fe908 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +# Handle features +set(_COMPONENTS "") +foreach(_feature IN LISTS ALL_FEATURES) + # Uppercase the feature name and replace "-" with "_" + string(TOUPPER "${_feature}" _FEATURE) + string(REPLACE "-" "_" _FEATURE "${_FEATURE}") + + # Final feature is empty, ignore it + if(_feature AND NOT "${_feature}" STREQUAL "dynamic-pluginmanager") + list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE}) + endif() +endforeach() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) + +set(corrade_rc_param "") +if(VCPKG_CROSSCOMPILING) + set(corrade_rc_param + "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + "${corrade_rc_param}" + -DUTILITY_USE_ANSI_COLORS=ON + -DBUILD_STATIC=${BUILD_STATIC} + MAYBE_UNUSED_VARIABLES + CORRADE_RC_EXECUTABLE + UTILITY_USE_ANSI_COLORS +) + +vcpkg_cmake_install() + +# Debug includes and share are the same as release +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# corrade-rc is not built when CMAKE_CROSSCOMPILING +vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN) + +# Ensure no empty folders are left behind +if(FEATURES STREQUAL "core") + # No features, no libs (only Corrade.h). + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug") + # debug is completely empty, as include and share + # have already been removed. + +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # No dlls + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json new file mode 100644 index 0000000..6bb6ed7 --- /dev/null +++ b/ports/corrade/vcpkg.json @@ -0,0 +1,86 @@ +{ + "name": "corrade", + "version-string": "2020.06", + "port-version": 8, + "description": "C++11/C++14 multiplatform utility library.", + "homepage": "https://magnum.graphics/corrade/", + "dependencies": [ + { + "name": "corrade", + "host": true, + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "interconnect", + "pluginmanager", + "testsuite", + "utility" + ], + "features": { + "dynamic-pluginmanager": { + "description": "PluginManager library with dynamic plugin support", + "supports": "!ios & !uwp & !android", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "pluginmanager" + ] + } + ] + }, + "interconnect": { + "description": "Interconnect library", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "utility" + ] + } + ] + }, + "pluginmanager": { + "description": "PluginManager library", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + { + "name": "dynamic-pluginmanager", + "platform": "!ios & !uwp & !android" + }, + "utility" + ] + } + ] + }, + "testsuite": { + "description": "TestSuite library", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "utility" + ] + } + ] + }, + "utility": { + "description": "Utility library" + } + } +} diff --git a/ports/magnum/002-sdl-includes.patch b/ports/magnum/002-sdl-includes.patch new file mode 100644 index 0000000..fb2ffed --- /dev/null +++ b/ports/magnum/002-sdl-includes.patch @@ -0,0 +1,43 @@ +diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp +index 276c7ee55..90c52f3cb 100644 +--- a/src/Magnum/Platform/Sdl2Application.cpp ++++ b/src/Magnum/Platform/Sdl2Application.cpp +@@ -34,7 +34,7 @@ + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wpragma-pack" + #endif +-#include ++#include + #ifdef CORRADE_TARGET_CLANG_CL + #pragma clang diagnostic pop + #endif +diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h +index b2426d513..176729fdb 100644 +--- a/src/Magnum/Platform/Sdl2Application.h ++++ b/src/Magnum/Platform/Sdl2Application.h +@@ -57,11 +57,11 @@ + #pragma clang diagnostic ignored "-Wpragma-pack" + #endif + /* SDL.h includes the world, adding 50k LOC. We don't want that either. */ +-#include +-#include +-#include /* huh, why is this not pulled in implicitly?! */ +-#include +-#include ++#include ++#include ++#include /* huh, why is this not pulled in implicitly?! */ ++#include ++#include + + #ifdef CORRADE_TARGET_IOS + /* Including SDL_main.h unconditionally would mean it'd override Corrade::Main +@@ -74,7 +74,7 @@ + #endif + + #ifdef CORRADE_TARGET_WINDOWS_RT +-#include /* For SDL_WinRTRunApp */ ++#include /* For SDL_WinRTRunApp */ + #include /* For the WinMain entrypoint */ + #endif + #ifdef CORRADE_TARGET_CLANG_CL diff --git a/ports/magnum/003-fix-FindGLFW.patch b/ports/magnum/003-fix-FindGLFW.patch new file mode 100644 index 0000000..a6b9cdf --- /dev/null +++ b/ports/magnum/003-fix-FindGLFW.patch @@ -0,0 +1,16 @@ +diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake +index 8761448..17321af 100644 +--- a/modules/FindMagnum.cmake ++++ b/modules/FindMagnum.cmake +@@ -647,9 +647,9 @@ foreach(_component ${Magnum_FIND_COMPONENTS}) + + # GLFW application dependencies + elseif(_component STREQUAL GlfwApplication) +- find_package(GLFW) ++ find_package(glfw3 CONFIG REQUIRED) + set_property(TARGET Magnum::${_component} APPEND PROPERTY +- INTERFACE_LINK_LIBRARIES GLFW::GLFW) ++ INTERFACE_LINK_LIBRARIES glfw) + # Use the Foundation framework on Apple to query the DPI awareness + if(CORRADE_TARGET_APPLE) + find_library(_MAGNUM_APPLE_FOUNDATION_FRAMEWORK_LIBRARY Foundation) diff --git a/ports/magnum/004-fix-FindOpenAL.patch b/ports/magnum/004-fix-FindOpenAL.patch new file mode 100644 index 0000000..f108612 --- /dev/null +++ b/ports/magnum/004-fix-FindOpenAL.patch @@ -0,0 +1,25 @@ +diff --git a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt +index 64371a4..375ca58 100644 +--- a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt ++++ b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt +@@ -24,6 +24,7 @@ + # + + find_package(Corrade REQUIRED PluginManager) ++find_package(OpenAL CONFIG REQUIRED) + + if(BUILD_PLUGINS_STATIC) + set(MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC 1) +diff --git a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt +index f4172d4..bdfd9da 100644 +--- a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt ++++ b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt +@@ -24,6 +24,8 @@ + # + + find_package(Corrade REQUIRED PluginManager) ++include(CMakeFindDependencyMacro) ++find_dependency(OpenAL) + + if(BUILD_PLUGINS_STATIC) + set(MAGNUM_WAVAUDIOIMPORTER_BUILD_STATIC 1) diff --git a/ports/magnum/005-fix-find-sdl2.patch b/ports/magnum/005-fix-find-sdl2.patch new file mode 100644 index 0000000..c435e9f --- /dev/null +++ b/ports/magnum/005-fix-find-sdl2.patch @@ -0,0 +1,13 @@ +diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt +index f1b404f..19babf4 100644 +--- a/src/Magnum/Platform/CMakeLists.txt ++++ b/src/Magnum/Platform/CMakeLists.txt +@@ -292,7 +292,7 @@ endif() + + # SDL2 application + if(WITH_SDL2APPLICATION) +- find_package(SDL2) ++ find_package(SDL2 CONFIG REQUIRED) + if(NOT SDL2_FOUND) + message(FATAL_ERROR "SDL2 library, required by Sdl2Application, was not found. Set WITH_SDL2APPLICATION to OFF to skip building it.") + endif() diff --git a/ports/magnum/006-fix-build.patch b/ports/magnum/006-fix-build.patch new file mode 100644 index 0000000..002b013 --- /dev/null +++ b/ports/magnum/006-fix-build.patch @@ -0,0 +1,70 @@ +diff --git a/src/Magnum/Vk/Enums.cpp b/src/Magnum/Vk/Enums.cpp +index ad8b6d063..b7dffb74f 100644 +--- a/src/Magnum/Vk/Enums.cpp ++++ b/src/Magnum/Vk/Enums.cpp +@@ -36,17 +36,17 @@ namespace Magnum { namespace Vk { + + namespace { + +-constexpr VkPrimitiveTopology PrimitiveTopologyMapping[]{ ++constexpr UnsignedInt PrimitiveTopologyMapping[]{ + VK_PRIMITIVE_TOPOLOGY_POINT_LIST, + VK_PRIMITIVE_TOPOLOGY_LINE_LIST, +- VkPrimitiveTopology(~UnsignedInt{}), ++ ~UnsignedInt{}, + VK_PRIMITIVE_TOPOLOGY_LINE_STRIP, + VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, + VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP, + VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN, +- VkPrimitiveTopology(~UnsignedInt{}), /* Instances */ +- VkPrimitiveTopology(~UnsignedInt{}), /* Faces */ +- VkPrimitiveTopology(~UnsignedInt{}) /* Edges */ ++ ~UnsignedInt{}, /* Instances */ ++ ~UnsignedInt{}, /* Faces */ ++ ~UnsignedInt{} /* Edges */ + }; + + constexpr VkIndexType IndexTypeMapping[]{ +@@ -94,12 +94,12 @@ constexpr VkSamplerMipmapMode SamplerMipmapModeMapping[]{ + VK_SAMPLER_MIPMAP_MODE_LINEAR + }; + +-constexpr VkSamplerAddressMode SamplerAddressModeMapping[]{ ++constexpr UnsignedInt SamplerAddressModeMapping[]{ + VK_SAMPLER_ADDRESS_MODE_REPEAT, + VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT, + VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, + VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER, +- VkSamplerAddressMode(~UnsignedInt{}), ++ ~UnsignedInt{}, + }; + + } +@@ -119,10 +119,10 @@ VkPrimitiveTopology vkPrimitiveTopology(const Magnum::MeshPrimitive primitive) { + + CORRADE_ASSERT(UnsignedInt(primitive) - 1 < Containers::arraySize(PrimitiveTopologyMapping), + "Vk::vkPrimitiveTopology(): invalid primitive" << primitive, {}); +- const VkPrimitiveTopology out = PrimitiveTopologyMapping[UnsignedInt(primitive) - 1]; +- CORRADE_ASSERT(out != VkPrimitiveTopology(~UnsignedInt{}), ++ const UnsignedInt out = PrimitiveTopologyMapping[UnsignedInt(primitive) - 1]; ++ CORRADE_ASSERT(out != ~UnsignedInt{}, + "Vk::vkPrimitiveTopology(): unsupported primitive" << primitive, {}); +- return out; ++ return VkPrimitiveTopology(out); + } + + bool hasVkIndexType(const Magnum::MeshIndexType type) { +@@ -224,10 +224,10 @@ bool hasVkSamplerAddressMode(const Magnum::SamplerWrapping wrapping) { + VkSamplerAddressMode vkSamplerAddressMode(const Magnum::SamplerWrapping wrapping) { + CORRADE_ASSERT(UnsignedInt(wrapping) < Containers::arraySize(SamplerAddressModeMapping), + "Vk::vkSamplerAddressMode(): invalid wrapping" << wrapping, {}); +- const VkSamplerAddressMode out = SamplerAddressModeMapping[UnsignedInt(wrapping)]; +- CORRADE_ASSERT(out != VkSamplerAddressMode(~UnsignedInt{}), ++ const UnsignedInt out = SamplerAddressModeMapping[UnsignedInt(wrapping)]; ++ CORRADE_ASSERT(out != ~UnsignedInt{}, + "Vk::vkSamplerAddressMode(): unsupported wrapping" << wrapping, {}); +- return out; ++ return VkSamplerAddressMode(out); + } + + }} diff --git a/ports/magnum/magnumdeploy.ps1 b/ports/magnum/magnumdeploy.ps1 new file mode 100644 index 0000000..1dad8fe --- /dev/null +++ b/ports/magnum/magnumdeploy.ps1 @@ -0,0 +1,40 @@ +# Magnum's plugin deployment strategy is that each Magnum module has a hardcoded +# set of plugin directories. Each of these directories is deployed in +# full if that Module is referenced. +# +# Note: this function signature and behavior is depended upon by applocal.ps1 +function deployPluginsIfMagnum([string]$targetBinaryDir, [string]$MagnumPluginsDir, [string]$targetBinaryName) { + Write-Verbose "Deploying magnum plugins" + + $baseDir = Split-Path $MagnumPluginsDir -parent + $pluginsBase = Split-Path $MagnumPluginsDir -Leaf + $binDir = "$baseDir\bin" + + function deployPlugins([string]$pluginSubdirName) { + if (Test-Path "$MagnumPluginsDir\$pluginSubdirName") { + Write-Verbose " Deploying plugins directory '$pluginSubdirName'" + New-Item "$targetBinaryDir\$pluginsBase\$pluginSubdirName" -ItemType Directory -ErrorAction SilentlyContinue | Out-Null + Get-ChildItem -Path "$MagnumPluginsDir\$pluginSubdirName\*" -Include "*.dll", "*.conf", "*.pdb" | % { + deployBinary "$targetBinaryDir\$pluginsBase\$pluginSubdirName" "$MagnumPluginsDir\$pluginSubdirName" $_.Name + resolve $_ + } + } else { + Write-Verbose " Skipping plugins directory '$pluginSubdirName': doesn't exist" + } + } + + # We detect Magnum modules in use via the DLLs that contain their + # plugin interfaces. + if ($targetBinaryName -like "MagnumAudio.dll" -or $targetBinaryName -like "MagnumAudio-d.dll") { + deployPlugins "audioimporters" + } elseif ($targetBinaryName -like "MagnumText.dll" -or $targetBinaryName -like "MagnumText-d.dll") { + deployPlugins "fonts" + deployPlugins "fontconverters" + } elseif ($targetBinaryName -like "MagnumTrade.dll" -or $targetBinaryName -like "MagnumTrade-d.dll") { + deployPlugins "importers" + deployPlugins "imageconverters" + deployPlugins "sceneconverters" + } elseif ($targetBinaryName -like "MagnumShaderTools.dll" -or $targetBinaryName -like "MagnumShaderTools-d.dll") { + deployPlugins "shaderconverters" + } +} diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake new file mode 100644 index 0000000..bb56028 --- /dev/null +++ b/ports/magnum/portfile.cmake @@ -0,0 +1,162 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mosra/magnum + REF b4d621c + SHA512 0e5be3e41bf18391979f47f9bcf9b1253a1918a3232ebd3c4cca93305de34cafb5aa58ab72dd1ba623a42a87fb7f4b2e1789ada59cb250c6396e40c508c4a2a5 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_PLUGINS_STATIC) + +set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES}) + +# Head only features +if(NOT VCPKG_USE_HEAD_VERSION) + foreach(_feature anyshaderconverter shadertools shaderconverter vk-info) + if("${_feature}" IN_LIST FEATURES) + message(FATAL_ERROR "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.") + endif() + endforeach() + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter vk-info) +endif() + +set(_COMPONENTS "") +# Generate cmake parameters from feature names +foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES) + # Uppercase the feature name and replace "-" with "_" + string(TOUPPER "${_feature}" _FEATURE) + string(REPLACE "-" "_" _FEATURE "${_FEATURE}") + + # Final feature is empty, ignore it + if(_feature) + list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE}) + endif() +endforeach() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) + +if(VCPKG_CROSSCOMPILING) + set(CORRADE_RC_EXECUTABLE "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${CORRADE_RC_EXECUTABLE} + -DBUILD_STATIC=${BUILD_STATIC} + -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC} + -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d + -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +# Copy tools into vcpkg's tools directory +set(_TOOL_EXEC_NAMES "") +set(_TOOLS + al-info + distancefieldconverter + fontconverter + gl-info + imageconverter + sceneconverter) +if(VCPKG_USE_HEAD_VERSION) + list(APPEND _TOOLS shaderconverter vk-info) +endif() +foreach(_tool IN LISTS _TOOLS) + if("${_tool}" IN_LIST FEATURES) + list(APPEND _TOOL_EXEC_NAMES magnum-${_tool}) + endif() +endforeach() +message(STATUS ${_TOOL_EXEC_NAMES}) +if(_TOOL_EXEC_NAMES) + vcpkg_copy_tools(TOOL_NAMES ${_TOOL_EXEC_NAMES} AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Special handling for plugins. +# +# For static plugins, in order to make MSBuild auto-linking magic work, where +# the linker implicitly takes everything from the root lib/ folder, the +# static libraries have to be moved out of lib/magnum/blah/ directly to lib/. +# Possibly would be enough to do this just for Windows, doing it also on other +# platforms for consistency. +# +# For dynamic plugins, auto-linking is not desirable as those are meant to be +# loaded dynamically at runtime instead. In order to prevent that, on Windows +# the *.lib files corresponding to the plugin *.dlls are removed. However, we +# cannot remove the *.lib files entirely here, as plugins from magnum-plugins +# are linked to them on Windows (e.g. AssimpImporter depends on +# AnyImageImporter). Thus the Any* plugin lib files are kept, but also not +# moved to the root lib/ folder, to prevent autolinking. A consequence of the +# *.lib file removal is that downstream projects can't implement Magnum plugins +# that would depend on (and thus link to) these, but that's considered a very +# rare use case and so it's fine. +# +# See https://github.com/microsoft/vcpkg/pull/1235#issuecomment-308805989 for +# futher info. +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + # move plugin libs to conventional place + file(GLOB_RECURSE LIB_TO_MOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + file(COPY ${LIB_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum") + + file(GLOB_RECURSE LIB_TO_MOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*") + file(COPY ${LIB_TO_MOVE_DBG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum") +else() + if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB_RECURSE LIB_TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + file(GLOB_RECURSE LIB_TO_KEEP "${CURRENT_PACKAGES_DIR}/lib/magnum/*Any*") + if(LIB_TO_KEEP) + list(REMOVE_ITEM LIB_TO_REMOVE ${LIB_TO_KEEP}) + endif() + if(LIB_TO_REMOVE) + file(REMOVE ${LIB_TO_REMOVE}) + endif() + + if (VCPKG_TARGET_IS_UWP) + set(debug_dir "magnum") + else() + set(debug_dir "magnum-d") + endif() + + file(GLOB_RECURSE LIB_TO_REMOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/*") + file(GLOB_RECURSE LIB_TO_KEEP_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/*Any*") + if(LIB_TO_KEEP_DBG) + list(REMOVE_ITEM LIB_TO_REMOVE_DBG ${LIB_TO_KEEP_DBG}) + endif() + if(LIB_TO_REMOVE_DBG) + file(REMOVE ${LIB_TO_REMOVE_DBG}) + endif() + + # remove maybe empty dirs + foreach(subdir "fonts" "importers" "fontconverters" "imageconverters" "audioimporters") + file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/${subdir}/*") + if(maybe_empty STREQUAL "") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/${subdir}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/${subdir}") + endif() + endforeach() + + file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + if(maybe_empty STREQUAL "") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}") + endif() + + endif() + + file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/magnum") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/${debug_dir}") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json new file mode 100644 index 0000000..a6490bc --- /dev/null +++ b/ports/magnum/vcpkg.json @@ -0,0 +1,560 @@ +{ + "name": "magnum", + "version-string": "2020.06", + "port-version": 19, + "description": "C++11/C++14 graphics middleware for games and data visualization", + "homepage": "https://magnum.graphics/", + "license": null, + "dependencies": [ + { + "name": "corrade", + "host": true, + "features": [ + "utility" + ] + }, + { + "name": "corrade", + "features": [ + "utility" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "anyaudioimporter", + "anyimageconverter", + "anyimageimporter", + "anysceneconverter", + "anysceneimporter", + "debugtools", + "gl", + "meshtools", + "primitives", + "scenegraph", + "sdl2application", + "shaders", + "text", + "texturetools", + "trade" + ], + "features": { + "al-info": { + "description": "magnum-al-info utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "anyaudioimporter": { + "description": "AnyAudioImporter plugin", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "pluginmanager" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "anyimageconverter": { + "description": "AnyImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anyimageimporter": { + "description": "AnyImageImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anysceneconverter": { + "description": "AnySceneConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anysceneimporter": { + "description": "AnySceneImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anyshaderconverter": { + "description": "AnyShaderConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "shadertools" + ] + } + ] + }, + "audio": { + "description": "Audio library", + "dependencies": [ + "openal-soft" + ] + }, + "cglcontext": { + "description": "CglContext library", + "supports": "osx", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "debugtools": { + "description": "DebugTools library" + }, + "distancefieldconverter": { + "description": "magnum-distancefieldconverter utility", + "supports": "!ios & !android", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl", + "texturetools", + "trade" + ] + } + ] + }, + "eglcontext": { + "description": "EglContext library", + "supports": "!windows & !osx", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "fontconverter": { + "description": "magnum-fontconverter utility", + "supports": "!ios & !android", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl", + "text", + "trade" + ] + } + ] + }, + "gl": { + "description": "GL library", + "supports": "!uwp" + }, + "gl-info": { + "description": "gl-info utility", + "supports": "!ios", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "glfwapplication": { + "description": "GlfwApplication library", + "dependencies": [ + "glfw3" + ] + }, + "glxcontext": { + "description": "GlxContext library", + "supports": "!windows & !osx", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "imageconverter": { + "description": "magnum-imageconverter utility", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "dynamic-pluginmanager" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "magnumfont": { + "description": "MagnumFont plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + } + ] + }, + "magnumfontconverter": { + "description": "MagnumFontConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "tgaimageconverter" + ] + } + ] + }, + "meshtools": { + "description": "MeshTools library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "objimporter": { + "description": "ObjImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "opengltester": { + "description": "OpenGLTester library", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "testsuite" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "primitives": { + "description": "Primitives library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "meshtools", + "trade" + ] + } + ] + }, + "sceneconverter": { + "description": "magnum-sceneconverter utility", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "dynamic-pluginmanager" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "anysceneconverter" + ] + } + ] + }, + "scenegraph": { + "description": "SceneGraph library" + }, + "sdl2application": { + "description": "Sdl2Application library", + "dependencies": [ + "sdl2" + ] + }, + "shaderconverter": { + "description": "magnum-shaderconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anyshaderconverter", + "shadertools" + ] + } + ] + }, + "shaders": { + "description": "Shaders library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "shadertools": { + "description": "ShaderTools library" + }, + "text": { + "description": "Text library", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "pluginmanager" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "texturetools" + ] + } + ] + }, + "texturetools": { + "description": "TextureTools library" + }, + "tgaimageconverter": { + "description": "TgaImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "tgaimporter": { + "description": "TgaImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "trade": { + "description": "Trade library", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "pluginmanager" + ] + } + ] + }, + "vk": { + "description": "Vk library", + "dependencies": [ + "vulkan" + ] + }, + "vk-info": { + "description": "vk-info utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "vk" + ] + } + ] + }, + "wavaudioimporter": { + "description": "WavAudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "wglcontext": { + "description": "WglContext library", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlesscglapplication": { + "description": "WindowlessCglApplication library", + "supports": "osx", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlesseglapplication": { + "description": "WindowlessEglApplication library", + "supports": "!windows & !osx & !ios", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlessglxapplication": { + "description": "WindowlessGlxApplication library", + "supports": "!windows & !osx & !ios", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlesswglapplication": { + "description": "WindowlessWglApplication library", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + } + } +} diff --git a/renderers/magnum-renderer/src/Render.cpp b/renderers/magnum-renderer/src/Render.cpp index f714fb0..86204e4 100644 --- a/renderers/magnum-renderer/src/Render.cpp +++ b/renderers/magnum-renderer/src/Render.cpp @@ -9,7 +9,7 @@ module; #include #include #include -#include +#include #include #include @@ -17,6 +17,7 @@ module; #include #include #include +#include module MagnumRender; import utils; @@ -98,10 +99,13 @@ void ee_magnum::MagnumRenderer::LoadProvinces() { GL::Mesh regionMesh; + Containers::ArrayView provinceVertices(province.vertices.data(), province.vertices.size()); + Containers::ArrayView provinceIndices(province.indices.data(), province.indices.size()); + regionMesh.setPrimitive(GL::MeshPrimitive::Triangles) .setCount(static_cast(province.indices.size())) - .addVertexBuffer(GL::Buffer{province.vertices}, 0, GL::Attribute<0, Magnum::Vector2>{}) - .setIndexBuffer(GL::Buffer{province.indices}, 0, GL::MeshIndexType::UnsignedShort); + .addVertexBuffer(GL::Buffer{provinceVertices}, 0, GL::Attribute<0, Magnum::Vector2>{}) + .setIndexBuffer(GL::Buffer{provinceIndices}, 0, GL::MeshIndexType::UnsignedShort); provinceMeshes.push_back(std::move(regionMesh)); @@ -120,14 +124,16 @@ void ee_magnum::MagnumRenderer::LoadProvinces() LOG(INFO, "Registered %d province meshes in renderer", provinceMeshes.size()); provinceSSBO.setTargetHint(GL::Buffer::TargetHint::ShaderStorage); - provinceSSBO.setData(provincesData, GL::BufferUsage::DynamicDraw); + Containers::ArrayView provincesDataView(provincesData.data(), provincesData.size()); + provinceSSBO.setData(provincesDataView, GL::BufferUsage::DynamicDraw); provinceSSBO.bind(GL::Buffer::Target::ShaderStorage, ProvinceMaterial::PROVINCES_DATA_BINDING); } void ee_magnum::MagnumRenderer::UpdateProvinces(const std::size_t index, const std::vector &data) { - provinceSSBO.setSubData(index, data); + Containers::ArrayView provincesData(data.data(), data.size()); + provinceSSBO.setSubData(index, provincesData); } void ee_magnum::MagnumRenderer::Shutdown() diff --git a/vcpkg.json b/vcpkg.json index 3435c37..bacfd41 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,7 +7,15 @@ "vulkan", "glfw3", "glm", - {"name": "magnum", "features": ["glfwapplication"]}, + { + "name": "magnum", + "features": ["glfwapplication"], + "version>=": "0" + }, + { + "name": "corrade", + "version>=": "0" + }, "rmlui", "gtest" ]