Merge branch 'master' into pd-upscaler

Author: praydog

.github/workflows/build-pr.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS]
+        target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS, PRAGMATA]
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

.github/workflows/dev-release.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS]
+        target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS, PRAGMATA]
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

.gitignore

@@ -12,4 +12,4 @@ src/sdk/generated
 cmake-build*
 .idea/
 build_vs2019_devmode_DMC5.bat
-src/CommitHash.autogenerated
+src/CommitHash.autogenerated

CMakeLists.txt

@@ -24,9 +24,7 @@ FOR /F "tokens=*" %%b IN ('git rev-parse --abbrev-ref HEAD') DO (SET REF_BRANCH=
 FOR /F "tokens=*" %%n IN ('git rev-list --count HEAD') DO (SET REF_TOTAL_COMMITS=%%n)
 IF "%REF_TOTAL_COMMITS%"=="" (SET REF_TOTAL_COMMITS=0)
 
-FOR /F "tokens=2 delims==" %%a IN ('wmic OS get localdatetime /value') DO (
-SET datetime=%%a
-)
+FOR /F "tokens=* delims=" %%a IN ('powershell -NoProfile -Command "Get-Date -Format yyyyMMddHHmm"') DO (SET datetime=%%a)
 
 SET year=%datetime:~0,4%
 SET month=%datetime:~4,2%
@@ -42,4 +40,4 @@ echo #define REF_COMMITS_PAST_TAG %REF_COMMITS_PAST_TAG% >> src/CommitHash.autog
 echo #define REF_BRANCH "%REF_BRANCH%" >> src/CommitHash.autogenerated
 echo #define REF_TOTAL_COMMITS %REF_TOTAL_COMMITS% >> src/CommitHash.autogenerated
 echo #define REF_BUILD_DATE "%day%.%month%.%year%" >> src/CommitHash.autogenerated
-echo #define REF_BUILD_TIME "%hour%:%minute%" >> src/CommitHash.autogenerated
+echo #define REF_BUILD_TIME "%hour%:%minute%" >> src/CommitHash.autogenerated

MakeCommitHash.bat

@@ -16,6 +16,7 @@ set(ASMJIT_STATIC ON CACHE BOOL "" FORCE)
 set(DYNAMIC_LOADER ON CACHE BOOL "" FORCE) # OpenXR
 set(BUILD_TOOLS OFF CACHE BOOL "" FORCE) # DirectXTK
 set(SAFETYHOOK_FETCH_ZYDIS ON)
+set(FT_DISABLE_HARFBUZZ ON CACHE BOOL "" FORCE) # Freetype
 
 if ("${CMAKE_BUILD_TYPE}" MATCHES "Release")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MT")
@@ -48,6 +49,7 @@ REF_BUILD_MHRISE_SDK = false
 REF_BUILD_SF6_SDK = false
 REF_BUILD_DD2_SDK = false
 REF_BUILD_MHWILDS_SDK = false
+REF_BUILD_PRAGMATA_SDK = false
 REF_BUILD_FRAMEWORK = { value = true }
 REF_BUILD_DEPENDENCIES = { value = true }
 
@@ -67,6 +69,7 @@ build-mhrise-sdk = "REF_BUILD_MHRISE_SDK OR REF_BUILD_FRAMEWORK"
 build-sf6-sdk = "REF_BUILD_SF6_SDK OR REF_BUILD_FRAMEWORK"
 build-dd2-sdk = "REF_BUILD_DD2_SDK OR REF_BUILD_FRAMEWORK"
 build-mhwilds-sdk = "REF_BUILD_MHWILDS_SDK OR REF_BUILD_FRAMEWORK"
+build-pragmata-sdk = "REF_BUILD_PRAGMATA_SDK OR REF_BUILD_FRAMEWORK"
 build-framework-dependencies = "REF_BUILD_DEPENDENCIES AND CMAKE_SIZEOF_VOID_P EQUAL 8"
 
 [fetch-content.asmjit]
@@ -128,13 +131,26 @@ condition = "build-framework-dependencies"
 git = "https://github.com/cursey/safetyhook"
 tag = "b046e123dc69821f2c375161e0adef3c6d9c9db4"
 
+[fetch-content.freetype]
+git = "https://github.com/freetype/freetype"
+tag = "f1cd6dbfa0c98f352b698448f40ac27e8fb3832e"
+
 [target.imgui]
 type = "static"
-sources = ["dependencies/imgui/*.cpp"]
-include-directories = ["dependencies/imgui", "src/re2-imgui"]
+sources = [
+    "dependencies/imgui/*.cpp",
+    "dependencies/imgui/misc/freetype/imgui_freetype.cpp",
+]
+include-directories = [
+    "dependencies/imgui",
+    "dependencies/imgui/misc/freetype",
+    "src/re2-imgui"]
 compile-definitions = [
     "IMGUI_USER_CONFIG=\"${CMAKE_CURRENT_SOURCE_DIR}/src/re2-imgui/re2_imconfig.hpp\"",
 ]
+link-libraries = [
+    "freetype"
+]
 condition = "build-framework"
 
 [target.imguizmo]
@@ -187,7 +203,7 @@ tag = "v1.34.10"
 
 [fetch-content.kananlib]
 git = "https://github.com/cursey/kananlib"
-tag = "d659e3b8312e26ba19329f96b73ba88d1211bfdb"
+tag = "3a2448d5b12afd607f02af231571ec76443cb545"
 
 [target.utility]
 type = "static"
@@ -374,6 +390,14 @@ condition = "build-mhwilds-sdk"
 [target.MHWILDS]
 type = "game"
 
+[target.PRAGMATASDK]
+type = "sdk"
+compile-definitions = ["PRAGMATA", "REENGINE_PACKED", "REENGINE_AT"]
+condition = "build-pragmata-sdk"
+
+[target.PRAGMATA]
+type = "game"
+
 [template.plugin]
 type = "shared"
 include-directories = ["include/"]

cmake.toml

@@ -354,7 +354,7 @@ void ImDrawListGrowChannels(ImDrawList* draw_list, const int num_channels)
         {
             ImDrawCmd draw_cmd;
             draw_cmd.ClipRect = draw_list->_ClipRectStack.back();
-            draw_cmd.TextureId = draw_list->_TextureIdStack.back();
+            draw_cmd.TexRef = draw_list->_TextureStack.back();
             channel._CmdBuffer.push_back(draw_cmd);
         }
     }

