From 477a616d481a651919ce2444e158e63f54e1ef8e Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Mon, 14 Nov 2022 05:22:34 -0500 Subject: Import libultraship as a submodule (#1943) Co-authored-by: briaguya Co-authored-by: Christopher Leggett Co-authored-by: David Chavez --- ZAPD/CMakeLists.txt | 6 +- ZAPD/ZAPD.vcxproj | 381 ----------------------- ZAPD/ZAPD.vcxproj.filters | 596 ------------------------------------ ZAPDUtils/CMakeLists.txt | 218 ------------- ZAPDUtils/Color3b.h | 21 -- ZAPDUtils/StrHash.h | 51 --- ZAPDUtils/Utils/BinaryReader.cpp | 203 ------------ ZAPDUtils/Utils/BinaryReader.h | 50 --- ZAPDUtils/Utils/BinaryWriter.cpp | 148 --------- ZAPDUtils/Utils/BinaryWriter.h | 41 --- ZAPDUtils/Utils/BitConverter.h | 184 ----------- ZAPDUtils/Utils/Directory.h | 60 ---- ZAPDUtils/Utils/File.h | 87 ------ ZAPDUtils/Utils/MemoryStream.cpp | 97 ------ ZAPDUtils/Utils/MemoryStream.h | 33 -- ZAPDUtils/Utils/Path.h | 50 --- ZAPDUtils/Utils/Stream.h | 34 -- ZAPDUtils/Utils/StringHelper.cpp | 130 -------- ZAPDUtils/Utils/StringHelper.h | 26 -- ZAPDUtils/Utils/vt.h | 45 --- ZAPDUtils/Vec2f.h | 19 -- ZAPDUtils/Vec3f.h | 19 -- ZAPDUtils/Vec3s.h | 21 -- ZAPDUtils/ZAPDUtils.vcxproj | 192 ------------ ZAPDUtils/ZAPDUtils.vcxproj.filters | 87 ------ 25 files changed, 3 insertions(+), 2796 deletions(-) delete mode 100644 ZAPD/ZAPD.vcxproj delete mode 100644 ZAPD/ZAPD.vcxproj.filters delete mode 100644 ZAPDUtils/CMakeLists.txt delete mode 100644 ZAPDUtils/Color3b.h delete mode 100644 ZAPDUtils/StrHash.h delete mode 100644 ZAPDUtils/Utils/BinaryReader.cpp delete mode 100644 ZAPDUtils/Utils/BinaryReader.h delete mode 100644 ZAPDUtils/Utils/BinaryWriter.cpp delete mode 100644 ZAPDUtils/Utils/BinaryWriter.h delete mode 100644 ZAPDUtils/Utils/BitConverter.h delete mode 100644 ZAPDUtils/Utils/Directory.h delete mode 100644 ZAPDUtils/Utils/File.h delete mode 100644 ZAPDUtils/Utils/MemoryStream.cpp delete mode 100644 ZAPDUtils/Utils/MemoryStream.h delete mode 100644 ZAPDUtils/Utils/Path.h delete mode 100644 ZAPDUtils/Utils/Stream.h delete mode 100644 ZAPDUtils/Utils/StringHelper.cpp delete mode 100644 ZAPDUtils/Utils/StringHelper.h delete mode 100644 ZAPDUtils/Utils/vt.h delete mode 100644 ZAPDUtils/Vec2f.h delete mode 100644 ZAPDUtils/Vec3f.h delete mode 100644 ZAPDUtils/Vec3s.h delete mode 100644 ZAPDUtils/ZAPDUtils.vcxproj delete mode 100644 ZAPDUtils/ZAPDUtils.vcxproj.filters diff --git a/ZAPD/CMakeLists.txt b/ZAPD/CMakeLists.txt index cf49ef6..c169a75 100644 --- a/ZAPD/CMakeLists.txt +++ b/ZAPD/CMakeLists.txt @@ -21,8 +21,8 @@ set(Header_Files source_group("Header Files" FILES ${Header_Files}) set(Header_Files__Libraries - "../../libultraship/libultraship/Lib/stb/stb_image.h" - "../../libultraship/libultraship/Lib/stb/stb_image_write.h" + "../../libultraship/extern/stb/stb_image.h" + "../../libultraship/extern/stb/stb_image_write.h" "ctpl_stl.h" ) source_group("Header Files\\Libraries" FILES ${Header_Files__Libraries}) @@ -332,7 +332,7 @@ endif() find_package(PNG REQUIRED) target_include_directories(${PROJECT_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPDUtils + ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2 ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/libgfxd ${PNG_PNG_INCLUDE_DIR}/ diff --git a/ZAPD/ZAPD.vcxproj b/ZAPD/ZAPD.vcxproj deleted file mode 100644 index 9369e97..0000000 --- a/ZAPD/ZAPD.vcxproj +++ /dev/null @@ -1,381 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36} - ZAPD - 10.0 - ZAPD - - - - Application - true - v142 - MultiByte - - - Application - false - v142 - true - MultiByte - - - Application - true - v142 - MultiByte - - - Application - false - v142 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - $(OutDir);$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\..\OTRExporter\packages\libpng-v142.1.6.37.2\build\native\lib\x64\v142\Debug\;$(ProjectDir)..\..\libultraship\libultraship\;$(ProjectDir)..\..\StormLib\bin\StormLib\x64\DebugUS\;$(LibraryPath) - $(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(ProjectDir)..\..\StormLib\src\;$(IncludePath) - MinimumRecommendedRules.ruleset - - - - - $(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(ProjectDir)..\..\StormLib\src\;$(IncludePath) - $(OutDir);$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\..\OTRExporter\packages\libpng-v142.1.6.37.2\build\native\lib\x64\v142\Debug\;$(ProjectDir)..\..\libultraship\libultraship\;$(ProjectDir)..\..\StormLib\bin\StormLib\x64\ReleaseUS\;$(LibraryPath) - false - MinimumRecommendedRules.ruleset - - - - - $(SolutionDir)ZAPD\lib\tinyxml2;$(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)ZAPD\lib\elfio;$(SolutionDir)ZAPD\lib\stb;$(ProjectDir);$(IncludePath) - $(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)x64\Debug;$(SolutionDir)packages\libpng.1.6.28.1\build\native\lib\x64\v140\dynamic\Debug;$(LibraryPath) - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - - Level3 - Disabled - true - true - stdcpp17 - stdc11 - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - true - - - - - Level3 - Disabled - true - true - stdcpp17 - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - stdc11 - MultiThreadedDebug - - - true - ZAPDUtils.lib;/WHOLEARCHIVE:OTRExporter.lib;libultraship.lib;%(AdditionalDependencies) - false - - - - - - - - - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - - - - - Level3 - true - true - true - true - stdcpp17 - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdc11 - - - true - true - ZAPDUtils.lib;/WHOLEARCHIVE:OTRExporter.lib;libultraship.lib;%(AdditionalDependencies) - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/ZAPD/ZAPD.vcxproj.filters b/ZAPD/ZAPD.vcxproj.filters deleted file mode 100644 index 82fa8ac..0000000 --- a/ZAPD/ZAPD.vcxproj.filters +++ /dev/null @@ -1,596 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {02148456-5068-4613-8478-f10addc58e70} - - - {bcab3136-95ba-4839-833c-43d78ad6e335} - - - {dc06ed84-f6fe-4277-80f3-d62bd5cdbb98} - - - {6049c045-bc38-4221-b29e-ca6d4d8af4aa} - - - {490e3a08-047b-48d3-ab53-3a860a3b92aa} - - - {26c06845-8e8e-4b79-ad18-07c4f9c0f801} - - - {d45c420d-2378-47ac-92c5-80db9475c195} - - - {03cc56a2-e0e8-4167-80a0-98fb900a959a} - - - {73db0879-6df8-4f6a-8cc2-a1f836e9e796} - - - {be9a5be0-ec6a-4200-8e39-bb58c7da7aa8} - - - {7ee79d97-c6a8-4e82-93ef-37981f4d7838} - - - {85600275-99fe-491d-8189-bcc3dc1a8903} - - - {ba9990b0-1082-48bb-874c-6108534b5455} - - - {ce9d91b0-ba20-4296-bc2d-8630965bb392} - - - {730beb67-6d59-4849-9d9b-702c4a565fc0} - - - {b26457d2-cdb8-4c92-9ed7-a55bf6d3619e} - - - {9651a041-1019-4486-9e90-1dccfa9471e9} - - - - - Source Files - - - Source Files\Z64\ZRoom - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Z64 - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files - - - Source Files - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Yaz0 - - - Source Files - - - Source Files\Z64 - - - Source Files\Z64 - - - - - Header Files\Z64\ZRoom - - - Header Files\Z64\ZRoom - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Libraries - - - Header Files\Libraries - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Libraries\libgfxd - - - Header Files\Libraries\libgfxd - - - Header Files\Libraries\libgfxd - - - Header Files\Z64 - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64\ZRoom\Commands - - - Header Files - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Yaz0 - - - Header Files\Yaz0 - - - Header Files - - - Header Files\Libraries - - - Header Files\Z64 - - - - - Resource Files - - - any\any - - - NuGet - - - - - - \ No newline at end of file diff --git a/ZAPDUtils/CMakeLists.txt b/ZAPDUtils/CMakeLists.txt deleted file mode 100644 index 68e8359..0000000 --- a/ZAPDUtils/CMakeLists.txt +++ /dev/null @@ -1,218 +0,0 @@ -set(PROJECT_NAME ZAPDUtils) - -################################################################################ -# Source groups -################################################################################ -set(Header_Files - "Color3b.h" - "StrHash.h" - "Vec2f.h" - "Vec3f.h" - "Vec3s.h" -) -source_group("Header Files" FILES ${Header_Files}) - -set(Header_Files__Utils - "Utils/BinaryReader.h" - "Utils/BinaryWriter.h" - "Utils/BitConverter.h" - "Utils/Directory.h" - "Utils/File.h" - "Utils/MemoryStream.h" - "Utils/Path.h" - "Utils/Stream.h" - "Utils/StringHelper.h" -) -source_group("Header Files\\Utils" FILES ${Header_Files__Utils}) - -set(Source_Files__Libraries - "../lib/tinyxml2/tinyxml2.cpp" -) -source_group("Source Files\\Libraries" FILES ${Source_Files__Libraries}) - -set(Source_Files__Utils - "Utils/BinaryReader.cpp" - "Utils/BinaryWriter.cpp" - "Utils/MemoryStream.cpp" - "Utils/StringHelper.cpp" -) -source_group("Source Files\\Utils" FILES ${Source_Files__Utils}) - -set(ALL_FILES - ${Header_Files} - ${Header_Files__Utils} - ${Source_Files__Libraries} - ${Source_Files__Utils} -) - -################################################################################ -# Target -################################################################################ -add_library(${PROJECT_NAME} STATIC ${ALL_FILES}) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") -use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}") -endif() - -set(ROOT_NAMESPACE ZAPDUtils) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - set_target_properties(${PROJECT_NAME} PROPERTIES - VS_GLOBAL_KEYWORD "Win32Proj" - ) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - endif() -endif() -################################################################################ -# MSVC runtime library -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - $<$: - MultiThreadedDebug - > - $<$: - MultiThreaded - > - $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - MultiThreaded - ) - endif() - set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR}) -endif() -################################################################################ -# Compile definitions -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG;" - "_MBCS" - ">" - "$<$:" - "NDEBUG;" - "UNICODE;" - "_UNICODE" - ">" - "_CONSOLE;" - "_CRT_SECURE_NO_WARNINGS" - STORMLIB_NO_AUTO_LINK - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG" - ">" - "$<$:" - "NDEBUG" - ">" - "WIN32;" - "_CONSOLE;" - "_CRT_SECURE_NO_WARNINGS;" - "UNICODE;" - "_UNICODE" - STORMLIB_NO_AUTO_LINK - ) - endif() -endif() - -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG" - ">" - "$<$:" - "NDEBUG" - ">" - "_CONSOLE;" - "_CRT_SECURE_NO_WARNINGS;" - "UNICODE;" - "_UNICODE" - ) -endif() - -################################################################################ -# Compile and link options -################################################################################ -if(MSVC) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /Oi; - /Gy - > - /permissive-; - /MP; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /O2; - /Ot - > - $<$: - /Gy - > - /permissive-; - /MP; - /Oi; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - endif() - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /OPT:REF; - /OPT:ICF - > - /SUBSYSTEM:CONSOLE - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /OPT:REF; - /OPT:ICF - > - /SUBSYSTEM:CONSOLE - ) - endif() -endif() - -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") - target_compile_options(${PROJECT_NAME} PRIVATE - -Wall -Wextra -Wno-error - -Wno-unused-parameter - -Wno-unused-function - -Wno-unused-variable - -Wno-missing-field-initializers - -Wno-parentheses - -Wno-narrowing - $<$:-Wno-deprecated-enum-enum-conversion> - ) -endif() -################################################################################ -# Dependencies -################################################################################ -# Link with other targets. - - diff --git a/ZAPDUtils/Color3b.h b/ZAPDUtils/Color3b.h deleted file mode 100644 index 507c099..0000000 --- a/ZAPDUtils/Color3b.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include - -struct Color3b -{ - uint8_t r, g, b; - - Color3b() - { - r = 0; - g = 0; - b = 0; - }; - Color3b(uint8_t nR, uint8_t nG, uint8_t nB) - { - r = nR; - g = nG; - b = nB; - }; -}; \ No newline at end of file diff --git a/ZAPDUtils/StrHash.h b/ZAPDUtils/StrHash.h deleted file mode 100644 index c611bdd..0000000 --- a/ZAPDUtils/StrHash.h +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once - -#include -#include -#include - -typedef uint32_t strhash; - -[[maybe_unused]] static strhash CRC32B(unsigned char* message, int32_t size) -{ - int32_t byte = 0, crc = 0; - int32_t mask = 0; - - crc = 0xFFFFFFFF; - - for (int32_t i = 0; i < size; i++) - { - byte = message[i]; - crc = crc ^ byte; - - for (int32_t j = 7; j >= 0; j--) - { - mask = -(crc & 1); - crc = (crc >> 1) ^ (0xEDB88320 & mask); - } - } - - return ~(uint32_t)(crc); -} - -[[maybe_unused]] constexpr static strhash CRC32BCT(const char* message, int32_t size) -{ - int32_t byte = 0, crc = 0; - int32_t mask = 0; - - crc = 0xFFFFFFFF; - - for (int32_t i = 0; i < size; i++) - { - byte = message[i]; - crc = crc ^ byte; - - for (int32_t j = 7; j >= 0; j--) - { - mask = -(crc & 1); - crc = (crc >> 1) ^ (0xEDB88320 & mask); - } - } - - return ~(uint32_t)(crc); -} \ No newline at end of file diff --git a/ZAPDUtils/Utils/BinaryReader.cpp b/ZAPDUtils/Utils/BinaryReader.cpp deleted file mode 100644 index 092124a..0000000 --- a/ZAPDUtils/Utils/BinaryReader.cpp +++ /dev/null @@ -1,203 +0,0 @@ -#include "BinaryReader.h" -#include -#include -#include "Stream.h" - -BinaryReader::BinaryReader(Stream* nStream) -{ - stream.reset(nStream); -} - -BinaryReader::BinaryReader(std::shared_ptr nStream) -{ - stream = nStream; -} - -void BinaryReader::Close() -{ - stream->Close(); -} - -void BinaryReader::SetEndianness(Endianness endianness) -{ - this->endianness = endianness; -} - -Endianness BinaryReader::GetEndianness() const -{ - return endianness; -} - -void BinaryReader::Seek(uint32_t offset, SeekOffsetType seekType) -{ - stream->Seek(offset, seekType); -} - -uint32_t BinaryReader::GetBaseAddress() -{ - return stream->GetBaseAddress(); -} - -void BinaryReader::Read(int32_t length) -{ - stream->Read(length); -} - -void BinaryReader::Read(char* buffer, int32_t length) -{ - stream->Read(buffer, length); -} - -char BinaryReader::ReadChar() -{ - return (char)stream->ReadByte(); -} - -int8_t BinaryReader::ReadByte() -{ - return stream->ReadByte(); -} - -uint8_t BinaryReader::ReadUByte() -{ - return (uint8_t)stream->ReadByte(); -} - -int16_t BinaryReader::ReadInt16() -{ - int16_t result = 0; - - stream->Read((char*)&result, sizeof(int16_t)); - - if (endianness != Endianness::Native) - result = BSWAP16(result); - - return result; -} - -int32_t BinaryReader::ReadInt32() -{ - int32_t result = 0; - - stream->Read((char*)&result, sizeof(int32_t)); - - if (endianness != Endianness::Native) - result = BSWAP32(result); - - return result; -} - -uint16_t BinaryReader::ReadUInt16() -{ - uint16_t result = 0; - - stream->Read((char*)&result, sizeof(uint16_t)); - - if (endianness != Endianness::Native) - result = BSWAP16(result); - - return result; -} - -uint32_t BinaryReader::ReadUInt32() -{ - uint32_t result = 0; - - stream->Read((char*)&result, sizeof(uint32_t)); - - if (endianness != Endianness::Native) - result = BSWAP32(result); - - return result; -} - -uint64_t BinaryReader::ReadUInt64() -{ - uint64_t result = 0; - - stream->Read((char*)&result, sizeof(uint64_t)); - - if (endianness != Endianness::Native) - result = BSWAP64(result); - - return result; -} - -float BinaryReader::ReadSingle() -{ - float result = NAN; - - stream->Read((char*)&result, sizeof(float)); - - if (endianness != Endianness::Native) - { - float tmp; - char* dst = (char*)&tmp; - char* src = (char*)&result; - dst[3] = src[0]; dst[2] = src[1]; dst[1] = src[2]; dst[0] = src[3]; - result = tmp; - } - - if (std::isnan(result)) - throw std::runtime_error("BinaryReader::ReadSingle(): Error reading stream"); - - return result; -} - -double BinaryReader::ReadDouble() -{ - double result = NAN; - - stream->Read((char*)&result, sizeof(double)); - - if (endianness != Endianness::Native) - { - double tmp; - char* dst = (char*)&tmp; - char* src = (char*)&result; - dst[7] = src[0]; dst[6] = src[1]; dst[5] = src[2]; dst[4] = src[3]; - dst[3] = src[4]; dst[2] = src[5]; dst[1] = src[6]; dst[0] = src[7]; - result = tmp; - } - - if (std::isnan(result)) - throw std::runtime_error("BinaryReader::ReadDouble(): Error reading stream"); - - return result; -} - -Vec3f BinaryReader::ReadVec3f() -{ - return Vec3f(); -} - -Vec3s BinaryReader::ReadVec3s() -{ - return Vec3s(0, 0, 0); -} - -Vec3s BinaryReader::ReadVec3b() -{ - return Vec3s(0, 0, 0); -} - -Vec2f BinaryReader::ReadVec2f() -{ - return Vec2f(); -} - -Color3b BinaryReader::ReadColor3b() -{ - return Color3b(); -} - -std::string BinaryReader::ReadString() -{ - std::string res; - int numChars = ReadInt32(); - - for (int i = 0; i < numChars; i++) - res += ReadChar(); - - return res; -} \ No newline at end of file diff --git a/ZAPDUtils/Utils/BinaryReader.h b/ZAPDUtils/Utils/BinaryReader.h deleted file mode 100644 index 0b18351..0000000 --- a/ZAPDUtils/Utils/BinaryReader.h +++ /dev/null @@ -1,50 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include "../Color3b.h" -#include "../Vec2f.h" -#include "../Vec3f.h" -#include "../Vec3s.h" -#include "BitConverter.h" -#include "Stream.h" - -class BinaryReader -{ -public: - BinaryReader(Stream* nStream); - BinaryReader(std::shared_ptr nStream); - - void Close(); - - void SetEndianness(Endianness endianness); - Endianness GetEndianness() const; - - void Seek(uint32_t offset, SeekOffsetType seekType); - uint32_t GetBaseAddress(); - - void Read(int32_t length); - void Read(char* buffer, int32_t length); - char ReadChar(); - int8_t ReadByte(); - int16_t ReadInt16(); - int32_t ReadInt32(); - uint8_t ReadUByte(); - uint16_t ReadUInt16(); - uint32_t ReadUInt32(); - uint64_t ReadUInt64(); - float ReadSingle(); - double ReadDouble(); - Vec3f ReadVec3f(); - Vec3s ReadVec3s(); - Vec3s ReadVec3b(); - Vec2f ReadVec2f(); - Color3b ReadColor3b(); - std::string ReadString(); - -protected: - std::shared_ptr stream; - Endianness endianness = Endianness::Native; -}; \ No newline at end of file diff --git a/ZAPDUtils/Utils/BinaryWriter.cpp b/ZAPDUtils/Utils/BinaryWriter.cpp deleted file mode 100644 index 34bcad0..0000000 --- a/ZAPDUtils/Utils/BinaryWriter.cpp +++ /dev/null @@ -1,148 +0,0 @@ -#include "BinaryWriter.h" - -BinaryWriter::BinaryWriter(Stream* nStream) -{ - stream.reset(nStream); -} - -BinaryWriter::BinaryWriter(std::shared_ptr nStream) -{ - stream = nStream; -} - -void BinaryWriter::SetEndianness(Endianness endianness) -{ - this->endianness = endianness; -} - -void BinaryWriter::Close() -{ - stream->Close(); -} - -std::shared_ptr BinaryWriter::GetStream() -{ - return stream; -} - -uint64_t BinaryWriter::GetBaseAddress() -{ - return stream->GetBaseAddress(); -} - -uint64_t BinaryWriter::GetLength() -{ - return stream->GetLength(); -} - -void BinaryWriter::Seek(int32_t offset, SeekOffsetType seekType) -{ - stream->Seek(offset, seekType); -} - -void BinaryWriter::Write(int8_t value) -{ - stream->Write((char*)&value, sizeof(int8_t)); -} - -void BinaryWriter::Write(uint8_t value) -{ - stream->Write((char*)&value, sizeof(uint8_t)); -} - -void BinaryWriter::Write(int16_t value) -{ - if (endianness != Endianness::Native) - value = BSWAP16(value); - - stream->Write((char*)&value, sizeof(int16_t)); -} - -void BinaryWriter::Write(uint16_t value) -{ - if (endianness != Endianness::Native) - value = BSWAP16(value); - - stream->Write((char*)&value, sizeof(uint16_t)); -} - -void BinaryWriter::Write(int32_t value) -{ - if (endianness != Endianness::Native) - value = BSWAP32(value); - - stream->Write((char*)&value, sizeof(int32_t)); -} - -void BinaryWriter::Write(int32_t valueA, int32_t valueB) -{ - Write(valueA); - Write(valueB); -} - -void BinaryWriter::Write(uint32_t value) -{ - if (endianness != Endianness::Native) - value = BSWAP32(value); - - stream->Write((char*)&value, sizeof(uint32_t)); -} - -void BinaryWriter::Write(int64_t value) -{ - if (endianness != Endianness::Native) - value = BSWAP64(value); - - stream->Write((char*)&value, sizeof(int64_t)); -} - -void BinaryWriter::Write(uint64_t value) -{ - if (endianness != Endianness::Native) - value = BSWAP64(value); - - stream->Write((char*)&value, sizeof(uint64_t)); -} - -void BinaryWriter::Write(float value) -{ - if (endianness != Endianness::Native) - { - float tmp; - char* dst = (char*)&tmp; - char* src = (char*)&value; - dst[3] = src[0]; dst[2] = src[1]; dst[1] = src[2]; dst[0] = src[3]; - value = tmp; - } - - stream->Write((char*)&value, sizeof(float)); -} - -void BinaryWriter::Write(double value) -{ - if (endianness != Endianness::Native) - { - double tmp; - char* dst = (char*)&tmp; - char* src = (char*)&value; - dst[7] = src[0]; dst[6] = src[1]; dst[5] = src[2]; dst[4] = src[3]; - dst[3] = src[4]; dst[2] = src[5]; dst[1] = src[6]; dst[0] = src[7]; - value = tmp; - } - - stream->Write((char*)&value, sizeof(double)); -} - -void BinaryWriter::Write(const std::string& str) -{ - int strLen = str.size(); - Write(strLen); - - for (char c : str) - stream->WriteByte(c); -} - -void BinaryWriter::Write(char* srcBuffer, size_t length) -{ - stream->Write(srcBuffer, length); -} diff --git a/ZAPDUtils/Utils/BinaryWriter.h b/ZAPDUtils/Utils/BinaryWriter.h deleted file mode 100644 index 67c8fcd..0000000 --- a/ZAPDUtils/Utils/BinaryWriter.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include "BitConverter.h" -#include "Stream.h" - -class BinaryWriter -{ -public: - BinaryWriter(Stream* nStream); - BinaryWriter(std::shared_ptr nStream); - - void SetEndianness(Endianness endianness); - - std::shared_ptr GetStream(); - uint64_t GetBaseAddress(); - uint64_t GetLength(); - void Seek(int32_t offset, SeekOffsetType seekType); - void Close(); - - void Write(int8_t value); - void Write(uint8_t value); - void Write(int16_t value); - void Write(uint16_t value); - void Write(int32_t value); - void Write(int32_t valueA, int32_t valueB); - void Write(uint32_t value); - void Write(int64_t value); - void Write(uint64_t value); - void Write(float value); - void Write(double value); - void Write(const std::string& str); - void Write(char* srcBuffer, size_t length); - -protected: - std::shared_ptr stream; - Endianness endianness = Endianness::Native; -}; \ No newline at end of file diff --git a/ZAPDUtils/Utils/BitConverter.h b/ZAPDUtils/Utils/BitConverter.h deleted file mode 100644 index b62891d..0000000 --- a/ZAPDUtils/Utils/BitConverter.h +++ /dev/null @@ -1,184 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -#ifdef _MSC_VER -#define BSWAP16 _byteswap_ushort -#define BSWAP32 _byteswap_ulong -#define BSWAP64 _byteswap_uint64 -#else -#define BSWAP16 __builtin_bswap16 -#define BSWAP32 __builtin_bswap32 -#define BSWAP64 __builtin_bswap64 -#endif - -enum class Endianness -{ - Little = 0, - Big = 1, - -#if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) || defined(__BIG_ENDIAN__) - Native = Big, -#else - Native = Little, -#endif -}; - -class BitConverter -{ -public: - static inline int8_t ToInt8BE(const uint8_t* data, int32_t offset) - { - return (uint8_t)data[offset + 0]; - } - - static inline int8_t ToInt8BE(const std::vector& data, int32_t offset) - { - return (uint8_t)data[offset + 0]; - } - - static inline uint8_t ToUInt8BE(const uint8_t* data, int32_t offset) - { - return (uint8_t)data[offset + 0]; - } - - static inline uint8_t ToUInt8BE(const std::vector& data, int32_t offset) - { - return (uint8_t)data[offset + 0]; - } - - static inline int16_t ToInt16BE(const uint8_t* data, int32_t offset) - { - return ((uint16_t)data[offset + 0] << 8) + (uint16_t)data[offset + 1]; - } - - static inline int16_t ToInt16BE(const std::vector& data, int32_t offset) - { - return ((uint16_t)data[offset + 0] << 8) + (uint16_t)data[offset + 1]; - } - - static inline uint16_t ToUInt16BE(const uint8_t* data, int32_t offset) - { - return ((uint16_t)data[offset + 0] << 8) + (uint16_t)data[offset + 1]; - } - - static inline uint16_t ToUInt16BE(const std::vector& data, int32_t offset) - { - return ((uint16_t)data[offset + 0] << 8) + (uint16_t)data[offset + 1]; - } - - static inline int32_t ToInt32BE(const uint8_t* data, int32_t offset) - { - return ((uint32_t)data[offset + 0] << 24) + ((uint32_t)data[offset + 1] << 16) + - ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3]; - } - - static inline int32_t ToInt32BE(const std::vector& data, int32_t offset) - { - return ((uint32_t)data[offset + 0] << 24) + ((uint32_t)data[offset + 1] << 16) + - ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3]; - } - - static inline uint32_t ToUInt32BE(const uint8_t* data, int32_t offset) - { - return ((uint32_t)data[offset + 0] << 24) + ((uint32_t)data[offset + 1] << 16) + - ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3]; - } - - static inline uint32_t ToUInt32BE(const std::vector& data, int32_t offset) - { - return ((uint32_t)data[offset + 0] << 24) + ((uint32_t)data[offset + 1] << 16) + - ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3]; - } - - static inline int64_t ToInt64BE(const uint8_t* data, int32_t offset) - { - return ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) + - ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) + - ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) + - ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]); - } - - static inline int64_t ToInt64BE(const std::vector& data, int32_t offset) - { - return ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) + - ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) + - ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) + - ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]); - } - - static inline uint64_t ToUInt64BE(const uint8_t* data, int32_t offset) - { - return ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) + - ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) + - ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) + - ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]); - } - - static inline uint64_t ToUInt64BE(const std::vector& data, int32_t offset) - { - return ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) + - ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) + - ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) + - ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]); - } - - static inline float ToFloatBE(const uint8_t* data, int32_t offset) - { - float value; - uint32_t floatData = ((uint32_t)data[offset + 0] << 24) + - ((uint32_t)data[offset + 1] << 16) + - ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3]; - static_assert(sizeof(uint32_t) == sizeof(float), "expected 32-bit float"); - std::memcpy(&value, &floatData, sizeof(value)); - return value; - } - - static inline float ToFloatBE(const std::vector& data, int32_t offset) - { - float value; - uint32_t floatData = ((uint32_t)data[offset + 0] << 24) + - ((uint32_t)data[offset + 1] << 16) + - ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3]; - static_assert(sizeof(uint32_t) == sizeof(float), "expected 32-bit float"); - std::memcpy(&value, &floatData, sizeof(value)); - return value; - } - - static inline double ToDoubleBE(const uint8_t* data, int32_t offset) - { - double value; - uint64_t floatData = - ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) + - ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) + - ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) + - ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]); - static_assert(sizeof(uint64_t) == sizeof(double), "expected 64-bit double"); - // Checks if the float format on the platform the ZAPD binary is running on supports the - // same float format as the object file. - static_assert(std::numeric_limits::is_iec559, - "expected IEC559 floats on host machine"); - std::memcpy(&value, &floatData, sizeof(value)); - return value; - } - - static inline double ToDoubleBE(const std::vector& data, int32_t offset) - { - double value; - uint64_t floatData = - ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) + - ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) + - ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) + - ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]); - static_assert(sizeof(uint64_t) == sizeof(double), "expected 64-bit double"); - // Checks if the float format on the platform the ZAPD binary is running on supports the - // same float format as the object file. - static_assert(std::numeric_limits::is_iec559, - "expected IEC559 doubles on host machine"); - std::memcpy(&value, &floatData, sizeof(value)); - return value; - } -}; diff --git a/ZAPDUtils/Utils/Directory.h b/ZAPDUtils/Utils/Directory.h deleted file mode 100644 index ea792d8..0000000 --- a/ZAPDUtils/Utils/Directory.h +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -#include -#include -#include "StringHelper.h" -#include - -#if __has_include() -#include -namespace fs = std::filesystem; -#else -#include -namespace fs = std::experimental::filesystem; -#endif - -#undef GetCurrentDirectory -#undef CreateDirectory - -class Directory -{ -public: - #ifndef PATH_HACK - static std::string GetCurrentDirectory() { return fs::current_path().string(); } - #endif - - static bool Exists(const fs::path& path) { return fs::exists(path); } - - // Stupid hack because of Windows.h - static void MakeDirectory(const std::string& path) - { - CreateDirectory(path); - } - - static void CreateDirectory(const std::string& path) - { - try - { - fs::create_directories(path); - } - catch (...) - { - } - } - - static std::vector ListFiles(const std::string& dir) - { - std::vector lst; - - if (Exists(dir)) - { - for (auto& p : fs::recursive_directory_iterator(dir)) - { - if (!p.is_directory()) - lst.push_back(p.path().generic_string()); - } - } - - return lst; - } -}; diff --git a/ZAPDUtils/Utils/File.h b/ZAPDUtils/Utils/File.h deleted file mode 100644 index f3448bd..0000000 --- a/ZAPDUtils/Utils/File.h +++ /dev/null @@ -1,87 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include "Path.h" -#include "Utils/StringHelper.h" -#include "Utils/Directory.h" - - -class File -{ -public: - static bool Exists(const fs::path& filePath) - { - std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate); - return file.good(); - } - - static std::vector ReadAllBytes(const fs::path& filePath) - { - std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate); - - if (!file) - return std::vector(); - - int32_t fileSize = (int32_t)file.tellg(); - file.seekg(0); - char* data = new char[fileSize]; - file.read(data, fileSize); - std::vector result = std::vector(data, data + fileSize); - delete[] data; - - return result; - }; - - static std::string ReadAllText(const fs::path& filePath) - { - std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate); - int32_t fileSize = (int32_t)file.tellg(); - file.seekg(0); - char* data = new char[fileSize + 1]; - memset(data, 0, fileSize + 1); - file.read(data, fileSize); - std::string str = std::string((const char*)data); - delete[] data; - - return str; - }; - - static std::vector ReadAllLines(const fs::path& filePath) - { - std::string text = ReadAllText(filePath); - std::vector lines = StringHelper::Split(text, "\n"); - - return lines; - }; - - static void WriteAllBytes(const fs::path& filePath, const std::vector& data) - { - std::ofstream file(filePath, std::ios::binary); - file.write((char*)data.data(), data.size()); - }; - - static void WriteAllBytes(const std::string& filePath, const std::vector& data) - { - if (!Directory::Exists(Path::GetDirectoryName(filePath))) - Directory::MakeDirectory(Path::GetDirectoryName(filePath).string()); - - std::ofstream file(filePath, std::ios::binary); - file.write((char*)data.data(), data.size()); - }; - - static void WriteAllBytes(const std::string& filePath, const char* data, int dataSize) - { - std::ofstream file(filePath, std::ios::binary); - file.write((char*)data, dataSize); - }; - - static void WriteAllText(const fs::path& filePath, const std::string& text) - { - std::ofstream file(filePath, std::ios::out); - file.write(text.c_str(), text.size()); - } -}; diff --git a/ZAPDUtils/Utils/MemoryStream.cpp b/ZAPDUtils/Utils/MemoryStream.cpp deleted file mode 100644 index 1c70c00..0000000 --- a/ZAPDUtils/Utils/MemoryStream.cpp +++ /dev/null @@ -1,97 +0,0 @@ -#include "MemoryStream.h" -#include - -#ifndef _MSC_VER -#define memcpy_s(dest, destSize, source, sourceSize) memcpy(dest, source, destSize) -#endif - -MemoryStream::MemoryStream() -{ - buffer = std::vector(); - //buffer.reserve(1024 * 16); - bufferSize = 0; - baseAddress = 0; -} - -MemoryStream::MemoryStream(char* nBuffer, size_t nBufferSize) : MemoryStream() -{ - buffer = std::vector(nBuffer, nBuffer + nBufferSize); - bufferSize = nBufferSize; - baseAddress = 0; -} - -MemoryStream::~MemoryStream() -{ -} - -uint64_t MemoryStream::GetLength() -{ - return buffer.size(); -} - -void MemoryStream::Seek(int32_t offset, SeekOffsetType seekType) -{ - if (seekType == SeekOffsetType::Start) - baseAddress = offset; - else if (seekType == SeekOffsetType::Current) - baseAddress += offset; - else if (seekType == SeekOffsetType::End) - baseAddress = bufferSize - 1 - offset; -} - -std::unique_ptr MemoryStream::Read(size_t length) -{ - std::unique_ptr result = std::make_unique(length); - - memcpy_s(result.get(), length, &buffer[baseAddress], length); - baseAddress += length; - - return result; -} - -void MemoryStream::Read(const char* dest, size_t length) -{ - memcpy_s((void*)dest, length, &buffer[baseAddress], length); - baseAddress += length; -} - -int8_t MemoryStream::ReadByte() -{ - return buffer[baseAddress++]; -} - -void MemoryStream::Write(char* srcBuffer, size_t length) -{ - if (baseAddress + length >= buffer.size()) - { - buffer.resize(baseAddress + length); - bufferSize += length; - } - - memcpy_s(&buffer[baseAddress], length, srcBuffer, length); - baseAddress += length; -} - -void MemoryStream::WriteByte(int8_t value) -{ - if (baseAddress >= buffer.size()) - { - buffer.resize(baseAddress + 1); - bufferSize = baseAddress; - } - - buffer[baseAddress++] = value; -} - -std::vector MemoryStream::ToVector() -{ - return buffer; -} - -void MemoryStream::Flush() -{ -} - -void MemoryStream::Close() -{ -} \ No newline at end of file diff --git a/ZAPDUtils/Utils/MemoryStream.h b/ZAPDUtils/Utils/MemoryStream.h deleted file mode 100644 index 5a17bb0..0000000 --- a/ZAPDUtils/Utils/MemoryStream.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include -#include -#include "Stream.h" - -class MemoryStream : public Stream -{ -public: - MemoryStream(); - MemoryStream(char* nBuffer, size_t nBufferSize); - ~MemoryStream(); - - uint64_t GetLength() override; - - void Seek(int32_t offset, SeekOffsetType seekType) override; - - std::unique_ptr Read(size_t length) override; - void Read(const char* dest, size_t length) override; - int8_t ReadByte() override; - - void Write(char* srcBuffer, size_t length) override; - void WriteByte(int8_t value) override; - - std::vector ToVector(); - - void Flush() override; - void Close() override; - -protected: - std::vector buffer; - std::size_t bufferSize; -}; \ No newline at end of file diff --git a/ZAPDUtils/Utils/Path.h b/ZAPDUtils/Utils/Path.h deleted file mode 100644 index 0f7ef27..0000000 --- a/ZAPDUtils/Utils/Path.h +++ /dev/null @@ -1,50 +0,0 @@ -#pragma once - -#include -#include -#include "Utils/StringHelper.h" - -#if __has_include() -#include -namespace fs = std::filesystem; -#else -#include -namespace fs = std::experimental::filesystem; -#endif - -class Path -{ -public: - static std::string GetFileName(const fs::path& input) - { - // https://en.cppreference.com/w/cpp/filesystem/path/filename - return input.filename().string(); - }; - - static std::string GetFileNameWithoutExtension(const fs::path& input) - { - // https://en.cppreference.com/w/cpp/filesystem/path/stem - return input.stem().string(); - }; - - static std::string GetFileNameExtension(const std::string& input) - { - return input.substr(input.find_last_of("."), input.length()); - }; - - static fs::path GetPath(const std::string& input) - { - std::vector split = StringHelper::Split(input, "/"); - fs::path output; - - for (std::string str : split) - { - if (str.find_last_of(".") == std::string::npos) - output /= str; - } - - return output; - }; - - static fs::path GetDirectoryName(const fs::path& path) { return path.parent_path(); }; -}; diff --git a/ZAPDUtils/Utils/Stream.h b/ZAPDUtils/Utils/Stream.h deleted file mode 100644 index e72d794..0000000 --- a/ZAPDUtils/Utils/Stream.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include -#include - -enum class SeekOffsetType -{ - Start, - Current, - End -}; - -class Stream -{ -public: - virtual ~Stream() = default; - virtual uint64_t GetLength() = 0; - uint64_t GetBaseAddress() { return baseAddress; } - - virtual void Seek(int32_t offset, SeekOffsetType seekType) = 0; - - virtual std::unique_ptr Read(size_t length) = 0; - virtual void Read(const char* dest, size_t length) = 0; - virtual int8_t ReadByte() = 0; - - virtual void Write(char* destBuffer, size_t length) = 0; - virtual void WriteByte(int8_t value) = 0; - - virtual void Flush() = 0; - virtual void Close() = 0; - -protected: - uint64_t baseAddress; -}; \ No newline at end of file diff --git a/ZAPDUtils/Utils/StringHelper.cpp b/ZAPDUtils/Utils/StringHelper.cpp deleted file mode 100644 index 26a8af3..0000000 --- a/ZAPDUtils/Utils/StringHelper.cpp +++ /dev/null @@ -1,130 +0,0 @@ -#include "StringHelper.h" - -#pragma optimize("2", on) -#define _CRT_SECURE_NO_WARNINGS - -#ifndef _MSC_VER -#define vsprintf_s vsprintf -#endif - -std::vector StringHelper::Split(std::string s, const std::string& delimiter) -{ - size_t pos_start = 0, pos_end, delim_len = delimiter.length(); - std::string token; - std::vector res; - - while ((pos_end = s.find(delimiter, pos_start)) != std::string::npos) { - token = s.substr(pos_start, pos_end - pos_start); - pos_start = pos_end + delim_len; - res.push_back(token); - } - - res.push_back(s.substr(pos_start)); - return res; -} - -std::string StringHelper::Strip(std::string s, const std::string& delimiter) -{ - size_t pos = 0; - std::string token; - - while ((pos = s.find(delimiter)) != std::string::npos) - { - token = s.substr(0, pos); - s.erase(pos, pos + delimiter.length()); - } - - return s; -} - -std::string StringHelper::Replace(std::string str, const std::string& from, - const std::string& to) -{ - size_t start_pos = str.find(from); - - while (start_pos != std::string::npos) - { - str.replace(start_pos, from.length(), to); - start_pos = str.find(from); - } - - return str; -} - -void StringHelper::ReplaceOriginal(std::string& str, const std::string& from, const std::string& to) -{ - size_t start_pos = str.find(from); - - while (start_pos != std::string::npos) - { - str.replace(start_pos, from.length(), to); - start_pos = str.find(from); - } -} - -bool StringHelper::StartsWith(const std::string& s, const std::string& input) -{ -#if __cplusplus >= 202002L - return s.starts_with(input.c_str()); -#else - return s.rfind(input, 0) == 0; -#endif -} - -bool StringHelper::Contains(const std::string& s, const std::string& input) -{ - return s.find(input) != std::string::npos; -} - -bool StringHelper::EndsWith(const std::string& s, const std::string& input) -{ - size_t inputLen = strlen(input.c_str()); - return s.rfind(input) == (s.size() - inputLen); -} - -std::string StringHelper::Sprintf(const char* format, ...) -{ - char buffer[32768]; - // char buffer[2048]; - std::string output; - va_list va; - - va_start(va, format); - vsprintf_s(buffer, format, va); - va_end(va); - - output = buffer; - return output; -} - -std::string StringHelper::Implode(std::vector& elements, - const char* const separator) -{ - return ""; - - // return std::accumulate(std::begin(elements), std::end(elements), std::string(), - //[separator](std::string& ss, std::string& s) { - // return ss.empty() ? s : ss + separator + s; - //}); -} - -int64_t StringHelper::StrToL(const std::string& str, int32_t base) -{ - return std::strtoull(str.c_str(), nullptr, base); -} - -std::string StringHelper::BoolStr(bool b) -{ - return b ? "true" : "false"; -} - -bool StringHelper::HasOnlyDigits(const std::string& str) -{ - return std::all_of(str.begin(), str.end(), ::isdigit); -} - -bool StringHelper::IEquals(const std::string& a, const std::string& b) -{ - return std::equal(a.begin(), a.end(), b.begin(), b.end(), - [](char a, char b) { return tolower(a) == tolower(b); }); -} diff --git a/ZAPDUtils/Utils/StringHelper.h b/ZAPDUtils/Utils/StringHelper.h deleted file mode 100644 index b737a2f..0000000 --- a/ZAPDUtils/Utils/StringHelper.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include - -class StringHelper -{ -public: - static std::vector Split(std::string s, const std::string& delimiter); - static std::string Strip(std::string s, const std::string& delimiter); - static std::string Replace(std::string str, const std::string& from, const std::string& to); - static void ReplaceOriginal(std::string& str, const std::string& from, const std::string& to); - static bool StartsWith(const std::string& s, const std::string& input); - static bool Contains(const std::string& s, const std::string& input); - static bool EndsWith(const std::string& s, const std::string& input); - static std::string Sprintf(const char* format, ...); - static std::string Implode(std::vector& elements, const char* const separator); - static int64_t StrToL(const std::string& str, int32_t base = 10); - static std::string BoolStr(bool b); - static bool HasOnlyDigits(const std::string& str); - static bool IEquals(const std::string& a, const std::string& b); -}; \ No newline at end of file diff --git a/ZAPDUtils/Utils/vt.h b/ZAPDUtils/Utils/vt.h deleted file mode 100644 index 23f4244..0000000 --- a/ZAPDUtils/Utils/vt.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef VT_H -#define VT_H - -// clang-format off -#define VT_COLOR_BLACK 0 -#define VT_COLOR_RED 1 -#define VT_COLOR_GREEN 2 -#define VT_COLOR_YELLOW 3 -#define VT_COLOR_BLUE 4 -#define VT_COLOR_PURPLE 5 -#define VT_COLOR_CYAN 6 -#define VT_COLOR_WHITE 7 -#define VT_COLOR_LIGHTGRAY 8 -#define VT_COLOR_DARKGRAY 9 - -#define VT_COLOR_FOREGROUND 3 -#define VT_COLOR_BACKGROUND 4 -// clang-format on - -#define VT_COLOR_EXPAND0(type, color) #type #color -#define VT_COLOR_EXPAND1(type, color) VT_COLOR_EXPAND0(type, color) -#define VT_COLOR(type, color) VT_COLOR_EXPAND1(VT_COLOR_##type, VT_COLOR_##color) - -#define VT_ESC "\x1b" -#define VT_CSI "[" -#define VT_CUP(x, y) VT_ESC VT_CSI y ";" x "H" -#define VT_ED(n) VT_ESC VT_CSI #n "J" -#define VT_SGR(n) VT_ESC VT_CSI n "m" - -// Add more macros if necessary -#define VT_COL(back, fore) VT_SGR(VT_COLOR(BACKGROUND, back) ";" VT_COLOR(FOREGROUND, fore)) -#define VT_FGCOL(color) VT_SGR(VT_COLOR(FOREGROUND, color)) -#define VT_BGCOL(color) VT_SGR(VT_COLOR(BACKGROUND, color)) - -// Bold -#define VT_BOLD "1" - -// Bold color support -#define VT_BOLD_FGCOL(color) VT_SGR(VT_BOLD ";" VT_COLOR(FOREGROUND, color)) -#define VT_BOLD_BGCOL(color) VT_SGR(VT_BOLD ";" VT_COLOR(BACKGROUND, color)) - -#define VT_RST VT_SGR("") -#define VT_CLS VT_ED(2) - -#endif diff --git a/ZAPDUtils/Vec2f.h b/ZAPDUtils/Vec2f.h deleted file mode 100644 index 73e9259..0000000 --- a/ZAPDUtils/Vec2f.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include - -struct Vec2f -{ - float x, y; - - Vec2f() - { - x = 0; - y = 0; - }; - Vec2f(float nX, float nY) - { - x = nX; - y = nY; - }; -}; \ No newline at end of file diff --git a/ZAPDUtils/Vec3f.h b/ZAPDUtils/Vec3f.h deleted file mode 100644 index 844b152..0000000 --- a/ZAPDUtils/Vec3f.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -struct Vec3f -{ - float x, y, z; - - Vec3f() - { - x = 0; - y = 0; - z = 0; - }; - Vec3f(float nX, float nY, float nZ) - { - x = nX; - y = nY; - z = nZ; - }; -}; \ No newline at end of file diff --git a/ZAPDUtils/Vec3s.h b/ZAPDUtils/Vec3s.h deleted file mode 100644 index 05816ed..0000000 --- a/ZAPDUtils/Vec3s.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include - -struct Vec3s -{ - int16_t x, y, z; - - Vec3s() - { - x = 0; - y = 0; - z = 0; - }; - Vec3s(int16_t nX, int16_t nY, int16_t nZ) - { - x = nX; - y = nY; - z = nZ; - }; -}; \ No newline at end of file diff --git a/ZAPDUtils/ZAPDUtils.vcxproj b/ZAPDUtils/ZAPDUtils.vcxproj deleted file mode 100644 index 164f4bb..0000000 --- a/ZAPDUtils/ZAPDUtils.vcxproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {a2e01c3e-d647-45d1-9788-043debc1a908} - ZAPDUtils - 10.0 - - - - StaticLibrary - false - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - false - v142 - MultiByte - - - StaticLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - MinimumRecommendedRules.ruleset - - - - - false - MinimumRecommendedRules.ruleset - - - - - true - MinimumRecommendedRules.ruleset - - - - - false - MinimumRecommendedRules.ruleset - - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - MaxSpeed - Speed - Default - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - Default - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - Console - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ZAPDUtils/ZAPDUtils.vcxproj.filters b/ZAPDUtils/ZAPDUtils.vcxproj.filters deleted file mode 100644 index 3c46d19..0000000 --- a/ZAPDUtils/ZAPDUtils.vcxproj.filters +++ /dev/null @@ -1,87 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {d8c2c1e7-b065-4b0f-86a2-46ab46eedc0b} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {e047919d-7186-49ca-b115-e48fbb5c8743} - - - {3de9dd46-0dfd-4d48-9f20-9f24e5b80fe0} - - - - - Header Files\Utils - - - Header Files\Utils - - - Header Files\Utils - - - Header Files\Utils - - - Header Files\Utils - - - Header Files\Utils - - - Header Files\Utils - - - Header Files\Utils - - - Header Files - - - Header Files\Utils - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files\Utils - - - Source Files\Utils - - - Source Files\Utils - - - Source Files\Libraries - - - Source Files\Utils - - - \ No newline at end of file -- cgit v1.2.3