Update dependencies

powerof3 · Sep 27, 2023 · 32ed901 · 32ed901
1 parent 808136c
commit 32ed901
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 119 deletions.
diff --git a/SPID/include/Cache.h b/SPID/include/Cache.h
@@ -1,17 +1,7 @@
 #pragma once
 
-inline HMODULE tweaks;
-
 namespace Cache
 {
-	using _GetFormEditorID = const char* (*)(std::uint32_t);
-
-	namespace EditorID
-	{
-		std::string GetEditorID(RE::FormID a_formID);
-		std::string GetEditorID(RE::TESForm* a_form);
-	}
-
 	namespace FormType
 	{
 		inline constexpr std::array whitelist{
@@ -31,4 +21,3 @@ namespace Cache
 		bool GetWhitelisted(RE::FormType a_type);
 	}
 }
-namespace EditorID = Cache::EditorID;
diff --git a/SPID/include/Defs.h b/SPID/include/Defs.h
@@ -128,7 +128,7 @@ inline std::ostream& operator<<(std::ostream& os, RE::TESFile* file)
 
 inline std::ostream& operator<<(std::ostream& os, RE::TESForm* form)
 {
-	if (const auto& edid = EditorID::GetEditorID(form); !edid.empty()) {
+	if (const auto& edid = edid::get_editorID(form); !edid.empty()) {
 		os << edid << " ";
 	}
 	os << "["

diff --git a/SPID/include/PCH.h b/SPID/include/PCH.h
@@ -9,16 +9,18 @@
 #include "RE/Skyrim.h"
 #include "SKSE/SKSE.h"
 
-#include <ClibUtil/distribution.hpp>
-#include <ClibUtil/rng.hpp>
-#include <ClibUtil/simpleINI.hpp>
-#include <ClibUtil/string.hpp>
 #include <MergeMapperPluginAPI.h>
 #include <ankerl/unordered_dense.h>
 #include <spdlog/sinks/basic_file_sink.h>
 #include <srell.hpp>
 #include <xbyak/xbyak.h>
 
+#include <ClibUtil/distribution.hpp>
+#include <ClibUtil/editorID.hpp>
+#include <ClibUtil/rng.hpp>
+#include <ClibUtil/simpleINI.hpp>
+#include <ClibUtil/string.hpp>
+
 #include "LogBuffer.h"
 
 #define DLLEXPORT __declspec(dllexport)
@@ -29,6 +31,7 @@ namespace buffered_logger = LogBuffer;
 namespace string = clib_util::string;
 namespace distribution = clib_util::distribution;
 namespace hash = clib_util::hash;
+namespace edid = clib_util::editorID;
 
 using namespace std::literals;
 using namespace string::literals;

diff --git a/SPID/src/Cache.cpp b/SPID/src/Cache.cpp
@@ -2,54 +2,6 @@
 
 namespace Cache
 {
-	std::string EditorID::GetEditorID(RE::FormID a_formID)
-	{
-		static auto function = reinterpret_cast<_GetFormEditorID>(GetProcAddress(tweaks, "GetFormEditorID"));
-		if (function) {
-			return function(a_formID);
-		}
-		return {};
-	}
-
-	std::string EditorID::GetEditorID(RE::TESForm* a_form)
-	{
-		if (!a_form) {
-			return {};
-		}
-		switch (a_form->GetFormType()) {
-		case RE::FormType::Keyword:
-		case RE::FormType::LocationRefType:
-		case RE::FormType::Action:
-		case RE::FormType::MenuIcon:
-		case RE::FormType::Global:
-		case RE::FormType::HeadPart:
-		case RE::FormType::Race:
-		case RE::FormType::Sound:
-		case RE::FormType::Script:
-		case RE::FormType::Navigation:
-		case RE::FormType::Cell:
-		case RE::FormType::WorldSpace:
-		case RE::FormType::Land:
-		case RE::FormType::NavMesh:
-		case RE::FormType::Dialogue:
-		case RE::FormType::Quest:
-		case RE::FormType::Idle:
-		case RE::FormType::AnimatedObject:
-		case RE::FormType::ImageAdapter:
-		case RE::FormType::VoiceType:
-		case RE::FormType::Ragdoll:
-		case RE::FormType::DefaultObject:
-		case RE::FormType::MusicType:
-		case RE::FormType::StoryManagerBranchNode:
-		case RE::FormType::StoryManagerQuestNode:
-		case RE::FormType::StoryManagerEventNode:
-		case RE::FormType::SoundRecord:
-			return a_form->GetFormEditorID();
-		default:
-			return GetEditorID(a_form->GetFormID());
-		}
-	}
-
 	bool FormType::GetWhitelisted(const RE::FormType a_type)
 	{
 		return std::ranges::find(whitelist, a_type) != whitelist.end();

diff --git a/SPID/src/LookupNPC.cpp b/SPID/src/LookupNPC.cpp
@@ -4,7 +4,7 @@ namespace NPC
 {
 	Data::ID::ID(RE::TESActorBase* a_base) :
 		formID(a_base->GetFormID()),
-		editorID(EditorID::GetEditorID(a_base))
+		editorID(edid::get_editorID(a_base))
 	{}
 
 	bool Data::ID::contains(const std::string& a_str) const

diff --git a/SPID/src/PCLevelMultManager.cpp b/SPID/src/PCLevelMultManager.cpp
@@ -73,11 +73,11 @@ namespace PCLevelMult
 		for (auto& [playerID, npcFormIDs] : _cache) {
 			logger::info("PlayerID : {:X}", playerID);
 			for (auto& [npcFormID, levelMap] : npcFormIDs) {
-				logger::info("\tNPC : {} [{:X}]", EditorID::GetEditorID(npcFormID), npcFormID);
+				logger::info("\tNPC : {} [{:X}]", edid::get_editorID(RE::TESForm::LookupByID(npcFormID)), npcFormID);
 				for (auto& [level, distFormMap] : levelMap.entries) {
 					logger::info("\t\tLevel : {}", level);
 					for (auto& [distFormID, idxSet] : distFormMap.rejectedEntries) {
-						logger::info("\t\t\tDist FormID : {} [{:X}]", EditorID::GetEditorID(distFormID), distFormID);
+						logger::info("\t\t\tDist FormID : {} [{:X}]", edid::get_editorID(RE::TESForm::LookupByID(distFormID)), distFormID);
 						for (auto& idx : idxSet) {
 							logger::info("\t\t\t\tIDX : {}", idx);
 						}
@@ -110,13 +110,13 @@ namespace PCLevelMult
 		for (auto& [playerID, npcFormIDs] : _cache) {
 			logger::info("PlayerID : {:X}", playerID);
 			for (auto& [npcFormID, levelMap] : npcFormIDs) {
-				logger::info("\tNPC : {} [{:X}]", EditorID::GetEditorID(npcFormID), npcFormID);
+				logger::info("\tNPC : {} [{:X}]", edid::get_editorID(RE::TESForm::LookupByID(npcFormID)), npcFormID);
 				for (auto& [level, distFormMap] : levelMap.entries) {
 					logger::info("\t\tLevel : {}", level);
 					for (auto& [formType, formIDSet] : distFormMap.distributedEntries) {
 						logger::info("\t\t\tDist FormType : {}", formType);
 						for (auto& formID : formIDSet) {
-							logger::info("\t\t\t\tDist FormID : {} [{:X}]", EditorID::GetEditorID(formID), formID);
+							logger::info("\t\t\t\tDist FormID : {} [{:X}]", edid::get_editorID(RE::TESForm::LookupByID(formID)), formID);
 						}
 					}
 				}

diff --git a/SPID/src/main.cpp b/SPID/src/main.cpp
@@ -14,7 +14,7 @@ void MessageHandler(SKSE::MessagingInterface::Message* a_message)
 		{
 			logger::info("{:*^50}", "DEPENDENCIES");
 
-			tweaks = GetModuleHandle(L"po3_Tweaks");
+            const auto tweaks = GetModuleHandle(L"po3_Tweaks");
 			logger::info("powerofthree's Tweaks (po3_tweaks) detected : {}", tweaks != nullptr);
 
 			if (std::tie(shouldLookupForms, shouldLogErrors) = INI::GetConfigs(); shouldLookupForms) {

diff --git a/cmake/ports/clib-util/portfile.cmake b/cmake/ports/clib-util/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO powerof3/CLibUtil
-    REF bf52162882f92d0ceccccd3a75305ed31b3efafa
-    SHA512 37ced7ee80b63663a7ddaf0c50d74ec32b7459b0e4e3f3f6db3afbd69faebe727ccad7a97ad48bf02686f345a5fbf7da960ff9ea0f24a52afeceb8078b608ad7
+    REF 4c942f62d83cfbdb9bb585a708cbbfbf5cb9c850
+    SHA512 8130bf589476202dcae05704145b0cbca3587e2458f1f79ee497f45fdc7dddcbc6a0e7311dd0566eb46633da963203bf0d9864debdd2406c317bbb18b484e184
     HEAD_REF master
 )
 

diff --git a/cmake/ports/clib-util/vcpkg.json b/cmake/ports/clib-util/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "clib-util",
-  "version-string": "1.3.3",
+  "version-string": "1.3.9",
   "port-version": 1,
   "description": "",
   "homepage": "https://github.com/powerof3/CLibUtil"

diff --git a/cmake/ports/mergemapper/portfile.cmake b/cmake/ports/mergemapper/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alandtse/MergeMapper
-    REF 9d710f2a2e055acb13e41319cc19e3255fa0538a
-    SHA512 4e9b49aaaf5ac969956bf066cb92423b42a4ba6681e188b792ee3494fba3084dccc744dfc4722ee8d8df1b245e5ee4b20a503e9610fadb546df921e6fae42506
+    REF ad758592e2c4fa77f0c0e985348f17af8fa24371
+    SHA512 010f2e5de88c41b5b614af5e7347f7f08293b190e89bd761664ee1f2bcfa70007f87b4e0bb219a5ad7ee06921db9f6df061c875d6723f6068d776e651f729374
     HEAD_REF main
 )
 

diff --git a/cmake/ports/mergemapper/vcpkg.json b/cmake/ports/mergemapper/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mergemapper",
-  "version-string": "1.4.0",
+  "version-string": "1.5.0",
   "port-version": 1,
   "description": "A SKSE plugin to dynamically map zmerges.",
   "homepage": "https://github.com/alandtse/MergeMapper"

diff --git a/cmake/ports/unordered-dense/portfile.cmake b/cmake/ports/unordered-dense/portfile.cmake
diff --git a/cmake/ports/unordered-dense/vcpkg.json b/cmake/ports/unordered-dense/vcpkg.json
diff --git a/extern/CommonLibSSE b/extern/CommonLibSSE
diff --git a/extern/CommonLibVR b/extern/CommonLibVR
+2 −1		README.md
+13 −1		cmake/sourcelist.cmake
+4 −0		include/RE/A/AIProcess.h
+8 −1		include/RE/A/Actor.h
+1 −0		include/RE/A/ActorMagicCaster.h
+1 −1		include/RE/A/ActorState.h
+14 −11		include/RE/A/AlchemyMenu.h
+47 −5		include/RE/A/AnimationFileManagerSingleton.h
+7 −0		include/RE/B/BGSLoadGameBuffer.h
+49 −0		include/RE/B/BGSNumericIDIndex.h
+26 −0		include/RE/B/BGSSaveFormBuffer.h
+35 −0		include/RE/B/BGSSaveGameBuffer.h
+93 −0		include/RE/B/BGSSaveLoadGame.h
+4 −1		include/RE/B/BGSScene.h
+14 −13		include/RE/B/BSEffectShaderMaterial.h
+1 −1		include/RE/B/BSFaceGenKeyframeMultiple.h
+1 −6		include/RE/B/BSIInputDevice.h
+5 −5		include/RE/B/BSImagespaceShader.h
+0 −3		include/RE/B/BSInputDevice.h
+5 −2		include/RE/B/BSKeyboardDevice.h
+34 −35		include/RE/B/BSPCOrbisGamepadDevice.h
+1 −1		include/RE/B/BSShaderManager.h
+20 −1		include/RE/B/BSTimer.h
+40 −10		include/RE/C/ConstructibleObjectMenu.h
+19 −16		include/RE/C/ControlMap.h
+2 −2		include/RE/E/EnchantConstructMenu.h
+42 −0		include/RE/F/FreeCameraState.h
+2 −2		include/RE/G/GFxMovieDef.h
+3 −3		include/RE/H/HighProcessData.h
+1 −1		include/RE/H/HitData.h
+3 −2		include/RE/H/hkArray.h
+2 −0		include/RE/H/hkStringPtr.h
+1 −1		include/RE/H/hkbCharacterStringData.h
+6 −5		include/RE/H/hkbClipGenerator.h
+52 −5		include/RE/H/hkpConstraintInstance.h
+1 −1		include/RE/H/hkpRayHitCollector.h
+6 −5		include/RE/I/IAnimationClipLoaderSingleton.h
+1 −1		include/RE/I/IMovementState.h
+134 −0		include/RE/I/ImageSpaceData.h
+30 −26		include/RE/I/ImageSpaceEffect.h
+40 −0		include/RE/I/ImageSpaceEffectDepthOfField.h
+21 −0		include/RE/I/ImageSpaceEffectOption.h
+239 −0		include/RE/I/ImageSpaceManager.h
+1 −1		include/RE/I/ImageSpaceModifierInstance.h
+1 −32		include/RE/I/ImageSpaceModifierInstanceDOF.h
+21 −11		include/RE/I/ImageSpaceShaderParam.h
+27 −0		include/RE/I/ImageSpaceTexture.h
+4 −0		include/RE/I/InputEvent.h
+1 −0		include/RE/I/InventoryChanges.h
+1 −0		include/RE/M/MenuControls.h
+1 −0		include/RE/M/MenuModeChangeEvent.h
+1 −1		include/RE/M/MiddleHighProcessData.h
+3 −1		include/RE/M/MistMenu.h
+0 −16		include/RE/Offsets.h
+1 −0		include/RE/P/PlayerCharacter.h
+2 −2		include/RE/P/Projectile.h
+26 −0		include/RE/S/ScreenshotHandler.h
+80 −64		include/RE/S/Sky.h
+12 −0		include/RE/Skyrim.h
+15 −10		include/RE/T/TESCondition.h
+2 −0		include/RE/T/TESDataHandler.h
+10 −1		include/RE/T/TESForm.h
+7 −0		include/RE/T/TESFullName.h
+9 −0		include/RE/T/TESIdleForm.h
+1 −87		include/RE/T/TESImageSpace.h
+8 −1		include/RE/T/TESObjectREFR.h
+8 −1		include/RE/T/TESPackage.h
+2 −1		include/RE/T/TESWaterSystem.h
+17 −0		include/RE/T/TextureFilterModes.h
+1 −0		include/SKSE/Impl/PCH.h
+27 −0		include/SKSE/Impl/ScePadAPI.h
+3 −0		include/SKSE/InputMap.h
+19 −0		src/RE/A/AIProcess.cpp
+31 −0		src/RE/A/Actor.cpp
+0 −11		src/RE/A/AnimationFileManagerSingleton.cpp
+0 −9		src/RE/B/BSInputDevice.cpp
+14 −0		src/RE/C/ControlMap.cpp
+8 −0		src/RE/H/hkStringPtr.cpp
+11 −0		src/RE/I/InputEvent.cpp
+7 −0		src/RE/I/InventoryChanges.cpp
+10 −0		src/RE/M/MenuControls.cpp
+1 −1		src/RE/P/Projectile.cpp
+12 −4		src/RE/S/Sky.cpp
+7 −0		src/RE/T/TESDataHandler.cpp
+28 −0		src/RE/T/TESForm.cpp
+39 −6		src/RE/T/TESObjectREFR.cpp
+122 −19		src/SKSE/InputMap.cpp
+1 −1		src/SKSE/Interfaces.cpp
+31 −31		src/SKSE/Logger.cpp