dependencies/imgui

@@ -529,7 +529,13 @@ class API {
             static const auto fn = API::s_instance->sdk()->type_definition->get_methods;
 
             std::vector<API::Method*> methods;
-            methods.resize(get_num_methods());
+
+            auto num_methods = get_num_methods();
+            if (num_methods < 1) {
+                return {};
+            }
+
+            methods.resize(num_methods);
 
             auto result = fn(*this, (REFrameworkMethodHandle*)&methods[0], methods.size() * sizeof(API::Method*), nullptr);
 
@@ -544,7 +550,14 @@ class API {
             static const auto fn = API::s_instance->sdk()->type_definition->get_fields;
 
             std::vector<API::Field*> fields;
-            fields.resize(get_num_fields());
+            
+
+            auto num_fields = get_num_fields();
+            if (num_fields < 1) {
+                return {};
+            }
+
+            fields.resize(num_fields);
 
             auto result = fn(*this, (REFrameworkFieldHandle*)&fields[0], fields.size() * sizeof(API::Field*), nullptr);
 
@@ -681,7 +694,13 @@ class API {
             static const auto fn = API::s_instance->sdk()->method->get_params;
 
             std::vector<REFrameworkMethodParameter> params;
-            params.resize(get_num_params());
+
+            auto num_params = get_num_params();
+            if (num_params < 1) {
+                return {};
+            }
+
+            params.resize(num_params);
 
             auto result = fn(*this, (REFrameworkMethodParameter*)&params[0], params.size() * sizeof(REFrameworkMethodParameter), nullptr);
 

dependencies/imnodes/imnodes.cpp

@@ -13,7 +13,7 @@ If you want builds that work on the old non-RT versions, download the versions t
 
 [Documentation](https://cursey.github.io/reframework-book/)
 
-[Modding Haven](https://discord.gg/9Vr2SJ3) (General RE Engine modding)
+[Haven's Night](https://discord.gg/9Vr2SJ3) (General RE Engine modding)
 
 [Infernal Warks](https://discord.com/invite/nX5EzVU) (DMC5 modding)