tweak: overall build improvements, speed, linux etc

Yamashi · Yamashi · commit 0823b9988ff1 · 2022-06-01T14:42:00.000+02:00
diff --git a/Code/client/Events/PapyrusFunctionRegisterEvent.h b/Code/client/Events/PapyrusFunctionRegisterEvent.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <TiltedCore/Stl.hpp>
-
 using TiltedPhoques::String;
 
 /**
diff --git a/Code/client/Games/References.cpp b/Code/client/Games/References.cpp
@@ -53,6 +53,21 @@ static TRotate* RealRotateZ = nullptr;
 static TActorProcess* RealActorProcess = nullptr;
 static TLockChange* RealLockChange = nullptr;
 
+namespace Settings
+{
+int32_t* GetDifficulty() noexcept
+{
+    POINTER_SKYRIMSE(int32_t, s_difficulty, 381472);
+    return s_difficulty.Get();
+}
+
+float* GetGreetDistance() noexcept
+{
+    POINTER_SKYRIMSE(float, s_greetDistance, 370892);
+    return s_greetDistance.Get();
+}
+}
+
 namespace GameplayFormulas
 {
 
diff --git a/Code/client/Games/References.h b/Code/client/Games/References.h
@@ -5,26 +5,13 @@
 
 namespace GameplayFormulas
 {
-
 float CalculateRealDamage(Actor* apHittee, float aDamage) noexcept;
-
 }
 
 namespace Settings
 {
-
-int32_t* GetDifficulty() noexcept
-{
-    POINTER_SKYRIMSE(int32_t, s_difficulty, 381472);
-    return s_difficulty.Get();
-}
-
-float* GetGreetDistance() noexcept
-{
-    POINTER_SKYRIMSE(float, s_greetDistance, 370892);
-    return s_greetDistance.Get();
-}
-
+int32_t* GetDifficulty() noexcept;
+float* GetGreetDistance() noexcept;
 }
 
 void FadeOutGame(bool aFadingOut, bool aBlackFade, float aFadeDuration, bool aRemainVisible, float aSecondsToFade) noexcept;
diff --git a/Code/client/TiltedOnlinePCH.h b/Code/client/TiltedOnlinePCH.h
@@ -37,6 +37,7 @@
 #include <TiltedCore/TaskQueue.hpp>
 #include <TiltedCore/Buffer.hpp>
 #include <TiltedCore/Initializer.hpp>
+#include <TiltedCore/Serialization.hpp>
 
 // TiltedReverse
 #include <AutoPtr.hpp>
diff --git a/Code/components/console/ConsoleRegistry.h b/Code/components/console/ConsoleRegistry.h
@@ -5,7 +5,6 @@
 #include <console/Command.h>
 #include <console/CommandQueue.h>
 #include <console/Setting.h>
-#include <spdlog/spdlog-inl.h>
 
 namespace Console
 {
diff --git a/Code/components/es_loader/ESLoader.h b/Code/components/es_loader/ESLoader.h
@@ -6,7 +6,7 @@ namespace fs = std::filesystem;
 
 namespace ESLoader
 {
-class RecordCollection;
+struct RecordCollection;
 
 struct PluginData
 {
diff --git a/Code/components/es_loader/RecordCollection.h b/Code/components/es_loader/RecordCollection.h
@@ -10,11 +10,10 @@
 
 namespace ESLoader
 {
-class RecordCollection
+struct RecordCollection
 {
     friend class TESFile;
 
-  public:
     FormEnum GetFormType(uint32_t aFormId) const noexcept
     {
         auto record = m_allRecords.find(aFormId);
@@ -64,14 +63,14 @@ class RecordCollection
     void BuildReferences();
 
 private:
-    TiltedPhoques::Map<uint32_t, Record> m_allRecords{};
-    TiltedPhoques::Map<uint32_t, REFR> m_objectReferences{};
-    TiltedPhoques::Map<uint32_t, CLMT> m_climates{};
-    TiltedPhoques::Map<uint32_t, NPC> m_npcs{};
-    TiltedPhoques::Map<uint32_t, CONT> m_containers{};
-    TiltedPhoques::Map<uint32_t, GMST> m_gameSettings{};
-    TiltedPhoques::Map<uint32_t, WRLD> m_worlds{};
-    TiltedPhoques::Map<uint32_t, NAVM> m_navMeshes{};
+    Map<uint32_t, Record> m_allRecords{};
+    Map<uint32_t, REFR> m_objectReferences{};
+    Map<uint32_t, CLMT> m_climates{};
+    Map<uint32_t, NPC> m_npcs{};
+    Map<uint32_t, CONT> m_containers{};
+    Map<uint32_t, GMST> m_gameSettings{};
+    Map<uint32_t, WRLD> m_worlds{};
+    Map<uint32_t, NAVM> m_navMeshes{};
 };
 
 } // namespace ESLoader
diff --git a/Code/encoding/Differential.h b/Code/encoding/Differential.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <optional>
-#include <TiltedCore/Buffer.hpp>
 
 template <class T>
 struct Differential
diff --git a/Code/encoding/EncodingPch.h b/Code/encoding/EncodingPch.h
@@ -0,0 +1,10 @@
+#include <mutex>
+#include <optional>
+
+#include <TiltedCore/Stl.hpp>
+#include <TiltedCore/Allocator.hpp>
+#include <TiltedCore/Buffer.hpp>
+#include <TiltedCore/Serialization.hpp>
+
+#include <glm/vec2.hpp>
+#include <glm/vec3.hpp>
diff --git a/Code/encoding/Messages/AuthenticationRequest.h b/Code/encoding/Messages/AuthenticationRequest.h
@@ -2,7 +2,7 @@
 
 #include "Message.h"
 #include <Structs/Mods.h>
-#include <TiltedCore/Buffer.hpp>
+
 
 struct AuthenticationRequest final : ClientMessage
 {
diff --git a/Code/encoding/Messages/ClientReferencesMoveRequest.h b/Code/encoding/Messages/ClientReferencesMoveRequest.h
@@ -2,7 +2,6 @@
 
 #include "Message.h"
 #include <Structs/ReferenceUpdate.h>
-#include <TiltedCore/Stl.hpp>
 
 using TiltedPhoques::String;
 
diff --git a/Code/encoding/Messages/Message.h b/Code/encoding/Messages/Message.h
@@ -1,9 +1,6 @@
 #pragma once
 
 #include "../Opcodes.h"
-#include <TiltedCore/Buffer.hpp>
-#include <TiltedCore/Stl.hpp>
-#include <TiltedCore/Serialization.hpp>
 
 using TiltedPhoques::String;
 using TiltedPhoques::Serialization;
diff --git a/Code/encoding/Messages/NotifyEquipmentChanges.h b/Code/encoding/Messages/NotifyEquipmentChanges.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Message.h"
-#include <TiltedCore/Buffer.hpp>
+
 #include <Structs/GameId.h>
 
 struct NotifyEquipmentChanges final : ServerMessage
diff --git a/Code/encoding/Messages/NotifyInventoryChanges.h b/Code/encoding/Messages/NotifyInventoryChanges.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Message.h"
-#include <TiltedCore/Buffer.hpp>
+
 #include <Structs/Inventory.h>
 
 struct NotifyInventoryChanges final : ServerMessage
diff --git a/Code/encoding/Messages/NotifyObjectInventoryChanges.h b/Code/encoding/Messages/NotifyObjectInventoryChanges.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Message.h"
-#include <TiltedCore/Buffer.hpp>
+
 #include <Structs/Inventory.h>
 
 struct NotifyObjectInventoryChanges final : ServerMessage
diff --git a/Code/encoding/Messages/ServerMessageFactory.cpp b/Code/encoding/Messages/ServerMessageFactory.cpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <TiltedCore/Stl.hpp>
-#include <TiltedCore/Allocator.hpp>
 #include <Messages/ServerMessageFactory.h>
 
 static std::function<UniquePtr<ServerMessage>(TiltedPhoques::Buffer::Reader& aReader)>
diff --git a/Code/encoding/StringCache.h b/Code/encoding/StringCache.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <mutex>
-#include <TiltedCore/Stl.hpp>
-#include <optional>
 #include <Messages/StringCacheUpdate.h>
 
 struct StringCache
diff --git a/Code/encoding/Structs/ActionEvent.h b/Code/encoding/Structs/ActionEvent.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <cstdint>
-#include <TiltedCore/Stl.hpp>
-#include <TiltedCore/Buffer.hpp>
 #include "AnimationVariables.h"
 #include "CachedString.h"
 
diff --git a/Code/encoding/Structs/ActorValues.h b/Code/encoding/Structs/ActorValues.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
-#include <TiltedCore/Stl.hpp>
-
 struct ActorValues
 {
     ActorValues() = default;
diff --git a/Code/encoding/Structs/AnimationGraphDescriptor.h b/Code/encoding/Structs/AnimationGraphDescriptor.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <TiltedCore/Stl.hpp>
-#include <cstdint>
-
 struct AnimationGraphDescriptor
 {
     AnimationGraphDescriptor() = default;
diff --git a/Code/encoding/Structs/AnimationVariables.h b/Code/encoding/Structs/AnimationVariables.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <cstdint>
-#include "TiltedCore/Buffer.hpp"
-#include "TiltedCore/Stl.hpp"
 
 using TiltedPhoques::Vector;
 
diff --git a/Code/encoding/Structs/CachedString.h b/Code/encoding/Structs/CachedString.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
-#include <TiltedCore/Stl.hpp>
-
 struct CachedString : TiltedPhoques::String
 {
     CachedString() = default;
diff --git a/Code/encoding/Structs/Factions.h b/Code/encoding/Structs/Factions.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <Structs/Faction.h>
-#include <TiltedCore/Stl.hpp>
+#include "Faction.h"
 
 using TiltedPhoques::Vector;
 
diff --git a/Code/encoding/Structs/GameId.h b/Code/encoding/Structs/GameId.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
-
 using TiltedPhoques::Buffer;
 
 struct GameId
diff --git a/Code/encoding/Structs/GridCellCoords.h b/Code/encoding/Structs/GridCellCoords.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
+
 #include <Structs/Vector3_NetQuantize.h>
 #include <limits>
 
diff --git a/Code/encoding/Structs/Inventory.h b/Code/encoding/Structs/Inventory.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <optional>
-
-#include <TiltedCore/Stl.hpp>
 #include "MagicEquipment.h"
 
 using TiltedPhoques::Buffer;
diff --git a/Code/encoding/Structs/LockData.h b/Code/encoding/Structs/LockData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
+
 
 struct LockData
 {
diff --git a/Code/encoding/Structs/Mods.h b/Code/encoding/Structs/Mods.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <cstdint>
-#include <TiltedCore/Stl.hpp>
-#include <TiltedCore/Buffer.hpp>
 
 using TiltedPhoques::String;
 using TiltedPhoques::Vector;
diff --git a/Code/encoding/Structs/Movement.h b/Code/encoding/Structs/Movement.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Structs/GameId.h>
-#include <TiltedCore/Buffer.hpp>
+
 #include <Structs/Vector3_NetQuantize.h>
 #include <Structs/Rotator2_NetQuantize.h>
 #include <Structs/AnimationVariables.h>
diff --git a/Code/encoding/Structs/ObjectData.h b/Code/encoding/Structs/ObjectData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
+
 #include <Structs/GameId.h>
 #include <Structs/LockData.h>
 #include <Structs/Inventory.h>
diff --git a/Code/encoding/Structs/QuestLog.h b/Code/encoding/Structs/QuestLog.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <cstdint>
-#include <TiltedCore/Stl.hpp>
 #include <Structs/GameId.h>
 
 using TiltedPhoques::Vector;
diff --git a/Code/encoding/Structs/ReferenceUpdate.h b/Code/encoding/Structs/ReferenceUpdate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
+
 #include <Structs/Movement.h>
 #include <Structs/ActionEvent.h>
 
diff --git a/Code/encoding/Structs/Rotator2_NetQuantize.h b/Code/encoding/Structs/Rotator2_NetQuantize.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <glm/vec2.hpp>
-#include <TiltedCore/Buffer.hpp>
-
 using TiltedPhoques::Buffer;
 
 struct Rotator2_NetQuantize : glm::vec2
diff --git a/Code/encoding/Structs/ServerSettings.h b/Code/encoding/Structs/ServerSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
+
 
 using TiltedPhoques::Buffer;
 
diff --git a/Code/encoding/Structs/Tints.h b/Code/encoding/Structs/Tints.h
@@ -2,9 +2,6 @@
 
 #include "CachedString.h"
 
-#include <TiltedCore/Buffer.hpp>
-#include <TiltedCore/Stl.hpp>
-
 using TiltedPhoques::Buffer;
 using TiltedPhoques::Vector;
 
diff --git a/Code/encoding/Structs/Vector2_NetQuantize.h b/Code/encoding/Structs/Vector2_NetQuantize.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
-#include <glm/vec2.hpp>
 
 using TiltedPhoques::Buffer;
 
diff --git a/Code/encoding/Structs/Vector3_NetQuantize.h b/Code/encoding/Structs/Vector3_NetQuantize.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <TiltedCore/Buffer.hpp>
-#include <glm/vec3.hpp>
-
 using TiltedPhoques::Buffer;
 
 //! Network optimized 3d vector
diff --git a/Code/encoding/xmake.lua b/Code/encoding/xmake.lua
@@ -6,6 +6,8 @@ target(name)
     add_includedirs(".", "../", {public = true})
     add_headerfiles("**.h|Structs/Fallout4/**|Structs/Skyrim/**", {prefixdir = "Encoding"})
     add_files("**.cpp|Structs/Fallout4/**|Structs/Skyrim/**")
+    set_pcxxheader("EncodingPch.h")
+
     if is_plat("linux") then
         add_cxxflags("-fPIC")
     end    
diff --git a/Code/server/Components/ModsComponent.h b/Code/server/Components/ModsComponent.h
diff --git a/Code/server/Game/Map.h b/Code/server/Game/Map.h
diff --git a/Code/server/Game/Player.h b/Code/server/Game/Player.h
diff --git a/Code/server/Game/PlayerManager.cpp b/Code/server/Game/PlayerManager.cpp
diff --git a/Code/server/Game/PlayerManager.h b/Code/server/Game/PlayerManager.h
diff --git a/Code/server/GameServer.cpp b/Code/server/GameServer.cpp
diff --git a/Code/server/GameServer.h b/Code/server/GameServer.h
diff --git a/Code/server/Pch.h b/Code/server/Pch.h
diff --git a/Code/server/Services/CalendarService.cpp b/Code/server/Services/CalendarService.cpp
diff --git a/Code/server/Services/OverlayService.cpp b/Code/server/Services/OverlayService.cpp
diff --git a/Code/server/Services/PlayerService.cpp b/Code/server/Services/PlayerService.cpp
diff --git a/Code/server/Services/StringCacheService.cpp b/Code/server/Services/StringCacheService.cpp
diff --git a/Code/server/World.cpp b/Code/server/World.cpp
diff --git a/Code/server/World.h b/Code/server/World.h
diff --git a/Code/server/main.cpp b/Code/server/main.cpp
diff --git a/Code/tests/encoding.cpp b/Code/tests/encoding.cpp
diff --git a/Dockerfile b/Dockerfile
diff --git a/Libraries/TiltedConnect b/Libraries/TiltedConnect
diff --git a/xmake.lua b/xmake.lua

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`#include <console/Command.h>`
`6`	`6`	`#include <console/CommandQueue.h>`
`7`	`7`	`#include <console/Setting.h>`
`8`		`-#include <spdlog/spdlog-inl.h>`
`9`	`8`
`10`	`9`	`namespace Console`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace fs = std::filesystem;`
`6`	`6`
`7`	`7`	`namespace ESLoader`
`8`	`8`	`{`
`9`		`-class RecordCollection;`
	`9`	`+struct RecordCollection;`
`10`	`10`
`11`	`11`	`struct PluginData`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include "Message.h"`
`4`	`4`	`#include <Structs/Mods.h>`
`5`		`-#include <TiltedCore/Buffer.hpp>`
	`5`	`+`
`6`	`6`
`7`	`7`	`struct AuthenticationRequest final : ClientMessage`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include <TiltedCore/Buffer.hpp>`
`4`		`-#include <TiltedCore/Stl.hpp>`
`5`		`-`
`6`	`3`	`struct ActorValues`
`7`	`4`	`{`
`8`	`5`	`ActorValues() = default;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include <TiltedCore/Buffer.hpp>`
	`3`	`+`
`4`	`4`
`5`	`5`	`struct LockData`
`6`	`6`	`{`