diff --git a/.gitmodules b/.gitmodules
index e4ea8a8..efa45ca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,11 +17,11 @@
[submodule "SDL2"]
path = third-party/SDL
url = https://github.com/libsdl-org/SDL
- branch = main
+ branch = SDL2
[submodule "libzip"]
path = third-party/libzip
url = https://github.com/nih-at/libzip
- branch = master
+ branch = main
[submodule "efsw"]
path = third-party/efsw
url = https://github.com/SpartanJ/efsw
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ae29bf..66f0c4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
# MassBuilderSaveTool
-# Copyright (C) 2021-2022 Guillaume Jacquemin
+# Copyright (C) 2021-2024 Guillaume Jacquemin
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,105 +14,127 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.24)
project(MassBuilderSaveTool)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/modules/" ${CMAKE_MODULE_PATH})
-SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+set(ZLIB_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) # Required on setups where zlib is available as both dynamic and static libs. Which is pretty much everywhere, actually.
-set(CORRADE_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_STATIC ON CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(CORRADE_WITH_INTERCONNECT OFF CACHE BOOL "" FORCE)
-set(CORRADE_WITH_PLUGINMANAGER OFF CACHE BOOL "" FORCE)
-set(CORRADE_WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
-set(CORRADE_WITH_MAIN ON CACHE BOOL "" FORCE)
-set(CORRADE_UTILITY_USE_ANSI_COLORS ON CACHE BOOL "" FORCE)
-add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL)
+option(SAVETOOL_USE_SYSTEM_LIBS "Use system-wide versions of the dependencies instead of the versions provided by submodules." OFF)
-set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-set(DIRECTX OFF CACHE BOOL "" FORCE) # We use OpenGL.
-set(SDL_ATOMIC OFF CACHE BOOL "" FORCE)
-set(SDL_CPUINFO OFF CACHE BOOL "" FORCE)
-set(SDL_EVENTS ON CACHE BOOL "" FORCE)
-set(SDL_FILE OFF CACHE BOOL "" FORCE)
-set(SDL_FILESYSTEM OFF CACHE BOOL "" FORCE)
-set(SDL_HAPTIC OFF CACHE BOOL "" FORCE)
-set(SDL_LOCALE OFF CACHE BOOL "" FORCE)
-set(SDL_POWER OFF CACHE BOOL "" FORCE)
-set(SDL_RENDER OFF CACHE BOOL "" FORCE)
-set(SDL_SENSOR OFF CACHE BOOL "" FORCE)
-set(SDL_THREADS ON CACHE BOOL "" FORCE)
-set(SDL_TIMERS ON CACHE BOOL "" FORCE)
-set(SDL_SHARED OFF CACHE BOOL "" FORCE)
-add_subdirectory(third-party/SDL EXCLUDE_FROM_ALL)
+include(CMakeDependentOption)
+cmake_dependent_option(SAVETOOL_USE_SYSTEM_CORRADE_MAGNUM "Use system-wide versions of Corrade and Magnum." ON "SAVETOOL_USE_SYSTEM_LIBS" OFF)
+cmake_dependent_option(SAVETOOL_USE_SYSTEM_SDL2 "Use a system-wide version of SDL2." ON "SAVETOOL_USE_SYSTEM_LIBS" OFF)
+cmake_dependent_option(SAVETOOL_USE_SYSTEM_LIBZIP "Use a system-wide version of libzip." ON "SAVETOOL_USE_SYSTEM_LIBS" OFF)
+cmake_dependent_option(SAVETOOL_USE_SYSTEM_EFSW "Use a system-wide version of EFSW." ON "SAVETOOL_USE_SYSTEM_LIBS" OFF)
+cmake_dependent_option(SAVETOOL_USE_SYSTEM_LIBCURL "Use a system-wide version of libcurl." ON "SAVETOOL_USE_SYSTEM_LIBS" OFF)
-set(MAGNUM_BUILD_STATIC ON CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+if(NOT SAVETOOL_USE_SYSTEM_LIBS OR NOT (SAVETOOL_USE_SYSTEM_CORRADE_MAGNUM AND SAVETOOL_USE_SYSTEM_SDL2 AND SAVETOOL_USE_SYSTEM_LIBZIP AND SAVETOOL_USE_SYSTEM_EFSW AND SAVETOOL_USE_SYSTEM_LIBCURL))
+ # Generic variables shared by multiple libs that don't provide their own.
+ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+ set(BUILD_STATIC_LIBS ON CACHE BOOL "" FORCE)
+ set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
+endif()
-set(MAGNUM_TARGET_GL ON CACHE BOOL "" FORCE)
-set(MAGNUM_TARGET_GLES OFF CACHE BOOL "" FORCE)
-set(MAGNUM_TARGET_VK OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_AUDIO OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_DEBUGTOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_GL ON CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_MATERIALTOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_MESHTOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SCENETOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SHADERS ON CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_TEXT OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_TEXTURETOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_TRADE OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_VK OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SDL2APPLICATION ON CACHE BOOL "" FORCE)
-add_subdirectory(third-party/magnum EXCLUDE_FROM_ALL)
+if(NOT SAVETOOL_USE_SYSTEM_SDL2)
+ set(DIRECTX OFF CACHE BOOL "" FORCE) # We use OpenGL.
+ set(SDL_ATOMIC OFF CACHE BOOL "" FORCE)
+ set(SDL_CPUINFO OFF CACHE BOOL "" FORCE)
+ set(SDL_EVENTS ON CACHE BOOL "" FORCE)
+ set(SDL_FILE OFF CACHE BOOL "" FORCE)
+ set(SDL_FILESYSTEM OFF CACHE BOOL "" FORCE)
+ set(SDL_HAPTIC OFF CACHE BOOL "" FORCE)
+ set(SDL_LOCALE OFF CACHE BOOL "" FORCE)
+ set(SDL_POWER OFF CACHE BOOL "" FORCE)
+ set(SDL_RENDER OFF CACHE BOOL "" FORCE)
+ set(SDL_SENSOR OFF CACHE BOOL "" FORCE)
+ set(SDL_THREADS ON CACHE BOOL "" FORCE)
+ set(SDL_TIMERS ON CACHE BOOL "" FORCE)
+ set(SDL_SHARED OFF CACHE BOOL "" FORCE)
+ add_subdirectory(third-party/SDL EXCLUDE_FROM_ALL)
+endif(NOT SAVETOOL_USE_SYSTEM_SDL2)
-set(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/imgui)
-set(MAGNUM_WITH_IMGUI ON CACHE BOOL "" FORCE)
-add_subdirectory(third-party/magnum-integration EXCLUDE_FROM_ALL)
+if(NOT SAVETOOL_USE_SYSTEM_CORRADE_MAGNUM)
+ set(CORRADE_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
+ set(CORRADE_BUILD_STATIC ON CACHE BOOL "" FORCE)
+ set(CORRADE_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
+ set(CORRADE_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
+ set(CORRADE_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+ set(CORRADE_WITH_INTERCONNECT OFF CACHE BOOL "" FORCE)
+ set(CORRADE_WITH_PLUGINMANAGER OFF CACHE BOOL "" FORCE)
+ set(CORRADE_WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
+ set(CORRADE_WITH_MAIN ON CACHE BOOL "" FORCE)
+ add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL)
-set(ENABLE_COMMONCRYPTO OFF CACHE BOOL "" FORCE)
-set(ENABLE_GNUTLS OFF CACHE BOOL "" FORCE)
-set(ENABLE_MBEDTLS OFF CACHE BOOL "" FORCE)
-set(ENABLE_OPENSSL OFF CACHE BOOL "" FORCE)
-set(ENABLE_WINDOWS_CRYPTO OFF CACHE BOOL "" FORCE)
-set(ENABLE_BZIP2 OFF CACHE BOOL "" FORCE)
-set(ENABLE_LZMA OFF CACHE BOOL "" FORCE)
-set(ENABLE_ZSTD OFF CACHE BOOL "" FORCE)
-set(BUILD_TOOLS OFF CACHE BOOL "" FORCE)
-set(BUILD_REGRESS OFF CACHE BOOL "" FORCE)
-set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-set(BUILD_DOC OFF CACHE BOOL "" FORCE)
-add_subdirectory(third-party/libzip EXCLUDE_FROM_ALL)
+ set(MAGNUM_BUILD_STATIC ON CACHE BOOL "" FORCE)
+ set(MAGNUM_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
+ set(MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(VERBOSE OFF CACHE BOOL "" FORCE)
-set(BUILD_TEST_APP OFF CACHE BOOL "" FORCE)
-set(EFSW_INSTALL OFF CACHE BOOL "" FORCE)
-add_subdirectory(third-party/efsw EXCLUDE_FROM_ALL)
+ set(MAGNUM_TARGET_GL ON CACHE BOOL "" FORCE)
+ set(MAGNUM_TARGET_GLES OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_TARGET_VK OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_AUDIO OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_DEBUGTOOLS OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_GL ON CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_MATERIALTOOLS OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_MESHTOOLS OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_SCENETOOLS OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_SHADERS ON CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_TEXT OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_TEXTURETOOLS OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_TRADE OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_VK OFF CACHE BOOL "" FORCE)
+ set(MAGNUM_WITH_SDL2APPLICATION ON CACHE BOOL "" FORCE)
+ add_subdirectory(third-party/magnum EXCLUDE_FROM_ALL)
-set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
-set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)
-set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-set(ENABLE_UNICODE ON CACHE BOOL "" FORCE)
-set(ENABLE_INET_PTON OFF CACHE BOOL "" FORCE)
-set(ENABLE_DEBUG OFF CACHE BOOL "" FORCE)
-set(ENABLE_THREADED_RESOLVER OFF CACHE BOOL "" FORCE)
-set(HTTP_ONLY ON CACHE BOOL "" FORCE)
-set(USE_LIBIDN2 OFF CACHE BOOL "" FORCE)
-set(USE_WIN32_IDN ON CACHE BOOL "" FORCE)
-set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE)
-set(CURL_STATIC_CRT OFF CACHE BOOL "" FORCE)
-set(CURL_USE_SCHANNEL ON CACHE BOOL "" FORCE)
-set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE) # For some reason, even when HTTP_ONLY is set to ON, libcurl will try to link to libssh2.
-add_subdirectory(third-party/curl EXCLUDE_FROM_ALL)
+ set(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/imgui)
+ set(MAGNUM_WITH_IMGUI ON CACHE BOOL "" FORCE)
+ add_subdirectory(third-party/magnum-integration EXCLUDE_FROM_ALL)
+endif(NOT SAVETOOL_USE_SYSTEM_CORRADE_MAGNUM)
+
+if(NOT SAVETOOL_USE_SYSTEM_LIBZIP)
+ set(ENABLE_COMMONCRYPTO OFF CACHE BOOL "" FORCE)
+ set(ENABLE_GNUTLS OFF CACHE BOOL "" FORCE)
+ set(ENABLE_MBEDTLS OFF CACHE BOOL "" FORCE)
+ set(ENABLE_OPENSSL OFF CACHE BOOL "" FORCE)
+ set(ENABLE_WINDOWS_CRYPTO OFF CACHE BOOL "" FORCE)
+ set(ENABLE_BZIP2 OFF CACHE BOOL "" FORCE)
+ set(ENABLE_LZMA OFF CACHE BOOL "" FORCE)
+ set(ENABLE_ZSTD OFF CACHE BOOL "" FORCE)
+ set(BUILD_TOOLS OFF CACHE BOOL "" FORCE)
+ set(BUILD_REGRESS OFF CACHE BOOL "" FORCE)
+ set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+ set(BUILD_DOC OFF CACHE BOOL "" FORCE)
+ add_subdirectory(third-party/libzip EXCLUDE_FROM_ALL)
+endif(NOT SAVETOOL_USE_SYSTEM_LIBZIP)
+
+if(NOT SAVETOOL_USE_SYSTEM_EFSW)
+ set(VERBOSE OFF CACHE BOOL "" FORCE)
+ set(BUILD_TEST_APP OFF CACHE BOOL "" FORCE)
+ set(EFSW_INSTALL OFF CACHE BOOL "" FORCE)
+ add_subdirectory(third-party/efsw EXCLUDE_FROM_ALL)
+endif(NOT SAVETOOL_USE_SYSTEM_EFSW)
+
+if(NOT SAVETOOL_USE_SYSTEM_LIBCURL)
+ set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)
+ set(ENABLE_UNICODE ON CACHE BOOL "" FORCE)
+ set(ENABLE_INET_PTON OFF CACHE BOOL "" FORCE)
+ set(ENABLE_DEBUG OFF CACHE BOOL "" FORCE)
+ set(ENABLE_THREADED_RESOLVER OFF CACHE BOOL "" FORCE)
+ set(HTTP_ONLY ON CACHE BOOL "" FORCE)
+ set(USE_LIBIDN2 OFF CACHE BOOL "" FORCE)
+ set(USE_WIN32_IDN ON CACHE BOOL "" FORCE)
+ set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE)
+ set(CURL_STATIC_CRT OFF CACHE BOOL "" FORCE)
+ set(CURL_USE_SCHANNEL ON CACHE BOOL "" FORCE)
+ set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE) # For some reason, even when HTTP_ONLY is set to ON, libcurl will try to link to libssh2.
+ add_subdirectory(third-party/curl EXCLUDE_FROM_ALL)
+endif(NOT SAVETOOL_USE_SYSTEM_LIBCURL)
add_subdirectory(src)
diff --git a/README.md b/README.md
index ef55037..4314677 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ launch `MassBuilderSaveTool-.exe`.
1. Install the 64-bit (`x86_64`) version of [MSYS2](https://www.msys2.org/) in its default path (`C:\msys64`), and
update it fully.
-2. Run `pacman -S git mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-ninja`.
+2. Run `pacman -S git mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-ninja mingw-w64-ucrt-x86_64-zlib`.
3. In a `URCT64` shell, type `git clone https://github.com/williamjcm/MassBuilderSaveTool`.
4. Type `cd MassBuilderSaveTool && git submodule init && git submodule update && mkdir build && cd build`.
5. Type `cmake -GNinja -DCMAKE_BUILD_TYPE=Release ..`
diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake
index 780932b..7d2e725 100644
--- a/modules/FindCorrade.cmake
+++ b/modules/FindCorrade.cmake
@@ -16,6 +16,8 @@
# components, which are:
#
# Containers - Containers library
+# Interconnect - Interconnect library
+# Main - Main library
# PluginManager - PluginManager library
# TestSuite - TestSuite library
# Utility - Utility library
@@ -68,7 +70,7 @@
# mode for MSVC 2017
# CORRADE_MSVC2015_COMPATIBILITY - Defined if compiled with compatibility
# mode for MSVC 2015
-# CORRADE_BUILD_DEPRECATED - Defined if compiled with deprecated APIs
+# CORRADE_BUILD_DEPRECATED - Defined if compiled with deprecated features
# included
# CORRADE_BUILD_STATIC - Defined if compiled as static libraries.
# Default are shared libraries.
@@ -78,6 +80,9 @@
# CORRADE_BUILD_MULTITHREADED - Defined if compiled in a way that makes it
# possible to safely use certain Corrade features simultaneously in multiple
# threads
+# CORRADE_BUILD_CPU_RUNTIME_DISPATCH - Defined if built with code paths
+# optimized for multiple architectres with the best matching variant selected
+# at runtime based on detected CPU features
# CORRADE_TARGET_UNIX - Defined if compiled for some Unix flavor
# (Linux, BSD, macOS)
# CORRADE_TARGET_APPLE - Defined if compiled for Apple platforms
@@ -98,6 +103,8 @@
# CORRADE_TARGET_MSVC - Defined if compiling with MSVC or Clang with
# a MSVC frontend
# CORRADE_TARGET_MINGW - Defined if compiling under MinGW
+# CORRADE_CPU_USE_IFUNC - Defined if GNU IFUNC is allowed to be used
+# for runtime dispatch in the Cpu library
# CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT - Defined if PluginManager
# doesn't support dynamic plugin loading due to platform limitations
# CORRADE_TESTSUITE_TARGET_XCTEST - Defined if TestSuite is targeting Xcode
@@ -115,6 +122,7 @@
# automatically)
# CORRADE_TESTSUITE_XCTEST_RUNNER - Path to XCTestRunner.mm.in file
# CORRADE_TESTSUITE_ADB_RUNNER - Path to AdbRunner.sh file
+# CORRADE_UTILITY_JS - Path to CorradeUtility.js file
# CORRADE_PEDANTIC_COMPILER_OPTIONS - List of pedantic compiler options used
# for targets with :prop_tgt:`CORRADE_USE_PEDANTIC_FLAGS` enabled
# CORRADE_PEDANTIC_COMPILER_DEFINITIONS - List of pedantic compiler
@@ -208,7 +216,7 @@
#
# ...)
#
-# Unline the above version this puts everything into ```` on
+# Unlike the above version this puts everything into ```` on
# both DLL and non-DLL platforms. If ```` is set to
# :variable:`CMAKE_CURRENT_BINARY_DIR` (e.g. for testing purposes), the files
# are copied directly, without the need to perform install step. Note that the
@@ -264,7 +272,7 @@
# This file is part of Corrade.
#
# Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021, 2022
+# 2017, 2018, 2019, 2020, 2021, 2022, 2023
# Vladimír Vondruš
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -317,6 +325,7 @@ set(_corradeFlags
BUILD_STATIC
BUILD_STATIC_UNIQUE_GLOBALS
BUILD_MULTITHREADED
+ BUILD_CPU_RUNTIME_DISPATCH
TARGET_UNIX
TARGET_APPLE
TARGET_IOS
@@ -325,10 +334,12 @@ set(_corradeFlags
TARGET_WINDOWS_RT
TARGET_EMSCRIPTEN
TARGET_ANDROID
- # TARGET_X86 etc and TARGET_LIBCXX are not exposed to CMake as the meaning
- # is unclear on platforms with multi-arch binaries or when mixing different
- # STL implementations. TARGET_GCC etc are figured out via UseCorrade.cmake,
- # as the compiler can be different when compiling the lib & when using it.
+ # TARGET_X86 etc, TARGET_32BIT, TARGET_BIG_ENDIAN and TARGET_LIBCXX etc.
+ # are not exposed to CMake as the meaning is unclear on platforms with
+ # multi-arch binaries or when mixing different STL implementations.
+ # TARGET_GCC etc are figured out via UseCorrade.cmake, as the compiler can
+ # be different when compiling the lib & when using it.
+ CPU_USE_IFUNC
PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
TESTSUITE_TARGET_XCTEST
UTILITY_USE_ANSI_COLORS)
@@ -406,6 +417,8 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
if(TARGET Corrade::${_component})
set(Corrade_${_component}_FOUND TRUE)
else()
+ unset(Corrade_${_component}_FOUND)
+
# Library (and not header-only) components
if(_component IN_LIST _CORRADE_LIBRARY_COMPONENTS AND NOT _component IN_LIST _CORRADE_HEADER_ONLY_COMPONENTS)
add_library(Corrade::${_component} UNKNOWN IMPORTED)
@@ -461,8 +474,9 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
# Interconnect library
if(_component STREQUAL Interconnect)
# Disable /OPT:ICF on MSVC, which merges functions with identical
- # contents and thus breaks signal comparison
- if(CORRADE_TARGET_WINDOWS AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ # contents and thus breaks signal comparison. Same case is for
+ # clang-cl which uses the MSVC linker by default.
+ if(CORRADE_TARGET_WINDOWS AND (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC"))
if(CMAKE_VERSION VERSION_LESS 3.13)
set_property(TARGET Corrade::${_component} PROPERTY
INTERFACE_LINK_LIBRARIES "-OPT:NOICF,REF")
@@ -496,25 +510,33 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
elseif(_component STREQUAL PluginManager)
# -ldl is handled by Utility now
- # TestSuite library has some additional files
+ # TestSuite library has some additional files. If those are not found,
+ # set the component _FOUND variable to false so it works properly both
+ # when the component is required and when it's optional.
elseif(_component STREQUAL TestSuite)
# XCTest runner file
if(CORRADE_TESTSUITE_TARGET_XCTEST)
find_file(CORRADE_TESTSUITE_XCTEST_RUNNER XCTestRunner.mm.in
PATH_SUFFIXES share/corrade/TestSuite)
- set(CORRADE_TESTSUITE_XCTEST_RUNNER_NEEDED CORRADE_TESTSUITE_XCTEST_RUNNER)
+ if(NOT CORRADE_TESTSUITE_XCTEST_RUNNER)
+ set(Corrade_${_component}_FOUND FALSE)
+ endif()
# ADB runner file
elseif(CORRADE_TARGET_ANDROID)
find_file(CORRADE_TESTSUITE_ADB_RUNNER AdbRunner.sh
PATH_SUFFIXES share/corrade/TestSuite)
- set(CORRADE_TESTSUITE_ADB_RUNNER_NEEDED CORRADE_TESTSUITE_ADB_RUNNER)
+ if(NOT CORRADE_TESTSUITE_ADB_RUNNER)
+ set(Corrade_${_component}_FOUND FALSE)
+ endif()
# Emscripten runner file
elseif(CORRADE_TARGET_EMSCRIPTEN)
find_file(CORRADE_TESTSUITE_EMSCRIPTEN_RUNNER EmscriptenRunner.html.in
PATH_SUFFIXES share/corrade/TestSuite)
- set(CORRADE_TESTSUITE_EMSCRIPTEN_RUNNER_NEEDED CORRADE_TESTSUITE_EMSCRIPTEN_RUNNER)
+ if(NOT CORRADE_TESTSUITE_EMSCRIPTEN_RUNNER)
+ set(Corrade_${_component}_FOUND FALSE)
+ endif()
endif()
# Utility library (contains all setup that is used by others)
@@ -539,6 +561,15 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
set_property(TARGET Corrade::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES "log")
endif()
+ # Emscripten has various stuff implemented in JS
+ if(CORRADE_TARGET_EMSCRIPTEN)
+ find_file(CORRADE_UTILITY_JS CorradeUtility.js
+ PATH_SUFFIXES lib)
+ set_property(TARGET Corrade::${_component} APPEND PROPERTY
+ # TODO switch to INTERFACE_LINK_OPTIONS and SHELL: once we
+ # require CMake 3.13 unconditionally
+ INTERFACE_LINK_LIBRARIES "--js-library ${CORRADE_UTILITY_JS}")
+ endif()
endif()
# Find library includes
@@ -559,11 +590,14 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
endforeach()
endif()
- # Decide if the component was found
- if((_component IN_LIST _CORRADE_LIBRARY_COMPONENTS AND _CORRADE_${_COMPONENT}_INCLUDE_DIR AND (_component IN_LIST _CORRADE_HEADER_ONLY_COMPONENTS OR CORRADE_${_COMPONENT}_LIBRARY_RELEASE OR CORRADE_${_COMPONENT}_LIBRARY_DEBUG)) OR (_component IN_LIST _CORRADE_EXECUTABLE_COMPONENTS AND CORRADE_${_COMPONENT}_EXECUTABLE))
- set(Corrade_${_component}_FOUND TRUE)
- else()
- set(Corrade_${_component}_FOUND FALSE)
+ # Decide if the component was found, unless the _FOUND is already set
+ # by something above.
+ if(NOT DEFINED Corrade_${_component}_FOUND)
+ if((_component IN_LIST _CORRADE_LIBRARY_COMPONENTS AND _CORRADE_${_COMPONENT}_INCLUDE_DIR AND (_component IN_LIST _CORRADE_HEADER_ONLY_COMPONENTS OR CORRADE_${_COMPONENT}_LIBRARY_RELEASE OR CORRADE_${_COMPONENT}_LIBRARY_DEBUG)) OR (_component IN_LIST _CORRADE_EXECUTABLE_COMPONENTS AND CORRADE_${_COMPONENT}_EXECUTABLE))
+ set(Corrade_${_component}_FOUND TRUE)
+ else()
+ set(Corrade_${_component}_FOUND FALSE)
+ endif()
endif()
endif()
endforeach()
@@ -590,7 +624,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 3.16)
# misleading messages.
elseif(NOT _component IN_LIST _CORRADE_IMPLICITLY_ENABLED_COMPONENTS)
string(TOUPPER ${_component} _COMPONENT)
- list(APPEND _CORRADE_REASON_FAILURE_MESSAGE "${_component} is not built by default. Make sure you enabled WITH_${_COMPONENT} when building Corrade.")
+ list(APPEND _CORRADE_REASON_FAILURE_MESSAGE "${_component} is not built by default. Make sure you enabled CORRADE_WITH_${_COMPONENT} when building Corrade.")
# Otherwise we have no idea. Better be silent than to print something
# misleading.
else()
@@ -606,9 +640,6 @@ find_package_handle_standard_args(Corrade REQUIRED_VARS
CORRADE_INCLUDE_DIR
_CORRADE_MODULE_DIR
_CORRADE_CONFIGURE_FILE
- ${CORRADE_TESTSUITE_XCTEST_RUNNER_NEEDED}
- ${CORRADE_TESTSUITE_ADB_RUNNER_NEEDED}
- ${CORRADE_TESTSUITE_EMSCRIPTEN_RUNNER_NEEDED}
HANDLE_COMPONENTS
${_CORRADE_REASON_FAILURE_MESSAGE})
diff --git a/modules/FindImGui.cmake b/modules/FindImGui.cmake
index 2bd46c5..0219051 100644
--- a/modules/FindImGui.cmake
+++ b/modules/FindImGui.cmake
@@ -36,7 +36,7 @@
# This file is part of Magnum.
#
# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021, 2022 Vladimír Vondruš
+# 2020, 2021, 2022, 2023 Vladimír Vondruš
# Copyright © 2018 Jonathan Hale
#
# Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
index caa6999..88959a3 100644
--- a/modules/FindMagnum.cmake
+++ b/modules/FindMagnum.cmake
@@ -57,6 +57,7 @@
# Audio - Audio library
# DebugTools - DebugTools library
# GL - GL library
+# MaterialTools - MaterialTools library
# MeshTools - MeshTools library
# Primitives - Primitives library
# SceneGraph - SceneGraph library
@@ -78,7 +79,6 @@
# WindowlessGlxApplication - Windowless GLX application
# WindowlessIosApplication - Windowless iOS application
# WindowlessWglApplication - Windowless WGL application
-# WindowlessWindowsEglApplication - Windowless Windows/EGL application
# CglContext - CGL context
# EglContext - EGL context
# GlxContext - GLX context
@@ -128,19 +128,18 @@
#
# Features of found Magnum library are exposed in these variables:
#
-# MAGNUM_BUILD_DEPRECATED - Defined if compiled with deprecated APIs
+# MAGNUM_BUILD_DEPRECATED - Defined if compiled with deprecated features
# included
# MAGNUM_BUILD_STATIC - Defined if compiled as static libraries
# MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS - Defined if static libraries keep the
# globals unique even across different shared libraries
# MAGNUM_TARGET_GL - Defined if compiled with OpenGL interop
# MAGNUM_TARGET_GLES - Defined if compiled for OpenGL ES
-# MAGNUM_TARGET_GLES2 - Defined if compiled for OpenGL ES 2.0
-# MAGNUM_TARGET_GLES3 - Defined if compiled for OpenGL ES 3.0
-# MAGNUM_TARGET_DESKTOP_GLES - Defined if compiled with OpenGL ES
-# emulation on desktop OpenGL
# MAGNUM_TARGET_WEBGL - Defined if compiled for WebGL
-# MAGNUM_TARGET_HEADLESS - Defined if compiled for headless machines
+# MAGNUM_TARGET_GLES2 - Defined if compiled for OpenGL ES 2.0 / WebGL
+# 1 instead of OpenGL ES 3.0+ / WebGL 2
+# MAGNUM_TARGET_EGL - Defined if compiled for EGL instead of a
+# platform-specific OpenGL support library like CGL, EAGL, GLX or WGL
# MAGNUM_TARGET_VK - Defined if compiled with Vulkan interop
#
# The following variables are provided for backwards compatibility purposes
@@ -149,6 +148,12 @@
#
# MAGNUM_BUILD_MULTITHREADED - Alias to CORRADE_BUILD_MULTITHREADED. Use
# CORRADE_BUILD_MULTITHREADED instead.
+# MAGNUM_TARGET_HEADLESS - Alias to MAGNUM_TARGET_EGL, unless on iOS,
+# Android, Emscripten or Windows RT. Use MAGNUM_TARGET_EGL instead.
+# MAGNUM_TARGET_DESKTOP_GLES` - Defined if compiled for OpenGL ES but
+# GLX / WGL is used instead of EGL. Use MAGNUM_TARGET_EGL instead.
+# MAGNUM_TARGET_GLES3 - Defined if compiled for OpenGL ES 3.0+ /
+# WebGL 2. Use an inverse of the MAGNUM_TARGET_GLES2 variable instead.
#
# Additionally these variables are defined for internal usage:
#
@@ -159,6 +164,7 @@
# MAGNUM_*_LIBRARY - Component libraries (w/o dependencies)
# MAGNUM_*_LIBRARY_DEBUG - Debug version of given library, if found
# MAGNUM_*_LIBRARY_RELEASE - Release version of given library, if found
+# MAGNUM_PLATFORM_JS - Path to MagnumPlatform.js file
# MAGNUM_BINARY_INSTALL_DIR - Binary installation directory
# MAGNUM_LIBRARY_INSTALL_DIR - Library installation directory
# MAGNUM_DATA_INSTALL_DIR - Data installation directory
@@ -202,7 +208,7 @@
# This file is part of Magnum.
#
# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021, 2022 Vladimír Vondruš
+# 2020, 2021, 2022, 2023 Vladimír Vondruš
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -223,18 +229,37 @@
# DEALINGS IN THE SOFTWARE.
#
+# CMake policies used by FindMagnum are popped again at the end.
+cmake_policy(PUSH)
+# Prefer GLVND when finding OpenGL. If this causes problems (known to fail with
+# NVidia drivers in Debian Buster, reported on 2019-04-09), users can override
+# this by setting OpenGL_GL_PREFERENCE to LEGACY.
+if(POLICY CMP0072)
+ cmake_policy(SET CMP0072 NEW)
+endif()
+
# Corrade library dependencies
set(_MAGNUM_CORRADE_DEPENDENCIES )
-foreach(_component ${Magnum_FIND_COMPONENTS})
- string(TOUPPER ${_component} _COMPONENT)
+foreach(_magnum_component ${Magnum_FIND_COMPONENTS})
+ set(_MAGNUM_${_magnum_component}_CORRADE_DEPENDENCIES )
# Unrolling the transitive dependencies here so this doesn't need to be
# after resolving inter-component dependencies. Listing also all plugins.
- if(_component MATCHES "^(Audio|DebugTools|MeshTools|Primitives|SceneTools|ShaderTools|Text|TextureTools|Trade|.+Importer|.+ImageConverter|.+Font|.+ShaderConverter)$")
- set(_MAGNUM_${_COMPONENT}_CORRADE_DEPENDENCIES PluginManager)
+ if(_magnum_component MATCHES "^(Audio|DebugTools|MeshTools|Primitives|SceneTools|ShaderTools|Text|TextureTools|Trade|.+Importer|.+ImageConverter|.+Font|.+ShaderConverter)$")
+ list(APPEND _MAGNUM_${_magnum_component}_CORRADE_DEPENDENCIES PluginManager)
+ endif()
+ if(_magnum_component STREQUAL DebugTools)
+ # DebugTools depends on TestSuite optionally, so if it's not there
+ # assume it wasn't compiled against it. Also, all variables from the
+ # FindCorrade module overwrite the local variables here (in particular
+ # _component, _COMPONENT and such), so we need to prefix extensively.
+ find_package(Corrade QUIET COMPONENTS TestSuite)
+ if(Corrade_TestSuite_FOUND)
+ list(APPEND _MAGNUM_${_magnum_component}_CORRADE_DEPENDENCIES TestSuite)
+ endif()
endif()
- list(APPEND _MAGNUM_CORRADE_DEPENDENCIES ${_MAGNUM_${_COMPONENT}_CORRADE_DEPENDENCIES})
+ list(APPEND _MAGNUM_CORRADE_DEPENDENCIES ${_MAGNUM_${_magnum_component}_CORRADE_DEPENDENCIES})
endforeach()
find_package(Corrade REQUIRED Utility ${_MAGNUM_CORRADE_DEPENDENCIES})
@@ -268,10 +293,8 @@ set(_magnumFlags
TARGET_GL
TARGET_GLES
TARGET_GLES2
- TARGET_GLES3
- TARGET_DESKTOP_GLES
TARGET_WEBGL
- TARGET_HEADLESS
+ TARGET_EGL
TARGET_VK)
foreach(_magnumFlag ${_magnumFlags})
list(FIND _magnumConfigure "#define MAGNUM_${_magnumFlag}" _magnum_${_magnumFlag})
@@ -280,17 +303,23 @@ foreach(_magnumFlag ${_magnumFlags})
endif()
endforeach()
-# For compatibility only, to be removed at some point
-if(MAGNUM_BUILD_DEPRECATED AND CORRADE_BUILD_MULTITHREADED)
- set(MAGNUM_BUILD_MULTITHREADED 1)
-endif()
-
-# OpenGL library preference. Prefer to use GLVND, since that's the better
-# approach nowadays, but allow the users to override it from outside in case
-# it is broken for some reason (Nvidia drivers in Debian's testing (Buster) --
-# reported on 2019-04-09).
-if(NOT CMAKE_VERSION VERSION_LESS 3.10 AND NOT OpenGL_GL_PREFERENCE)
- set(OpenGL_GL_PREFERENCE GLVND)
+# For compatibility only, to be removed at some point. Refer to
+# src/Magnum/configure.h.cmake for the decision logic here.
+if(MAGNUM_BUILD_DEPRECATED)
+ if(CORRADE_BUILD_MULTITHREADED)
+ set(MAGNUM_BUILD_MULTITHREADED 1)
+ endif()
+ if(NOT CORRADE_TARGET_IOS AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_WINDOWS_RT)
+ if(NOT MAGNUM_TARGET_GLES AND MAGNUM_TARGET_EGL)
+ set(MAGNUM_TARGET_HEADLESS 1)
+ endif()
+ if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_EGL)
+ set(MAGNUM_TARGET_DESKTOP_GLES 1)
+ endif()
+ endif()
+ if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_GLES2)
+ set(MAGNUM_TARGET_GLES3 1)
+ endif()
endif()
# Base Magnum library
@@ -355,8 +384,8 @@ endif()
# Component distinction (listing them explicitly to avoid mistakes with finding
# components from other repositories)
set(_MAGNUM_LIBRARY_COMPONENTS
- Audio DebugTools GL MeshTools Primitives SceneGraph SceneTools Shaders
- ShaderTools Text TextureTools Trade
+ Audio DebugTools GL MaterialTools MeshTools Primitives SceneGraph
+ SceneTools Shaders ShaderTools Text TextureTools Trade
WindowlessEglApplication EglContext OpenGLTester)
set(_MAGNUM_PLUGIN_COMPONENTS
AnyAudioImporter AnyImageConverter AnyImageImporter AnySceneConverter
@@ -395,7 +424,7 @@ if(CORRADE_TARGET_UNIX AND NOT CORRADE_TARGET_APPLE)
list(APPEND _MAGNUM_LIBRARY_COMPONENTS GlxApplication XEglApplication WindowlessGlxApplication GlxContext)
endif()
if(CORRADE_TARGET_WINDOWS)
- list(APPEND _MAGNUM_LIBRARY_COMPONENTS WindowlessWglApplication WglContext WindowlessWindowsEglApplication)
+ list(APPEND _MAGNUM_LIBRARY_COMPONENTS WindowlessWglApplication WglContext)
endif()
if(CORRADE_TARGET_UNIX OR CORRADE_TARGET_WINDOWS)
list(APPEND _MAGNUM_EXECUTABLE_COMPONENTS fontconverter distancefieldconverter)
@@ -420,30 +449,24 @@ if(MAGNUM_TARGET_GL)
set(_MAGNUM_DebugTools_GL_DEPENDENCY_IS_OPTIONAL ON)
endif()
+set(_MAGNUM_MaterialTools_DEPENDENCIES Trade)
+
set(_MAGNUM_MeshTools_DEPENDENCIES Trade)
if(MAGNUM_TARGET_GL)
list(APPEND _MAGNUM_MeshTools_DEPENDENCIES GL)
endif()
set(_MAGNUM_OpenGLTester_DEPENDENCIES GL)
-if(MAGNUM_TARGET_HEADLESS OR CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
+if(MAGNUM_TARGET_EGL)
list(APPEND _MAGNUM_OpenGLTester_DEPENDENCIES WindowlessEglApplication)
elseif(CORRADE_TARGET_IOS)
list(APPEND _MAGNUM_OpenGLTester_DEPENDENCIES WindowlessIosApplication)
-elseif(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES)
+elseif(CORRADE_TARGET_APPLE)
list(APPEND _MAGNUM_OpenGLTester_DEPENDENCIES WindowlessCglApplication)
elseif(CORRADE_TARGET_UNIX)
- if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)
- list(APPEND _MAGNUM_OpenGLTester_DEPENDENCIES WindowlessEglApplication)
- else()
- list(APPEND _MAGNUM_OpenGLTester_DEPENDENCIES WindowlessGlxApplication)
- endif()
+ list(APPEND _MAGNUM_OpenGLTester_DEPENDENCIES WindowlessGlxApplication)
elseif(CORRADE_TARGET_WINDOWS)
- if(NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES)
- list(APPEND _MAGNUM_OpenGLTester_DEPENDENCIES WindowlessWglApplication)
- else()
- list(APPEND _MAGNUM_OpenGLTester_DEPENDENCIES WindowlessWindowsEglApplication)
- endif()
+ list(APPEND _MAGNUM_OpenGLTester_DEPENDENCIES WindowlessWglApplication)
endif()
set(_MAGNUM_Primitives_DEPENDENCIES MeshTools Trade)
@@ -492,7 +515,6 @@ set(_MAGNUM_WindowlessEglApplication_DEPENDENCIES GL)
set(_MAGNUM_WindowlessGlxApplication_DEPENDENCIES GL)
set(_MAGNUM_WindowlessIosApplication_DEPENDENCIES GL)
set(_MAGNUM_WindowlessWglApplication_DEPENDENCIES GL)
-set(_MAGNUM_WindowlessWindowsEglApplication_DEPENDENCIES GL)
set(_MAGNUM_XEglApplication_DEPENDENCIES GL)
set(_MAGNUM_CglContext_DEPENDENCIES GL)
set(_MAGNUM_EglContext_DEPENDENCIES GL)
@@ -680,7 +702,17 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
set_property(TARGET Magnum::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES android EGL::EGL)
- # EmscriptenApplication has no additional dependencies
+ # Emscripten application dependencies
+ elseif(_component STREQUAL EmscriptenApplication)
+ # Emscripten has various stuff implemented in JS
+ if(CORRADE_TARGET_EMSCRIPTEN)
+ find_file(MAGNUM_PLATFORM_JS MagnumPlatform.js
+ PATH_SUFFIXES lib)
+ set_property(TARGET Magnum::${_component} APPEND PROPERTY
+ # TODO switch to INTERFACE_LINK_OPTIONS and SHELL: once
+ # we require CMake 3.13 unconditionally
+ INTERFACE_LINK_LIBRARIES "--js-library ${MAGNUM_PLATFORM_JS}")
+ endif()
# GLFW application dependencies
elseif(_component STREQUAL GlfwApplication)
@@ -699,7 +731,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS})
endif()
- # With GLVND (since CMake 3.11) we need to explicitly link to
+ # With GLVND (since CMake 3.10) we need to explicitly link to
# GLX/EGL because libOpenGL doesn't provide it. For EGL we have
# our own EGL find module, which makes things simpler. The
# upstream FindOpenGL is anything but simple. Also can't use
@@ -708,16 +740,16 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
# OPENGL_opengl_LIBRARY because that's set even if
# OpenGL_GL_PREFERENCE is explicitly set to LEGACY.
if(MAGNUM_TARGET_GL)
- if(CORRADE_TARGET_UNIX AND NOT CORRADE_TARGET_APPLE AND (NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES))
+ if(MAGNUM_TARGET_EGL)
+ find_package(EGL)
+ set_property(TARGET Magnum::${_component} APPEND
+ PROPERTY INTERFACE_LINK_LIBRARIES EGL::EGL)
+ elseif(CORRADE_TARGET_UNIX AND NOT CORRADE_TARGET_APPLE)
find_package(OpenGL)
if(OPENGL_opengl_LIBRARY AND OpenGL_GL_PREFERENCE STREQUAL GLVND)
set_property(TARGET Magnum::${_component} APPEND
PROPERTY INTERFACE_LINK_LIBRARIES OpenGL::GLX)
endif()
- elseif(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES AND NOT CORRADE_TARGET_EMSCRIPTEN)
- find_package(EGL)
- set_property(TARGET Magnum::${_component} APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES EGL::EGL)
endif()
endif()
@@ -736,9 +768,17 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
elseif(CORRADE_TARGET_UNIX)
set_property(TARGET Magnum::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS})
+ # Emscripten has various stuff implemented in JS
+ elseif(CORRADE_TARGET_EMSCRIPTEN)
+ find_file(MAGNUM_PLATFORM_JS MagnumPlatform.js
+ PATH_SUFFIXES lib)
+ set_property(TARGET Magnum::${_component} APPEND PROPERTY
+ # TODO switch to INTERFACE_LINK_OPTIONS and SHELL: once
+ # we require CMake 3.13 unconditionally
+ INTERFACE_LINK_LIBRARIES "--js-library ${MAGNUM_PLATFORM_JS}")
endif()
- # With GLVND (since CMake 3.11) we need to explicitly link to
+ # With GLVND (since CMake 3.10) we need to explicitly link to
# GLX/EGL because libOpenGL doesn't provide it. For EGL we have
# our own EGL find module, which makes things simpler. The
# upstream FindOpenGL is anything but simple. Also can't use
@@ -747,16 +787,16 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
# OPENGL_opengl_LIBRARY because that's set even if
# OpenGL_GL_PREFERENCE is explicitly set to LEGACY.
if(MAGNUM_TARGET_GL)
- if(CORRADE_TARGET_UNIX AND NOT CORRADE_TARGET_APPLE AND (NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES))
+ if(MAGNUM_TARGET_EGL)
+ find_package(EGL)
+ set_property(TARGET Magnum::${_component} APPEND
+ PROPERTY INTERFACE_LINK_LIBRARIES EGL::EGL)
+ elseif(CORRADE_TARGET_UNIX AND NOT CORRADE_TARGET_APPLE)
find_package(OpenGL)
if(OPENGL_opengl_LIBRARY AND OpenGL_GL_PREFERENCE STREQUAL GLVND)
set_property(TARGET Magnum::${_component} APPEND
PROPERTY INTERFACE_LINK_LIBRARIES OpenGL::GLX)
endif()
- elseif(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES AND NOT CORRADE_TARGET_EMSCRIPTEN)
- find_package(EGL)
- set_property(TARGET Magnum::${_component} APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES EGL::EGL)
endif()
endif()
@@ -768,12 +808,19 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
set_property(TARGET Magnum::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${X11_LIBRARIES})
- # With GLVND (since CMake 3.11) we need to explicitly link to
+ # With GLVND (since CMake 3.10) we need to explicitly link to
# GLX because libOpenGL doesn't provide it. Also can't use
# OpenGL_OpenGL_FOUND, because that one is set also if GLVND is
# *not* found. WTF. Also can't just check for
# OPENGL_opengl_LIBRARY because that's set even if
# OpenGL_GL_PREFERENCE is explicitly set to LEGACY.
+ #
+ # If MAGNUM_TARGET_GLES and MAGNUM_TARGET_EGL is set, these
+ # applications can be built only if GLVND is available as
+ # otherwise there would be a conflict between libGL and
+ # libGLES. Thus, if GLVND is not available, it won't link
+ # libGLX here, but that shouldn't be a problem since the
+ # application library won't exist either.
find_package(OpenGL)
if(OPENGL_opengl_LIBRARY AND OpenGL_GL_PREFERENCE STREQUAL GLVND)
set_property(TARGET Magnum::${_component} APPEND PROPERTY
@@ -799,12 +846,6 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
# Windowless WGL application has no additional dependencies
- # Windowless Windows/EGL application dependencies
- elseif(_component STREQUAL WindowlessWindowsEglApplication)
- find_package(EGL)
- set_property(TARGET Magnum::${_component} APPEND PROPERTY
- INTERFACE_LINK_LIBRARIES EGL::EGL)
-
# X/EGL application dependencies
elseif(_component STREQUAL XEglApplication)
find_package(EGL)
@@ -822,7 +863,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
# GLX context dependencies
if(_component STREQUAL GlxContext)
- # With GLVND (since CMake 3.11) we need to explicitly link to
+ # With GLVND (since CMake 3.10) we need to explicitly link to
# GLX because libOpenGL doesn't provide it. Also can't use
# OpenGL_OpenGL_FOUND, because that one is set also if GLVND is
# *not* found. If GLVND is not used, link to X11 instead. Also
@@ -854,14 +895,14 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
elseif(_component STREQUAL Audio)
find_package(OpenAL)
set_property(TARGET Magnum::${_component} APPEND PROPERTY
- INTERFACE_LINK_LIBRARIES Corrade::PluginManager OpenAL::OpenAL)
+ INTERFACE_LINK_LIBRARIES OpenAL::OpenAL)
# No special setup for DebugTools library
# GL library
elseif(_component STREQUAL GL)
- if(NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES)
- # If the GLVND library (CMake 3.11+) was found, link to the
+ if(NOT MAGNUM_TARGET_GLES OR (MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_EGL AND NOT CORRADE_TARGET_IOS))
+ # If the GLVND library (CMake 3.10+) was found, link to the
# imported target. Otherwise (and also on all systems except
# Linux) link to the classic libGL. Can't use
# OpenGL_OpenGL_FOUND, because that one is set also if GLVND is
@@ -880,12 +921,16 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
find_package(OpenGLES2 REQUIRED)
set_property(TARGET Magnum::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES OpenGLES2::OpenGLES2)
- elseif(MAGNUM_TARGET_GLES3)
+ else()
find_package(OpenGLES3 REQUIRED)
set_property(TARGET Magnum::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES OpenGLES3::OpenGLES3)
endif()
+ # MaterialTools library
+ elseif(_component STREQUAL MaterialTools)
+ set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES PhongToPbrMetallicRoughness.h)
+
# MeshTools library
elseif(_component STREQUAL MeshTools)
set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES CompressIndices.h)
@@ -904,26 +949,19 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
# No special setup for SceneGraph library
- # ShaderTools library
- elseif(_component STREQUAL ShaderTools)
- set_property(TARGET Magnum::${_component} APPEND PROPERTY
- INTERFACE_LINK_LIBRARIES Corrade::PluginManager)
+ # SceneTools library
+ elseif(_component STREQUAL SceneTools)
+ set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES Hierarchy.h)
+ # No special setup for ShaderTools library
# No special setup for Shaders library
-
- # Text library
- elseif(_component STREQUAL Text)
- set_property(TARGET Magnum::${_component} APPEND PROPERTY
- INTERFACE_LINK_LIBRARIES Corrade::PluginManager)
+ # No special setup for Text library
# TextureTools library
elseif(_component STREQUAL TextureTools)
set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES Atlas.h)
- # Trade library
- elseif(_component STREQUAL Trade)
- set_property(TARGET Magnum::${_component} APPEND PROPERTY
- INTERFACE_LINK_LIBRARIES Corrade::PluginManager)
+ # No special setup for Trade library
# Vk library
elseif(_component STREQUAL Vk)
@@ -952,8 +990,13 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
endif()
# Automatic import of static plugins. Skip in case the include dir was
- # not found -- that'll fail later with a proper message.
- if(_component IN_LIST _MAGNUM_PLUGIN_COMPONENTS AND _MAGNUM_${_COMPONENT}_INCLUDE_DIR)
+ # not found -- that'll fail later with a proper message. Skip it also
+ # if the include dir doesn't contain the generated configure.h, which
+ # is the case with Magnum as a subproject and given plugin not enabled
+ # -- there it finds just the sources, where's just configure.h.cmake,
+ # and that's not useful for anything. The assumption here is that it
+ # will fail later anyway on the binary not being found.
+ if(_component IN_LIST _MAGNUM_PLUGIN_COMPONENTS AND _MAGNUM_${_COMPONENT}_INCLUDE_DIR AND EXISTS ${_MAGNUM_${_COMPONENT}_INCLUDE_DIR}/configure.h)
# Automatic import of static plugins
file(READ ${_MAGNUM_${_COMPONENT}_INCLUDE_DIR}/configure.h _magnum${_component}Configure)
string(FIND "${_magnum${_component}Configure}" "#define MAGNUM_${_COMPONENT}_BUILD_STATIC" _magnum${_component}_BUILD_STATIC)
@@ -967,9 +1010,13 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
# are optional dependencies, defer adding them to later once we know if
# they were found or not.
if(_component IN_LIST _MAGNUM_LIBRARY_COMPONENTS OR _component IN_LIST _MAGNUM_PLUGIN_COMPONENTS)
+ foreach(_dependency ${_MAGNUM_${_component}_CORRADE_DEPENDENCIES})
+ set_property(TARGET Magnum::${_component} APPEND PROPERTY
+ INTERFACE_LINK_LIBRARIES Corrade::${_dependency})
+ endforeach()
set_property(TARGET Magnum::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES Magnum::Magnum)
- set(_MAGNUM_${component}_OPTIONAL_DEPENDENCIES_TO_ADD )
+ set(_MAGNUM_${_component}_OPTIONAL_DEPENDENCIES_TO_ADD )
foreach(_dependency ${_MAGNUM_${_component}_DEPENDENCIES})
if(NOT _MAGNUM_${_component}_${_dependency}_DEPENDENCY_IS_OPTIONAL)
set_property(TARGET Magnum::${_component} APPEND PROPERTY
@@ -1031,20 +1078,6 @@ if(CORRADE_TARGET_EMSCRIPTEN)
MAGNUM_EMSCRIPTENAPPLICATION_JS
MAGNUM_WINDOWLESSEMSCRIPTENAPPLICATION_JS
MAGNUM_WEBAPPLICATION_CSS)
-
- # If we are on CMake 3.13 and up, `-s USE_WEBGL2=1` linker option is
- # propagated from FindOpenGLES3.cmake already. If not (and the GL library
- # is used), we need to modify the global CMAKE_EXE_LINKER_FLAGS. Do it here
- # instead of in FindOpenGLES3.cmake so it works also for CMake subprojects
- # (in which case find_package(OpenGLES3) is called in (and so
- # CMAKE_EXE_LINKER_FLAGS would be modified in) Magnum's root CMakeLists.txt
- # and thus can't affect the variable in the outer project). CMake supports
- # IN_LIST as an operator since 3.1 (Emscripten needs at least 3.7), but
- # it's behind a policy, so enable that one as well.
- cmake_policy(SET CMP0057 NEW)
- if(CMAKE_VERSION VERSION_LESS 3.13 AND GL IN_LIST Magnum_FIND_COMPONENTS AND NOT MAGNUM_TARGET_GLES2 AND NOT CMAKE_EXE_LINKER_FLAGS MATCHES "-s USE_WEBGL2=1")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_WEBGL2=1")
- endif()
endif()
# For CMake 3.16+ with REASON_FAILURE_MESSAGE, provide additional potentially
@@ -1069,7 +1102,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 3.16)
# misleading messages.
elseif(NOT _component IN_LIST _MAGNUM_IMPLICITLY_ENABLED_COMPONENTS)
string(TOUPPER ${_component} _COMPONENT)
- list(APPEND _MAGNUM_REASON_FAILURE_MESSAGE "${_component} is not built by default. Make sure you enabled WITH_${_COMPONENT} when building Magnum.")
+ list(APPEND _MAGNUM_REASON_FAILURE_MESSAGE "${_component} is not built by default. Make sure you enabled MAGNUM_WITH_${_COMPONENT} when building Magnum.")
# Otherwise we have no idea. Better be silent than to print something
# misleading.
else()
@@ -1271,3 +1304,6 @@ if(MAGNUM_PLUGINS_RELEASE_DIR)
set(MAGNUM_PLUGINS_SCENECONVERTER_RELEASE_DIR ${MAGNUM_PLUGINS_RELEASE_DIR}/sceneconverters)
set(MAGNUM_PLUGINS_AUDIOIMPORTER_RELEASE_DIR ${MAGNUM_PLUGINS_RELEASE_DIR}/audioimporters)
endif()
+
+# Resets CMake policies set at the top of the file to not affect other code.
+cmake_policy(POP)
diff --git a/modules/FindMagnumIntegration.cmake b/modules/FindMagnumIntegration.cmake
index f0d5351..7a547ce 100644
--- a/modules/FindMagnumIntegration.cmake
+++ b/modules/FindMagnumIntegration.cmake
@@ -48,7 +48,7 @@
# This file is part of Magnum.
#
# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021, 2022 Vladimír Vondruš
+# 2020, 2021, 2022, 2023 Vladimír Vondruš
# Copyright © 2018 Konstantinos Chatzilygeroudis
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -89,8 +89,14 @@ if(_MAGNUMINTEGRATION_OPTIONAL_DEPENDENCIES)
find_package(Magnum OPTIONAL_COMPONENTS ${_MAGNUMINTEGRATION_OPTIONAL_DEPENDENCIES})
endif()
-# Global integration include dir
-find_path(MAGNUMINTEGRATION_INCLUDE_DIR Magnum
+# Global include dir that's unique to Magnum Integration. Often it will be
+# installed alongside Magnum, which is why the hint, but if not, it shouldn't
+# just pick MAGNUM_INCLUDE_DIR because then _MAGNUMINTEGRATION_*_INCLUDE_DIR
+# will fail to be found. In case of CMake subprojects the versionIntegration.h
+# is generated inside the build dir so this won't find it, instead
+# src/CMakeLists.txt forcibly sets MAGNUMINTEGRATION_INCLUDE_DIR as an internal
+# cache value to make that work.
+find_path(MAGNUMINTEGRATION_INCLUDE_DIR Magnum/versionIntegration.h
HINTS ${MAGNUM_INCLUDE_DIR})
mark_as_advanced(MAGNUMINTEGRATION_INCLUDE_DIR)
@@ -314,7 +320,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 3.16)
# misleading messages.
elseif(NOT _component IN_LIST _MAGNUMINTEGRATION_IMPLICITLY_ENABLED_COMPONENTS)
string(TOUPPER ${_component} _COMPONENT)
- list(APPEND _MAGNUMINTEGRATION_REASON_FAILURE_MESSAGE "${_component} is not built by default. Make sure you enabled WITH_${_COMPONENT} when building Magnum Integration.")
+ list(APPEND _MAGNUMINTEGRATION_REASON_FAILURE_MESSAGE "${_component} is not built by default. Make sure you enabled MAGNUM_WITH_${_COMPONENT} when building Magnum Integration.")
# Otherwise we have no idea. Better be silent than to print something
# misleading.
else()
diff --git a/modules/FindSDL2.cmake b/modules/FindSDL2.cmake
index 311b052..2ce89ca 100644
--- a/modules/FindSDL2.cmake
+++ b/modules/FindSDL2.cmake
@@ -20,7 +20,7 @@
# This file is part of Magnum.
#
# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021, 2022 Vladimír Vondruš
+# 2020, 2021, 2022, 2023 Vladimír Vondruš
# Copyright © 2018 Jonathan Hale
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -138,10 +138,10 @@ else()
# which CMake somehow prefers before the SDL2-2.0.dylib file. Making
# the dylib first so it is preferred. Not sure how this maps to debug
# config though :/
- NAMES SDL2-2.0 SDL2
+ NAMES SDL2-2.0 SDL2 SDL2-static
PATH_SUFFIXES ${_SDL2_LIBRARY_PATH_SUFFIX})
find_library(SDL2_LIBRARY_DEBUG
- NAMES SDL2d
+ NAMES SDL2d SDL2-staticd
PATH_SUFFIXES ${_SDL2_LIBRARY_PATH_SUFFIX})
# FPHSA needs one of the _DEBUG/_RELEASE variables to check that the
# library was found -- using SDL_LIBRARY, which will get populated by
diff --git a/src/SaveTool/SaveTool.cpp b/src/Application/Application.cpp
similarity index 57%
rename from src/SaveTool/SaveTool.cpp
rename to src/Application/Application.cpp
index c9e2315..eaa712d 100644
--- a/src/SaveTool/SaveTool.cpp
+++ b/src/Application/Application.cpp
@@ -1,5 +1,5 @@
// MassBuilderSaveTool
-// Copyright (C) 2021-2022 Guillaume Jacquemin
+// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -14,8 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-#include "SaveTool.h"
-
#include
#include
@@ -29,14 +27,18 @@
#include
-#include
+#include
+#include
#include
#include
#include "../FontAwesome/IconsFontAwesome5.h"
+#include "../Configuration/Configuration.h"
#include "../Logger/Logger.h"
+#include "Application.h"
+
using namespace Containers::Literals;
extern const ImVec2 center_pivot = {0.5f, 0.5f};
@@ -45,20 +47,24 @@ extern const ImVec2 center_pivot = {0.5f, 0.5f};
Utility::Tweakable tweak;
#endif
-SaveTool::SaveTool(const Arguments& arguments):
+namespace mbst {
+
+Application::Application(const Arguments& arguments):
Platform::Sdl2Application{arguments,
- Configuration{}.setTitle("M.A.S.S. Builder Save Tool " SAVETOOL_VERSION " (\"" SAVETOOL_CODENAME "\")")
+ Configuration{}.setTitle("M.A.S.S. Builder Save Tool " SAVETOOL_VERSION_STRING " (\"" SAVETOOL_CODENAME "\")")
.setSize({960, 720})}
{
#ifdef SAVETOOL_DEBUG_BUILD
tweak.enable("", "../../");
#endif
+ LOG_INFO_FORMAT("Framebuffer size: {}x{}", framebufferSize().x(), framebufferSize().y());
+ LOG_INFO_FORMAT("Window size: {}x{}", windowSize().x(), windowSize().y());
+ LOG_INFO_FORMAT("DPI scaling: {}x{}", dpiScaling().x(), dpiScaling().y());
+
LOG_INFO("Configuring OpenGL renderer.");
GL::Renderer::enable(GL::Renderer::Feature::Blending);
GL::Renderer::enable(GL::Renderer::Feature::ScissorTest);
- GL::Renderer::disable(GL::Renderer::Feature::FaceCulling);
- GL::Renderer::disable(GL::Renderer::Feature::DepthTest);
GL::Renderer::setBlendFunction(GL::Renderer::BlendFunction::SourceAlpha,
GL::Renderer::BlendFunction::OneMinusSourceAlpha);
GL::Renderer::setBlendEquation(GL::Renderer::BlendEquation::Add,
@@ -78,9 +84,9 @@ SaveTool::SaveTool(const Arguments& arguments):
#endif
LOG_INFO("Registering custom events.");
- if((_initEventId = SDL_RegisterEvents(3)) == UnsignedInt(-1)) {
+ if((_initEventId = SDL_RegisterEvents(3)) == std::uint32_t(-1)) {
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error",
- "SDL_RegisterEvents() failed in SaveTool::SaveTool(). Exiting...", window());
+ "SDL_RegisterEvents() failed in Application::SaveTool(). Exiting...", window());
exit(EXIT_FAILURE);
return;
}
@@ -99,24 +105,10 @@ SaveTool::SaveTool(const Arguments& arguments):
initialiseGui();
- if(!initialiseToolDirectories()) {
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error initialising the app",
- _lastError.data(), window());
- exit(EXIT_FAILURE);
- return;
- }
-
- if(!findGameDataDirectory()) {
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error initialising the app",
- _lastError.data(), window());
- exit(EXIT_FAILURE);
- return;
- }
-
checkGameState();
_gameCheckTimerId = SDL_AddTimer(2000,
- [](UnsignedInt interval, void* param)->UnsignedInt{
- static_cast(param)->checkGameState();
+ [](std::uint32_t interval, void* param)->std::uint32_t{
+ static_cast(param)->checkGameState();
return interval;
}, this);
if(_gameCheckTimerId == 0) {
@@ -128,9 +120,7 @@ SaveTool::SaveTool(const Arguments& arguments):
initialiseConfiguration();
- LOG_INFO("Initialising update checker.");
- curl_global_init(CURL_GLOBAL_DEFAULT);
- if(_checkUpdatesOnStartup) {
+ if(conf().checkUpdatesOnStartup()) {
_queue.addToast(Toast::Type::Default, "Checking for updates..."_s);
_updateThread = std::thread{[this]{ checkForUpdates(); }};
}
@@ -141,37 +131,28 @@ SaveTool::SaveTool(const Arguments& arguments):
GL::DebugOutput::setEnabled(GL::DebugOutput::Source::Api, GL::DebugOutput::Type::Other, {131185}, false);
}
- if(_skipDisclaimer) {
- _uiState = UiState::Initialising;
+ if(conf().skipDisclaimer()) {
+ _uiState = UiState::Initialising;
_initThread = std::thread{[this]{ initialiseManager(); }};
}
_timeline.start();
}
-SaveTool::~SaveTool() {
+Application::~Application() {
LOG_INFO("Cleaning up.");
- LOG_INFO("Shutting libcurl down.");
- curl_global_cleanup();
-
SDL_RemoveTimer(_gameCheckTimerId);
LOG_INFO("Saving the configuration.");
- _conf.setValue("cheat_mode"_s, _cheatMode);
- _conf.setValue("advanced_mode"_s, _advancedMode);
- _conf.setValue("startup_update_check"_s, _checkUpdatesOnStartup);
- _conf.setValue("skip_disclaimer"_s, _skipDisclaimer);
- _conf.setValue("swap_interval"_s, _swapInterval);
- _conf.setValue("fps_cap"_s, _fpsCap);
-
- _conf.save();
+ conf().save();
LOG_INFO("Exiting.");
}
-void SaveTool::drawEvent() {
+void
+Application::drawEvent() {
#ifdef SAVETOOL_DEBUG_BUILD
tweak.update();
#endif
@@ -182,8 +163,8 @@ void SaveTool::drawEvent() {
swapBuffers();
- if(_swapInterval == 0 && _fpsCap < 301.0f) {
- while(_timeline.currentFrameDuration() < (1.0f / _fpsCap));
+ if(conf().swapInterval() == 0 && conf().fpsCap() < 301.0f) {
+ while(_timeline.currentFrameDuration() < (1.0f / conf().fpsCap()));
}
redraw();
@@ -191,45 +172,54 @@ void SaveTool::drawEvent() {
_timeline.nextFrame();
}
-void SaveTool::viewportEvent(ViewportEvent& event) {
+void
+Application::viewportEvent(ViewportEvent& event) {
GL::defaultFramebuffer.setViewport({{}, event.framebufferSize()});
- const Vector2 size = Vector2{windowSize()}/dpiScaling();
+ const auto size = Vector2{windowSize()}/dpiScaling();
_imgui.relayout(size, windowSize(), framebufferSize());
}
-void SaveTool::keyPressEvent(KeyEvent& event) {
+void
+Application::keyPressEvent(KeyEvent& event) {
if(_imgui.handleKeyPressEvent(event)) return;
}
-void SaveTool::keyReleaseEvent(KeyEvent& event) {
+void
+Application::keyReleaseEvent(KeyEvent& event) {
if(_imgui.handleKeyReleaseEvent(event)) return;
}
-void SaveTool::mousePressEvent(MouseEvent& event) {
+void
+Application::mousePressEvent(MouseEvent& event) {
if(_imgui.handleMousePressEvent(event)) return;
}
-void SaveTool::mouseReleaseEvent(MouseEvent& event) {
+void
+Application::mouseReleaseEvent(MouseEvent& event) {
if(_imgui.handleMouseReleaseEvent(event)) return;
}
-void SaveTool::mouseMoveEvent(MouseMoveEvent& event) {
+void
+Application::mouseMoveEvent(MouseMoveEvent& event) {
if(_imgui.handleMouseMoveEvent(event)) return;
}
-void SaveTool::mouseScrollEvent(MouseScrollEvent& event) {
+void
+Application::mouseScrollEvent(MouseScrollEvent& event) {
if(_imgui.handleMouseScrollEvent(event)) {
event.setAccepted();
return;
}
}
-void SaveTool::textInputEvent(TextInputEvent& event) {
+void
+Application::textInputEvent(TextInputEvent& event) {
if(_imgui.handleTextInputEvent(event)) return;
}
-void SaveTool::anyEvent(SDL_Event& event) {
+void
+Application::anyEvent(SDL_Event& event) {
if(event.type == _initEventId) {
initEvent(event);
}
@@ -241,7 +231,8 @@ void SaveTool::anyEvent(SDL_Event& event) {
}
}
-void SaveTool::drawImGui() {
+void
+Application::drawImGui() {
_imgui.newFrame();
if(ImGui::GetIO().WantTextInput && !isTextInputActive()) {
@@ -258,7 +249,8 @@ void SaveTool::drawImGui() {
_imgui.drawFrame();
}
-void SaveTool::drawGui() {
+void
+Application::drawGui() {
drawMainMenu();
switch(_uiState) {
@@ -300,8 +292,9 @@ void SaveTool::drawGui() {
_queue.draw(windowSize());
}
-void SaveTool::drawDisclaimer() {
- ImGui::SetNextWindowPos(ImVec2{Vector2{windowSize() / 2.0f}}, ImGuiCond_Always, center_pivot);
+void
+Application::drawDisclaimer() {
+ ImGui::SetNextWindowPos(ImVec2{Vector2{windowSize() / 2.0f} / dpiScaling()}, ImGuiCond_Always, center_pivot);
if(ImGui::Begin("Disclaimer##DisclaimerWindow", nullptr,
ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoBringToFrontOnFocus|
@@ -330,7 +323,13 @@ void SaveTool::drawDisclaimer() {
ImGui::Bullet();
ImGui::SameLine();
- ImGui::TextUnformatted("This version of the application was tested on M.A.S.S. Builder early access version " SUPPORTED_GAME_VERSION ". It may or may not work with other versions of the game.");
+ ImGui::TextUnformatted("This version of the application was tested on M.A.S.S. Builder early access version " SAVETOOL_SUPPORTED_GAME_VERSION ". It may or may not work with other versions of the game.");
+
+ if(conf().isRunningInWine()) {
+ ImGui::Bullet();
+ ImGui::SameLine();
+ ImGui::TextUnformatted("You are currently running this application in Wine/Proton. It hasn't been fully tested, so some issues may arise. Furthermore, features may be unavailable.");
+ }
ImGui::PopTextWrapPos();
@@ -344,11 +343,13 @@ void SaveTool::drawDisclaimer() {
ImGui::Dummy({0.0f, 5.0f});
ImGui::Dummy({4.0f, 0.0f});
ImGui::SameLine();
- ImGui::Checkbox("Don't show next time", &_skipDisclaimer);
+ if(drawCheckbox("Don't show next time", conf().skipDisclaimer())) {
+ conf().setSkipDisclaimer(!conf().skipDisclaimer());
+ }
ImGui::TableSetColumnIndex(1);
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {24.0f, 12.0f});
if(ImGui::Button("I understand the risks")) {
- _uiState = UiState::Initialising;
+ _uiState = UiState::Initialising;
_initThread = std::thread{[this]{ initialiseManager(); }};
}
ImGui::PopStyleVar();
@@ -359,8 +360,9 @@ void SaveTool::drawDisclaimer() {
ImGui::End();
}
-void SaveTool::drawInitialisation() {
- ImGui::SetNextWindowPos(ImVec2{Vector2{windowSize() / 2.0f}}, ImGuiCond_Always, center_pivot);
+void
+Application::drawInitialisation() {
+ ImGui::SetNextWindowPos(ImVec2{Vector2{windowSize() / 2.0f} / dpiScaling()}, ImGuiCond_Always, center_pivot);
if(ImGui::BeginPopupModal("##InitPopup", nullptr,
ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar))
@@ -372,7 +374,8 @@ void SaveTool::drawInitialisation() {
ImGui::OpenPopup("##InitPopup");
}
-void SaveTool::drawGameState() {
+void
+Application::drawGameState() {
ImGui::TextUnformatted("Game state:");
ImGui::SameLine();
{
@@ -393,18 +396,19 @@ void SaveTool::drawGameState() {
}
}
-void SaveTool::drawHelpMarker(Containers::StringView text, Float wrap_pos) {
+void
+Application::drawHelpMarker(Containers::StringView text, float wrap_pos) {
ImGui::TextUnformatted(ICON_FA_QUESTION_CIRCLE);
drawTooltip(text, wrap_pos);
}
-void SaveTool::drawTooltip(Containers::StringView text, Float wrap_pos) {
- if(ImGui::IsItemHovered()){
- ImGui::BeginTooltip();
+void
+Application::drawTooltip(Containers::StringView text, float wrap_pos) {
+ if(ImGui::IsItemHovered() && ImGui::BeginTooltip()) {
if(wrap_pos > 0.0f) {
ImGui::PushTextWrapPos(wrap_pos);
}
- ImGui::TextUnformatted(text.data());
+ ImGui::TextUnformatted(text.cbegin(), text.cend());
if(wrap_pos > 0.0f) {
ImGui::PopTextWrapPos();
}
@@ -412,11 +416,121 @@ void SaveTool::drawTooltip(Containers::StringView text, Float wrap_pos) {
}
}
-void SaveTool::openUri(Containers::StringView uri) {
- ShellExecuteW(nullptr, nullptr, Utility::Unicode::widen(uri.data()), nullptr, nullptr, SW_SHOWDEFAULT);
+bool
+Application::drawCheckbox(Containers::StringView label, bool value) {
+ return ImGui::Checkbox(label.data(), &value);
}
-void SaveTool::checkGameState() {
+void
+Application::drawVector3Drag(Containers::StringView id, Vector3& vec, float speed, Vector3 min, Vector3 max,
+ const char* x_format, const char* y_format, const char* z_format, ImGuiSliderFlags_ flags)
+{
+ ImGui::PushID(id.cbegin());
+ ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
+ ImGui::DragFloat("##X", &vec.x(), speed, min.x(), max.x(), x_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::DragFloat("##Y", &vec.y(), speed, min.y(), max.y(), y_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::DragFloat("##Z", &vec.z(), speed, min.z(), max.z(), z_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::PopID();
+}
+
+void
+Application::drawVector3dDrag(Containers::StringView id, Vector3d& vec, float speed, Vector3d min, Vector3d max,
+ const char* x_format, const char* y_format, const char* z_format,
+ ImGuiSliderFlags_ flags)
+{
+ ImGui::PushID(id.cbegin());
+ ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
+ ImGui::DragScalar("##X", ImGuiDataType_Double, &vec.x(), speed, &min.x(), &max.x(), x_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::DragScalar("##Y", ImGuiDataType_Double, &vec.y(), speed, &min.y(), &max.y(), y_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::DragScalar("##X", ImGuiDataType_Double, &vec.x(), speed, &min.z(), &max.z(), z_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::PopID();
+}
+
+void
+Application::drawVector3Slider(Containers::StringView id, Vector3& vec, Vector3 min, Vector3 max, const char* x_format,
+ const char* y_format, const char* z_format, ImGuiSliderFlags_ flags)
+{
+ ImGui::PushID(id.cbegin());
+ ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
+ ImGui::SliderFloat("##X", &vec.x(), min.x(), max.x(), x_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::SliderFloat("##Y", &vec.y(), min.y(), max.y(), y_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::SliderFloat("##Z", &vec.z(), min.z(), max.z(), z_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::PopID();
+}
+
+void
+Application::drawVector3dSlider(Containers::StringView id, Vector3d& vec, Vector3d min, Vector3d max,
+ const char* x_format, const char* y_format, const char* z_format,
+ ImGuiSliderFlags_ flags)
+{
+ ImGui::PushID(id.cbegin());
+ ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
+ ImGui::SliderScalar("##X", ImGuiDataType_Double, &vec.x(), &min.x(), &max.x(), x_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::SliderScalar("##Y", ImGuiDataType_Double, &vec.y(), &min.y(), &max.y(), y_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::SliderScalar("##X", ImGuiDataType_Double, &vec.x(), &min.z(), &max.z(), z_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::PopID();
+}
+
+void
+Application::drawVector2Slider(Containers::StringView id, Vector2& vec, Vector2 min, Vector2 max, const char* x_format,
+ const char* y_format, ImGuiSliderFlags_ flags)
+{
+ ImGui::PushID(id.cbegin());
+ ImGui::PushMultiItemsWidths(2, ImGui::CalcItemWidth());
+ ImGui::SliderFloat("##X", &vec.x(), min.x(), max.x(), x_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::SliderFloat("##Y", &vec.y(), min.y(), max.y(), y_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::PopID();
+}
+
+void
+Application::drawVector2dSlider(Containers::StringView id, Vector2d& vec, Vector2d min, Vector2d max,
+ const char* x_format, const char* y_format, ImGuiSliderFlags_ flags)
+{
+ ImGui::PushID(id.cbegin());
+ ImGui::PushMultiItemsWidths(2, ImGui::CalcItemWidth());
+ ImGui::SliderScalar("##X", ImGuiDataType_Double, &vec.x(), &min.x(), &max.x(), x_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ ImGui::SliderScalar("##Y", ImGuiDataType_Double, &vec.y(), &min.y(), &max.y(), y_format, flags);
+ ImGui::PopItemWidth();
+ ImGui::PopID();
+}
+
+void
+Application::openUri(Containers::StringView uri) {
+ if(!conf().isRunningInWine()) {
+ ShellExecuteA(nullptr, nullptr, uri.data(), nullptr, nullptr, SW_SHOWDEFAULT);
+ }
+ else {
+ std::system(Utility::format("winebrowser.exe {}", uri).cbegin());
+ }
+}
+
+void
+Application::checkGameState() {
WTS_PROCESS_INFOW* process_infos = nullptr;
unsigned long process_count = 0;
@@ -437,3 +551,5 @@ void SaveTool::checkGameState() {
_gameState = GameState::Unknown;
}
}
+
+}
diff --git a/src/SaveTool/SaveTool.h b/src/Application/Application.h
similarity index 51%
rename from src/SaveTool/SaveTool.h
rename to src/Application/Application.h
index c662203..9c16709 100644
--- a/src/SaveTool/SaveTool.h
+++ b/src/Application/Application.h
@@ -1,7 +1,7 @@
#pragma once
// MassBuilderSaveTool
-// Copyright (C) 2021-2022 Guillaume Jacquemin
+// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
+#include
#include
#include
#include
#include
-#include
#include
#ifdef SAVETOOL_DEBUG_BUILD
#include
@@ -34,13 +34,15 @@
#include
#include
-#include
#include
-#include "../ProfileManager/ProfileManager.h"
-#include "../MassManager/MassManager.h"
+#include "../Managers/BackupManager.h"
+#include "../Managers/MassManager.h"
+#include "../Managers/ProfileManager.h"
+#include "../Managers/StagedMassManager.h"
#include "../ToastQueue/ToastQueue.h"
+#include "../UpdateChecker/UpdateChecker.h"
#ifdef SAVETOOL_DEBUG_BUILD
#define tw CORRADE_TWEAKABLE
@@ -50,17 +52,19 @@ using namespace Corrade;
using namespace Containers::Literals;
using namespace Magnum;
-class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener {
- public:
- explicit SaveTool(const Arguments& arguments);
+namespace mbst {
- ~SaveTool() override;
+class Application: public Platform::Sdl2Application, public efsw::FileWatchListener {
+ public:
+ explicit Application(const Arguments& arguments);
+
+ ~Application() override;
void handleFileAction(efsw::WatchID watch_id,
const std::string& dir,
const std::string& filename,
efsw::Action action,
- std::string old_filename = "") override;
+ std::string old_filename) override;
private:
// Events
@@ -78,20 +82,15 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
void anyEvent(SDL_Event& event) override;
- enum InitStatus: Int {
+ enum InitStatus: std::int32_t {
InitSuccess,
ProfileManagerFailure
};
void initEvent(SDL_Event& event);
- enum UpdateCheckStatus : Int {
- CurlInitFailed = 0,
- CurlError = 1,
- CurlTimeout = 2,
- };
void updateCheckEvent(SDL_Event& event);
- enum FileEventType: Int {
+ enum FileEventType: std::int32_t {
FileAdded = efsw::Action::Add,
FileDeleted = efsw::Action::Delete,
FileModified = efsw::Action::Modified,
@@ -104,8 +103,6 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
void initialiseConfiguration();
void initialiseGui();
void initialiseManager();
- auto initialiseToolDirectories() -> bool;
- auto findGameDataDirectory() -> bool;
void initialiseMassManager();
void initialiseFileWatcher();
@@ -117,21 +114,21 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
void drawInitialisation();
void drawProfileManager();
- auto drawBackupListPopup() -> ImGuiID;
- auto drawBackupProfilePopup(std::size_t profile_index) -> ImGuiID;
- auto drawDeleteProfilePopup(std::size_t profile_index) -> ImGuiID;
+ void drawBackupListPopup();
+ void drawBackupFolder(const Managers::Vfs::Directory& dir);
+ void drawBackupRestorePopup(std::size_t backup_index);
+ void drawBackupDeletePopup(std::size_t backup_index);
+ void drawDeleteProfilePopup(std::size_t profile_index);
void drawManager();
- auto drawIntEditPopup(int* value_to_edit, int max) -> bool;
- auto drawRenamePopup(Containers::ArrayView name_view) -> bool;
+ bool drawIntEditPopup(int* value_to_edit, int max);
+ bool drawRenamePopup(Containers::ArrayView name_view);
void drawGeneralInfo();
void drawResearchInventory();
- template
- void drawMaterialRow(Containers::StringView name, Int tier, Getter getter, Setter setter);
- void drawUnavailableMaterialRow(Containers::StringView name, Int tier);
+ void drawMaterialRow(Containers::StringView name, std::int32_t tier, GameData::MaterialID id);
void drawMassManager();
- auto drawDeleteMassPopup(int mass_index) -> ImGuiID;
- auto drawDeleteStagedMassPopup(Containers::StringView filename) -> ImGuiID;
+ void drawDeleteMassPopup(int mass_index);
+ void drawDeleteStagedMassPopup(Containers::StringView filename);
void drawMassViewer();
void drawFrameInfo();
@@ -140,33 +137,55 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
void drawEyeColourPicker();
void drawCustomFrameStyles();
void drawArmour();
+ void drawBLAttachment();
void drawCustomArmourStyles();
void drawWeapons();
- void drawWeaponCategory(Containers::StringView name, Containers::ArrayView weapons_view, bool& dirty,
- Containers::StringView payload_type, Containers::StringView payload_tooltip);
- void drawWeaponEditor(Weapon& weapon);
+ void drawWeaponCategory(Containers::StringView name, Containers::ArrayView weapons_view,
+ bool& dirty, Containers::StringView payload_type,
+ Containers::StringView payload_tooltip);
+ void drawWeaponEditor(GameObjects::Weapon& weapon);
void drawGlobalStyles();
void drawTuning();
- void drawDecalEditor(Decal& decal);
- void drawAccessoryEditor(Accessory& accessory, Containers::ArrayView style_view);
- auto getStyleName(Int id, Containers::ArrayView view) -> Containers::StringView;
+ void drawDecalEditor(GameObjects::Decal& decal);
+ void drawAccessoryEditor(GameObjects::Accessory& accessory,
+ Containers::ArrayView style_view);
+ auto getStyleName(std::int32_t id, Containers::ArrayView view)
+ -> Containers::StringView;
enum DCSResult {
DCS_Fail,
DCS_ResetStyle,
DCS_Save
};
- auto drawCustomStyle(CustomStyle& style) -> DCSResult;
+ auto drawCustomStyle(GameObjects::CustomStyle& style) -> DCSResult;
void drawAbout();
void drawGameState();
// Convenience wrappers over ImGui stuff
- void drawHelpMarker(Containers::StringView text, Float wrap_pos = 0.0f);
- void drawTooltip(Containers::StringView text, Float wrap_pos = 0.0f);
+ void drawHelpMarker(Containers::StringView text, float wrap_pos = 0.0f);
+ void drawTooltip(Containers::StringView text, float wrap_pos = 0.0f);
+ bool drawCheckbox(Containers::StringView label, bool value);
+ void drawVector3Drag(Containers::StringView id, Vector3& vec, float speed, Vector3 min, Vector3 max,
+ const char* x_format, const char* y_format, const char* z_format,
+ ImGuiSliderFlags_ flags = ImGuiSliderFlags_None);
+ void drawVector3dDrag(Containers::StringView id, Vector3d& vec, float speed, Vector3d min, Vector3d max,
+ const char* x_format, const char* y_format, const char* z_format,
+ ImGuiSliderFlags_ flags = ImGuiSliderFlags_None);
+ void drawVector3Slider(Containers::StringView id, Vector3& vec, Vector3 min, Vector3 max, const char* x_format,
+ const char* y_format, const char* z_format,
+ ImGuiSliderFlags_ flags = ImGuiSliderFlags_None);
+ void drawVector3dSlider(Containers::StringView id, Vector3d& vec, Vector3d min, Vector3d max,
+ const char* x_format, const char* y_format, const char* z_format,
+ ImGuiSliderFlags_ flags = ImGuiSliderFlags_None);
+ void drawVector2Slider(Containers::StringView id, Vector2& vec, Vector2 min, Vector2 max, const char* x_format,
+ const char* y_format, ImGuiSliderFlags_ flags = ImGuiSliderFlags_None);
+ void drawVector2dSlider(Containers::StringView id, Vector2d& vec, Vector2d min, Vector2d max,
+ const char* x_format, const char* y_format,
+ ImGuiSliderFlags_ flags = ImGuiSliderFlags_None);
template
- auto drawUnsafeWidget(Functor func, Args... args) -> bool {
+ bool drawUnsafeWidget(Functor func, Args... args) {
GameState game_state = _gameState; // Copying the value to reduce the risk of a data race.
ImGui::BeginDisabled(game_state != GameState::NotRunning);
bool result = func(std::forward(args)...);
@@ -197,7 +216,6 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
void checkForUpdates();
- Utility::Configuration _conf{"MassBuilderSaveTool.ini"_s};
Utility::Resource _rs{"assets"_s};
// GUI-related members
@@ -211,11 +229,11 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
MassViewer
} _uiState{UiState::Disclaimer};
- bool _aboutPopup{false};
+ bool _aboutPopup = false;
#ifdef SAVETOOL_DEBUG_BUILD
- bool _demoWindow{false};
- bool _styleEditor{false};
- bool _metricsWindow{false};
+ bool _demoWindow = false;
+ bool _styleEditor = false;
+ bool _metricsWindow = false;
#endif
ToastQueue _queue;
@@ -223,37 +241,29 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
std::thread _initThread;
std::thread _updateThread;
- UnsignedInt _initEventId;
- UnsignedInt _updateEventId;
- UnsignedInt _fileEventId;
+ std::uint32_t _initEventId;
+ std::uint32_t _updateEventId;
+ std::uint32_t _fileEventId;
Containers::String _lastError;
- Containers::String _gameDataDir;
- Containers::String _configDir;
- Containers::String _saveDir;
- Containers::String _screenshotsDir;
-
- Containers::String _backupsDir;
- Containers::String _stagingDir;
- //Containers::String _armouryDir;
- //Containers::String _armoursDir;
- //Containers::String _weaponsDir;
- //Containers::String _stylesDir;
-
- enum class GameState : UnsignedByte {
+ enum class GameState : std::uint8_t {
Unknown, NotRunning, Running
} _gameState{GameState::Unknown};
SDL_TimerID _gameCheckTimerId = 0;
- Containers::Pointer _profileManager;
- Profile* _currentProfile{nullptr};
+ Containers::Pointer _profileManager;
+ GameObjects::Profile* _currentProfile = nullptr;
- Containers::Pointer _massManager;
- Mass* _currentMass{nullptr};
+ Containers::Pointer _backupManager;
- Weapon* _currentWeapon = nullptr;
+ Containers::Pointer _massManager;
+ GameObjects::Mass* _currentMass = nullptr;
+
+ Containers::Pointer _stagedMassManager;
+
+ GameObjects::Weapon* _currentWeapon = nullptr;
Containers::Pointer _fileWatcher;
enum watchID {
@@ -262,36 +272,29 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
};
Containers::StaticArray<2, efsw::WatchID> _watchIDs;
- int _swapInterval = 1;
- float _fpsCap = 60.0f;
+ Containers::Optional _checker{Containers::NullOpt};
+ std::mutex _checkerMutex;
- bool _skipDisclaimer{false};
- bool _checkUpdatesOnStartup{true};
+ bool _modifiedBySaveTool = false;
+ bool _jointsDirty = false;
+ bool _stylesDirty = false;
+ bool _eyeFlareDirty = false;
+ bool _meleeDirty = false;
+ bool _shieldsDirty = false;
+ bool _bShootersDirty = false;
+ bool _eShootersDirty = false;
+ bool _bLaunchersDirty = false;
+ bool _eLaunchersDirty = false;
- bool _updateAvailable{false};
- Containers::String _latestVersion;
- Containers::String _releaseLink;
- Containers::String _downloadLink;
-
- bool _modifiedBySaveTool{false};
- bool _jointsDirty{false};
- bool _stylesDirty{false};
- bool _eyeFlareDirty{false};
- Containers::StaticArray<38, Int> _selectedArmourDecals{ValueInit};
- Containers::StaticArray<38, Int> _selectedArmourAccessories{ValueInit};
- Int _selectedBLPlacement{0};
- Int _selectedWeaponPart{0};
- Int _selectedWeaponDecal{0};
- Int _selectedWeaponAccessory{0};
- bool _meleeDirty{false};
- bool _shieldsDirty{false};
- bool _bShootersDirty{false};
- bool _eShootersDirty{false};
- bool _bLaunchersDirty{false};
- bool _eLaunchersDirty{false};
-
- bool _cheatMode{false};
- bool _advancedMode{false};
+ Containers::Optional _selectedArmourSlot{Containers::NullOpt};
+ Containers::StaticArray<38, std::int32_t> _selectedArmourDecals{ValueInit};
+ Containers::StaticArray<38, std::int32_t> _selectedArmourAccessories{ValueInit};
+ std::uint32_t _selectedBLPlacement = 0;
+ std::int32_t _selectedWeaponPart = 0;
+ std::int32_t _selectedWeaponDecal = 0;
+ std::int32_t _selectedWeaponAccessory = 0;
Timeline _timeline;
};
+
+}
diff --git a/src/SaveTool/SaveTool_FileWatcher.cpp b/src/Application/Application_FileWatcher.cpp
similarity index 84%
rename from src/SaveTool/SaveTool_FileWatcher.cpp
rename to src/Application/Application_FileWatcher.cpp
index 42a3fcd..3348d8e 100644
--- a/src/SaveTool/SaveTool_FileWatcher.cpp
+++ b/src/Application/Application_FileWatcher.cpp
@@ -1,5 +1,5 @@
// MassBuilderSaveTool
-// Copyright (C) 2021-2022 Guillaume Jacquemin
+// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -24,13 +24,13 @@
#include
#include
-#include "SaveTool.h"
+#include "Application.h"
-void SaveTool::handleFileAction(efsw::WatchID watch_id,
- const std::string&,
- const std::string& filename,
- efsw::Action action,
- std::string old_filename)
+namespace mbst {
+
+void
+Application::handleFileAction(efsw::WatchID watch_id, const std::string&, const std::string& filename,
+ efsw::Action action, std::string old_filename)
{
SDL_Event event;
SDL_zero(event);
@@ -48,7 +48,9 @@ void SaveTool::handleFileAction(efsw::WatchID watch_id,
return;
} // TODO: actually do something when config files will finally be handled
- if(!Utility::String::endsWith(filename, Utility::format("Profile{}.sav", _currentProfile->account()).data())) {
+ if(!Utility::String::endsWith(filename, Utility::format("Profile{}.sav", _currentProfile->account()).data()) &&
+ filename.find("Unit") == std::string::npos)
+ {
return;
}
@@ -60,19 +62,20 @@ void SaveTool::handleFileAction(efsw::WatchID watch_id,
SDL_PushEvent(&event);
}
-void SaveTool::fileUpdateEvent(SDL_Event& event) {
+void
+Application::fileUpdateEvent(SDL_Event& event) {
Containers::String filename{static_cast(event.user.data1),
std::strlen(static_cast(event.user.data1)), nullptr};
if((event.user.code & StagedUpdate) == StagedUpdate) {
- _massManager->refreshStagedMass(filename);
+ _stagedMassManager->refreshMass(filename);
return;
}
Containers::String old_filename;
- Int index = 0;
- Int old_index = 0;
+ std::int32_t index = 0;
+ std::int32_t old_index = 0;
bool is_current_profile = filename == _currentProfile->filename();
bool is_unit = filename.hasPrefix(_currentProfile->isDemo() ? "DemoUnit"_s : "Unit"_s);
if(is_unit) {
@@ -81,9 +84,10 @@ void SaveTool::fileUpdateEvent(SDL_Event& event) {
}
if(event.user.code == FileMoved) {
- old_filename = Containers::String{static_cast(event.user.data2), std::strlen(static_cast(event.user.data2)), nullptr};
+ old_filename = Containers::String{static_cast(event.user.data2),
+ std::strlen(static_cast(event.user.data2)), nullptr};
old_index = ((old_filename[_currentProfile->isDemo() ? 8 : 4] - 0x30) * 10) +
- (old_filename[_currentProfile->isDemo() ? 9 : 5] - 0x30);
+ (old_filename[_currentProfile->isDemo() ? 9 : 5] - 0x30);
}
switch(event.user.code) {
@@ -123,8 +127,8 @@ void SaveTool::fileUpdateEvent(SDL_Event& event) {
}
else {
if(_modifiedBySaveTool && _currentMass->filename() == filename) {
- auto handle = CreateFileW(Utility::Unicode::widen(Containers::StringView{filename}), GENERIC_READ, 0,
- nullptr, OPEN_EXISTING, 0, nullptr);
+ auto handle = CreateFileW(Utility::Unicode::widen(Containers::StringView{filename}),
+ GENERIC_READ, 0, nullptr, OPEN_EXISTING, 0, nullptr);
if(handle && handle != INVALID_HANDLE_VALUE) {
CloseHandle(handle);
_modifiedBySaveTool = false;
@@ -148,3 +152,5 @@ void SaveTool::fileUpdateEvent(SDL_Event& event) {
_queue.addToast(Toast::Type::Warning, "Unknown file action type"_s);
}
}
+
+}
diff --git a/src/Application/Application_Initialisation.cpp b/src/Application/Application_Initialisation.cpp
new file mode 100644
index 0000000..c692408
--- /dev/null
+++ b/src/Application/Application_Initialisation.cpp
@@ -0,0 +1,141 @@
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+#include
+
+#include "../Configuration/Configuration.h"
+#include "../FontAwesome/IconsFontAwesome5.h"
+#include "../FontAwesome/IconsFontAwesome5Brands.h"
+#include "../Logger/Logger.h"
+
+#include "Application.h"
+
+namespace mbst {
+
+void
+Application::initEvent(SDL_Event& event) {
+ _initThread.join();
+
+ switch(event.user.code) {
+ case InitSuccess:
+ _uiState = UiState::ProfileManager;
+ ImGui::CloseCurrentPopup();
+ break;
+ case ProfileManagerFailure:
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error ",
+ _profileManager->lastError().data(), window());
+ exit(EXIT_FAILURE);
+ break;
+ default:
+ break;
+ }
+}
+
+void
+Application::initialiseConfiguration() {
+ LOG_INFO("Reading configuration file.");
+
+ setSwapInterval(conf().swapInterval());
+ setMinimalLoopPeriod(0);
+}
+
+void
+Application::initialiseGui() {
+ LOG_INFO("Initialising Dear ImGui.");
+
+ auto ctx = ImGui::CreateContext();
+ auto& io = ImGui::GetIO();
+
+ const auto size = Vector2{windowSize()}/dpiScaling();
+
+ auto reg_font = _rs.getRaw("SourceSansPro-Regular.ttf"_s);
+ ImFontConfig font_config;
+ font_config.FontDataOwnedByAtlas = false;
+ std::strcpy(font_config.Name, "Source Sans Pro");
+ io.Fonts->AddFontFromMemoryTTF(const_cast(reg_font.data()), int(reg_font.size()),
+ 20.0f * float(framebufferSize().x()) / size.x(), &font_config);
+
+ auto icon_font = _rs.getRaw(FONT_ICON_FILE_NAME_FAS);
+ static const ImWchar icon_range[] = { ICON_MIN_FA, ICON_MAX_FA, 0 };
+ ImFontConfig icon_config;
+ icon_config.FontDataOwnedByAtlas = false;
+ icon_config.MergeMode = true;
+ icon_config.PixelSnapH = true;
+ icon_config.OversampleH = icon_config.OversampleV = 1;
+ icon_config.GlyphMinAdvanceX = 18.0f;
+ io.Fonts->AddFontFromMemoryTTF(const_cast(icon_font.data()), int(icon_font.size()),
+ 16.0f * float(framebufferSize().x()) / size.x(), &icon_config, icon_range);
+
+ auto brand_font = _rs.getRaw(FONT_ICON_FILE_NAME_FAB);
+ static const ImWchar brand_range[] = { ICON_MIN_FAB, ICON_MAX_FAB, 0 };
+ io.Fonts->AddFontFromMemoryTTF(const_cast(brand_font.data()), int(brand_font.size()),
+ 16.0f * float(framebufferSize().x()) / size.x(), &icon_config, brand_range);
+
+ auto mono_font = _rs.getRaw("SourceCodePro-Regular.ttf"_s);
+ io.Fonts->AddFontFromMemoryTTF(const_cast(mono_font.data()), int(mono_font.size()),
+ 18.0f * float(framebufferSize().x()) / size.x(), &font_config);
+
+ _imgui = ImGuiIntegration::Context(*ctx, Vector2{windowSize()}/dpiScaling(), windowSize(), framebufferSize());
+
+ io.IniFilename = nullptr;
+
+ auto& style = ImGui::GetStyle();
+
+ style.WindowTitleAlign = {0.5f, 0.5f};
+ style.FrameRounding = 3.2f;
+ style.Colors[ImGuiCol_WindowBg] = ImColor(0xff1f1f1f);
+}
+
+void
+Application::initialiseManager() {
+ LOG_INFO("Initialising the profile manager.");
+
+ SDL_Event event;
+ SDL_zero(event);
+ event.type = _initEventId;
+
+ _profileManager.emplace();
+ if(!_profileManager->ready()) {
+ event.user.code = ProfileManagerFailure;
+ SDL_PushEvent(&event);
+ return;
+ }
+
+ _backupManager.emplace();
+
+ _stagedMassManager.emplace();
+
+ event.user.code = InitSuccess;
+ SDL_PushEvent(&event);
+}
+
+void
+Application::initialiseMassManager() {
+ LOG_INFO("Initialising the M.A.S.S. manager.");
+ _massManager.emplace(_currentProfile->account(), _currentProfile->isDemo());
+}
+
+void
+Application::initialiseFileWatcher() {
+ LOG_INFO("Initialising the file watcher.");
+ _fileWatcher.emplace();
+ _watchIDs[SaveDir] = _fileWatcher->addWatch(conf().directories().gameSaves, this, false);
+ _watchIDs[StagingDir] = _fileWatcher->addWatch(conf().directories().staging, this, false);
+ _fileWatcher->watch();
+}
+
+}
diff --git a/src/SaveTool/SaveTool_MainManager.cpp b/src/Application/Application_MainManager.cpp
similarity index 64%
rename from src/SaveTool/SaveTool_MainManager.cpp
rename to src/Application/Application_MainManager.cpp
index 2f0d1c7..38e52f6 100644
--- a/src/SaveTool/SaveTool_MainManager.cpp
+++ b/src/Application/Application_MainManager.cpp
@@ -1,5 +1,5 @@
// MassBuilderSaveTool
-// Copyright (C) 2021-2022 Guillaume Jacquemin
+// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,20 +16,27 @@
#include
+#include
#include
#include
+#include
+
#include
+#include "../Configuration/Configuration.h"
#include "../FontAwesome/IconsFontAwesome5.h"
-#include "../Maps/LastMissionId.h"
-#include "../Maps/StoryProgress.h"
+#include "../GameData/LastMissionId.h"
+#include "../GameData/StoryProgress.h"
-#include "SaveTool.h"
+#include "Application.h"
-void SaveTool::drawManager() {
+namespace mbst {
+
+void
+Application::drawManager() {
ImGui::SetNextWindowPos({0.0f, ImGui::GetItemRectSize().y}, ImGuiCond_Always);
- ImGui::SetNextWindowSize({Float(windowSize().x()), Float(windowSize().y()) - ImGui::GetItemRectSize().y},
+ ImGui::SetNextWindowSize(ImVec2{Vector2{float(windowSize().x()), float(windowSize().y()) - ImGui::GetItemRectSize().y} / dpiScaling()},
ImGuiCond_Always);
if(!ImGui::Begin("##MainWindow", nullptr,
ImGuiWindowFlags_NoDecoration|ImGuiWindowFlags_NoMove|
@@ -52,7 +59,7 @@ void SaveTool::drawManager() {
if(ImGui::BeginChild("##ProfileInfo",
{ImGui::GetContentRegionAvail().x * 0.60f, 0.0f},
- true, ImGuiWindowFlags_MenuBar))
+ ImGuiChildFlags_Border, ImGuiWindowFlags_MenuBar))
{
if(ImGui::BeginMenuBar()) {
ImGui::TextUnformatted("Profile information");
@@ -79,7 +86,7 @@ void SaveTool::drawManager() {
ImGui::SameLine();
if(ImGui::BeginChild("##MASSManager", {0.0f, 0.0f},
- true, ImGuiWindowFlags_MenuBar))
+ ImGuiChildFlags_Border, ImGuiWindowFlags_MenuBar))
{
if(ImGui::BeginMenuBar()) {
ImGui::TextUnformatted("M.A.S.S. management");
@@ -94,7 +101,8 @@ void SaveTool::drawManager() {
ImGui::End();
}
-auto SaveTool::drawIntEditPopup(int* value_to_edit, int max) -> bool {
+bool
+Application::drawIntEditPopup(int* value_to_edit, int max) {
bool apply = false;
if(ImGui::BeginPopup("int_edit")) {
ImGui::Text("Please enter a value between 0 and %i:", max);
@@ -103,7 +111,7 @@ auto SaveTool::drawIntEditPopup(int* value_to_edit, int max) -> bool {
drawHelpMarker("You can either drag the widget left or right to change the value,\n"
"or click on it while holding Ctrl to edit the value directly.");
ImGui::SameLine();
- drawUnsafeWidget([](auto... args){ return ImGui::SliderInt("", args...); },
+ drawUnsafeWidget([](auto... args){ return ImGui::SliderInt("##IntSlider", args...); },
value_to_edit, 0, max, "%d", ImGuiSliderFlags_AlwaysClamp);
ImGui::SameLine();
if(drawUnsafeWidget([]{ return ImGui::Button("Apply"); })) {
@@ -117,7 +125,8 @@ auto SaveTool::drawIntEditPopup(int* value_to_edit, int max) -> bool {
return apply;
}
-auto SaveTool::drawRenamePopup(Containers::ArrayView name_view) -> bool {
+bool
+Application::drawRenamePopup(Containers::ArrayView name_view) {
bool apply = false;
if(ImGui::BeginPopup("name_edit")) {
ImGui::TextUnformatted("Please enter a new name. Conditions:");
@@ -133,13 +142,15 @@ auto SaveTool::drawRenamePopup(Containers::ArrayView name_view) -> bool {
(name_view[0] != ' ' && name_view[len - 1] != ' ') ? ICON_FA_CHECK : ICON_FA_TIMES);
static auto callback = [](ImGuiInputTextCallbackData* data)->int {
- if(data->EventChar < 256 && std::strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789- ", char(data->EventChar))) {
+ if(data->EventChar < 256 &&
+ std::strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789- ", char(data->EventChar)))
+ {
return 0;
}
return 1;
};
- drawUnsafeWidget([](auto... args){ return ImGui::InputText("", args...); },
+ drawUnsafeWidget([](auto... args){ return ImGui::InputText("##NameField", args...); },
name_view.data(), name_view.size(),
ImGuiInputTextFlags_CallbackCharFilter,
callback, nullptr);
@@ -169,16 +180,17 @@ auto SaveTool::drawRenamePopup(Containers::ArrayView name_view) -> bool {
return apply;
}
-void SaveTool::drawGeneralInfo() {
+void
+Application::drawGeneralInfo() {
if(!_currentProfile) {
return;
}
ImGui::Text("Credits: %i", _currentProfile->credits());
- auto it = std::find_if(story_progress.begin(), story_progress.end(),
- [this](const StoryProgressPoint& p){ return p.id == _currentProfile->storyProgress(); });
- if(it != story_progress.end())
+ auto it = std::find_if(GameData::story_progress.begin(), GameData::story_progress.end(),
+ [this](const GameData::StoryProgressPoint& p){ return p.id == _currentProfile->storyProgress(); });
+ if(it != GameData::story_progress.end())
{
ImGui::TextUnformatted("Story progress:");
ImGui::SameLine(0.0f, ImGui::GetStyle().ItemSpacing.x / 4.0f);
@@ -193,8 +205,8 @@ void SaveTool::drawGeneralInfo() {
ImGui::Text("Story progress: 0x%x", _currentProfile->storyProgress());
}
- if(mission_id_map.find(_currentProfile->lastMissionId()) != mission_id_map.cend()) {
- ImGui::Text("Last mission: %s", mission_id_map.at(_currentProfile->lastMissionId()).data());
+ if(GameData::mission_id_map.find(_currentProfile->lastMissionId()) != GameData::mission_id_map.cend()) {
+ ImGui::Text("Last mission: %s", GameData::mission_id_map.at(_currentProfile->lastMissionId()).data());
}
else if(_currentProfile->lastMissionId() == -1) {
ImGui::TextUnformatted("Last mission: none");
@@ -205,7 +217,7 @@ void SaveTool::drawGeneralInfo() {
drawTooltip("This is the last mission selected in the mission selection screen, not the last mission played.",
float(windowSize().x()) * 0.35f);
- const Float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
+ const float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
ImGui::Dummy({ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y - footer_height_to_reserve});
ImGui::Separator();
@@ -224,13 +236,13 @@ void SaveTool::drawGeneralInfo() {
}
}
- if(!_cheatMode) {
+ if(!conf().cheatMode()) {
return;
}
ImGui::SameLine();
- static Int credits;
+ static std::int32_t credits;
if(drawUnsafeWidget([]{ return ImGui::Button("Edit credits"); })) {
credits = _currentProfile->credits();
ImGui::OpenPopup("int_edit");
@@ -251,7 +263,7 @@ void SaveTool::drawGeneralInfo() {
if(_gameState != GameState::NotRunning) {
ImGui::CloseCurrentPopup();
}
- for(const auto& sp : story_progress) {
+ for(const auto& sp : GameData::story_progress) {
if(ImGui::BeginMenu(sp.chapter.data())) {
if(!sp.after) {
if(ImGui::MenuItem(sp.point.data())) {
@@ -277,7 +289,8 @@ void SaveTool::drawGeneralInfo() {
}
}
-void SaveTool::drawResearchInventory() {
+void
+Application::drawResearchInventory() {
if(!_currentProfile) {
return;
}
@@ -292,156 +305,90 @@ void SaveTool::drawResearchInventory() {
ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
ImGui::TableSetColumnIndex(1);
- ImGui::Text("Engine materials");
+ ImGui::TextUnformatted("Engine materials");
- drawMaterialRow("Verse steel", 1,
- [this]{ return _currentProfile->verseSteel(); },
- [this](Int amount){ return _currentProfile->setVerseSteel(amount); });
- drawMaterialRow("Undinium", 2,
- [this]{ return _currentProfile->undinium(); },
- [this](Int amount){ return _currentProfile->setUndinium(amount); });
- drawMaterialRow("Necrium alloy", 3,
- [this]{ return _currentProfile->necriumAlloy(); },
- [this](Int amount){ return _currentProfile->setNecriumAlloy(amount); });
- drawMaterialRow("Lunarite", 4,
- [this]{ return _currentProfile->lunarite(); },
- [this](Int amount){ return _currentProfile->setLunarite(amount); });
- drawMaterialRow("Asterite", 5,
- [this]{ return _currentProfile->asterite(); },
- [this](Int amount){ return _currentProfile->setAsterite(amount); });
- drawMaterialRow("Hallite fragma", 6,
- [this]{ return _currentProfile->halliteFragma(); },
- [this](Int amount){ return _currentProfile->setHalliteFragma(amount); });
- drawUnavailableMaterialRow("Unnoctinium", 7);
+ drawMaterialRow("Verse steel", 1, GameData::MaterialID::VerseSteel);
+ drawMaterialRow("Undinium", 2, GameData::MaterialID::Undinium);
+ drawMaterialRow("Necrium alloy", 3, GameData::MaterialID::NecriumAlloy);
+ drawMaterialRow("Lunarite", 4, GameData::MaterialID::Lunarite);
+ drawMaterialRow("Asterite", 5, GameData::MaterialID::Asterite);
+ drawMaterialRow("Hallite fragma", 6, GameData::MaterialID::HalliteFragma);
+ drawMaterialRow("Unnoctinium", 7, GameData::MaterialID::Unnoctinium);
ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
ImGui::TableSetColumnIndex(1);
- ImGui::Text("OS materials");
+ ImGui::TextUnformatted("OS materials");
- drawMaterialRow("Ednil", 1,
- [this]{ return _currentProfile->ednil(); },
- [this](Int amount){ return _currentProfile->setEdnil(amount); });
- drawMaterialRow("Nuflalt", 2,
- [this]{ return _currentProfile->nuflalt(); },
- [this](Int amount){ return _currentProfile->setNuflalt(amount); });
- drawMaterialRow("Aurelene", 3,
- [this]{ return _currentProfile->aurelene(); },
- [this](Int amount){ return _currentProfile->setAurelene(amount); });
- drawMaterialRow("Soldus", 4,
- [this]{ return _currentProfile->soldus(); },
- [this](Int amount){ return _currentProfile->setSoldus(amount); });
- drawMaterialRow("Synthesized N", 5,
- [this]{ return _currentProfile->synthesisedN(); },
- [this](Int amount){ return _currentProfile->setSynthesisedN(amount); });
- drawMaterialRow("Nanoc", 6,
- [this]{ return _currentProfile->nanoc(); },
- [this](Int amount){ return _currentProfile->setNanoc(amount); });
- drawUnavailableMaterialRow("Abyssillite", 7);
+ drawMaterialRow("Ednil", 1, GameData::MaterialID::Ednil);
+ drawMaterialRow("Nuflalt", 2, GameData::MaterialID::Nuflalt);
+ drawMaterialRow("Aurelene", 3, GameData::MaterialID::Aurelene);
+ drawMaterialRow("Soldus", 4, GameData::MaterialID::Soldus);
+ drawMaterialRow("Synthesized N", 5, GameData::MaterialID::SynthesisedN);
+ drawMaterialRow("Nanoc", 6, GameData::MaterialID::Nanoc);
+ drawMaterialRow("Abyssillite", 7, GameData::MaterialID::Abyssillite);
ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
ImGui::TableSetColumnIndex(1);
- ImGui::Text("Architect materials");
+ ImGui::TextUnformatted("Architect materials");
- drawMaterialRow("Alcarbonite", 1,
- [this]{ return _currentProfile->alcarbonite(); },
- [this](Int amount){ return _currentProfile->setAlcarbonite(amount); });
- drawMaterialRow("Keripehene", 2,
- [this]{ return _currentProfile->keriphene(); },
- [this](Int amount){ return _currentProfile->setKeriphene(amount); });
- drawMaterialRow("Nitinol-CM", 3,
- [this]{ return _currentProfile->nitinolCM(); },
- [this](Int amount){ return _currentProfile->setNitinolCM(amount); });
- drawMaterialRow("Quarkium", 4,
- [this]{ return _currentProfile->quarkium(); },
- [this](Int amount){ return _currentProfile->setQuarkium(amount); });
- drawMaterialRow("Alterene", 5,
- [this]{ return _currentProfile->alterene(); },
- [this](Int amount){ return _currentProfile->setAlterene(amount); });
- drawMaterialRow("Cosmium", 6,
- [this]{ return _currentProfile->cosmium(); },
- [this](Int amount){ return _currentProfile->setCosmium(amount); });
- drawUnavailableMaterialRow("Purified quarkium", 7);
+ drawMaterialRow("Alcarbonite", 1, GameData::MaterialID::Alcarbonite);
+ drawMaterialRow("Keriphene", 2, GameData::MaterialID::Keriphene);
+ drawMaterialRow("Nitinol-CM", 3, GameData::MaterialID::NitinolCM);
+ drawMaterialRow("Quarkium", 4, GameData::MaterialID::Quarkium);
+ drawMaterialRow("Alterene", 5, GameData::MaterialID::Alterene);
+ drawMaterialRow("Cosmium", 6, GameData::MaterialID::Cosmium);
+ drawMaterialRow("Purified quarkium", 7, GameData::MaterialID::PurifiedQuarkium);
ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
ImGui::TableSetColumnIndex(1);
- ImGui::Text("Quark data");
+ ImGui::TextUnformatted("Quark data");
- drawMaterialRow("Mixed composition", 1,
- [this]{ return _currentProfile->mixedComposition(); },
- [this](Int amount){ return _currentProfile->setMixedComposition(amount); });
- drawMaterialRow("Void residue", 2,
- [this]{ return _currentProfile->voidResidue(); },
- [this](Int amount){ return _currentProfile->setVoidResidue(amount); });
- drawMaterialRow("Muscular construction", 3,
- [this]{ return _currentProfile->muscularConstruction(); },
- [this](Int amount){ return _currentProfile->setMuscularConstruction(amount); });
- drawMaterialRow("Mineral exoskeletology", 4,
- [this]{ return _currentProfile->mineralExoskeletology(); },
- [this](Int amount){ return _currentProfile->setMineralExoskeletology(amount); });
- drawMaterialRow("Carbonized skin", 5,
- [this]{ return _currentProfile->carbonisedSkin(); },
- [this](Int amount){ return _currentProfile->setCarbonisedSkin(amount); });
- drawMaterialRow("Isolated void particle", 6,
- [this]{ return _currentProfile->isolatedVoidParticle(); },
- [this](Int amount){ return _currentProfile->setIsolatedVoidParticle(amount); });
- drawUnavailableMaterialRow("Weaponised physiology", 7);
+ drawMaterialRow("Mixed composition", 1, GameData::MaterialID::MixedComposition);
+ drawMaterialRow("Void residue", 2, GameData::MaterialID::VoidResidue);
+ drawMaterialRow("Muscular construction", 3, GameData::MaterialID::MuscularConstruction);
+ drawMaterialRow("Mineral exoskeletology", 4, GameData::MaterialID::MineralExoskeletology);
+ drawMaterialRow("Carbonized skin", 5, GameData::MaterialID::CarbonisedSkin);
+ drawMaterialRow("Isolated void particle", 6, GameData::MaterialID::IsolatedVoidParticle);
+ drawMaterialRow("Weaponised physiology", 7, GameData::MaterialID::WeaponisedPhysiology);
ImGui::EndTable();
}
}
-template
-void SaveTool::drawMaterialRow(Containers::StringView name, Int tier, Getter getter, Setter setter) {
- static_assert(std::is_same::value, "getter doesn't return an Int, and/or doesn't take zero arguments.");
- static_assert(std::is_same::value, "setter doesn't return a bool, and/or doesn't take a single Int as an argument.");
-
+void
+Application::drawMaterialRow(Containers::StringView name, std::int32_t tier, GameData::MaterialID id) {
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);
ImGui::Text("T%i", tier);
ImGui::TableSetColumnIndex(1);
- ImGui::TextUnformatted(name.data());
+ ImGui::TextUnformatted(name.cbegin(), name.cend());
ImGui::TableSetColumnIndex(2);
- if(getter() != -1) {
- ImGui::Text("%i", getter());
- if(_cheatMode) {
- ImGui::TableSetColumnIndex(3);
- ImGui::PushID(name.data());
- static Int var = 0;
- if(drawUnsafeWidget(ImGui::SmallButton, ICON_FA_EDIT)) {
- (var) = getter();
- ImGui::OpenPopup("int_edit");
- }
- drawTooltip("Edit");
- if(drawIntEditPopup(&(var), 9999)) {
- if(!setter(var)) {
- _queue.addToast(Toast::Type::Error, _currentProfile->lastError());
- }
- }
- ImGui::PopID();
+ ImGui::Text("%i", _currentProfile->material(id));
+ if(conf().cheatMode()) {
+ ImGui::TableSetColumnIndex(3);
+ ImGui::PushID(name.data());
+ static std::int32_t var = 0;
+ if(drawUnsafeWidget(ImGui::SmallButton, ICON_FA_EDIT)) {
+ var = _currentProfile->material(id);
+ ImGui::OpenPopup("int_edit");
}
- }
- else {
- ImGui::TextDisabled("Not found in the save file");
+ drawTooltip("Edit");
+ if(drawIntEditPopup(&var, 9999)) {
+ if(!_currentProfile->setMaterial(id, var)) {
+ _queue.addToast(Toast::Type::Error, _currentProfile->lastError());
+ }
+ }
+ ImGui::PopID();
}
}
-void SaveTool::drawUnavailableMaterialRow(Containers::StringView name, Int tier) {
- ImGui::TableNextRow();
- ImGui::TableSetColumnIndex(0);
- ImGui::Text("T%i", tier);
- ImGui::TableSetColumnIndex(1);
- ImGui::TextUnformatted(name.data());
- ImGui::TableSetColumnIndex(2);
- ImGui::TextDisabled("Unavailable as of game version " SUPPORTED_GAME_VERSION);
-}
-
-void SaveTool::drawMassManager() {
+void
+Application::drawMassManager() {
if(!_massManager) {
return;
}
static int mass_to_delete = 0;
- static ImGuiID mass_deletion_popup_ID = drawDeleteMassPopup(mass_to_delete);
if(ImGui::BeginTable("##HangarsTable", 4,
ImGuiTableFlags_BordersOuter|ImGuiTableFlags_RowBg|ImGuiTableFlags_ScrollY,
@@ -470,7 +417,7 @@ void SaveTool::drawMassManager() {
ImGui::TableSetColumnIndex(0);
ImGui::Selectable(Utility::format("{:.2d}", i + 1).data(),
false, ImGuiSelectableFlags_SpanAllColumns|ImGuiSelectableFlags_AllowItemOverlap);
- if(_massManager->hangar(i).state() == Mass::State::Valid &&
+ if(_massManager->hangar(i).state() == GameObjects::Mass::State::Valid &&
ImGui::BeginDragDropSource(ImGuiDragDropFlags_SourceNoHoldToOpenOthers))
{
drag_drop_index = i;
@@ -484,21 +431,21 @@ void SaveTool::drawMassManager() {
if(const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("StagedMass")) {
if(payload->DataSize != sizeof(Containers::String)) {
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Fatal error",
- "payload->DataSize != sizeof(Containers::String) in SaveTool::drawMassManager()",
+ "payload->DataSize != sizeof(Containers::String) in Application::drawMassManager()",
window());
exit(EXIT_FAILURE);
}
Containers::StringView file = *static_cast(payload->Data);
- if(!_massManager->importMass(file, i)) {
+ if(!_stagedMassManager->import(file, i, _currentProfile->account(), _currentProfile->isDemo())) {
_queue.addToast(Toast::Type::Error, _massManager->lastError());
}
}
else if((payload = ImGui::AcceptDragDropPayload("Mass"))) {
if(payload->DataSize != sizeof(int)) {
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Fatal error",
- "payload->DataSize != sizeof(int) in SaveTool::drawMassManager()",
+ "payload->DataSize != sizeof(int) in Application::drawMassManager()",
window());
exit(EXIT_FAILURE);
}
@@ -515,14 +462,15 @@ void SaveTool::drawMassManager() {
ImGui::TableSetColumnIndex(1);
switch(_massManager->hangar(i).state()) {
- case Mass::State::Empty:
+ case GameObjects::Mass::State::Empty:
ImGui::TextDisabled("");
break;
- case Mass::State::Invalid:
+ case GameObjects::Mass::State::Invalid:
ImGui::TextDisabled("");
break;
- case Mass::State::Valid:
- ImGui::TextUnformatted(_massManager->hangar(i).name().data());
+ case GameObjects::Mass::State::Valid:
+ ImGui::TextUnformatted(_massManager->hangar(i).name().cbegin(),
+ _massManager->hangar(i).name().cend());
break;
}
@@ -532,10 +480,10 @@ void SaveTool::drawMassManager() {
drawTooltip("This is the currently active frame slot.");
}
- if(_massManager->hangar(i).state() != Mass::State::Empty) {
+ if(_massManager->hangar(i).state() != GameObjects::Mass::State::Empty) {
ImGui::TableSetColumnIndex(3);
ImGui::PushID(i);
- if(_massManager->hangar(i).state() == Mass::State::Valid) {
+ if(_massManager->hangar(i).state() == GameObjects::Mass::State::Valid) {
if(ImGui::SmallButton(ICON_FA_SEARCH)) {
_currentMass = &_massManager->hangar(i);
_uiState = UiState::MassViewer;
@@ -550,9 +498,10 @@ void SaveTool::drawMassManager() {
ImGui::SameLine(0.0f, 2.0f);
if(drawUnsafeWidget(ImGui::SmallButton, ICON_FA_TRASH_ALT)) {
mass_to_delete = i;
- ImGui::OpenPopup(mass_deletion_popup_ID);
+ ImGui::OpenPopup("Confirmation##DeleteMassConfirmation");
}
drawTooltip("Delete");
+ drawDeleteMassPopup(mass_to_delete);
ImGui::PopID();
}
}
@@ -562,7 +511,6 @@ void SaveTool::drawMassManager() {
drawDeleteMassPopup(mass_to_delete);
- static ImGuiID staged_mass_deletion_popup_ID = drawDeleteStagedMassPopup("");
static Containers::StringView staged_mass_to_delete;
if(ImGui::BeginTable("##StagingArea", 2,
@@ -579,32 +527,33 @@ void SaveTool::drawMassManager() {
ImGui::TextUnformatted("Staging area");
ImGui::SameLine();
if(ImGui::SmallButton(ICON_FA_FOLDER_OPEN " Open staging folder")) {
- openUri(Utility::Path::toNativeSeparators(_stagingDir));
+ openUri(Utility::Path::toNativeSeparators(conf().directories().staging));
}
- for(const auto& pair : _massManager->stagedMasses()) {
+ for(const auto& mass : _stagedMassManager->stagedMasses()) {
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);
- Containers::String staged_formatted = Utility::format("{} ({})", pair.second, pair.first);
+ Containers::String staged_formatted = Utility::format("{} ({})", mass.name, mass.filename);
ImGui::Selectable(staged_formatted.data());
if((ImGui::CalcTextSize(staged_formatted.data()).x + ImGui::GetStyle().FramePadding.x) > ImGui::GetContentRegionAvail().x) {
drawTooltip(staged_formatted.data());
}
if(ImGui::BeginDragDropSource(ImGuiDragDropFlags_SourceNoHoldToOpenOthers)) {
- ImGui::SetDragDropPayload("StagedMass", &(pair.first), sizeof(Containers::String));
+ ImGui::SetDragDropPayload("StagedMass", &(mass.filename), sizeof(Containers::String));
- ImGui::Text("%s - Staged", pair.second.data());
+ ImGui::Text("%s - Staged", mass.name.cbegin());
ImGui::EndDragDropSource();
}
ImGui::TableSetColumnIndex(1);
- ImGui::PushID(pair.first.data());
+ ImGui::PushID(mass.filename.data());
if(ImGui::SmallButton(ICON_FA_TRASH_ALT)) {
- staged_mass_to_delete = pair.first;
- ImGui::OpenPopup(staged_mass_deletion_popup_ID);
+ staged_mass_to_delete = mass.filename;
+ ImGui::OpenPopup("Confirmation##DeleteStagedMassConfirmation");
}
drawTooltip("Delete");
+ drawDeleteStagedMassPopup(staged_mass_to_delete);
ImGui::PopID();
}
@@ -614,7 +563,7 @@ void SaveTool::drawMassManager() {
if(const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("Mass")) {
if(payload->DataSize != sizeof(int)) {
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Fatal error",
- "payload->DataSize != sizeof(int) in SaveTool::drawMassManager()",
+ "payload->DataSize != sizeof(int) in Application::drawMassManager()",
window());
exit(EXIT_FAILURE);
}
@@ -632,27 +581,28 @@ void SaveTool::drawMassManager() {
drawDeleteStagedMassPopup(staged_mass_to_delete);
}
-auto SaveTool::drawDeleteMassPopup(int mass_index) -> ImGuiID {
+void
+Application::drawDeleteMassPopup(int mass_index) {
if(!ImGui::BeginPopupModal("Confirmation##DeleteMassConfirmation", nullptr,
ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove))
{
- return ImGui::GetID("Confirmation##DeleteMassConfirmation");
+ return;
}
- if(_massManager->hangar(mass_index).state() == Mass::State::Empty) {
+ Containers::ScopeGuard guard{ImGui::EndPopup};
+
+ if(_massManager->hangar(mass_index).state() == GameObjects::Mass::State::Empty) {
ImGui::CloseCurrentPopup();
- ImGui::EndPopup();
- return 0;
+ return;
}
if(_gameState != GameState::NotRunning) {
ImGui::CloseCurrentPopup();
- ImGui::EndPopup();
- return 0;
+ return;
}
ImGui::PushTextWrapPos(float(windowSize().x()) * 0.40f);
- if(_massManager->hangar(mass_index).state() == Mass::State::Invalid) {
+ if(_massManager->hangar(mass_index).state() == GameObjects::Mass::State::Invalid) {
ImGui::Text("Are you sure you want to delete the invalid M.A.S.S. data in hangar %.2i ? This operation is irreversible.",
mass_index + 1);
}
@@ -682,22 +632,19 @@ auto SaveTool::drawDeleteMassPopup(int mass_index) -> ImGuiID {
ImGui::EndTable();
}
-
- ImGui::EndPopup();
-
- return 0;
}
-auto SaveTool::drawDeleteStagedMassPopup(Containers::StringView filename) -> ImGuiID {
+void
+Application::drawDeleteStagedMassPopup(Containers::StringView filename) {
if(!ImGui::BeginPopupModal("Confirmation##DeleteStagedMassConfirmation", nullptr,
ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove))
{
- return ImGui::GetID("Confirmation##DeleteStagedMassConfirmation");
+ return;
}
ImGui::PushTextWrapPos(float(windowSize().x()) * 0.40f);
ImGui::Text("Are you sure you want to delete the staged M.A.S.S. named %s ? This operation is irreversible.",
- _massManager->stagedMasses().at(filename).data());
+ _stagedMassManager->at(filename).filename.cbegin());
ImGui::PopTextWrapPos();
if(ImGui::BeginTable("##DeleteStagedMassLayout", 2)) {
@@ -708,8 +655,9 @@ auto SaveTool::drawDeleteStagedMassPopup(Containers::StringView filename) -> ImG
ImGui::TableSetColumnIndex(1);
if(ImGui::Button("Yes")) {
- if(!_massManager->deleteStagedMass(filename)) {
- _queue.addToast(Toast::Type::Error, _massManager->lastError());
+ if(!_stagedMassManager->remove(filename)) {
+ _queue.addToast(Toast::Type::Error,
+ "Couldn't delete the staged M.A.S.S. at " + filename + ": " + _stagedMassManager->lastError());
}
ImGui::CloseCurrentPopup();
}
@@ -722,6 +670,6 @@ auto SaveTool::drawDeleteStagedMassPopup(Containers::StringView filename) -> ImG
}
ImGui::EndPopup();
-
- return 0;
+}
+
}
diff --git a/src/SaveTool/SaveTool_MassViewer.cpp b/src/Application/Application_MassViewer.cpp
similarity index 63%
rename from src/SaveTool/SaveTool_MassViewer.cpp
rename to src/Application/Application_MassViewer.cpp
index 7ff8c5f..1bd38b9 100644
--- a/src/SaveTool/SaveTool_MassViewer.cpp
+++ b/src/Application/Application_MassViewer.cpp
@@ -1,5 +1,5 @@
// MassBuilderSaveTool
-// Copyright (C) 2021-2022 Guillaume Jacquemin
+// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -19,15 +19,22 @@
#include
+#include
+
+#include "../Configuration/Configuration.h"
#include "../FontAwesome/IconsFontAwesome5.h"
-#include "../Maps/Accessories.h"
+#include "../GameData/Accessories.h"
#define STYLENAMES_DEFINITION
-#include "../Maps/StyleNames.h"
+#include "../GameData/StyleNames.h"
+#include "../ImportExport/Export.h"
-#include "SaveTool.h"
+#include "Application.h"
-void SaveTool::drawMassViewer() {
- if(!_currentMass || _currentMass->state() != Mass::State::Valid) {
+namespace mbst {
+
+void
+Application::drawMassViewer() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
_currentMass = nullptr;
_currentWeapon = nullptr;
_uiState = UiState::MainManager;
@@ -36,7 +43,7 @@ void SaveTool::drawMassViewer() {
}
ImGui::SetNextWindowPos({0.0f, ImGui::GetItemRectSize().y}, ImGuiCond_Always);
- ImGui::SetNextWindowSize({Float(windowSize().x()), Float(windowSize().y()) - ImGui::GetItemRectSize().y},
+ ImGui::SetNextWindowSize(ImVec2{Vector2{float(windowSize().x()), float(windowSize().y()) - ImGui::GetItemRectSize().y} / dpiScaling()},
ImGuiCond_Always);
if(!ImGui::Begin("##MassViewer", nullptr,
ImGuiWindowFlags_NoDecoration|ImGuiWindowFlags_NoMove|
@@ -48,7 +55,7 @@ void SaveTool::drawMassViewer() {
if(ImGui::BeginChild("##MassInfo",
{0.0f, 0.0f},
- true, ImGuiWindowFlags_MenuBar))
+ ImGuiChildFlags_Border, ImGuiWindowFlags_MenuBar))
{
if(ImGui::BeginMenuBar()) {
if(ImGui::BeginTable("##MassViewerMenuTable", 4)) {
@@ -84,8 +91,9 @@ void SaveTool::drawMassViewer() {
_jointsDirty = false;
_stylesDirty = false;
_eyeFlareDirty = false;
- _selectedArmourDecals = Containers::StaticArray<38, Int>{ValueInit};
- _selectedArmourAccessories = Containers::StaticArray<38, Int>{ValueInit};
+ _selectedArmourSlot = Containers::NullOpt;
+ _selectedArmourDecals = Containers::StaticArray<38, std::int32_t>{ValueInit};
+ _selectedArmourAccessories = Containers::StaticArray<38, std::int32_t>{ValueInit};
_selectedBLPlacement = 0;
_selectedWeaponPart = 0;
_selectedWeaponDecal = 0;
@@ -122,6 +130,13 @@ void SaveTool::drawMassViewer() {
ImGui::EndTabItem();
}
+ if(_currentMass->bulletLauncherAttachmentStyle() != GameObjects::BulletLauncherAttachmentStyle::NotFound &&
+ ImGui::BeginTabItem("Bullet launcher attachment"))
+ {
+ drawBLAttachment();
+ ImGui::EndTabItem();
+ }
+
if(ImGui::BeginTabItem("Custom armour styles")) {
drawCustomArmourStyles();
ImGui::EndTabItem();
@@ -132,7 +147,7 @@ void SaveTool::drawMassViewer() {
ImGui::EndTabItem();
}
- if(_currentMass->globalStyles().size() != 0 && ImGui::BeginTabItem("Global styles")) {
+ if(!_currentMass->globalStyles().isEmpty() && ImGui::BeginTabItem("Global styles")) {
drawGlobalStyles();
ImGui::EndTabItem();
}
@@ -153,8 +168,9 @@ void SaveTool::drawMassViewer() {
ImGui::End();
}
-void SaveTool::drawGlobalStyles() {
- if(!_currentMass || _currentMass->state() != Mass::State::Valid) {
+void
+Application::drawGlobalStyles() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
return;
}
@@ -165,10 +181,9 @@ void SaveTool::drawGlobalStyles() {
ImGui::TextWrapped("In-game values are multiplied by 100. For example, 0.500 here is equal to 50 in-game.");
- for(UnsignedInt i = 0; i < _currentMass->globalStyles().size(); i++) {
+ for(std::uint32_t i = 0; i < _currentMass->globalStyles().size(); i++) {
ImGui::PushID(int(i));
- DCSResult result;
- result = drawCustomStyle(_currentMass->globalStyles()[i]);
+ auto result = drawCustomStyle(_currentMass->globalStyles()[i]);
switch(result) {
case DCS_ResetStyle:
_currentMass->getGlobalStyles();
@@ -189,8 +204,9 @@ void SaveTool::drawGlobalStyles() {
ImGui::EndChild();
}
-void SaveTool::drawTuning() {
- if(!_currentMass || _currentMass->state() != Mass::State::Valid) {
+void
+Application::drawTuning() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
return;
}
@@ -221,7 +237,7 @@ void SaveTool::drawTuning() {
ImGui::TableNextColumn();
ImGui::TextUnformatted("Gears");
- for(UnsignedInt i = 0; i < _currentMass->gears().size(); i++) {
+ for(std::uint32_t i = 0; i < _currentMass->gears().size(); i++) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::Text("%i", _currentMass->gears()[i]);
@@ -247,7 +263,7 @@ void SaveTool::drawTuning() {
ImGui::TableNextColumn();
ImGui::TextUnformatted("Modules");
- for(UnsignedInt i = 0; i < _currentMass->modules().size(); i++) {
+ for(std::uint32_t i = 0; i < _currentMass->modules().size(); i++) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::Text("%i", _currentMass->modules()[i]);
@@ -273,7 +289,7 @@ void SaveTool::drawTuning() {
ImGui::TableNextColumn();
ImGui::TextUnformatted("Techs");
- for(UnsignedInt i = 0; i < _currentMass->techs().size(); i++) {
+ for(std::uint32_t i = 0; i < _currentMass->techs().size(); i++) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::Text("%i", _currentMass->techs()[i]);
@@ -285,8 +301,9 @@ void SaveTool::drawTuning() {
ImGui::EndTable();
}
-auto SaveTool::drawCustomStyle(CustomStyle& style) -> DCSResult {
- if(!_currentMass || _currentMass->state() != Mass::State::Valid) {
+Application::DCSResult
+Application::drawCustomStyle(GameObjects::CustomStyle& style) {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
return DCS_Fail;
}
@@ -296,13 +313,15 @@ auto SaveTool::drawCustomStyle(CustomStyle& style) -> DCSResult {
DCSResult return_value = DCS_Fail;
- if(!ImGui::BeginChild("##CustomStyle", {0.0f, 244.0f}, true, ImGuiWindowFlags_MenuBar)) {
+ if(!ImGui::BeginChild("##CustomStyle", {}, ImGuiChildFlags_Border|ImGuiChildFlags_AutoResizeY,
+ ImGuiWindowFlags_MenuBar))
+ {
ImGui::EndChild();
return DCS_Fail;
}
if(ImGui::BeginMenuBar()) {
- ImGui::TextUnformatted(style.name.data());
+ ImGui::TextUnformatted(style.name.cbegin(), style.name.cend());
static Containers::StaticArray<33, char> name_buf{ValueInit};
if(ImGui::SmallButton(ICON_FA_EDIT " Rename")) {
@@ -316,6 +335,18 @@ auto SaveTool::drawCustomStyle(CustomStyle& style) -> DCSResult {
style.name = name_buf.data();
}
+ if(ImGui::SmallButton(ICON_FA_FILE_EXPORT " Export")) {
+ if(!ImportExport::exportStyle(_currentMass->name(), style)) {
+ _queue.addToast(Toast::Type::Error, ImportExport::lastExportError());
+ }
+ else {
+ _queue.addToast(Toast::Type::Success, "Style exported successfully.");
+ }
+ }
+ if(drawUnsafeWidget(ImGui::SmallButton, ICON_FA_FILE_IMPORT " Import")) {
+ // TODO: implement once the style manager is ready.
+ }
+
ImGui::EndMenuBar();
}
@@ -390,13 +421,14 @@ auto SaveTool::drawCustomStyle(CustomStyle& style) -> DCSResult {
return return_value;
}
-void SaveTool::drawDecalEditor(Decal& decal) {
+void
+Application::drawDecalEditor(GameObjects::Decal& decal) {
ImGui::Text("ID: %i", decal.id);
- if(ImGui::BeginTable("##DecalTable", _advancedMode ? 2 : 1, ImGuiTableFlags_BordersInnerV)) {
+ if(ImGui::BeginTable("##DecalTable", conf().advancedMode() ? 2 : 1, ImGuiTableFlags_BordersInnerV)) {
ImGui::TableSetupColumn("##Normal", ImGuiTableColumnFlags_WidthStretch);
- if(_advancedMode) {
+ if(conf().advancedMode()) {
ImGui::TableSetupColumn("##Advanced", ImGuiTableColumnFlags_WidthStretch);
}
@@ -420,12 +452,17 @@ void SaveTool::drawDecalEditor(Decal& decal) {
ImGui::SameLine();
drawHelpMarker("Right-click for more option, click the coloured square for the full picker.");
- ImGui::PushMultiItemsWidths(2, ImGui::CalcItemWidth());
- ImGui::SliderFloat("##OffsetX", &decal.offset.x(), 0.0f, 1.0f, "X: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::SliderFloat("##OffsetY", &decal.offset.y(), 0.0f, 1.0f, "Y: %.3f");
- ImGui::PopItemWidth();
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector2Slider("##Offset", arg, Vector2{0.0f}, Vector2{1.0f}, "X: %.3f", "Y: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector2dSlider("##Offset", arg, Vector2d{0.0}, Vector2d{1.0}, "X: %.3f", "Y: %.3f");
+ }
+ }, decal.offset
+ );
ImGui::SameLine();
drawHelpMarker("0.0 = -100 in-game\n1.0 = 100 in-game");
@@ -442,7 +479,7 @@ void SaveTool::drawDecalEditor(Decal& decal) {
ImGui::Checkbox("##Wrap", &decal.wrap);
ImGui::EndGroup();
- if(_advancedMode) {
+ if(conf().advancedMode()) {
ImGui::TableNextColumn();
ImGui::TextColored(ImColor(255, 255, 0), ICON_FA_EXCLAMATION_TRIANGLE);
@@ -458,34 +495,49 @@ void SaveTool::drawDecalEditor(Decal& decal) {
ImGui::SameLine();
ImGui::BeginGroup();
- ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
- ImGui::DragFloat("##PosX", &decal.position.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::DragFloat("##PosY", &decal.position.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::DragFloat("##PosZ", &decal.position.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
- ImGui::PopItemWidth();
+ ImGui::PushItemWidth(-1.0f);
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Drag("##Position", arg, 1.0f, Vector3{-FLT_MAX}, Vector3{FLT_MAX}, "X: %.3f",
+ "Y: %.3f", "Z: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dDrag("##Position", arg, 1.0f, Vector3d{-DBL_MAX}, Vector3d{DBL_MAX}, "X: %.3f",
+ "Y: %.3f", "Z: %.3f");
+ }
+ }, decal.position
+ );
- ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
- ImGui::DragFloat("##UX", &decal.uAxis.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::DragFloat("##UY", &decal.uAxis.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::DragFloat("##UZ", &decal.uAxis.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
- ImGui::PopItemWidth();
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Drag("##U", arg, 1.0f, Vector3{-FLT_MAX}, Vector3{FLT_MAX}, "X: %.3f", "Y: %.3f",
+ "Z: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dDrag("##U", arg, 1.0f, Vector3d{-DBL_MAX}, Vector3d{DBL_MAX}, "X: %.3f", "Y: %.3f",
+ "Z: %.3f");
+ }
+ }, decal.uAxis
+ );
+
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Drag("##V", arg, 1.0f, Vector3{-FLT_MAX}, Vector3{FLT_MAX}, "X: %.3f", "Y: %.3f",
+ "Z: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dDrag("##V", arg, 1.0f, Vector3d{-DBL_MAX}, Vector3d{DBL_MAX}, "X: %.3f", "Y: %.3f",
+ "Z: %.3f");
+ }
+ }, decal.vAxis
+ );
- ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
- ImGui::DragFloat("##VX", &decal.vAxis.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::DragFloat("##VY", &decal.vAxis.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Y: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::DragFloat("##VZ", &decal.vAxis.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
ImGui::PopItemWidth();
ImGui::EndGroup();
}
@@ -494,12 +546,13 @@ void SaveTool::drawDecalEditor(Decal& decal) {
}
}
-void SaveTool::drawAccessoryEditor(Accessory& accessory, Containers::ArrayView style_view) {
+void
+Application::drawAccessoryEditor(GameObjects::Accessory& accessory, Containers::ArrayView style_view) {
if(accessory.id < 1) {
ImGui::TextUnformatted("Accessory: ");
}
- else if(accessories.find(accessory.id) != accessories.cend()) {
- ImGui::Text("Accessory #%.4i - %s", accessory.id, accessories.at(accessory.id).name.data());
+ else if(GameData::accessories.find(accessory.id) != GameData::accessories.cend()) {
+ ImGui::Text("Accessory #%.4i - %s", accessory.id, GameData::accessories.at(accessory.id).name.data());
}
else {
ImGui::Text("Accessory #%i", accessory.id);
@@ -508,8 +561,8 @@ void SaveTool::drawAccessoryEditor(Accessory& accessory, Containers::ArrayView size = Containers::NullOpt;
+ static std::int32_t tab = 0;
+ static Containers::Optional size = Containers::NullOpt;
if(ImGui::SmallButton("Change")) {
ImGui::OpenPopup("##AccessoryPopup");
if(accessory.id >= 3000) {
@@ -532,7 +585,7 @@ void SaveTool::drawAccessoryEditor(Accessory& accessory, Containers::ArrayView= tab * 1000 && acc.first < ((tab + 1) * 1000) && (!size || *size == acc.second.size)) {
- if(ImGui::Selectable(Utility::format("#{:.4d} - {} ({})", acc.first, acc.second.name, size_labels[acc.second.size]).data(),
- acc.first == accessory.id))
+ for(const auto& [id, acc] : GameData::accessories) {
+ if(id >= tab * 1000 && id < ((tab + 1) * 1000) && (!size || *size == acc.size)) {
+ if(ImGui::Selectable(Utility::format("#{:.4d} - {} ({})", id, acc.name, size_labels[acc.size]).data(),
+ id == accessory.id))
{
- accessory.id = acc.first;
+ accessory.id = id;
accessory.attachIndex = 0;
}
- if(acc.first == accessory.id) {
+ if(id == accessory.id) {
ImGui::SetItemDefaultFocus();
}
}
@@ -635,11 +688,11 @@ void SaveTool::drawAccessoryEditor(Accessory& accessory, Containers::ArrayView;
+ if constexpr (std::is_same_v) {
+ drawVector3Drag("##RelativePosition", arg, 1.0f, Vector3{-FLT_MAX}, Vector3{FLT_MAX}, "X: %.3f",
+ "Y: %.3f", "Z: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dDrag("##RelativePosition", arg, 1.0f, Vector3d{-DBL_MAX}, Vector3d{DBL_MAX}, "X: %.3f",
+ "Y: %.3f", "Z: %.3f");
+ }
+ }, accessory.relativePosition
+ );
}
- ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
- ImGui::SliderFloat("##PosOffsetX", &accessory.relativePositionOffset.x(), -500.0f, +500.0f, "X: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::SliderFloat("##PosOffsetY", &accessory.relativePositionOffset.y(), -500.0f, +500.0f, "Y: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::SliderFloat("##PosOffsetZ", &accessory.relativePositionOffset.z(), -500.0f, +500.0f, "Z: %.3f");
- ImGui::PopItemWidth();
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Slider("##OffsetPosition", arg, Vector3{-500.0f}, Vector3{500.0f}, "X: %.3f", "Y: %.3f",
+ "Z: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dSlider("##OffsetPosition", arg, Vector3d{-500.0}, Vector3d{500.0}, "X: %.3f", "Y: %.3f",
+ "Z: %.3f");
+ }
+ }, accessory.relativePositionOffset
+ );
ImGui::SameLine();
drawHelpMarker("+/-500.0 = +/-250 in-game");
- if(_advancedMode) {
- ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
- ImGui::DragFloat("##RotX", &accessory.relativeRotation.x(), 1.0f, -FLT_MAX, +FLT_MAX, "Roll: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::DragFloat("##RotY", &accessory.relativeRotation.y(), 1.0f, -FLT_MAX, +FLT_MAX, "Yaw: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::DragFloat("##RotZ", &accessory.relativeRotation.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Pitch: %.3f");
- ImGui::PopItemWidth();
+ if(conf().advancedMode()) {
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Drag("##RelativeRotation", arg, 1.0f, Vector3{-FLT_MAX}, Vector3{FLT_MAX}, "Roll: %.3f",
+ "Yaw: %.3f", "Pitch: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dDrag("##RelativeRotation", arg, 1.0f, Vector3d{-DBL_MAX}, Vector3d{DBL_MAX},
+ "Roll: %.3f", "Yaw: %.3f", "Pitch: %.3f");
+ }
+ }, accessory.relativePosition
+ );
}
- ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
- ImGui::SliderFloat("##RotOffsetX", &accessory.relativeRotationOffset.x(), -180.0f, +180.0f, "Roll: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::SliderFloat("##RotOffsetY", &accessory.relativeRotationOffset.y(), -180.0f, +180.0f, "Yaw: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::SliderFloat("##RotOffsetZ", &accessory.relativeRotationOffset.z(), -180.0f, +180.0f, "Pitch: %.3f");
- ImGui::PopItemWidth();
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Slider("##OffsetRotation", arg, Vector3{-180.0f}, Vector3{180.0f}, "Roll: %.3f",
+ "Yaw: %.3f", "Pitch: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dSlider("##OffsetRotation", arg, Vector3d{-180.0}, Vector3d{180.0}, "Roll: %.3f",
+ "Yaw: %.3f", "Pitch: %.3f");
+ }
+ }, accessory.relativeRotationOffset
+ );
- ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
- ImGui::SliderFloat("##ScaleX", &accessory.localScale.x(), -3.0f, +3.0f, "X: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::SliderFloat("##ScaleY", &accessory.localScale.y(), -3.0f, +3.0f, "Y: %.3f");
- ImGui::PopItemWidth();
- ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
- ImGui::SliderFloat("##ScaleZ", &accessory.localScale.z(), -3.0f, +3.0f, "Z: %.3f");
- ImGui::PopItemWidth();
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Slider("##Scale", arg, Vector3{-3.0f}, Vector3{3.0f}, "X: %.3f", "Y: %.3f", "Z: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dSlider("##Scale", arg, Vector3d{-3.0}, Vector3d{3.0}, "X: %.3f", "Y: %.3f", "Z: %.3f");
+ }
+ }, accessory.localScale
+ );
ImGui::SameLine();
drawHelpMarker("+/-3.0 = +/-150 in-game");
ImGui::EndGroup();
}
-auto SaveTool::getStyleName(Int id, Containers::ArrayView view) -> Containers::StringView {
+Containers::StringView
+Application::getStyleName(std::int32_t id, Containers::ArrayView view) {
if(id >= 0 && id <= 15) {
return view[id].name;
}
@@ -740,6 +812,8 @@ auto SaveTool::getStyleName(Int id, Containers::ArrayView view) ->
return _currentMass->globalStyles()[id - 50].name;
}
else {
- return style_names.at(id);
+ return GameData::builtin_style_names.at(id);
}
}
+
+}
diff --git a/src/Application/Application_MassViewer_Armour.cpp b/src/Application/Application_MassViewer_Armour.cpp
new file mode 100644
index 0000000..a6e5b3b
--- /dev/null
+++ b/src/Application/Application_MassViewer_Armour.cpp
@@ -0,0 +1,392 @@
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+
+#include "../FontAwesome/IconsFontAwesome5.h"
+#include "../GameData/ArmourSets.h"
+#include "../GameData/StyleNames.h"
+
+#include "Application.h"
+
+namespace mbst {
+
+void
+Application::drawArmour() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
+ return;
+ }
+
+ constexpr static Containers::StringView slot_labels[] = {
+ #define c(enumerator, strenum, name) name,
+ #include "../Maps/ArmourSlots.hpp"
+ #undef c
+ };
+
+ auto labels_view = arrayView(slot_labels);
+
+ const static float footer_height_to_reserve = ImGui::GetFrameHeightWithSpacing();
+
+ ImGui::BeginGroup();
+
+ if(ImGui::BeginTable("##SlotsTable", 1,
+ ImGuiTableFlags_ScrollY|ImGuiTableFlags_BordersOuter|ImGuiTableFlags_BordersInnerH,
+ {ImGui::GetContentRegionAvail().x * 0.15f, -footer_height_to_reserve}))
+ {
+ ImGui::TableSetupColumn("##Slots", ImGuiTableColumnFlags_WidthStretch);
+
+ for(std::size_t i = 0; i < labels_view.size(); i++) {
+ ImGui::TableNextRow();
+ ImGui::TableNextColumn();
+ if(ImGui::Selectable(labels_view[i].data(), _selectedArmourSlot && (*_selectedArmourSlot) == i,
+ ImGuiSelectableFlags_SpanAvailWidth))
+ {
+ _selectedArmourSlot = i;
+ }
+ }
+
+ ImGui::EndTable();
+ }
+
+ if(ImGui::Button(ICON_FA_UNDO_ALT " Reset all")) {
+ _currentMass->getArmourParts();
+ }
+
+ ImGui::EndGroup();
+
+ ImGui::SameLine();
+
+ if(!_selectedArmourSlot) {
+ ImGui::TextUnformatted("No selected armour slot.");
+ return;
+ }
+
+ auto& part = _currentMass->armourParts()[*_selectedArmourSlot];
+
+ ImGui::BeginGroup();
+
+ if(ImGui::BeginChild("##ArmourEditor", {0.0f, -footer_height_to_reserve})) {
+
+ ImGui::SeparatorText("Part");
+
+ if(GameData::armour_sets.find(part.id) != GameData::armour_sets.cend()) {
+ ImGui::Text("Set name: %s", GameData::armour_sets.at(part.id).name.data());
+ }
+ else {
+ ImGui::Text("Set ID: %u", part.id);
+ }
+
+ ImGui::SameLine();
+
+ if(ImGui::SmallButton("Change")) {
+ ImGui::OpenPopup("##ArmourPartPopup");
+ }
+ if(ImGui::BeginPopup("##ArmourPartPopup")) {
+ if(ImGui::BeginListBox("##ChangePart")) {
+ for(auto& set : GameData::armour_sets) {
+ if(part.slot != GameObjects::ArmourPart::Slot::Neck || set.second.neck_compatible) {
+ if(ImGui::Selectable(set.second.name.data(), set.first == part.id,
+ ImGuiSelectableFlags_SpanAvailWidth))
+ {
+ part.id = set.first;
+ }
+ }
+ }
+ ImGui::EndListBox();
+ }
+
+ ImGui::EndPopup();
+ }
+
+ ImGui::SeparatorText("Styles");
+
+ for(std::int32_t i = 0; i < 4; i++) {
+ drawAlignedText("Slot %d:", i + 1);
+
+ ImGui::SameLine();
+
+ ImGui::PushID(i);
+ if(ImGui::BeginCombo("##Style",
+ getStyleName(part.styles[i], _currentMass->armourCustomStyles()).data()))
+ {
+ for(const auto& style : GameData::builtin_style_names) {
+ if(ImGui::Selectable(getStyleName(style.first, _currentMass->armourCustomStyles()).data(),
+ part.styles[i] == style.first))
+ {
+ part.styles[i] = style.first;
+ }
+ }
+
+ ImGui::EndCombo();
+ }
+ ImGui::PopID();
+ }
+
+ ImGui::SeparatorText("Decals");
+
+ constexpr static float selectable_width = 25.0f;
+
+ drawAlignedText("Showing/editing decal:");
+ ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, {0.5f, 0.0f});
+ for(std::uint32_t i = 0; i < part.decals.size(); i++) {
+ ImGui::SameLine();
+ if(ImGui::Selectable(std::to_string(i + 1).c_str(), _selectedArmourDecals[*_selectedArmourSlot] == int(i),
+ ImGuiSelectableFlags_None, {selectable_width, 0.0f}))
+ {
+ _selectedArmourDecals[*_selectedArmourSlot] = int(i);
+ }
+ if(i != part.decals.size() - 1) {
+ ImGui::SameLine();
+ ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
+ }
+ }
+ ImGui::PopStyleVar();
+ drawDecalEditor(part.decals[_selectedArmourDecals[*_selectedArmourSlot]]);
+
+ if(!part.accessories.isEmpty()) {
+ ImGui::SeparatorText("Accessories");
+
+ drawAlignedText("Showing/editing accessory:");
+ ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, {0.5f, 0.0f});
+ for(std::uint32_t i = 0; i < part.accessories.size(); i++) {
+ ImGui::SameLine();
+ if(ImGui::Selectable((std::string{} + char(i + 65)).c_str(),
+ _selectedArmourAccessories[*_selectedArmourSlot] == int(i),
+ ImGuiSelectableFlags_None, {selectable_width, 0.0f}))
+ {
+ _selectedArmourAccessories[*_selectedArmourSlot] = int(i);
+ }
+ if(i != part.accessories.size() - 1) {
+ ImGui::SameLine();
+ ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
+ }
+ }
+ ImGui::PopStyleVar();
+ drawAccessoryEditor(part.accessories[_selectedArmourAccessories[*_selectedArmourSlot]],
+ _currentMass->armourCustomStyles());
+ }
+ }
+
+ ImGui::EndChild();
+
+ if(drawUnsafeWidget([]{ return ImGui::Button(ICON_FA_SAVE " Save"); })) {
+ _modifiedBySaveTool = true;
+ if(!_currentMass->writeArmourPart(part.slot)) {
+ _modifiedBySaveTool = false;
+ _queue.addToast(Toast::Type::Error, _currentMass->lastError());
+ }
+ }
+
+ ImGui::EndGroup();
+}
+
+void
+Application::drawBLAttachment() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
+ return;
+ }
+
+ drawAlignedText("Attachment style:"_s);
+ ImGui::SameLine();
+ if(ImGui::RadioButton("Active one",
+ _currentMass->bulletLauncherAttachmentStyle() == GameObjects::BulletLauncherAttachmentStyle::ActiveOne))
+ {
+ _currentMass->bulletLauncherAttachmentStyle() = GameObjects::BulletLauncherAttachmentStyle::ActiveOne;
+ }
+ ImGui::SameLine();
+ if(ImGui::RadioButton("Active one per slot",
+ _currentMass->bulletLauncherAttachmentStyle() == GameObjects::BulletLauncherAttachmentStyle::ActiveOnePerSlot))
+ {
+ _currentMass->bulletLauncherAttachmentStyle() = GameObjects::BulletLauncherAttachmentStyle::ActiveOnePerSlot;
+ }
+ ImGui::SameLine();
+ if(ImGui::RadioButton("All equipped",
+ _currentMass->bulletLauncherAttachmentStyle() == GameObjects::BulletLauncherAttachmentStyle::AllEquipped))
+ {
+ _currentMass->bulletLauncherAttachmentStyle() = GameObjects::BulletLauncherAttachmentStyle::ActiveOnePerSlot;
+ }
+
+ ImGui::Separator();
+
+ constexpr static float selectable_width = 25.0f;
+ drawAlignedText("Launcher slot:");
+ ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, {0.5f, 0.0f});
+ for(auto i = 0u; i < _currentMass->bulletLauncherAttachments().size(); i++) {
+ ImGui::SameLine();
+ if(ImGui::Selectable(std::to_string(i).c_str(), _selectedBLPlacement == i, ImGuiSelectableFlags_None,
+ {selectable_width, 0.0f}))
+ {
+ _selectedBLPlacement = i;
+ }
+ if(i != _currentMass->bulletLauncherAttachments().size() - 1) {
+ ImGui::SameLine();
+ ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
+ }
+ }
+ ImGui::PopStyleVar();
+
+ auto& placement = _currentMass->bulletLauncherAttachments()[_selectedBLPlacement];
+
+ static const Containers::StringView socket_labels[] = {
+ #define c(enumerator, enumstr, name) name,
+ #include "../Maps/BulletLauncherSockets.hpp"
+ #undef c
+ };
+
+ drawAlignedText("Socket:");
+ ImGui::SameLine();
+ if(ImGui::BeginCombo("##Socket", socket_labels[std::uint32_t(placement.socket)].data())) {
+ for(std::uint32_t i = 0; i < (sizeof(socket_labels) / sizeof(socket_labels[0])); i++) {
+ if(ImGui::Selectable(socket_labels[i].data(), i == std::uint32_t(placement.socket), ImGuiSelectableFlags_SpanAvailWidth)) {
+ placement.socket = static_cast(i);
+ }
+ }
+ ImGui::EndCombo();
+ }
+
+ if(placement.socket != GameObjects::BulletLauncherAttachment::Socket::Auto) {
+ ImGui::BeginGroup();
+ drawAlignedText("Relative position:");
+ drawAlignedText("Offset position:");
+ drawAlignedText("Relative rotation:");
+ drawAlignedText("Offset rotation:");
+ drawAlignedText("Scale:");
+ ImGui::EndGroup();
+
+ ImGui::SameLine();
+
+ ImGui::BeginGroup();
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Drag("##RelativePosition", arg, 1.0f, Vector3{-FLT_MAX}, Vector3{FLT_MAX}, "X: %.3f",
+ "Y: %.3f", "Z: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dDrag("##RelativePosition", arg, 1.0f, Vector3d{-DBL_MAX}, Vector3d{DBL_MAX},
+ "X: %.3f", "Y: %.3f", "Z: %.3f");
+ }
+ }, placement.relativeLocation
+ );
+
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Slider("##OffsetPosition", arg, Vector3{-500.0f}, Vector3{500.0f}, "X: %.3f", "Y: %.3f",
+ "Z: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dSlider("##OffsetPosition", arg, Vector3d{-500.0}, Vector3d{500.0}, "X: %.3f",
+ "Y: %.3f", "Z: %.3f");
+ }
+ }, placement.offsetLocation
+ );
+ ImGui::SameLine();
+ drawHelpMarker("+/-500.0 = +/-250 in-game");
+
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Drag("##RelativeRotation", arg, 1.0f, Vector3{-FLT_MAX}, Vector3{FLT_MAX},
+ "Pitch: %.3f", "Yaw: %.3f", "Roll: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dDrag("##RelativeRotation", arg, 1.0f, Vector3d{-DBL_MAX}, Vector3d{DBL_MAX},
+ "Pitch: %.3f", "Yaw: %.3f", "Roll: %.3f");
+ }
+ }, placement.relativeRotation
+ );
+
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Slider("##OffsetRotation", arg, Vector3{-30.0f, -30.0f, -180.0f},
+ Vector3{30.0f, 30.0f, 180.0f}, "Pitch: %.3f", "Yaw: %.3f", "Roll: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dSlider("##OffsetRotation", arg, Vector3d{-30.0, -30.0, -180.0},
+ Vector3d{30.0, 30.0, 180.0}, "Pitch: %.3f", "Yaw: %.3f", "Roll: %.3f");
+ }
+ }, placement.offsetRotation
+ );
+
+ std::visit(
+ [this](auto& arg){
+ using T = std::decay_t;
+ if constexpr (std::is_same_v) {
+ drawVector3Slider("##Scale", arg, Vector3{0.5f}, Vector3{1.5f}, "X: %.3f", "Y: %.3f", "Z: %.3f");
+ }
+ else if constexpr (std::is_same_v) {
+ drawVector3dSlider("##Scale", arg, Vector3d{0.5}, Vector3d{1.5}, "X: %.3f", "Y: %.3f", "Z: %.3f");
+ }
+ }, placement.relativeScale
+ );
+ ImGui::SameLine();
+ drawHelpMarker("0.5 = 50 in-game\n1.5 = 150 in-game");
+ ImGui::EndGroup();
+ }
+
+ _modifiedBySaveTool = true;
+ if(drawUnsafeWidget([]{ return ImGui::Button(ICON_FA_SAVE " Save"); })) {
+ _modifiedBySaveTool = true;
+ if(!_currentMass->writeBulletLauncherAttachments()) {
+ _modifiedBySaveTool = false;
+ _queue.addToast(Toast::Type::Error, _currentMass->lastError());
+ }
+ }
+}
+
+void
+Application::drawCustomArmourStyles() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
+ return;
+ }
+
+ if(!ImGui::BeginChild("##ArmourStyles")) {
+ ImGui::EndChild();
+ return;
+ }
+
+ ImGui::TextWrapped("In-game values are multiplied by 100. For example, 0.500 here is equal to 50 in-game.");
+
+ for(std::uint32_t i = 0; i < _currentMass->armourCustomStyles().size(); i++) {
+ ImGui::PushID(int(i));
+ auto result = drawCustomStyle(_currentMass->armourCustomStyles()[i]);
+ switch(result) {
+ case DCS_ResetStyle:
+ _currentMass->getArmourCustomStyles();
+ break;
+ case DCS_Save:
+ _modifiedBySaveTool = true;
+ if(!_currentMass->writeArmourCustomStyle(i)) {
+ _modifiedBySaveTool = false;
+ _queue.addToast(Toast::Type::Error, _currentMass->lastError());
+ }
+ break;
+ default:
+ break;
+ }
+ ImGui::PopID();
+ }
+
+ ImGui::EndChild();
+}
+
+}
diff --git a/src/Application/Application_MassViewer_Frame.cpp b/src/Application/Application_MassViewer_Frame.cpp
new file mode 100644
index 0000000..2ccead1
--- /dev/null
+++ b/src/Application/Application_MassViewer_Frame.cpp
@@ -0,0 +1,294 @@
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+
+#include "../FontAwesome/IconsFontAwesome5.h"
+#include "../GameData/StyleNames.h"
+
+#include "Application.h"
+
+namespace mbst {
+
+void
+Application::drawFrameInfo() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
+ return;
+ }
+
+ if(!ImGui::BeginChild("##FrameInfo")) {
+ ImGui::EndChild();
+ return;
+ }
+
+ ImGui::BeginGroup();
+
+ if(ImGui::BeginChild("##JointSliders",
+ {(ImGui::GetContentRegionAvail().x / 2.0f) - (ImGui::GetStyle().WindowPadding.x / 2.0f),
+ 0.0f},
+ ImGuiChildFlags_Border|ImGuiChildFlags_AutoResizeY, ImGuiWindowFlags_MenuBar))
+ {
+ if(ImGui::BeginMenuBar()) {
+ ImGui::TextUnformatted("Joint sliders");
+ drawHelpMarker("In-game values are multiplied by 100. For example, 0.500 here is equal to 50 in-game.",
+ static_cast(windowSize().x()) / 4.0f);
+
+ ImGui::EndMenuBar();
+ }
+
+ drawJointSliders();
+ }
+ ImGui::EndChild();
+
+ if(ImGui::BeginChild("##FrameStyles",
+ {(ImGui::GetContentRegionAvail().x / 2.0f) - (ImGui::GetStyle().WindowPadding.x / 2.0f), 0.0f},
+ ImGuiChildFlags_Border, ImGuiWindowFlags_MenuBar))
+ {
+ if(ImGui::BeginMenuBar()) {
+ ImGui::TextUnformatted("Frame styles");
+
+ ImGui::EndMenuBar();
+ }
+
+ drawFrameStyles();
+ }
+ ImGui::EndChild();
+
+ ImGui::EndGroup();
+
+ ImGui::SameLine();
+
+ if(ImGui::BeginChild("##EyeFlare", {}, ImGuiChildFlags_Border, ImGuiWindowFlags_MenuBar)) {
+ if(ImGui::BeginMenuBar()) {
+ ImGui::TextUnformatted("Eye flare colour");
+ drawHelpMarker("Right-click the picker for more options.", 250.0f);
+
+ ImGui::EndMenuBar();
+ }
+
+ drawEyeColourPicker();
+ }
+ ImGui::EndChild();
+
+ ImGui::EndChild();
+}
+
+void
+Application::drawJointSliders() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
+ return;
+ }
+
+ ImGui::BeginGroup();
+ drawAlignedText("Neck:");
+ drawAlignedText("Body:");
+ drawAlignedText("Shoulders:");
+ drawAlignedText("Hips:");
+ drawAlignedText("Arms:");
+ drawAlignedText("Legs:");
+ ImGui::EndGroup();
+
+ ImGui::SameLine();
+
+ ImGui::BeginGroup();
+ ImGui::PushItemWidth(-1.0f);
+ if(ImGui::SliderFloat("##NeckSlider", &_currentMass->jointSliders().neck, 0.0f, 1.0f)) {
+ _jointsDirty = true;
+ }
+ if(ImGui::SliderFloat("##BodySlider", &_currentMass->jointSliders().body, 0.0f, 1.0f)) {
+ _jointsDirty = true;
+ }
+ if(ImGui::SliderFloat("##ShouldersSlider", &_currentMass->jointSliders().shoulders, 0.0f, 1.0f)) {
+ _jointsDirty = true;
+ }
+ if(ImGui::SliderFloat("##HipsSlider", &_currentMass->jointSliders().hips, 0.0f, 1.0f)) {
+ _jointsDirty = true;
+ }
+ ImGui::PushMultiItemsWidths(2, ImGui::CalcItemWidth());
+ if(ImGui::SliderFloat("##UpperArmsSlider", &_currentMass->jointSliders().upperArms, 0.0f, 1.0f, "Upper: %.3f")) {
+ _jointsDirty = true;
+ }
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ if(ImGui::SliderFloat("##LowerArmsSlider", &_currentMass->jointSliders().lowerArms, 0.0f, 1.0f, "Lower: %.3f")) {
+ _jointsDirty = true;
+ }
+ ImGui::PopItemWidth();
+ ImGui::PushMultiItemsWidths(2, ImGui::CalcItemWidth());
+ if(ImGui::SliderFloat("##UpperLegsSlider", &_currentMass->jointSliders().upperLegs, 0.0f, 1.0f, "Upper: %.3f")) {
+ _jointsDirty = true;
+ }
+ ImGui::PopItemWidth();
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ if(ImGui::SliderFloat("##LowerLegsSlider", &_currentMass->jointSliders().lowerLegs, 0.0f, 1.0f, "Lower: %.3f")) {
+ _jointsDirty = true;
+ }
+ ImGui::PopItemWidth();
+ ImGui::PopItemWidth();
+ ImGui::EndGroup();
+
+ if(!_jointsDirty) {
+ ImGui::BeginDisabled();
+ ImGui::Button(ICON_FA_SAVE " Save");
+ ImGui::SameLine();
+ ImGui::Button(ICON_FA_UNDO " Reset");
+ ImGui::EndDisabled();
+ }
+ else {
+ if(drawUnsafeWidget([]{ return ImGui::Button(ICON_FA_SAVE " Save"); })) {
+ _modifiedBySaveTool = true;
+ if(!_currentMass->writeJointSliders()) {
+ _modifiedBySaveTool = false;
+ _queue.addToast(Toast::Type::Error, _currentMass->lastError());
+ }
+ _jointsDirty = false;
+ }
+ ImGui::SameLine();
+ if(ImGui::Button(ICON_FA_UNDO " Reset")) {
+ _currentMass->getJointSliders();
+ _jointsDirty = false;
+ }
+ }
+}
+
+void
+Application::drawFrameStyles() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
+ return;
+ }
+
+ for(std::int32_t i = 0; i < 4; i++) {
+ drawAlignedText("Slot %d:", i + 1);
+
+ ImGui::SameLine();
+
+ ImGui::PushID(i);
+
+ ImGui::PushItemWidth(-1.0f);
+ if(ImGui::BeginCombo("##Style",
+ getStyleName(_currentMass->frameStyles()[i], _currentMass->frameCustomStyles()).data()))
+ {
+ for(const auto& style : GameData::builtin_style_names) {
+ if(ImGui::Selectable(getStyleName(style.first, _currentMass->frameCustomStyles()).data(),
+ _currentMass->frameStyles()[i] == style.first))
+ {
+ _currentMass->frameStyles()[i] = style.first;
+ _stylesDirty = true;
+ }
+ }
+
+ ImGui::EndCombo();
+ }
+ ImGui::PopItemWidth();
+
+ ImGui::PopID();
+ }
+
+ if(!_stylesDirty) {
+ ImGui::BeginDisabled();
+ ImGui::Button(ICON_FA_SAVE " Save");
+ ImGui::SameLine();
+ ImGui::Button(ICON_FA_UNDO " Reset");
+ ImGui::EndDisabled();
+ }
+ else {
+ if(drawUnsafeWidget([]{ return ImGui::Button(ICON_FA_SAVE " Save"); })) {
+ _modifiedBySaveTool = true;
+ if(!_currentMass->writeFrameStyles()) {
+ _modifiedBySaveTool = false;
+ _queue.addToast(Toast::Type::Error, _currentMass->lastError());
+ }
+ _stylesDirty = false;
+ }
+ ImGui::SameLine();
+ if(ImGui::Button(ICON_FA_UNDO " Reset")) {
+ _currentMass->getFrameStyles();
+ _stylesDirty = false;
+ }
+ }
+}
+
+void
+Application::drawEyeColourPicker() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
+ return;
+ }
+
+ if(ImGui::ColorPicker3("##EyeFlarePicker", &_currentMass->eyeFlareColour().x())) {
+ _eyeFlareDirty = true;
+ }
+
+ if(!_eyeFlareDirty) {
+ ImGui::BeginDisabled();
+ ImGui::Button(ICON_FA_SAVE " Save");
+ ImGui::SameLine();
+ ImGui::Button(ICON_FA_UNDO " Reset");
+ ImGui::EndDisabled();
+ }
+ else {
+ if(drawUnsafeWidget([]{ return ImGui::Button(ICON_FA_SAVE " Save"); })) {
+ _modifiedBySaveTool = true;
+ if(!_currentMass->writeEyeFlareColour()) {
+ _modifiedBySaveTool = false;
+ _queue.addToast(Toast::Type::Error, _currentMass->lastError());
+ }
+ _eyeFlareDirty = false;
+ }
+ ImGui::SameLine();
+ if(ImGui::Button(ICON_FA_UNDO " Reset")) {
+ _currentMass->getEyeFlareColour();
+ _eyeFlareDirty = false;
+ }
+ }
+}
+
+void
+Application::drawCustomFrameStyles() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
+ return;
+ }
+
+ if(!ImGui::BeginChild("##FrameStyles")) {
+ ImGui::EndChild();
+ return;
+ }
+
+ ImGui::TextWrapped("In-game values are multiplied by 100. For example, 0.500 here is equal to 50 in-game.");
+
+ for(std::uint32_t i = 0; i < _currentMass->frameCustomStyles().size(); i++) {
+ ImGui::PushID(int(i));
+ auto result = drawCustomStyle(_currentMass->frameCustomStyles()[i]);
+ switch(result) {
+ case DCS_ResetStyle:
+ _currentMass->getFrameCustomStyles();
+ break;
+ case DCS_Save:
+ _modifiedBySaveTool = true;
+ if(!_currentMass->writeFrameCustomStyle(i)) {
+ _modifiedBySaveTool = false;
+ _queue.addToast(Toast::Type::Error, _currentMass->lastError());
+ }
+ break;
+ default:
+ break;
+ }
+ ImGui::PopID();
+ }
+
+ ImGui::EndChild();
+}
+
+}
diff --git a/src/SaveTool/SaveTool_MassViewer_Weapons.cpp b/src/Application/Application_MassViewer_Weapons.cpp
similarity index 73%
rename from src/SaveTool/SaveTool_MassViewer_Weapons.cpp
rename to src/Application/Application_MassViewer_Weapons.cpp
index 909712f..7865a0e 100644
--- a/src/SaveTool/SaveTool_MassViewer_Weapons.cpp
+++ b/src/Application/Application_MassViewer_Weapons.cpp
@@ -1,5 +1,5 @@
// MassBuilderSaveTool
-// Copyright (C) 2021-2022 Guillaume Jacquemin
+// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,18 +16,21 @@
#include "../FontAwesome/IconsFontAwesome5.h"
-#include "../Maps/StyleNames.h"
-#include "../Maps/WeaponParts.h"
+#include "../GameData/StyleNames.h"
+#include "../GameData/WeaponParts.h"
-#include "SaveTool.h"
+#include "Application.h"
-void SaveTool::drawWeapons() {
- if(!_currentMass || _currentMass->state() != Mass::State::Valid) {
+namespace mbst {
+
+void
+Application::drawWeapons() {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid) {
_currentWeapon = nullptr;
return;
}
- const Float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
+ const float footer_height_to_reserve = ImGui::GetFrameHeightWithSpacing();
ImGui::BeginGroup();
@@ -52,11 +55,9 @@ void SaveTool::drawWeapons() {
bool dirty = _meleeDirty || _shieldsDirty || _bShootersDirty || _eShootersDirty || _bLaunchersDirty || _eLaunchersDirty;
- if(!dirty) {
- ImGui::BeginDisabled();
- }
+ ImGui::BeginDisabled(!dirty);
- if(drawUnsafeWidget([]{ return ImGui::Button(ICON_FA_SAVE " Save"); })) {
+ if(drawUnsafeWidget([]{ return ImGui::Button(ICON_FA_SAVE " Save order"); })) {
if(_meleeDirty) {
_modifiedBySaveTool = true;
if(!_currentMass->writeMeleeWeapons()) {
@@ -153,9 +154,7 @@ void SaveTool::drawWeapons() {
}
}
- if(!dirty) {
- ImGui::EndDisabled();
- }
+ ImGui::EndDisabled();
ImGui::EndGroup();
@@ -177,42 +176,40 @@ void SaveTool::drawWeapons() {
ImGui::EndChild();
- ImGui::Separator();
-
if(drawUnsafeWidget([](){ return ImGui::Button(ICON_FA_SAVE " Save changes to weapon category"); })) {
_modifiedBySaveTool = true;
switch(_currentWeapon->type) {
- case WeaponType::Melee:
+ case GameObjects::Weapon::Type::Melee:
if(!_currentMass->writeMeleeWeapons()) {
_modifiedBySaveTool = false;
_queue.addToast(Toast::Type::Error, _currentMass->lastError());
}
break;
- case WeaponType::Shield:
+ case GameObjects::Weapon::Type::Shield:
if(!_currentMass->writeShields()) {
_modifiedBySaveTool = false;
_queue.addToast(Toast::Type::Error, _currentMass->lastError());
}
break;
- case WeaponType::BulletShooter:
+ case GameObjects::Weapon::Type::BulletShooter:
if(!_currentMass->writeBulletShooters()) {
_modifiedBySaveTool = false;
_queue.addToast(Toast::Type::Error, _currentMass->lastError());
}
break;
- case WeaponType::EnergyShooter:
+ case GameObjects::Weapon::Type::EnergyShooter:
if(!_currentMass->writeEnergyShooters()) {
_modifiedBySaveTool = false;
_queue.addToast(Toast::Type::Error, _currentMass->lastError());
}
break;
- case WeaponType::BulletLauncher:
+ case GameObjects::Weapon::Type::BulletLauncher:
if(!_currentMass->writeBulletLaunchers()) {
_modifiedBySaveTool = false;
_queue.addToast(Toast::Type::Error, _currentMass->lastError());
}
break;
- case WeaponType::EnergyLauncher:
+ case GameObjects::Weapon::Type::EnergyLauncher:
if(!_currentMass->writeEnergyLaunchers()) {
_modifiedBySaveTool = false;
_queue.addToast(Toast::Type::Error, _currentMass->lastError());
@@ -228,22 +225,22 @@ void SaveTool::drawWeapons() {
if(ImGui::Button(ICON_FA_UNDO_ALT " Reset weapon category")) {
switch(_currentWeapon->type) {
- case WeaponType::Melee:
+ case GameObjects::Weapon::Type::Melee:
_currentMass->getMeleeWeapons();
break;
- case WeaponType::Shield:
+ case GameObjects::Weapon::Type::Shield:
_currentMass->getShields();
break;
- case WeaponType::BulletShooter:
+ case GameObjects::Weapon::Type::BulletShooter:
_currentMass->getBulletShooters();
break;
- case WeaponType::EnergyShooter:
+ case GameObjects::Weapon::Type::EnergyShooter:
_currentMass->getEnergyShooters();
break;
- case WeaponType::BulletLauncher:
+ case GameObjects::Weapon::Type::BulletLauncher:
_currentMass->getBulletLaunchers();
break;
- case WeaponType::EnergyLauncher:
+ case GameObjects::Weapon::Type::EnergyLauncher:
_currentMass->getEnergyLaunchers();
break;
default:
@@ -254,16 +251,17 @@ void SaveTool::drawWeapons() {
ImGui::EndGroup();
}
-void SaveTool::drawWeaponCategory(Containers::StringView name, Containers::ArrayView weapons_view, bool& dirty,
- Containers::StringView payload_type, Containers::StringView payload_tooltip)
+void
+Application::drawWeaponCategory(Containers::StringView name, Containers::ArrayView weapons_view, bool& dirty,
+ Containers::StringView payload_type, Containers::StringView payload_tooltip)
{
ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
ImGui::TableNextColumn();
- ImGui::TextUnformatted(name.data());
+ ImGui::TextUnformatted(name.cbegin(), name.cend());
ImGui::PushID(payload_type.data());
- for(UnsignedInt i = 0; i < weapons_view.size(); i++) {
+ for(std::uint32_t i = 0; i < weapons_view.size(); i++) {
auto& weapon = weapons_view[i];
ImGui::TableNextRow();
@@ -275,7 +273,7 @@ void SaveTool::drawWeaponCategory(Containers::StringView name, Containers::Array
_currentWeapon = &weapon;
}
if(ImGui::BeginDragDropSource()) {
- ImGui::SetDragDropPayload(payload_type.data(), &i, sizeof(UnsignedInt));
+ ImGui::SetDragDropPayload(payload_type.data(), &i, sizeof(std::uint32_t));
if(ImGui::GetIO().KeyCtrl) {
ImGui::Text("%s %i - %s (copy)", payload_tooltip.data(), i + 1, weapon.name.data());
}
@@ -317,8 +315,9 @@ void SaveTool::drawWeaponCategory(Containers::StringView name, Containers::Array
ImGui::PopID();
}
-void SaveTool::drawWeaponEditor(Weapon& weapon) {
- if(!_currentMass || _currentMass->state() != Mass::State::Valid || !_currentWeapon) {
+void
+Application::drawWeaponEditor(GameObjects::Weapon& weapon) {
+ if(!_currentMass || _currentMass->state() != GameObjects::Mass::State::Valid || !_currentWeapon) {
return;
}
@@ -328,7 +327,7 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
#undef c
};
- drawAlignedText("%s: %s", labels[UnsignedInt(weapon.type)].data(), weapon.name.data());
+ drawAlignedText("%s: %s", labels[std::uint32_t(weapon.type)].data(), weapon.name.data());
ImGui::SameLine();
@@ -347,11 +346,11 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
ImGui::BeginGroup();
drawAlignedText("Equipped:");
- if(weapon.type != WeaponType::Shield) {
+ if(weapon.type != GameObjects::Weapon::Type::Shield) {
drawAlignedText("Damage type:");
}
- if(weapon.type == WeaponType::Melee) {
+ if(weapon.type == GameObjects::Weapon::Type::Melee) {
drawAlignedText("Dual-wield:");
drawAlignedText("Custom effect mode:");
@@ -365,48 +364,48 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
ImGui::BeginGroup();
ImGui::Checkbox("##EquippedCheckbox", &weapon.attached);
- if(weapon.type != WeaponType::Shield) {
- if(weapon.type == WeaponType::Melee &&
- ImGui::RadioButton("Physical##NoElement", weapon.damageType == DamageType::Physical))
+ if(weapon.type != GameObjects::Weapon::Type::Shield) {
+ if(weapon.type == GameObjects::Weapon::Type::Melee &&
+ ImGui::RadioButton("Physical##NoElement", weapon.damageType == GameObjects::Weapon::DamageType::Physical))
{
- weapon.damageType = DamageType::Physical;
+ weapon.damageType = GameObjects::Weapon::DamageType::Physical;
}
- else if((weapon.type == WeaponType::BulletShooter || weapon.type == WeaponType::BulletLauncher) &&
- ImGui::RadioButton("Piercing##NoElement", weapon.damageType == DamageType::Piercing))
+ else if((weapon.type == GameObjects::Weapon::Type::BulletShooter || weapon.type == GameObjects::Weapon::Type::BulletLauncher) &&
+ ImGui::RadioButton("Piercing##NoElement", weapon.damageType == GameObjects::Weapon::DamageType::Piercing))
{
- weapon.damageType = DamageType::Piercing;
+ weapon.damageType = GameObjects::Weapon::DamageType::Piercing;
}
- else if((weapon.type == WeaponType::EnergyShooter || weapon.type == WeaponType::EnergyLauncher) &&
- ImGui::RadioButton("Plasma##NoElement", weapon.damageType == DamageType::Plasma))
+ else if((weapon.type == GameObjects::Weapon::Type::EnergyShooter || weapon.type == GameObjects::Weapon::Type::EnergyLauncher) &&
+ ImGui::RadioButton("Plasma##NoElement", weapon.damageType == GameObjects::Weapon::DamageType::Plasma))
{
- weapon.damageType = DamageType::Plasma;
+ weapon.damageType = GameObjects::Weapon::DamageType::Plasma;
}
ImGui::SameLine();
- if(ImGui::RadioButton("Heat##Heat", weapon.damageType == DamageType::Heat)) {
- weapon.damageType = DamageType::Heat;
+ if(ImGui::RadioButton("Heat##Heat", weapon.damageType == GameObjects::Weapon::DamageType::Heat)) {
+ weapon.damageType = GameObjects::Weapon::DamageType::Heat;
}
ImGui::SameLine();
- if(ImGui::RadioButton("Freeze##Freeze", weapon.damageType == DamageType::Freeze)) {
- weapon.damageType = DamageType::Freeze;
+ if(ImGui::RadioButton("Freeze##Freeze", weapon.damageType == GameObjects::Weapon::DamageType::Freeze)) {
+ weapon.damageType = GameObjects::Weapon::DamageType::Freeze;
}
ImGui::SameLine();
- if(ImGui::RadioButton("Shock##Shock", weapon.damageType == DamageType::Shock)) {
- weapon.damageType = DamageType::Shock;
+ if(ImGui::RadioButton("Shock##Shock", weapon.damageType == GameObjects::Weapon::DamageType::Shock)) {
+ weapon.damageType = GameObjects::Weapon::DamageType::Shock;
}
}
- if(weapon.type == WeaponType::Melee) {
+ if(weapon.type == GameObjects::Weapon::Type::Melee) {
ImGui::Checkbox("##DualWield", &weapon.dualWield);
- if(ImGui::RadioButton("Default##Default", weapon.effectColourMode == EffectColourMode::Default)) {
- weapon.effectColourMode = EffectColourMode::Default;
+ if(ImGui::RadioButton("Default##Default", weapon.effectColourMode == GameObjects::Weapon::EffectColourMode::Default)) {
+ weapon.effectColourMode = GameObjects::Weapon::EffectColourMode::Default;
}
ImGui::SameLine();
- if(ImGui::RadioButton("Custom##Custom", weapon.effectColourMode == EffectColourMode::Custom)) {
- weapon.effectColourMode = EffectColourMode::Custom;
+ if(ImGui::RadioButton("Custom##Custom", weapon.effectColourMode == GameObjects::Weapon::EffectColourMode::Custom)) {
+ weapon.effectColourMode = GameObjects::Weapon::EffectColourMode::Custom;
}
- bool custom_effect = (weapon.effectColourMode == EffectColourMode::Custom);
+ bool custom_effect = (weapon.effectColourMode == GameObjects::Weapon::EffectColourMode::Custom);
if(!custom_effect) {
ImGui::BeginDisabled();
}
@@ -425,8 +424,8 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
if(ImGui::CollapsingHeader("Weapon parts")) {
drawAlignedText("Viewing/editing part:");
- for(Int i = 0; UnsignedLong(i) < weapon.parts.size(); i++) {
- if(UnsignedLong(_selectedWeaponPart) >= weapon.parts.size()) {
+ for(std::int32_t i = 0; std::size_t(i) < weapon.parts.size(); i++) {
+ if(std::size_t(_selectedWeaponPart) >= weapon.parts.size()) {
_selectedWeaponPart = 0;
}
ImGui::SameLine();
@@ -435,20 +434,20 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
auto& part = weapon.parts[_selectedWeaponPart];
- const auto* map = [this, &weapon]()-> const std::map* {
+ const auto* map = [this, &weapon]()-> const std::map* {
switch(weapon.type) {
- case WeaponType::Melee:
- return _selectedWeaponPart == 0 ? &melee_grips : &melee_assaulters;
- case WeaponType::Shield:
- return _selectedWeaponPart == 0 ? &shield_handles : &shield_shells;
- case WeaponType::BulletShooter:
- return _selectedWeaponPart == 0 ? &bshooter_triggers : &bshooter_barrels;
- case WeaponType::EnergyShooter:
- return _selectedWeaponPart == 0 ? &eshooter_triggers : &eshooter_busters;
- case WeaponType::BulletLauncher:
- return _selectedWeaponPart == 0 ? &blauncher_pods : &blauncher_projectiles;
- case WeaponType::EnergyLauncher:
- return _selectedWeaponPart == 0 ? &elauncher_generators : &elauncher_pods;
+ case GameObjects::Weapon::Type::Melee:
+ return _selectedWeaponPart == 0 ? &GameData::melee_grips : &GameData::melee_assaulters;
+ case GameObjects::Weapon::Type::Shield:
+ return _selectedWeaponPart == 0 ? &GameData::shield_handles : &GameData::shield_shells;
+ case GameObjects::Weapon::Type::BulletShooter:
+ return _selectedWeaponPart == 0 ? &GameData::bshooter_triggers : &GameData::bshooter_barrels;
+ case GameObjects::Weapon::Type::EnergyShooter:
+ return _selectedWeaponPart == 0 ? &GameData::eshooter_triggers : &GameData::eshooter_busters;
+ case GameObjects::Weapon::Type::BulletLauncher:
+ return _selectedWeaponPart == 0 ? &GameData::blauncher_pods : &GameData::blauncher_projectiles;
+ case GameObjects::Weapon::Type::EnergyLauncher:
+ return _selectedWeaponPart == 0 ? &GameData::elauncher_generators : &GameData::elauncher_pods;
}
return nullptr;
@@ -459,7 +458,7 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
}
if(map->find(part.id) != map->cend()) {
- ImGui::TextUnformatted(map->at(part.id).data());
+ ImGui::TextUnformatted(map->at(part.id).cbegin(), map->at(part.id).cend());
}
else if(part.id == -1) {
ImGui::TextUnformatted("");
@@ -490,14 +489,14 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
}
}
- if(weapon.type == WeaponType::Shield ||
- (weapon.type == WeaponType::BulletLauncher && _selectedWeaponPart != 0))
+ if(weapon.type == GameObjects::Weapon::Type::Shield ||
+ (weapon.type == GameObjects::Weapon::Type::BulletLauncher && _selectedWeaponPart != 0))
{
ImGui::SameLine();
if(ImGui::SmallButton("Unequip")) {
part.id = -1;
}
- if(weapon.type == WeaponType::Shield && _selectedWeaponPart == 0) {
+ if(weapon.type == GameObjects::Weapon::Type::Shield && _selectedWeaponPart == 0) {
drawTooltip("This will make the whole shield and its accessories invisible.");
}
else {
@@ -505,10 +504,10 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
}
}
- if(ImGui::BeginChild("##PartDetails", {0.0f, 0.0f}, true)) {
+ if(ImGui::BeginChild("##PartDetails", {}, ImGuiChildFlags_Border)) {
ImGui::TextUnformatted("Styles:");
- for(Int i = 0; i < 4; i++) {
+ for(std::int32_t i = 0; i < 4; i++) {
drawAlignedText("Slot %d:", i + 1);
ImGui::SameLine();
@@ -516,7 +515,7 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
ImGui::PushID(i);
if(ImGui::BeginCombo("##Style", getStyleName(part.styles[i], weapon.customStyles).data())) {
- for(const auto& style: style_names) {
+ for(const auto& style: GameData::builtin_style_names) {
if(ImGui::Selectable(getStyleName(style.first, weapon.customStyles).data(),
part.styles[i] == style.first)) {
part.styles[i] = style.first;
@@ -534,7 +533,7 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
ImGui::PushID("Decal");
drawAlignedText("Showing/editing decal");
- for(UnsignedLong i = 0; i < part.decals.size(); i++) {
+ for(std::size_t i = 0; i < part.decals.size(); i++) {
ImGui::SameLine();
ImGui::RadioButton(std::to_string(i + 1).c_str(), &_selectedWeaponDecal, int(i));
}
@@ -543,13 +542,13 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
ImGui::PopID();
- if(part.accessories.size() != 0) {
+ if(!part.accessories.isEmpty()) {
ImGui::Separator();
ImGui::PushID("Accessory");
drawAlignedText("Showing/editing accessory");
- for(UnsignedLong i = 0; i < part.accessories.size(); i++) {
+ for(std::size_t i = 0; i < part.accessories.size(); i++) {
ImGui::SameLine();
ImGui::RadioButton(std::string{char(65 + i)}.c_str(), &_selectedWeaponAccessory, int(i));
}
@@ -563,3 +562,5 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
ImGui::EndChild();
}
}
+
+}
diff --git a/src/SaveTool/SaveTool_ProfileManager.cpp b/src/Application/Application_ProfileManager.cpp
similarity index 58%
rename from src/SaveTool/SaveTool_ProfileManager.cpp
rename to src/Application/Application_ProfileManager.cpp
index 89b7bdf..ce103a0 100644
--- a/src/SaveTool/SaveTool_ProfileManager.cpp
+++ b/src/Application/Application_ProfileManager.cpp
@@ -1,5 +1,5 @@
// MassBuilderSaveTool
-// Copyright (C) 2021-2022 Guillaume Jacquemin
+// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -20,14 +20,17 @@
#include "../FontAwesome/IconsFontAwesome5.h"
-#include "SaveTool.h"
+#include "Application.h"
extern const ImVec2 center_pivot;
-void SaveTool::drawProfileManager() {
+namespace mbst {
+
+void
+Application::drawProfileManager() {
static std::size_t profile_index = 0;
- ImGui::SetNextWindowPos(ImVec2{Vector2{windowSize() / 2.0f}}, ImGuiCond_Always, center_pivot);
+ ImGui::SetNextWindowPos(ImVec2{Vector2{windowSize() / 2.0f} / dpiScaling()}, ImGuiCond_Always, center_pivot);
if(ImGui::Begin("Profile management##ProfileManager", nullptr,
ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoBringToFrontOnFocus|
ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_MenuBar))
@@ -37,10 +40,6 @@ void SaveTool::drawProfileManager() {
ImGui::EndMenuBar();
}
- static ImGuiID backup_list_popup_id = drawBackupListPopup();
- static ImGuiID backup_popup_id = drawBackupProfilePopup(profile_index);
- static ImGuiID delete_popup_id = drawDeleteProfilePopup(profile_index);
-
if(ImGui::BeginTable("##ManagerLayout", 2)) {
ImGui::TableSetupColumn("##Label", ImGuiTableColumnFlags_WidthStretch);
ImGui::TableSetupColumn("##Refresh", ImGuiTableColumnFlags_WidthFixed);
@@ -59,9 +58,10 @@ void SaveTool::drawProfileManager() {
}
ImGui::SameLine();
if(ImGui::SmallButton("Backups")) {
- _profileManager->refreshBackups();
- ImGui::OpenPopup(backup_list_popup_id);
+ _backupManager->refresh();
+ ImGui::OpenPopup("Backups##BackupsModal");
}
+ drawBackupListPopup();
ImGui::EndTable();
}
@@ -80,7 +80,7 @@ void SaveTool::drawProfileManager() {
ImGui::TextUnformatted("Actions");
for(std::size_t i = 0; i < _profileManager->profiles().size(); ++i) {
- Profile& profile = _profileManager->profiles()[i];
+ GameObjects::Profile& profile = _profileManager->profiles()[i];
ImGui::TableNextRow();
@@ -100,16 +100,21 @@ void SaveTool::drawProfileManager() {
ImGui::TableSetColumnIndex(2);
if(ImGui::SmallButton(ICON_FA_FILE_ARCHIVE)) {
- profile_index = i;
- ImGui::OpenPopup(backup_popup_id);
+ if(!_backupManager->create(_profileManager->profiles()[i])) {
+ _queue.addToast(Toast::Type::Error, _backupManager->lastError(), std::chrono::seconds{5});
+ }
+ else {
+ _queue.addToast(Toast::Type::Success, "Backup created successfully!"_s);
+ }
}
drawTooltip("Backup");
ImGui::SameLine(0.0f, 2.0f);
if(drawUnsafeWidget(ImGui::SmallButton, ICON_FA_TRASH_ALT)) {
profile_index = i;
- ImGui::OpenPopup(delete_popup_id);
+ ImGui::OpenPopup("Confirmation##DeleteProfileConfirmation");
}
drawTooltip("Delete");
+ drawDeleteProfilePopup(profile_index);
ImGui::PopID();
}
ImGui::EndTable();
@@ -118,107 +123,20 @@ void SaveTool::drawProfileManager() {
ImGui::TextUnformatted("Click a profile to manage it.");
}
- drawBackupListPopup();
- drawBackupProfilePopup(profile_index);
- drawDeleteProfilePopup(profile_index);
-
ImGui::End();
}
-auto SaveTool::drawBackupListPopup() -> ImGuiID {
- ImGui::SetNextWindowPos(ImVec2{Vector2{windowSize() / 2.0f}}, ImGuiCond_Always, center_pivot);
+void
+Application::drawBackupListPopup() {
+ ImGui::SetNextWindowPos(ImVec2{Vector2{windowSize() / 2.0f} / dpiScaling()}, ImGuiCond_Always, center_pivot);
if(!ImGui::BeginPopupModal("Backups##BackupsModal", nullptr,
ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove))
{
- return ImGui::GetID("Backups##BackupsModal");
+ return;
}
static std::size_t backup_index;
- if(ImGui::BeginPopupModal("Restore backup", nullptr,
- ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_AlwaysAutoResize))
- {
- ImGui::PushTextWrapPos(float(windowSize().x()) * 0.40f);
- ImGui::Text("Are you sure you want to restore the %s backup from %.4i-%.2i-%.2i %.2i:%.2i:%.2i ? Any existing data will be overwritten.",
- _profileManager->backups()[backup_index].company.data(),
- _profileManager->backups()[backup_index].timestamp.year,
- _profileManager->backups()[backup_index].timestamp.month,
- _profileManager->backups()[backup_index].timestamp.day,
- _profileManager->backups()[backup_index].timestamp.hour,
- _profileManager->backups()[backup_index].timestamp.minute,
- _profileManager->backups()[backup_index].timestamp.second);
- ImGui::PopTextWrapPos();
-
- if(ImGui::BeginTable("##RestoreBackupLayout", 2)) {
- ImGui::TableSetupColumn("##Dummy", ImGuiTableColumnFlags_WidthStretch);
- ImGui::TableSetupColumn("##YesNo", ImGuiTableColumnFlags_WidthFixed);
-
- ImGui::TableNextRow();
-
- ImGui::TableSetColumnIndex(1);
- if(ImGui::Button("Yes")) {
- if(!_profileManager->restoreBackup(backup_index)) {
- _queue.addToast(Toast::Type::Error, _profileManager->lastError());
- }
- if(!_profileManager->refreshProfiles()) {
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error",
- _profileManager->lastError().data(), window());
- exit(EXIT_FAILURE);
- }
- ImGui::CloseCurrentPopup();
- }
- ImGui::SameLine();
- if(ImGui::Button("No", ImGui::GetItemRectSize())) {
- ImGui::CloseCurrentPopup();
- }
-
- ImGui::EndTable();
- }
-
- ImGui::EndPopup();
- }
-
- if(ImGui::BeginPopupModal("Delete backup", nullptr,
- ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_AlwaysAutoResize))
- {
- ImGui::PushTextWrapPos(float(windowSize().x()) * 0.40f);
- ImGui::Text("Are you sure you want to delete the %s backup from %.4i-%.2i-%.2i %.2i:%.2i:%.2i ? This operation is irreversible.",
- _profileManager->backups()[backup_index].company.data(),
- _profileManager->backups()[backup_index].timestamp.year,
- _profileManager->backups()[backup_index].timestamp.month,
- _profileManager->backups()[backup_index].timestamp.day,
- _profileManager->backups()[backup_index].timestamp.hour,
- _profileManager->backups()[backup_index].timestamp.minute,
- _profileManager->backups()[backup_index].timestamp.second);
- ImGui::PopTextWrapPos();
-
- if(ImGui::BeginTable("##DeleteBackupLayout", 2)) {
- ImGui::TableSetupColumn("##Dummy", ImGuiTableColumnFlags_WidthStretch);
- ImGui::TableSetupColumn("##YesNo", ImGuiTableColumnFlags_WidthFixed);
-
- ImGui::TableNextRow();
-
- ImGui::TableSetColumnIndex(1);
- if(ImGui::Button("Yes")) {
- if(!_profileManager->deleteBackup(backup_index)) {
- _queue.addToast(Toast::Type::Error, _profileManager->lastError());
- }
- ImGui::CloseCurrentPopup();
- }
- ImGui::SameLine();
- if(ImGui::Button("No", ImGui::GetItemRectSize())) {
- ImGui::CloseCurrentPopup();
- }
-
- ImGui::EndTable();
- }
-
- ImGui::EndPopup();
- }
-
- static ImGuiID restore_backup_popup_id = ImGui::GetID("Restore backup");
- static ImGuiID delete_backup_popup_id = ImGui::GetID("Delete backup");
-
if(ImGui::BeginTable("##BackupsLabelLayout", 2)) {
ImGui::TableSetupColumn("##Label", ImGuiTableColumnFlags_WidthStretch);
ImGui::TableSetupColumn("##Refresh", ImGuiTableColumnFlags_WidthFixed);
@@ -229,13 +147,13 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
ImGui::TableSetColumnIndex(1);
if(ImGui::SmallButton("Refresh")) {
- _profileManager->refreshBackups();
+ _backupManager->refresh();
}
ImGui::EndTable();
}
- if(_profileManager->backups().isEmpty()) {
+ if(_backupManager->backups().isEmpty()) {
ImGui::TextDisabled("No backups were found.");
}
else if(ImGui::BeginTable("##Backups", 4,
@@ -257,16 +175,17 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
ImGui::TableSetColumnIndex(3);
ImGui::TextUnformatted("Actions");
- for(std::size_t i = 0; i < _profileManager->backups().size(); ++i) {
- auto& backup = _profileManager->backups()[i];
+ //drawBackupFolder(_backupManager->vfs());
+
+ for(std::size_t i = 0; i < _backupManager->backups().size(); ++i) {
+ auto& backup = _backupManager->backups()[i];
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);
- ImGui::TextUnformatted(backup.company.data());
- if(ImGui::IsItemHovered()) {
- ImGui::BeginTooltip();
+ ImGui::TextUnformatted(backup.company.cbegin(), backup.company.cend());
+ if(ImGui::IsItemHovered() && ImGui::BeginTooltip()) {
for(const auto& file : backup.includedFiles) {
- ImGui::TextUnformatted(file.data());
+ ImGui::TextUnformatted(file.cbegin());
}
ImGui::EndTooltip();
}
@@ -281,27 +200,29 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
backup.timestamp.second);
ImGui::TableSetColumnIndex(2);
- ImGui::TextUnformatted(backup.type == ProfileType::Demo ? "Demo" : "Full");
+ ImGui::TextUnformatted(backup.demo ? "Demo" : "Full");
ImGui::TableSetColumnIndex(3);
ImGui::PushID(int(i));
if(ImGui::SmallButton(ICON_FA_UNDO)) {
backup_index = i;
- ImGui::OpenPopup(restore_backup_popup_id);
+ ImGui::OpenPopup("Restore backup##RestoreBackupModal");
}
drawTooltip("Restore");
+ drawBackupRestorePopup(backup_index);
ImGui::SameLine(0.0f, 2.0f);
if(ImGui::SmallButton(ICON_FA_TRASH_ALT)) {
backup_index = i;
- ImGui::OpenPopup(delete_backup_popup_id);
+ ImGui::OpenPopup("Delete backup##DeleteBackupModal");
}
drawTooltip("Delete");
+ drawBackupDeletePopup(backup_index);
ImGui::PopID();
}
ImGui::EndTable();
}
- ImGui::PushTextWrapPos(ImGui::GetWindowContentRegionWidth());
+ ImGui::PushTextWrapPos(ImGui::GetContentRegionAvail().x);
ImGui::TextUnformatted("Hover over a company name to see which files are included in the backup.");
ImGui::PopTextWrapPos();
@@ -320,20 +241,91 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
}
ImGui::EndPopup();
-
- return 0;
}
-auto SaveTool::drawBackupProfilePopup(std::size_t profile_index) -> ImGuiID {
- if(!ImGui::BeginPopupModal("Include builds ?##IncludeBuildsDialog", nullptr,
- ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove))
- {
- return ImGui::GetID("Include builds ?##IncludeBuildsDialog");
+void
+Application::drawBackupFolder(const Managers::Vfs::Directory& dir) {
+ if(dir.files().isEmpty() && dir.subdirs().isEmpty()) {
+ return;
}
- ImGui::TextUnformatted("Should builds be added to the backup ?");
+ for(auto& subdir : dir.subdirs()) {
+ ImGui::TableNextRow();
+ ImGui::TableNextColumn();
+ bool open = ImGui::TreeNodeEx(subdir.name().cbegin(), ImGuiTreeNodeFlags_SpanAllColumns);
- if(ImGui::BeginTable("##NameBackupLayout", 2)) {
+ ImGui::TableNextColumn();
+ ImGui::TextDisabled("--");
+
+ ImGui::TableNextColumn();
+ ImGui::TextDisabled("--");
+
+ ImGui::TableNextColumn();
+ ImGui::TextDisabled("--");
+
+ if(open) {
+ drawBackupFolder(subdir);
+ ImGui::TreePop();
+ }
+ }
+
+ for(auto file : dir.files()) {
+ ImGui::TableNextRow();
+ ImGui::TableNextColumn();
+ ImGui::TreeNodeEx(file->company.cbegin(), ImGuiTreeNodeFlags_SpanAllColumns|ImGuiTreeNodeFlags_Leaf|
+ ImGuiTreeNodeFlags_NoTreePushOnOpen);
+
+ ImGui::TableNextColumn();
+ ImGui::Text("%.4i-%.2i-%.2i %.2i:%.2i:%.2i",
+ file->timestamp.year,
+ file->timestamp.month,
+ file->timestamp.day,
+ file->timestamp.hour,
+ file->timestamp.minute,
+ file->timestamp.second);
+
+ ImGui::TableNextColumn();
+ ImGui::TextUnformatted(file->demo ? "Demo" : "Full");
+
+ ImGui::TableNextColumn();
+ ImGui::PushID(file);
+ if(ImGui::SmallButton(ICON_FA_UNDO)) {
+ //ImGui::OpenPopup("Restore backup##RestoreBackupModal");
+ }
+ drawTooltip("Restore");
+ //drawBackupRestorePopup(backup_index);
+ ImGui::SameLine(0.0f, 2.0f);
+ if(ImGui::SmallButton(ICON_FA_TRASH_ALT)) {
+ //ImGui::OpenPopup("Delete backup##DeleteBackupModal");
+ }
+ drawTooltip("Delete");
+ //drawBackupDeletePopup(backup_index);
+ ImGui::PopID();
+ }
+}
+
+
+void
+Application::drawBackupRestorePopup(std::size_t backup_index) {
+ if(!ImGui::BeginPopupModal("Restore backup##RestoreBackupModal", nullptr,
+ ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_AlwaysAutoResize))
+ {
+ return;
+ }
+
+ ImGui::PushTextWrapPos(float(windowSize().x()) * 0.50f);
+ ImGui::Text("Are you sure you want to restore the %s backup from %.4i-%.2i-%.2i %.2i:%.2i:%.2i ?\n\n"
+ "Any existing data will be overwritten.",
+ _backupManager->backups()[backup_index].company.data(),
+ _backupManager->backups()[backup_index].timestamp.year,
+ _backupManager->backups()[backup_index].timestamp.month,
+ _backupManager->backups()[backup_index].timestamp.day,
+ _backupManager->backups()[backup_index].timestamp.hour,
+ _backupManager->backups()[backup_index].timestamp.minute,
+ _backupManager->backups()[backup_index].timestamp.second);
+ ImGui::PopTextWrapPos();
+
+ if(ImGui::BeginTable("##RestoreBackupLayout", 2)) {
ImGui::TableSetupColumn("##Dummy", ImGuiTableColumnFlags_WidthStretch);
ImGui::TableSetupColumn("##YesNo", ImGuiTableColumnFlags_WidthFixed);
@@ -341,22 +333,18 @@ auto SaveTool::drawBackupProfilePopup(std::size_t profile_index) -> ImGuiID {
ImGui::TableSetColumnIndex(1);
if(ImGui::Button("Yes")) {
- if(!_profileManager->backupProfile(profile_index, true)) {
+ if(!_backupManager->restore(backup_index)) {
+ _queue.addToast(Toast::Type::Error, _profileManager->lastError());
+ }
+ if(!_profileManager->refreshProfiles()) {
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error",
_profileManager->lastError().data(), window());
+ exit(EXIT_FAILURE);
}
ImGui::CloseCurrentPopup();
}
ImGui::SameLine();
if(ImGui::Button("No", ImGui::GetItemRectSize())) {
- if(!_profileManager->backupProfile(profile_index, false)) {
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error",
- _profileManager->lastError().data(), window());
- }
- ImGui::CloseCurrentPopup();
- }
- ImGui::SameLine();
- if(ImGui::Button("Cancel")) {
ImGui::CloseCurrentPopup();
}
@@ -364,15 +352,58 @@ auto SaveTool::drawBackupProfilePopup(std::size_t profile_index) -> ImGuiID {
}
ImGui::EndPopup();
-
- return 0;
}
-auto SaveTool::drawDeleteProfilePopup(std::size_t profile_index) -> ImGuiID {
+void
+Application::drawBackupDeletePopup(std::size_t backup_index) {
+ if(!ImGui::BeginPopupModal("Delete backup##DeleteBackupModal", nullptr,
+ ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_AlwaysAutoResize))
+ {
+ return;
+ }
+
+ ImGui::PushTextWrapPos(float(windowSize().x()) * 0.50f);
+ ImGui::Text("Are you sure you want to delete the %s backup from %.4i-%.2i-%.2i %.2i:%.2i:%.2i ?\n\n"
+ "This operation is irreversible.",
+ _backupManager->backups()[backup_index].company.data(),
+ _backupManager->backups()[backup_index].timestamp.year,
+ _backupManager->backups()[backup_index].timestamp.month,
+ _backupManager->backups()[backup_index].timestamp.day,
+ _backupManager->backups()[backup_index].timestamp.hour,
+ _backupManager->backups()[backup_index].timestamp.minute,
+ _backupManager->backups()[backup_index].timestamp.second);
+ ImGui::PopTextWrapPos();
+
+ if(ImGui::BeginTable("##DeleteBackupLayout", 2)) {
+ ImGui::TableSetupColumn("##Dummy", ImGuiTableColumnFlags_WidthStretch);
+ ImGui::TableSetupColumn("##YesNo", ImGuiTableColumnFlags_WidthFixed);
+
+ ImGui::TableNextRow();
+
+ ImGui::TableSetColumnIndex(1);
+ if(ImGui::Button("Yes")) {
+ if(!_backupManager->remove(backup_index)) {
+ _queue.addToast(Toast::Type::Error, _profileManager->lastError());
+ }
+ ImGui::CloseCurrentPopup();
+ }
+ ImGui::SameLine();
+ if(ImGui::Button("No", ImGui::GetItemRectSize())) {
+ ImGui::CloseCurrentPopup();
+ }
+
+ ImGui::EndTable();
+ }
+
+ ImGui::EndPopup();
+}
+
+void
+Application::drawDeleteProfilePopup(std::size_t profile_index) {
if(!ImGui::BeginPopupModal("Confirmation##DeleteProfileConfirmation", nullptr,
ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoMove))
{
- return ImGui::GetID("Confirmation##DeleteProfileConfirmation");
+ return;
}
static bool delete_builds = false;
@@ -410,6 +441,6 @@ auto SaveTool::drawDeleteProfilePopup(std::size_t profile_index) -> ImGuiID {
}
ImGui::EndPopup();
-
- return 0;
+}
+
}
diff --git a/src/Application/Application_UpdateChecker.cpp b/src/Application/Application_UpdateChecker.cpp
new file mode 100644
index 0000000..828c7a6
--- /dev/null
+++ b/src/Application/Application_UpdateChecker.cpp
@@ -0,0 +1,95 @@
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+
+#include
+
+#include "../Logger/Logger.h"
+
+#include "Application.h"
+
+namespace mbst {
+
+void
+Application::updateCheckEvent(SDL_Event& event) {
+ _updateThread.join();
+
+ switch(static_cast(event.user.code)) {
+ case UpdateChecker::Success:
+ _checkerMutex.lock();
+ if(_checker->updateAvailable()) {
+ using namespace std::chrono_literals;
+ _queue.addToast(Toast::Type::Warning,
+ "Your version is out of date and thus unsupported.\nCheck the settings for more information."_s, 5s);
+ }
+ else {
+ if(_checker->version() == current_version || (current_version > _checker->version() && current_version.prerelease)) {
+ _queue.addToast(Toast::Type::Success, "The application is already up to date."_s);
+ }
+ else if(_checker->version() > current_version && !current_version.prerelease) {
+ _queue.addToast(Toast::Type::Warning,
+ "Your version is more recent than the latest one in the repo. How???"_s);
+ }
+ }
+ _checkerMutex.unlock();
+ break;
+ case UpdateChecker::HttpError:
+ _checkerMutex.lock();
+ _queue.addToast(Toast::Type::Error, _checker->error());
+ LOG_ERROR(_checker->error());
+ _checkerMutex.unlock();
+ break;
+ case UpdateChecker::CurlInitFailed:
+ _queue.addToast(Toast::Type::Error, "Couldn't initialise libcurl. Update check aborted."_s);
+ LOG_ERROR("Couldn't initialise libcurl. Update check aborted.");
+ break;
+ case UpdateChecker::CurlError:
+ {
+ using namespace std::chrono_literals;
+ _checkerMutex.lock();
+ _queue.addToast(Toast::Type::Error, _checker->error(), 10s);
+ LOG_ERROR(_checker->error());
+ _checkerMutex.unlock();
+ }
+ break;
+ case UpdateChecker::CurlTimeout:
+ _queue.addToast(Toast::Type::Error, "The request timed out."_s);
+ LOG_ERROR("The request timed out.");
+ break;
+ }
+}
+
+void
+Application::checkForUpdates() {
+ SDL_Event event;
+ SDL_zero(event);
+ event.type = _updateEventId;
+
+ _checkerMutex.lock();
+
+ if(!_checker) {
+ _checker.emplace();
+ }
+
+ event.user.code = _checker->check();
+
+ _checkerMutex.unlock();
+
+ SDL_PushEvent(&event);
+}
+
+}
diff --git a/src/SaveTool/SaveTool_drawAbout.cpp b/src/Application/Application_drawAbout.cpp
similarity index 73%
rename from src/SaveTool/SaveTool_drawAbout.cpp
rename to src/Application/Application_drawAbout.cpp
index 1904d1b..c8ef16c 100644
--- a/src/SaveTool/SaveTool_drawAbout.cpp
+++ b/src/Application/Application_drawAbout.cpp
@@ -1,5 +1,5 @@
// MassBuilderSaveTool
-// Copyright (C) 2021-2022 Guillaume Jacquemin
+// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -14,8 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-#include "SaveTool.h"
-
#include
#include
@@ -29,9 +27,14 @@
#include "../FontAwesome/IconsFontAwesome5.h"
#include "../FontAwesome/IconsFontAwesome5Brands.h"
+#include "Application.h"
+
extern const ImVec2 center_pivot;
-void SaveTool::drawAbout() {
+namespace mbst {
+
+void
+Application::drawAbout() {
ImGui::SetNextWindowPos(ImVec2{Vector2{windowSize() / 2.0f}}, ImGuiCond_Always, center_pivot);
ImGui::SetNextWindowSize({float(windowSize().x()) * 0.8f, float(windowSize().y()) * 0.75f}, ImGuiCond_Always);
@@ -59,7 +62,7 @@ void SaveTool::drawAbout() {
ImGui::TextWrapped("This application, made for the M.A.S.S. Builder community by Guillaume Jacquemin (aka William JCM), "
"is a rewrite of the wxWidgets-powered M.A.S.S. Builder Save Tool (formerly known as wxMASSManager).");
- auto website = "https://williamjcm.ovh/coding/mbst";
+ auto website = "https://williamjcm.ovh/mbst";
drawAlignedText(ICON_FA_GLOBE " %s", website);
ImGui::SameLine();
if(ImGui::Button("Copy to clipboard")) {
@@ -69,7 +72,7 @@ void SaveTool::drawAbout() {
if(ImGui::Button("Open in browser")) {
openUri(website);
}
- auto repo = "https://williamjcm.ovh/git/williamjcm/MassBuilderSaveTool";
+ auto repo = "https://git.williamjcm.ovh/williamjcm/MassBuilderSaveTool";
drawAlignedText(ICON_FA_GIT_ALT " %s", repo);
ImGui::SameLine();
if(ImGui::Button("Copy to clipboard")) {
@@ -83,12 +86,13 @@ void SaveTool::drawAbout() {
ImGui::Separator();
if(ImGui::CollapsingHeader("Licence")) {
- ImGui::TextWrapped("This application is made available under the terms of the GNU General Public License, version 3, the full text of which is available below:");
+ ImGui::TextWrapped("This application is made available under the terms of the GNU General Public License,"
+ "version 3, the full text of which is available below:");
- if(ImGui::BeginChild("##GPL", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
+ if(ImGui::BeginChild("##GPL", {0.0f, float(windowSize().y()) * 0.3f}, ImGuiChildFlags_Border)) {
static auto licence = _rs.getRaw("COPYING");
ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
- ImGui::TextEx(licence.data(), licence.data() + licence.size(), ImGuiTextFlags_None);
+ ImGui::TextUnformatted(licence.cbegin(), licence.cend());
ImGui::PopFont();
}
ImGui::EndChild();
@@ -114,14 +118,6 @@ void SaveTool::drawAbout() {
ImGui::TextUnformatted("Licence: MIT");
- static auto corrade_licence = _rs.getRaw("COPYING.Corrade");
- if(ImGui::BeginChild("##CorradeLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
- ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
- ImGui::TextEx(corrade_licence.data(), corrade_licence.data() + corrade_licence.size(), ImGuiTextFlags_None);
- ImGui::PopFont();
- }
- ImGui::EndChild();
-
ImGui::TreePop();
}
@@ -142,14 +138,6 @@ void SaveTool::drawAbout() {
ImGui::TextUnformatted("Licence: MIT");
- static auto magnum_licence = _rs.getRaw("COPYING.Magnum");
- if(ImGui::BeginChild("##MagnumLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
- ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
- ImGui::TextEx(magnum_licence.data(), magnum_licence.data() + magnum_licence.size(), ImGuiTextFlags_None);
- ImGui::PopFont();
- }
- ImGui::EndChild();
-
ImGui::TreePop();
}
@@ -168,14 +156,6 @@ void SaveTool::drawAbout() {
ImGui::TextUnformatted("Licence: MIT");
- static auto imgui_licence = _rs.getRaw("LICENSE.ImGui");
- if(ImGui::BeginChild("##ImGuiLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
- ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
- ImGui::TextEx(imgui_licence.data(), imgui_licence.data() + imgui_licence.size(), ImGuiTextFlags_None);
- ImGui::PopFont();
- }
- ImGui::EndChild();
-
ImGui::TreePop();
}
@@ -194,14 +174,6 @@ void SaveTool::drawAbout() {
ImGui::TextUnformatted("Licence: zlib");
- static auto sdl_licence = _rs.getRaw("LICENSE.SDL");
- if(ImGui::BeginChild("##SDLLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
- ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
- ImGui::TextEx(sdl_licence.data(), sdl_licence.data() + sdl_licence.size(), ImGuiTextFlags_None);
- ImGui::PopFont();
- }
- ImGui::EndChild();
-
ImGui::TreePop();
}
@@ -220,14 +192,6 @@ void SaveTool::drawAbout() {
ImGui::TextUnformatted("Licence: 3-clause BSD");
- static auto libzip_licence = _rs.getRaw("LICENSE.libzip");
- if(ImGui::BeginChild("##libzipLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
- ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
- ImGui::TextEx(libzip_licence.data(), libzip_licence.data() + libzip_licence.size(), ImGuiTextFlags_None);
- ImGui::PopFont();
- }
- ImGui::EndChild();
-
ImGui::TreePop();
}
@@ -245,14 +209,6 @@ void SaveTool::drawAbout() {
ImGui::TextUnformatted("Licence: MIT");
- static auto efsw_licence = _rs.getRaw("LICENSE.efsw");
- if(ImGui::BeginChild("##efswLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
- ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
- ImGui::TextEx(efsw_licence.data(), efsw_licence.data() + efsw_licence.size(), ImGuiTextFlags_None);
- ImGui::PopFont();
- }
- ImGui::EndChild();
-
ImGui::TreePop();
}
@@ -271,14 +227,6 @@ void SaveTool::drawAbout() {
ImGui::TextUnformatted("Licence: MIT/X derivative");
- static auto curl_licence = _rs.getRaw("LICENSE.curl");
- if(ImGui::BeginChild("##libcurlLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
- ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
- ImGui::TextEx(curl_licence.data(), curl_licence.data() + curl_licence.size(), ImGuiTextFlags_None);
- ImGui::PopFont();
- }
- ImGui::EndChild();
-
ImGui::TreePop();
}
@@ -322,3 +270,5 @@ void SaveTool::drawAbout() {
ImGui::EndPopup();
}
+
+}
diff --git a/src/Application/Application_drawMainMenu.cpp b/src/Application/Application_drawMainMenu.cpp
new file mode 100644
index 0000000..957089e
--- /dev/null
+++ b/src/Application/Application_drawMainMenu.cpp
@@ -0,0 +1,277 @@
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+
+#include "../Configuration/Configuration.h"
+#include "../FontAwesome/IconsFontAwesome5.h"
+#include "../FontAwesome/IconsFontAwesome5Brands.h"
+
+#include "Application.h"
+
+namespace mbst {
+
+void
+Application::drawMainMenu() {
+ if(!ImGui::BeginMainMenuBar()) {
+ return;
+ }
+
+ if(ImGui::BeginMenu("Save Tool##SaveToolMenu")) {
+ if(ImGui::BeginMenu(ICON_FA_FOLDER_OPEN " Open game data directory")) {
+ if(ImGui::MenuItem(ICON_FA_COG " Configuration", nullptr, false,
+ Utility::Path::exists(conf().directories().gameConfig)))
+ {
+ openUri(Utility::Path::toNativeSeparators(conf().directories().gameConfig));
+ }
+
+ if(ImGui::MenuItem(ICON_FA_SAVE " Saves", nullptr, false,
+ Utility::Path::exists(conf().directories().gameSaves)))
+ {
+ openUri(Utility::Path::toNativeSeparators(conf().directories().gameSaves));
+ }
+
+ if(ImGui::MenuItem(ICON_FA_IMAGE " Screenshots", nullptr, false,
+ Utility::Path::exists(conf().directories().gameScreenshots)))
+ {
+ openUri(Utility::Path::toNativeSeparators(conf().directories().gameScreenshots));
+ }
+
+ ImGui::EndMenu();
+ }
+
+ if(ImGui::BeginMenu(ICON_FA_FOLDER_OPEN " Open manager directory")) {
+ if(ImGui::MenuItem(ICON_FA_FILE_ARCHIVE " Profile backups", nullptr, false,
+ Utility::Path::exists(conf().directories().backups)))
+ {
+ openUri(Utility::Path::toNativeSeparators(conf().directories().backups));
+ }
+
+ if(ImGui::MenuItem(ICON_FA_EXCHANGE_ALT " Staging area", nullptr, false,
+ Utility::Path::exists(conf().directories().staging)))
+ {
+ openUri(Utility::Path::toNativeSeparators(conf().directories().staging));
+ }
+
+ if(ImGui::BeginMenu(ICON_FA_BOXES " Armoury")) {
+ if(ImGui::MenuItem(ICON_FA_SHIELD_ALT " Armour parts", nullptr, false,
+ Utility::Path::exists(conf().directories().armours)))
+ {
+ openUri(Utility::Path::toNativeSeparators(conf().directories().armours));
+ }
+
+ if(ImGui::MenuItem(ICON_FA_HAMMER " Weapons", nullptr, false,
+ Utility::Path::exists(conf().directories().weapons)))
+ {
+ openUri(Utility::Path::toNativeSeparators(conf().directories().weapons));
+ }
+
+ if(ImGui::MenuItem(ICON_FA_PALETTE " Custom styles", nullptr, false,
+ Utility::Path::exists(conf().directories().styles)))
+ {
+ openUri(Utility::Path::toNativeSeparators(conf().directories().styles));
+ }
+
+ ImGui::EndMenu();
+ }
+
+ ImGui::EndMenu();
+ }
+
+ ImGui::Separator();
+
+ if(ImGui::BeginMenu(ICON_FA_COG " Settings")) {
+ ImGui::BeginGroup();
+ drawAlignedText("Vertical sync:");
+ if(conf().swapInterval() == 0) {
+ drawAlignedText("FPS cap:");
+ }
+ ImGui::EndGroup();
+
+ ImGui::SameLine();
+
+ ImGui::BeginGroup();
+
+ static const char* framelimit_labels[] = {
+ "Off",
+ "Every VBLANK",
+ "Every second VBLANK",
+ "Every third VBLANK",
+ };
+
+ ImGui::PushItemWidth(300.0f);
+
+ if(ImGui::BeginCombo("##FrameLimit", framelimit_labels[conf().swapInterval()])) {
+ for(int i = 0; i <= 3; i++) {
+ if(ImGui::Selectable(framelimit_labels[i], conf().swapInterval() == i)) {
+ conf().setSwapInterval(i);
+ setSwapInterval(i);
+ if(i == 0) {
+ setMinimalLoopPeriod(0);
+ }
+ }
+ }
+
+ ImGui::EndCombo();
+ }
+
+ if(conf().swapInterval() == 0) {
+ static float fps_cap = conf().fpsCap();
+ if(ImGui::SliderFloat("##FpsCapSlider", &fps_cap, 15.0f, 301.0f,
+ conf().fpsCap() != 301.0f ? "%.0f" : "Uncapped", ImGuiSliderFlags_AlwaysClamp))
+ {
+ conf().setFpsCap(fps_cap);
+ }
+ }
+
+ ImGui::PopItemWidth();
+
+ ImGui::EndGroup();
+
+ if(drawCheckbox("Cheat mode", conf().cheatMode())) {
+ conf().setCheatMode(!conf().cheatMode());
+ }
+ ImGui::SameLine();
+ ImGui::AlignTextToFramePadding();
+ drawHelpMarker("This gives access to save edition features that can be considered cheats.",
+ float(windowSize().x()) * 0.4f);
+
+ if(drawCheckbox("Advanced mode", conf().advancedMode())) {
+ conf().setAdvancedMode(!conf().advancedMode());
+ }
+ ImGui::SameLine();
+ ImGui::AlignTextToFramePadding();
+ drawHelpMarker("This gives access to editing values that have unknown purposes or are undocumented.",
+ float(windowSize().x()) * 0.4f);
+
+ if(drawCheckbox("Check for updates on startup", conf().checkUpdatesOnStartup())) {
+ conf().setCheckUpdatesOnStartup(!conf().checkUpdatesOnStartup());
+ }
+ ImGui::SameLine();
+ if(ImGui::Button(ICON_FA_SYNC_ALT " Check now")) {
+ _queue.addToast(Toast::Type::Default, "Checking for updates...");
+ _updateThread = std::thread{[this]{ checkForUpdates(); }};
+ }
+
+ if(_checker && _checkerMutex.try_lock()) {
+ if(_checker->updateAvailable()) {
+ drawAlignedText("Version %s is available.", Containers::String{_checker->version()}.data());
+ if(ImGui::Button(ICON_FA_FILE_SIGNATURE " Release notes")) {
+ openUri("https://williamjcm.ovh/mbst");
+ }
+ ImGui::SameLine();
+ if(ImGui::Button(ICON_FA_DOWNLOAD " Download now")) {
+ openUri(_checker->downloadLink());
+ }
+ }
+ _checkerMutex.unlock();
+ }
+
+ if(drawCheckbox("Skip disclaimer", conf().skipDisclaimer())) {
+ conf().setSkipDisclaimer(!conf().skipDisclaimer());
+ }
+
+ ImGui::EndMenu();
+ }
+
+ ImGui::Separator();
+
+ if(ImGui::MenuItem(ICON_FA_SIGN_OUT_ALT " Quit##QuitMenuItem")) {
+ exit(EXIT_SUCCESS);
+ }
+
+ ImGui::EndMenu();
+ }
+
+ ImGui::BeginDisabled(conf().isRunningInWine());
+ if(ImGui::BeginMenu("Game##GameMenu")) {
+ if(ImGui::MenuItem(ICON_FA_PLAY " Run demo##RunDemoMenuItem")) {
+ openUri("steam://run/1048390");
+ }
+ drawTooltip("Will not work if you have the full game.");
+
+ if(ImGui::MenuItem(ICON_FA_PLAY " Run full game##RunFullGameMenuItem")) {
+ openUri("steam://run/956680");
+ }
+
+ ImGui::Separator();
+
+ if(ImGui::BeginMenu(ICON_FA_DISCORD " Discord communities")) {
+ if(ImGui::MenuItem("Official server")) {
+ openUri("https://discord.gg/sekai-project");
+ }
+
+ if(ImGui::MenuItem("Community server")) {
+ openUri("https://discord.gg/massbuildercommunity");
+ }
+
+ ImGui::EndMenu();
+ }
+
+ ImGui::EndMenu();
+ }
+ ImGui::EndDisabled();
+ if(conf().isRunningInWine() && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
+ ImGui::SetTooltip("Not available when running in Wine.");
+ }
+
+ #ifdef SAVETOOL_DEBUG_BUILD
+ if(ImGui::BeginMenu("Debug tools")) {
+ ImGui::MenuItem("ImGui demo window", nullptr, &_demoWindow);
+ ImGui::MenuItem("ImGui style editor", nullptr, &_styleEditor);
+ ImGui::MenuItem("ImGui metrics window", nullptr, &_metricsWindow);
+
+ ImGui::EndMenu();
+ }
+ #endif
+
+ if(ImGui::BeginMenu("Help")) {
+ if(ImGui::BeginMenu(ICON_FA_KEYBOARD " Keyboard shortcuts")) {
+ ImGui::BulletText("CTRL+Click on a slider or drag box to input value as text.");
+ ImGui::BulletText("TAB/SHIFT+TAB to cycle through keyboard editable fields.");
+ ImGui::BulletText("While inputing text:\n");
+ ImGui::Indent();
+ ImGui::BulletText("CTRL+Left/Right to word jump.");
+ ImGui::BulletText("CTRL+A or double-click to select all.");
+ ImGui::BulletText("CTRL+X/C/V to use clipboard cut/copy/paste.");
+ ImGui::BulletText("CTRL+Z,CTRL+Y to undo/redo.");
+ ImGui::BulletText("ESCAPE to revert.");
+ ImGui::BulletText("You can apply arithmetic operators +,*,/ on numerical values.\nUse +- to subtract.");
+ ImGui::Unindent();
+ ImGui::EndMenu();
+ }
+ ImGui::MenuItem(ICON_FA_INFO_CIRCLE " About", nullptr, &_aboutPopup);
+
+ ImGui::EndMenu();
+ }
+
+ if(_gameCheckTimerId != 0) {
+ if(ImGui::BeginTable("##MainMenuLayout", 2)) {
+ ImGui::TableSetupColumn("##Dummy", ImGuiTableColumnFlags_WidthStretch);
+ ImGui::TableSetupColumn("##GameState", ImGuiTableColumnFlags_WidthFixed);
+
+ ImGui::TableNextRow();
+ ImGui::TableSetColumnIndex(1);
+ drawGameState();
+
+ ImGui::EndTable();
+ }
+ }
+
+ ImGui::EndMainMenuBar();
+}
+
+}
diff --git a/src/BinaryIo/BinaryIo.h b/src/BinaryIo/BinaryIo.h
new file mode 100644
index 0000000..8cc09a6
--- /dev/null
+++ b/src/BinaryIo/BinaryIo.h
@@ -0,0 +1,24 @@
+#pragma once
+
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+namespace BinaryIo {
+
+class Reader;
+class Writer;
+
+}
diff --git a/src/BinaryIo/Reader.cpp b/src/BinaryIo/Reader.cpp
new file mode 100644
index 0000000..c00edfc
--- /dev/null
+++ b/src/BinaryIo/Reader.cpp
@@ -0,0 +1,150 @@
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+
+#include
+#include
+
+#include "../Logger/Logger.h"
+
+#include "Reader.h"
+
+namespace BinaryIo {
+
+Reader::Reader(Containers::StringView filename) {
+ _file = std::fopen(filename.data(), "rb");
+
+ if(!_file) {
+ LOG_ERROR_FORMAT("Couldn't open {} for reading: {}", filename, std::strerror(errno));
+ }
+}
+
+Reader::~Reader() {
+ closeFile();
+}
+
+bool
+Reader::open() {
+ return _file;
+}
+
+bool
+Reader::eof() {
+ return std::feof(_file) != 0;
+}
+
+std::int64_t
+Reader::position() {
+ return _ftelli64(_file);
+}
+
+bool
+Reader::seek(std::int64_t position) {
+ return _fseeki64(_file, position, SEEK_SET) == 0;
+}
+
+void
+Reader::closeFile() {
+ std::fclose(_file);
+ _file = nullptr;
+}
+
+bool
+Reader::readChar(char& value) {
+ return std::fread(&value, sizeof(char), 1, _file) == 1;
+}
+
+bool
+Reader::readInt8(std::int8_t& value) {
+ return std::fread(&value, sizeof(std::int8_t), 1, _file) == 1;
+}
+
+bool
+Reader::readUint8(std::uint8_t& value) {
+ return std::fread(&value, sizeof(std::uint8_t), 1, _file) == 1;
+}
+
+bool
+Reader::readInt16(std::int16_t& value) {
+ return std::fread(&value, sizeof(std::int16_t), 1, _file) == 1;
+}
+
+bool
+Reader::readUint16(std::uint16_t& value) {
+ return std::fread(&value, sizeof(std::uint16_t), 1, _file) == 1;
+}
+
+bool
+Reader::readInt32(std::int32_t& value) {
+ return std::fread(&value, sizeof(std::int32_t), 1, _file) == 1;
+}
+
+bool
+Reader::readUint32(std::uint32_t& value) {
+ return std::fread(&value, sizeof(std::uint32_t), 1, _file) == 1;
+}
+
+bool
+Reader::readInt64(std::int64_t& value) {
+ return std::fread(&value, sizeof(std::int64_t), 1, _file) == 1;
+}
+
+bool
+Reader::readUint64(std::uint64_t& value) {
+ return std::fread(&value, sizeof(std::uint64_t), 1, _file) == 1;
+}
+
+bool
+Reader::readFloat(float& value) {
+ return std::fread(&value, sizeof(float), 1, _file) == 1;
+}
+
+bool
+Reader::readDouble(double& value) {
+ return std::fread(&value, sizeof(double), 1, _file) == 1;
+}
+
+bool
+Reader::readArray(Containers::Array& array, std::size_t count) {
+ if(array.size() < count) {
+ array = Containers::Array{ValueInit, count};
+ }
+
+ return std::fread(array.data(), sizeof(char), count, _file) == count;
+}
+
+bool
+Reader::readUEString(Containers::String& str) {
+ std::uint32_t length = 0;
+ if(!readUint32(length) || length == 0) {
+ return false;
+ }
+
+ str = Containers::String{ValueInit, length - 1};
+
+ return std::fread(str.data(), sizeof(char), length, _file) == length;
+}
+
+std::int32_t
+Reader::peekChar() {
+ std::int32_t c;
+ c = std::fgetc(_file);
+ std::ungetc(c, _file);
+ return c;
+}
+
+}
diff --git a/src/BinaryIo/Reader.h b/src/BinaryIo/Reader.h
new file mode 100644
index 0000000..6a00886
--- /dev/null
+++ b/src/BinaryIo/Reader.h
@@ -0,0 +1,80 @@
+#pragma once
+
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+#include
+
+#include
+#include
+#include
+
+using namespace Corrade;
+
+namespace BinaryIo {
+
+class Reader {
+ public:
+ explicit Reader(Containers::StringView filename);
+ ~Reader();
+
+ Reader(const Reader& other) = delete;
+ Reader& operator=(const Reader& other) = delete;
+
+ Reader(Reader&& other) = default;
+ Reader& operator=(Reader&& other) = default;
+
+ bool open();
+ bool eof();
+ auto position() -> std::int64_t;
+
+ bool seek(std::int64_t position);
+
+ void closeFile();
+
+ bool readChar(char& value);
+ bool readInt8(std::int8_t& value);
+ bool readUint8(std::uint8_t& value);
+ bool readInt16(std::int16_t& value);
+ bool readUint16(std::uint16_t& value);
+ bool readInt32(std::int32_t& value);
+ bool readUint32(std::uint32_t& value);
+ bool readInt64(std::int64_t& value);
+ bool readUint64(std::uint64_t& value);
+ bool readFloat(float& value);
+ bool readDouble(double& value);
+ bool readArray(Containers::Array& array, std::size_t count);
+
+ template
+ bool readValue(T& value) {
+ return fread(&value, sizeof(T), 1, _file) == 1;
+ }
+
+ template
+ bool readStaticArray(Containers::StaticArray& array) {
+ return std::fread(array.data(), sizeof(char), S, _file) == S;
+ }
+
+ bool readUEString(Containers::String& str);
+
+ auto peekChar() -> std::int32_t;
+
+ private:
+ std::FILE* _file = nullptr;
+};
+
+}
diff --git a/src/BinaryIo/Writer.cpp b/src/BinaryIo/Writer.cpp
new file mode 100644
index 0000000..4a0bb5d
--- /dev/null
+++ b/src/BinaryIo/Writer.cpp
@@ -0,0 +1,163 @@
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+
+#include "../Logger/Logger.h"
+
+#include "Writer.h"
+
+using namespace Containers::Literals;
+
+namespace BinaryIo {
+
+Writer::Writer(Containers::StringView filename) {
+ _file = std::fopen(filename.data(), "wb");
+ if(!_file) {
+ LOG_ERROR_FORMAT("Couldn't open {} for reading: {}", filename, std::strerror(errno));
+ }
+}
+
+Writer::~Writer() {
+ closeFile();
+}
+
+bool
+Writer::open() {
+ return _file;
+}
+
+void
+Writer::closeFile() {
+ std::fflush(_file);
+ std::fclose(_file);
+ _file = nullptr;
+}
+
+std::int64_t
+Writer::position() {
+ return _ftelli64(_file);
+}
+
+Containers::ArrayView
+Writer::array() const {
+ return _data;
+}
+
+std::size_t
+Writer::arrayPosition() const {
+ return _index;
+}
+
+bool
+Writer::flushToFile() {
+ bool ret = writeArray(_data);
+ std::fflush(_file);
+ _data = Containers::Array{};
+ _index = 0;
+ return ret;
+}
+
+bool
+Writer::writeChar(char value) {
+ return std::fwrite(&value, sizeof(char), 1, _file) == 1;
+}
+
+bool
+Writer::writeInt8(std::int8_t value) {
+ return std::fwrite(&value, sizeof(std::int8_t), 1, _file) == 1;
+}
+
+bool
+Writer::writeUint8(std::uint8_t value) {
+ return std::fwrite(&value, sizeof(std::uint8_t), 1, _file) == 1;
+}
+
+bool
+Writer::writeInt16(std::int16_t value) {
+ return std::fwrite(&value, sizeof(std::int16_t), 1, _file) == 1;
+}
+
+bool
+Writer::writeUint16(std::uint16_t value) {
+ return std::fwrite(&value, sizeof(std::uint16_t), 1, _file) == 1;
+}
+
+bool
+Writer::writeInt32(std::int32_t value) {
+ return std::fwrite(&value, sizeof(std::int32_t), 1, _file) == 1;
+}
+
+bool
+Writer::writeUint32(std::uint32_t value) {
+ return std::fwrite(&value, sizeof(std::uint32_t), 1, _file) == 1;
+}
+
+bool
+Writer::writeInt64(std::int64_t value) {
+ return std::fwrite(&value, sizeof(std::int64_t), 1, _file) == 1;
+}
+
+bool
+Writer::writeUint64(std::uint64_t value) {
+ return std::fwrite(&value, sizeof(std::uint64_t), 1, _file) == 1;
+}
+
+bool
+Writer::writeFloat(float value) {
+ return std::fwrite(&value, sizeof(float), 1, _file) == 1;
+}
+
+bool
+Writer::writeDouble(double value) {
+ return std::fwrite(&value, sizeof(double), 1, _file) == 1;
+}
+
+bool
+Writer::writeArray(Containers::ArrayView array) {
+ if(array.isEmpty()) {
+ return false;
+ }
+
+ return std::fwrite(array.data(), sizeof(char), array.size(), _file) == array.size();
+}
+
+bool
+Writer::writeUEString(Containers::StringView str) {
+ if(str.size() > UINT32_MAX) {
+ LOG_ERROR_FORMAT("String is too big. Expected size() < UINT32_MAX, got {} instead.", str.size());
+ return false;
+ }
+
+ writeUint32(static_cast(str.size()) + 1);
+
+ if(str.size() > 0) {
+ std::size_t count = std::fwrite(str.data(), sizeof(char), str.size(), _file);
+ if(count != str.size()) {
+ return false;
+ }
+ }
+ return writeChar('\0');
+}
+
+std::size_t
+Writer::writeUEStringToArray(Containers::StringView value) {
+ return writeValueToArray(std::uint32_t(value.size()) + 1u) +
+ writeDataToArray(Containers::ArrayView{value}) +
+ writeValueToArray('\0');
+}
+
+}
diff --git a/src/UESaveFile/BinaryWriter.h b/src/BinaryIo/Writer.h
similarity index 55%
rename from src/UESaveFile/BinaryWriter.h
rename to src/BinaryIo/Writer.h
index efdc4ed..763622e 100644
--- a/src/UESaveFile/BinaryWriter.h
+++ b/src/BinaryIo/Writer.h
@@ -1,7 +1,7 @@
#pragma once
// MassBuilderSaveTool
-// Copyright (C) 2021-2022 Guillaume Jacquemin
+// Copyright (C) 2021-2024 Guillaume Jacquemin
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
+#include
#include
#include
@@ -23,81 +24,80 @@
#include
#include
-#include
-
using namespace Corrade;
-using namespace Magnum;
-class BinaryWriter {
+namespace BinaryIo {
+
+class Writer {
public:
- explicit BinaryWriter(Containers::StringView filename);
- ~BinaryWriter();
+ explicit Writer(Containers::StringView filename);
+ ~Writer();
- BinaryWriter(const BinaryWriter& other) = delete;
- BinaryWriter& operator=(const BinaryWriter& other) = delete;
+ Writer(const Writer& other) = delete;
+ Writer& operator=(const Writer& other) = delete;
- BinaryWriter(BinaryWriter&& other) = default;
- BinaryWriter& operator=(BinaryWriter&& other) = default;
+ Writer(Writer&& other) = default;
+ Writer& operator=(Writer&& other) = default;
- auto open() -> bool;
+ bool open();
void closeFile();
- auto position() -> Long;
+ auto position() -> std::int64_t;
auto array() const -> Containers::ArrayView;
- auto arrayPosition() const -> UnsignedLong;
- auto flushToFile() -> bool;
+ auto arrayPosition() const -> std::size_t;
+ bool flushToFile();
- auto writeByte(Byte value) -> bool;
- auto writeChar(char value) -> bool;
- auto writeUnsignedByte(UnsignedByte value) -> bool;
- auto writeShort(Short value) -> bool;
- auto writeUnsignedShort(UnsignedShort value) -> bool;
- auto writeInt(Int value) -> bool;
- auto writeUnsignedInt(UnsignedInt value) -> bool;
- auto writeLong(Long value) -> bool;
- auto writeUnsignedLong(UnsignedLong value) -> bool;
- auto writeFloat(Float value) -> bool;
- auto writeDouble(Double value) -> bool;
- auto writeArray(Containers::ArrayView array) -> bool;
+ bool writeChar(char value);
+ bool writeInt8(std::int8_t value);
+ bool writeUint8(std::uint8_t value);
+ bool writeInt16(std::int16_t value);
+ bool writeUint16(std::uint16_t value);
+ bool writeInt32(std::int32_t value);
+ bool writeUint32(std::uint32_t value);
+ bool writeInt64(std::int64_t value);
+ bool writeUint64(std::uint64_t value);
+ bool writeFloat(float value);
+ bool writeDouble(double value);
+ bool writeArray(Containers::ArrayView array);
template
- auto writeString(const char(&str)[size]) -> bool {
+ bool writeString(const char(&str)[size]) {
return writeArray({str, size - 1});
}
template
- auto writeStaticArray(Containers::StaticArrayView array) -> bool {
+ bool writeStaticArray(Containers::StaticArrayView array) {
return std::fwrite(array.data(), sizeof(char), S, _file) == S;
}
- auto writeUEString(Containers::StringView str) -> bool;
+ bool writeUEString(Containers::StringView str);
template::value, T, T&>>
- auto writeValueToArray(U value) -> UnsignedLong {
+ auto writeValueToArray(U value) -> std::size_t {
Containers::ArrayView view{&value, 1};
return writeDataToArray(view);
}
- auto writeUEStringToArray(Containers::StringView value) -> UnsignedLong;
+ auto writeUEStringToArray(Containers::StringView value) -> std::size_t;
template
- void writeValueToArrayAt(T& value, UnsignedLong position) {
+ void writeValueToArrayAt(T& value, std::size_t position) {
Containers::ArrayView view{&value, 1};
writeDataToArrayAt(view, position);
}
template
- auto writeDataToArray(Containers::ArrayView view) -> UnsignedLong {
+ auto writeDataToArray(Containers::ArrayView view) -> std::size_t {
arrayAppend(_data, Containers::arrayCast(view));
_index += sizeof(T) * view.size();
return sizeof(T) * view.size();
}
template
- void writeDataToArrayAt(Containers::ArrayView view, UnsignedLong position) {
+ void writeDataToArrayAt(Containers::ArrayView view, std::size_t position) {
auto casted_view = Containers::arrayCast(view);
- for(UnsignedLong i = 0; i < casted_view.size(); i++) {
+ for(std::size_t i = 0; i < casted_view.size(); i++) {
_data[position + i] = casted_view[i];
}
}
@@ -106,5 +106,7 @@ class BinaryWriter {
FILE* _file = nullptr;
Containers::Array _data;
- UnsignedLong _index = 0;
+ std::size_t _index = 0;
};
+
+}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93d4596..8fbd5ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
# MassBuilderSaveTool
-# Copyright (C) 2021-2022 Guillaume Jacquemin
+# Copyright (C) 2021-2024 Guillaume Jacquemin
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,21 +14,36 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
-set(SAVETOOL_PROJECT_VERSION 1.4.3)
+set(SAVETOOL_PROJECT_VERSION 1.5.0)
-find_package(Corrade REQUIRED Main Containers Utility)
+find_package(Corrade REQUIRED Containers Utility)
+if(CORRADE_TARGET_WINDOWS)
+ find_package(Corrade REQUIRED Main)
+endif()
find_package(Magnum REQUIRED GL Sdl2Application)
find_package(MagnumIntegration REQUIRED ImGui)
+if(SAVETOOL_USE_SYSTEM_LIBZIP)
+ find_package(libzip REQUIRED)
+endif(SAVETOOL_USE_SYSTEM_LIBZIP)
+
+if(SAVETOOL_USE_SYSTEM_EFSW)
+ find_package(efsw REQUIRED)
+endif(SAVETOOL_USE_SYSTEM_EFSW)
+
+if(SAVETOOL_USE_SYSTEM_LIBCURL)
+ find_package(CURL REQUIRED HTTPS)
+endif(SAVETOOL_USE_SYSTEM_LIBCURL)
+
set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)
corrade_add_resource(Assets assets.conf)
-add_library(Logger STATIC EXCLUDE_FROM_ALL
+set(Logger_SOURCES
Logger/Logger.h
Logger/Logger.cpp
Logger/EntryType.h
@@ -36,164 +51,200 @@ add_library(Logger STATIC EXCLUDE_FROM_ALL
Logger/MagnumLogBuffer.cpp
)
-target_link_libraries(Logger PRIVATE
- Corrade::Utility
- Magnum::Magnum
+set(BinaryIo_SOURCES
+ BinaryIo/BinaryIo.h
+ BinaryIo/Reader.h
+ BinaryIo/Reader.cpp
+ BinaryIo/Writer.h
+ BinaryIo/Writer.cpp
)
-add_library(UESaveFile STATIC EXCLUDE_FROM_ALL
- UESaveFile/Serialisers/AbstractUnrealCollectionPropertySerialiser.h
- UESaveFile/Serialisers/AbstractUnrealPropertySerialiser.h
- UESaveFile/Serialisers/AbstractUnrealStructSerialiser.h
- UESaveFile/Serialisers/ArrayPropertySerialiser.h
- UESaveFile/Serialisers/ArrayPropertySerialiser.cpp
- UESaveFile/Serialisers/BoolPropertySerialiser.h
- UESaveFile/Serialisers/BoolPropertySerialiser.cpp
- UESaveFile/Serialisers/BytePropertySerialiser.h
- UESaveFile/Serialisers/BytePropertySerialiser.cpp
- UESaveFile/Serialisers/ColourPropertySerialiser.h
- UESaveFile/Serialisers/ColourPropertySerialiser.cpp
- UESaveFile/Serialisers/DateTimePropertySerialiser.h
- UESaveFile/Serialisers/DateTimePropertySerialiser.cpp
- UESaveFile/Serialisers/EnumPropertySerialiser.h
- UESaveFile/Serialisers/EnumPropertySerialiser.cpp
- UESaveFile/Serialisers/FloatPropertySerialiser.h
- UESaveFile/Serialisers/FloatPropertySerialiser.cpp
- UESaveFile/Serialisers/GuidPropertySerialiser.h
- UESaveFile/Serialisers/GuidPropertySerialiser.cpp
- UESaveFile/Serialisers/IntPropertySerialiser.h
- UESaveFile/Serialisers/IntPropertySerialiser.cpp
- UESaveFile/Serialisers/MapPropertySerialiser.h
- UESaveFile/Serialisers/MapPropertySerialiser.cpp
- UESaveFile/Serialisers/ResourcePropertySerialiser.h
- UESaveFile/Serialisers/ResourcePropertySerialiser.cpp
- UESaveFile/Serialisers/RotatorPropertySerialiser.h
- UESaveFile/Serialisers/RotatorPropertySerialiser.cpp
- UESaveFile/Serialisers/StringPropertySerialiser.h
- UESaveFile/Serialisers/StringPropertySerialiser.cpp
- UESaveFile/Serialisers/SetPropertySerialiser.h
- UESaveFile/Serialisers/SetPropertySerialiser.cpp
- UESaveFile/Serialisers/StructSerialiser.h
- UESaveFile/Serialisers/StructSerialiser.cpp
- UESaveFile/Serialisers/TextPropertySerialiser.h
- UESaveFile/Serialisers/TextPropertySerialiser.cpp
- UESaveFile/Serialisers/UnrealPropertySerialiser.h
- UESaveFile/Serialisers/VectorPropertySerialiser.h
- UESaveFile/Serialisers/VectorPropertySerialiser.cpp
- UESaveFile/Serialisers/Vector2DPropertySerialiser.h
- UESaveFile/Serialisers/Vector2DPropertySerialiser.cpp
+set(Gvas_SOURCES
+ Gvas/Serialisers/Serialisers.h
+ Gvas/Serialisers/AbstractUnrealCollectionProperty.h
+ Gvas/Serialisers/AbstractUnrealProperty.h
+ Gvas/Serialisers/AbstractUnrealStruct.h
+ Gvas/Serialisers/ArrayProperty.h
+ Gvas/Serialisers/ArrayProperty.cpp
+ Gvas/Serialisers/BoolProperty.h
+ Gvas/Serialisers/BoolProperty.cpp
+ Gvas/Serialisers/ByteProperty.h
+ Gvas/Serialisers/ByteProperty.cpp
+ Gvas/Serialisers/ColourProperty.h
+ Gvas/Serialisers/ColourProperty.cpp
+ Gvas/Serialisers/DateTimeProperty.h
+ Gvas/Serialisers/DateTimeProperty.cpp
+ Gvas/Serialisers/EnumProperty.h
+ Gvas/Serialisers/EnumProperty.cpp
+ Gvas/Serialisers/FloatProperty.h
+ Gvas/Serialisers/FloatProperty.cpp
+ Gvas/Serialisers/GuidProperty.h
+ Gvas/Serialisers/GuidProperty.cpp
+ Gvas/Serialisers/IntProperty.h
+ Gvas/Serialisers/IntProperty.cpp
+ Gvas/Serialisers/MapProperty.h
+ Gvas/Serialisers/MapProperty.cpp
+ Gvas/Serialisers/ResourceProperty.h
+ Gvas/Serialisers/ResourceProperty.cpp
+ Gvas/Serialisers/RotatorProperty.h
+ Gvas/Serialisers/RotatorProperty.cpp
+ Gvas/Serialisers/StringProperty.h
+ Gvas/Serialisers/StringProperty.cpp
+ Gvas/Serialisers/SetProperty.h
+ Gvas/Serialisers/SetProperty.cpp
+ Gvas/Serialisers/Struct.h
+ Gvas/Serialisers/Struct.cpp
+ Gvas/Serialisers/TextProperty.h
+ Gvas/Serialisers/TextProperty.cpp
+ Gvas/Serialisers/UnrealProperty.h
+ Gvas/Serialisers/VectorProperty.h
+ Gvas/Serialisers/VectorProperty.cpp
+ Gvas/Serialisers/Vector2DProperty.h
+ Gvas/Serialisers/Vector2DProperty.cpp
- UESaveFile/Types/ArrayProperty.h
- UESaveFile/Types/BoolProperty.h
- UESaveFile/Types/ByteProperty.h
- UESaveFile/Types/ColourStructProperty.h
- UESaveFile/Types/DateTimeStructProperty.h
- UESaveFile/Types/EnumProperty.h
- UESaveFile/Types/FloatProperty.h
- UESaveFile/Types/GenericStructProperty.h
- UESaveFile/Types/GuidStructProperty.h
- UESaveFile/Types/IntProperty.h
- UESaveFile/Types/MapProperty.h
- UESaveFile/Types/NoneProperty.h
- UESaveFile/Types/RotatorStructProperty.h
- UESaveFile/Types/SetProperty.h
- UESaveFile/Types/StringProperty.h
- UESaveFile/Types/StructProperty.h
- UESaveFile/Types/ResourceItemValue.h
- UESaveFile/Types/TextProperty.h
- UESaveFile/Types/UnrealProperty.h
- UESaveFile/Types/UnrealPropertyBase.h
- UESaveFile/Types/VectorStructProperty.h
+ Gvas/Types/Types.h
+ Gvas/Types/ArrayProperty.h
+ Gvas/Types/BoolProperty.h
+ Gvas/Types/ByteProperty.h
+ Gvas/Types/ColourStructProperty.h
+ Gvas/Types/DateTimeStructProperty.h
+ Gvas/Types/EnumProperty.h
+ Gvas/Types/FloatProperty.h
+ Gvas/Types/GenericStructProperty.h
+ Gvas/Types/GuidStructProperty.h
+ Gvas/Types/IntProperty.h
+ Gvas/Types/MapProperty.h
+ Gvas/Types/NoneProperty.h
+ Gvas/Types/RotatorStructProperty.h
+ Gvas/Types/SetProperty.h
+ Gvas/Types/StringProperty.h
+ Gvas/Types/StructProperty.h
+ Gvas/Types/ResourceItemValue.h
+ Gvas/Types/TextProperty.h
+ Gvas/Types/UnrealProperty.h
+ Gvas/Types/UnrealPropertyBase.h
+ Gvas/Types/Vector2DStructProperty.h
+ Gvas/Types/VectorStructProperty.h
- UESaveFile/Debug.h
- UESaveFile/Debug.cpp
- UESaveFile/UESaveFile.h
- UESaveFile/UESaveFile.cpp
- UESaveFile/BinaryReader.h
- UESaveFile/BinaryReader.cpp
- UESaveFile/BinaryWriter.h
- UESaveFile/BinaryWriter.cpp
- UESaveFile/PropertySerialiser.h
- UESaveFile/PropertySerialiser.cpp
+ Gvas/Gvas.h
+ Gvas/Debug.h
+ Gvas/Debug.cpp
+ Gvas/File.h
+ Gvas/File.cpp
+ Gvas/PropertySerialiser.h
+ Gvas/PropertySerialiser.cpp
)
-target_link_libraries(UESaveFile PRIVATE
- Corrade::Containers
- Corrade::Utility
- Magnum::Magnum
- Logger
+set(ImportExport_SOURCES
+ ImportExport/Import.h
+ ImportExport/Import.cpp
+ ImportExport/Export.h
+ ImportExport/Export.cpp
+ ImportExport/Keys.h
)
-add_executable(MassBuilderSaveTool WIN32
+if(CORRADE_TARGET_WINDOWS)
+ set(SAVETOOL_RC_FILE resource.rc)
+endif()
+
+add_executable(MassBuilderSaveTool
main.cpp
- SaveTool/SaveTool.h
- SaveTool/SaveTool.cpp
- SaveTool/SaveTool_drawAbout.cpp
- SaveTool/SaveTool_drawMainMenu.cpp
- SaveTool/SaveTool_FileWatcher.cpp
- SaveTool/SaveTool_Initialisation.cpp
- SaveTool/SaveTool_MainManager.cpp
- SaveTool/SaveTool_MassViewer.cpp
- SaveTool/SaveTool_MassViewer_Frame.cpp
- SaveTool/SaveTool_MassViewer_Armour.cpp
- SaveTool/SaveTool_MassViewer_Weapons.cpp
- SaveTool/SaveTool_ProfileManager.cpp
- SaveTool/SaveTool_UpdateChecker.cpp
- ProfileManager/ProfileManager.h
- ProfileManager/ProfileManager.cpp
- Profile/Profile.h
- Profile/Profile.cpp
- Profile/PropertyNames.h
- Profile/ResourceIDs.h
- MassManager/MassManager.h
- MassManager/MassManager.cpp
- Mass/Accessory.h
- Mass/ArmourPart.h
- Mass/BulletLauncherAttachment.h
- Mass/CustomStyle.h
- Mass/Decal.h
- Mass/Joints.h
- Mass/Mass.h
- Mass/Mass.cpp
- Mass/Mass_Frame.cpp
- Mass/Mass_Armour.cpp
- Mass/Mass_Weapons.cpp
- Mass/Mass_Styles.cpp
- Mass/Mass_DecalsAccessories.cpp
- Mass/PropertyNames.h
- Mass/Weapon.h
- Mass/Weapon.cpp
- Mass/WeaponPart.h
- Maps/Accessories.h
- Maps/ArmourSets.h
+ Application/Application.h
+ Application/Application.cpp
+ Application/Application_drawAbout.cpp
+ Application/Application_drawMainMenu.cpp
+ Application/Application_FileWatcher.cpp
+ Application/Application_Initialisation.cpp
+ Application/Application_MainManager.cpp
+ Application/Application_MassViewer.cpp
+ Application/Application_MassViewer_Frame.cpp
+ Application/Application_MassViewer_Armour.cpp
+ Application/Application_MassViewer_Weapons.cpp
+ Application/Application_ProfileManager.cpp
+ Application/Application_UpdateChecker.cpp
+ Configuration/Configuration.h
+ Configuration/Configuration.cpp
+ FontAwesome/IconsFontAwesome5.h
+ FontAwesome/IconsFontAwesome5Brands.h
+ GameData/Accessories.h
+ GameData/ArmourSets.h
+ GameData/LastMissionId.h
+ GameData/ResourceIDs.h
+ GameData/StoryProgress.h
+ GameData/StyleNames.h
+ GameData/WeaponParts.h
+ GameObjects/Accessory.h
+ GameObjects/ArmourPart.h
+ GameObjects/BulletLauncherAttachment.h
+ GameObjects/CustomStyle.h
+ GameObjects/Decal.h
+ GameObjects/Joints.h
+ GameObjects/Mass.h
+ GameObjects/Mass.cpp
+ GameObjects/Mass_Frame.cpp
+ GameObjects/Mass_Armour.cpp
+ GameObjects/Mass_Weapons.cpp
+ GameObjects/Mass_Styles.cpp
+ GameObjects/Mass_DecalsAccessories.cpp
+ GameObjects/Profile.h
+ GameObjects/Profile.cpp
+ GameObjects/PropertyNames.h
+ GameObjects/Weapon.h
+ GameObjects/Weapon.cpp
+ GameObjects/WeaponPart.h
+ Managers/Backup.h
+ Managers/BackupManager.h
+ Managers/BackupManager.cpp
+ Managers/MassManager.h
+ Managers/MassManager.cpp
+ Managers/ProfileManager.h
+ Managers/ProfileManager.cpp
+ Managers/StagedMass.h
+ Managers/StagedMassManager.h
+ Managers/StagedMassManager.cpp
+ Managers/Vfs/Directory.h
Maps/ArmourSlots.hpp
Maps/BulletLauncherAttachmentStyles.hpp
Maps/BulletLauncherSockets.hpp
Maps/DamageTypes.hpp
Maps/EffectColourModes.hpp
- Maps/LastMissionId.h
- Maps/StoryProgress.h
- Maps/StyleNames.h
- Maps/WeaponParts.h
Maps/WeaponTypes.hpp
ToastQueue/ToastQueue.h
ToastQueue/ToastQueue.cpp
+ UpdateChecker/UpdateChecker.h
+ UpdateChecker/UpdateChecker.cpp
Utilities/Crc32.h
- FontAwesome/IconsFontAwesome5.h
- FontAwesome/IconsFontAwesome5Brands.h
- resource.rc
+ Utilities/Crc32.cpp
+ Utilities/Temp.h
+ Utilities/Temp.cpp
+ Version/Version.h
+ Version/Version.cpp
+ ${Logger_SOURCES}
+ ${BinaryIo_SOURCES}
+ ${Gvas_SOURCES}
+ ${ImportExport_SOURCES}
+ ${SAVETOOL_RC_FILE}
${Assets}
)
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
- add_compile_definitions(SAVETOOL_DEBUG_BUILD)
+if(CORRADE_TARGET_WINDOWS)
+ set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE $)
endif()
-add_compile_definitions(
- SAVETOOL_VERSION="${SAVETOOL_PROJECT_VERSION}"
- SAVETOOL_CODENAME="Enigmatic Ellenier"
- SUPPORTED_GAME_VERSION="0.9.x"
+
+target_compile_definitions(MassBuilderSaveTool PRIVATE
+ SAVETOOL_VERSION_STRING="${SAVETOOL_PROJECT_VERSION}"
+ SAVETOOL_VERSION_MAJOR=1
+ SAVETOOL_VERSION_MINOR=5
+ SAVETOOL_VERSION_PATCH=0
+ SAVETOOL_VERSION_PRERELEASE=false
+ SAVETOOL_CODENAME="Fuckin' UE5..."
+ SAVETOOL_SUPPORTED_GAME_VERSION="0.11.x"
)
+if(CMAKE_BUILD_TYPE STREQUAL Debug)
+ target_compile_definitions(MassBuilderSaveTool PRIVATE SAVETOOL_DEBUG_BUILD)
+endif()
+
if(CMAKE_BUILD_TYPE STREQUAL Release)
set_target_properties(MassBuilderSaveTool PROPERTIES OUTPUT_NAME MassBuilderSaveTool-${SAVETOOL_PROJECT_VERSION})
endif()
@@ -207,16 +258,29 @@ endif()
target_link_libraries(MassBuilderSaveTool PRIVATE
Corrade::Containers
Corrade::Utility
- Corrade::Main
Magnum::Magnum
Magnum::GL
Magnum::Sdl2Application
MagnumIntegration::ImGui
- Logger
- UESaveFile
- efsw
- zip
- libcurl
- imm32
- wtsapi32
+ CURL::libcurl_static
)
+
+if(SAVETOOL_USE_SYSTEM_LIBZIP)
+ target_link_libraries(MassBuilderSaveTool PRIVATE libzip::zip)
+else()
+ target_link_libraries(MassBuilderSaveTool PRIVATE zip)
+endif()
+
+if(SAVETOOL_USE_SYSTEM_EFSW)
+ target_link_libraries(MassBuilderSaveTool PRIVATE efsw::efsw)
+else()
+ target_link_libraries(MassBuilderSaveTool PRIVATE efsw)
+endif()
+
+if(CORRADE_TARGET_WINDOWS)
+ target_link_libraries(MassBuilderSaveTool PRIVATE
+ Corrade::Main
+ imm32
+ wtsapi32
+ )
+endif()
diff --git a/src/Configuration/Configuration.cpp b/src/Configuration/Configuration.cpp
new file mode 100644
index 0000000..f2c8887
--- /dev/null
+++ b/src/Configuration/Configuration.cpp
@@ -0,0 +1,292 @@
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include "../Logger/Logger.h"
+
+#include "Configuration.h"
+
+namespace mbst {
+
+Configuration::Configuration() {
+ Containers::String exe_path = Utility::Path::split(*Utility::Path::executableLocation()).first();
+ _conf = Utility::Configuration{Utility::Path::join(exe_path, "MassBuilderSaveTool.ini")};
+
+ if(_conf.hasValue("swap_interval")) {
+ _swapInterval = _conf.value("swap_interval");
+ }
+ else {
+ _conf.setValue("swap_interval", 1);
+ }
+
+ if(_conf.hasValue("frame_limit")) {
+ std::string frame_limit = _conf.value("frame_limit");
+ if(frame_limit == "half_vsync") {
+ _swapInterval = 2;
+ }
+ _conf.removeValue("frame_limit");
+ }
+
+ if(_conf.hasValue("fps_cap")) {
+ _fpsCap = _conf.value("fps_cap");
+ }
+ else {
+ _conf.setValue("fps_cap", 60.0f);
+ }
+
+ if(_conf.hasValue("cheat_mode")) {
+ _cheatMode = _conf.value("cheat_mode");
+ }
+ else {
+ _conf.setValue("cheat_mode", _cheatMode);
+ }
+
+ if(_conf.hasValue("advanced_mode")) {
+ _advancedMode = _conf.value("advanced_mode");
+ }
+ else {
+ _conf.setValue("advanced_mode", _advancedMode);
+ }
+
+ if(_conf.hasValue("startup_update_check")) {
+ _checkUpdatesOnStartup = _conf.value("startup_update_check");
+ }
+ else {
+ _conf.setValue("startup_update_check", _checkUpdatesOnStartup);
+ }
+
+ if(_conf.hasValue("skip_disclaimer")) {
+ _skipDisclaimer = _conf.value("skip_disclaimer");
+ }
+ else {
+ _conf.setValue("skip_disclaimer", _skipDisclaimer);
+ }
+
+ LOG_INFO("Searching for the game's save directory.");
+ wchar_t* localappdata_path = nullptr;
+ Containers::ScopeGuard guard{localappdata_path, CoTaskMemFree};
+ auto result = SHGetKnownFolderPath(FOLDERID_LocalAppData, KF_FLAG_DEFAULT, nullptr, &localappdata_path);
+ if(result != S_OK)
+ {
+ char* message_buffer = nullptr;
+ auto size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
+ nullptr, result, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL),
+ reinterpret_cast(&message_buffer), 0, nullptr);
+ String message{message_buffer, size};
+ LocalFree(message_buffer);
+
+ _lastError = Utility::format("SHGetKnownFolderPath() failed with error code {}: {}", result, message);
+ LOG_ERROR(_lastError);
+ return;
+ }
+
+ auto game_data_dir = Utility::Path::join(
+ Utility::Path::fromNativeSeparators(Utility::Unicode::narrow(localappdata_path)),
+ "MASS_Builder/Saved"_s
+ );
+ if(!Utility::Path::exists(game_data_dir)) {
+ LOG_ERROR(_lastError = game_data_dir + " wasn't found. Make sure to play the game at least once."_s);
+ return;
+ }
+
+ _directories.gameConfig = Utility::Path::join(game_data_dir, "Config/WindowsNoEditor"_s);
+ _directories.gameSaves = Utility::Path::join(game_data_dir, "SaveGames"_s);
+ _directories.gameScreenshots = Utility::Path::join(game_data_dir, "Screenshots/WindowsNoEditor"_s);
+
+ LOG_INFO("Initialising Save Tool directories.");
+ Containers::String executable_location = Utility::Path::split(*Utility::Path::executableLocation()).first();
+ _directories.backups = Utility::Path::join(executable_location, "backups");
+ _directories.staging = Utility::Path::join(executable_location, "staging");
+ auto armoury_dir = Utility::Path::join(executable_location, "armoury");
+ _directories.armours = Utility::Path::join(armoury_dir, "armours");
+ _directories.weapons = Utility::Path::join(armoury_dir, "weapons");
+ _directories.styles = Utility::Path::join(armoury_dir, "styles");
+ _directories.temp = Utility::Path::join(executable_location, "temp");
+
+ if(!Utility::Path::exists(_directories.backups)) {
+ LOG_WARNING("Backups directory not found, creating...");
+ if(!Utility::Path::make(_directories.backups)) {
+ LOG_ERROR(_lastError = "Couldn't create the backups directory.");
+ return;
+ }
+ }
+ if(!Utility::Path::exists(_directories.staging)) {
+ LOG_WARNING("Staging directory not found, creating...");
+ if(!Utility::Path::make(_directories.staging)) {
+ LOG_ERROR(_lastError = "Couldn't create the staging directory.");
+ return;
+ }
+ }
+ if(!Utility::Path::exists(_directories.armours)) {
+ LOG_WARNING("Armours directory not found, creating...");
+ if(!Utility::Path::make(_directories.armours)) {
+ LOG_ERROR(_lastError = "Couldn't create the armours directory.");
+ return;
+ }
+ }
+ if(!Utility::Path::exists(_directories.weapons)) {
+ LOG_WARNING("Weapons directory not found, creating...");
+ if(!Utility::Path::make(_directories.weapons)) {
+ LOG_ERROR(_lastError = "Couldn't create the weapons directory.");
+ return;
+ }
+ }
+ if(!Utility::Path::exists(_directories.styles)) {
+ LOG_WARNING("Styles directory not found, creating...");
+ if(!Utility::Path::make(_directories.styles)) {
+ LOG_ERROR(_lastError = "Couldn't create the styles directory.");
+ return;
+ }
+ }
+
+ if(!Utility::Path::exists(_directories.temp)) {
+ LOG_WARNING("Temporary directory not found, creating...");
+ if(!Utility::Path::make(_directories.temp)) {
+ LOG_ERROR(_lastError = "Couldn't create the temporary directory.");
+ return;
+ }
+ }
+
+ _valid = true;
+}
+
+Configuration::~Configuration() {
+ save();
+}
+
+bool
+Configuration::valid() const {
+ return _valid;
+}
+
+Containers::StringView
+Configuration::lastError() const {
+ return _lastError;
+}
+
+void
+Configuration::save() {
+ _conf.save();
+}
+
+int
+Configuration::swapInterval() const {
+ return _swapInterval;
+}
+
+void
+Configuration::setSwapInterval(int interval) {
+ _swapInterval = interval;
+ _conf.setValue("swap_interval", _swapInterval);
+ _conf.save();
+}
+
+float
+Configuration::fpsCap() const {
+ return _fpsCap;
+}
+
+void
+Configuration::setFpsCap(float cap) {
+ _fpsCap = cap;
+ _conf.setValue("fps_cap", _fpsCap);
+ _conf.save();
+}
+
+bool
+Configuration::cheatMode() const {
+ return _cheatMode;
+}
+
+void
+Configuration::setCheatMode(bool enabled) {
+ _cheatMode = enabled;
+ _conf.setValue("cheat_mode", _cheatMode);
+ _conf.save();
+}
+
+bool
+Configuration::advancedMode() const {
+ return _advancedMode;
+}
+
+void
+Configuration::setAdvancedMode(bool enabled) {
+ _advancedMode = enabled;
+ _conf.setValue("advanced_mode", _advancedMode);
+ _conf.save();
+}
+
+bool
+Configuration::checkUpdatesOnStartup() const {
+ return _checkUpdatesOnStartup;
+}
+
+void
+Configuration::setCheckUpdatesOnStartup(bool mode) {
+ _checkUpdatesOnStartup = mode;
+ _conf.setValue("startup_update_check", _checkUpdatesOnStartup);
+ _conf.save();
+}
+
+bool
+Configuration::skipDisclaimer() const {
+ return _skipDisclaimer;
+}
+
+void
+Configuration::setSkipDisclaimer(bool mode) {
+ _skipDisclaimer = mode;
+ _conf.setValue("skip_disclaimer", _skipDisclaimer);
+ _conf.save();
+}
+
+bool
+Configuration::isRunningInWine() const {
+ return _isRunningInWine;
+}
+
+void
+Configuration::setRunningInWine(bool wine) {
+ _isRunningInWine = wine;
+}
+
+Configuration::Directories const&
+Configuration::directories() const {
+ return _directories;
+}
+
+Configuration&
+Configuration::instance() {
+ static Configuration conf{};
+ return conf;
+}
+
+Configuration&
+conf() {
+ return Configuration::instance();
+}
+
+}
diff --git a/src/Configuration/Configuration.h b/src/Configuration/Configuration.h
new file mode 100644
index 0000000..79ec469
--- /dev/null
+++ b/src/Configuration/Configuration.h
@@ -0,0 +1,94 @@
+#pragma once
+
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+
+using namespace Corrade;
+
+namespace mbst {
+
+class Configuration {
+ public:
+ static auto instance() -> Configuration&;
+
+ ~Configuration();
+
+ bool valid() const;
+
+ auto lastError() const -> Containers::StringView;
+
+ void save();
+
+ auto swapInterval() const -> int;
+ void setSwapInterval(int interval);
+
+ auto fpsCap() const -> float;
+ void setFpsCap(float cap);
+
+ bool cheatMode() const;
+ void setCheatMode(bool enabled);
+
+ bool advancedMode() const;
+ void setAdvancedMode(bool enabled);
+
+ bool checkUpdatesOnStartup() const;
+ void setCheckUpdatesOnStartup(bool mode);
+
+ bool skipDisclaimer() const;
+ void setSkipDisclaimer(bool mode);
+
+ bool isRunningInWine() const;
+ void setRunningInWine(bool wine);
+
+ struct Directories {
+ Containers::String gameSaves;
+ Containers::String gameConfig;
+ Containers::String gameScreenshots;
+ Containers::String backups;
+ Containers::String staging;
+ Containers::String armours;
+ Containers::String weapons;
+ Containers::String styles;
+ Containers::String temp;
+ };
+ auto directories() const -> Directories const&;
+
+ private:
+ explicit Configuration();
+
+ Utility::Configuration _conf;
+
+ Containers::String _lastError;
+
+ int _swapInterval = 1;
+ float _fpsCap = 60.0f;
+ bool _cheatMode = false;
+ bool _advancedMode = false;
+ bool _checkUpdatesOnStartup = true;
+ bool _skipDisclaimer = false;
+
+ bool _isRunningInWine = false;
+
+ bool _valid = false;
+
+ Directories _directories;
+};
+
+Configuration& conf();
+
+}
diff --git a/src/GameData/Accessories.h b/src/GameData/Accessories.h
new file mode 100644
index 0000000..0eb4463
--- /dev/null
+++ b/src/GameData/Accessories.h
@@ -0,0 +1,783 @@
+#pragma once
+
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+#include
+
+#include