refactor: merge NiPointX.h into NiPoint.h

qudix · qudix · commit 7d4ee48b3e44 · 2024-06-07T22:55:30.000-05:00
diff --git a/CommonLibF4/cmake/sourcelist.cmake b/CommonLibF4/cmake/sourcelist.cmake
@@ -284,9 +284,7 @@ set(SOURCES
 	include/RE/NetImmerse/NiNode.h
 	include/RE/NetImmerse/NiObject.h
 	include/RE/NetImmerse/NiObjectNET.h
-	include/RE/NetImmerse/NiPoint2.h
-	include/RE/NetImmerse/NiPoint3.h
-	include/RE/NetImmerse/NiPoint4.h
+	include/RE/NetImmerse/NiPoint.h
 	include/RE/NetImmerse/NiProperty.h
 	include/RE/NetImmerse/NiQuaternion.h
 	include/RE/NetImmerse/NiRTTI.h
@@ -436,9 +434,7 @@ set(SOURCES
 	src/RE/NetImmerse/NiBinaryStream.cpp
 	src/RE/NetImmerse/NiMatrix3.cpp
 	src/RE/NetImmerse/NiObjectNET.cpp
-	src/RE/NetImmerse/NiPoint2.cpp
-	src/RE/NetImmerse/NiPoint3.cpp
-	src/RE/NetImmerse/NiPoint4.cpp
+	src/RE/NetImmerse/NiPoint.cpp
 	src/RE/NetImmerse/NiRect.cpp
 	src/RE/Scaleform/GFx/GFx_Player.cpp
 	src/REL/IAT.cpp
diff --git a/CommonLibF4/include/RE/Bethesda/Actor.h b/CommonLibF4/include/RE/Bethesda/Actor.h
@@ -14,7 +14,7 @@
 #include "RE/Bethesda/IMovementInterface.h"
 #include "RE/Bethesda/TESObjectREFRs.h"
 #include "RE/NetImmerse/NiFlags.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/BGSCharacterMorph.h b/CommonLibF4/include/RE/Bethesda/BGSCharacterMorph.h
@@ -5,7 +5,7 @@
 #include "RE/Bethesda/BSFixedString.h"
 #include "RE/Bethesda/BSTArray.h"
 #include "RE/Bethesda/BSTHashMap.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/BGSPrimitive.h b/CommonLibF4/include/RE/Bethesda/BGSPrimitive.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/BGSTextureSet.h b/CommonLibF4/include/RE/Bethesda/BGSTextureSet.h
@@ -10,8 +10,7 @@
 #include "RE/Bethesda/TESForms.h"
 #include "RE/NetImmerse/NiAlphaProperty.h"
 #include "RE/NetImmerse/NiColor.h"
-#include "RE/NetImmerse/NiPoint2.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/BSAudioManager.h b/CommonLibF4/include/RE/Bethesda/BSAudioManager.h
@@ -5,7 +5,7 @@
 #include "RE/Bethesda/BSTHashMap.h"
 #include "RE/Bethesda/BSTList.h"
 #include "RE/NetImmerse/NiAVObject.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/BSBound.h b/CommonLibF4/include/RE/Bethesda/BSBound.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "RE/NetImmerse/NiExtraData.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/BSExtraData.h b/CommonLibF4/include/RE/Bethesda/BSExtraData.h
@@ -7,7 +7,7 @@
 #include "RE/Bethesda/BSTSmartPointer.h"
 #include "RE/Bethesda/BSTTuple.h"
 #include "RE/Bethesda/MemoryManager.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/BSGraphics.h b/CommonLibF4/include/RE/Bethesda/BSGraphics.h
@@ -3,7 +3,7 @@
 #include "RE/Bethesda/Atomic.h"
 #include "RE/Bethesda/BSTHashMap.h"
 #include "RE/NetImmerse/NiColor.h"
-#include "RE/NetImmerse/NiPoint2.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiRect.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 #include "RE/NetImmerse/NiTexture.h"
diff --git a/CommonLibF4/include/RE/Bethesda/BSShaderMaterial.h b/CommonLibF4/include/RE/Bethesda/BSShaderMaterial.h
@@ -5,7 +5,7 @@
 #include "RE/Bethesda/BSTSmartPointer.h"
 #include "RE/Bethesda/BSTextureDB.h"
 #include "RE/NetImmerse/NiColor.h"
-#include "RE/NetImmerse/NiPoint2.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/BSSpring.h b/CommonLibF4/include/RE/Bethesda/BSSpring.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "RE/NetImmerse/NiPoint2.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE::BSSpring
 {
diff --git a/CommonLibF4/include/RE/Bethesda/BSTInterpolator.h b/CommonLibF4/include/RE/Bethesda/BSTInterpolator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RE/NetImmerse/NiPoint2.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/FormComponents.h b/CommonLibF4/include/RE/Bethesda/FormComponents.h
@@ -9,7 +9,7 @@
 #include "RE/Bethesda/BSTSmartPointer.h"
 #include "RE/Bethesda/BSTTuple.h"
 #include "RE/Bethesda/MemoryManager.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiRefObject.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
diff --git a/CommonLibF4/include/RE/Bethesda/IMenu.h b/CommonLibF4/include/RE/Bethesda/IMenu.h
@@ -31,8 +31,7 @@
 #include "RE/Bethesda/UserEvents.h"
 #include "RE/NetImmerse/NiColor.h"
 #include "RE/NetImmerse/NiMatrix3.h"
-#include "RE/NetImmerse/NiPoint2.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiQuaternion.h"
 #include "RE/NetImmerse/NiRect.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
diff --git a/CommonLibF4/include/RE/Bethesda/IMovementInterface.h b/CommonLibF4/include/RE/Bethesda/IMovementInterface.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "RE/Bethesda/BSTSmartPointer.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/Interface3D.h b/CommonLibF4/include/RE/Bethesda/Interface3D.h
@@ -5,7 +5,7 @@
 #include "RE/Bethesda/BSTArray.h"
 #include "RE/Bethesda/UIShaderFXInfo.h"
 #include "RE/NetImmerse/NiColor.h"
-#include "RE/NetImmerse/NiPoint2.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/NavMesh.h b/CommonLibF4/include/RE/Bethesda/NavMesh.h
@@ -5,7 +5,7 @@
 #include "RE/Bethesda/BSTSmartPointer.h"
 #include "RE/Bethesda/FormComponents.h"
 #include "RE/Bethesda/TESForms.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/PlayerCharacter.h b/CommonLibF4/include/RE/Bethesda/PlayerCharacter.h
@@ -15,7 +15,7 @@
 #include "RE/Bethesda/BSTTuple.h"
 #include "RE/Bethesda/IMovementInterface.h"
 #include "RE/Havok/hkRefPtr.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 #include "RE/NetImmerse/NiTMap.h"
 
diff --git a/CommonLibF4/include/RE/Bethesda/PlayerControls.h b/CommonLibF4/include/RE/Bethesda/PlayerControls.h
@@ -8,8 +8,7 @@
 #include "RE/Bethesda/BSTEvent.h"
 #include "RE/Bethesda/BSTSingleton.h"
 #include "RE/Bethesda/IMovementInterface.h"
-#include "RE/NetImmerse/NiPoint2.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/Projectiles.h b/CommonLibF4/include/RE/Bethesda/Projectiles.h
@@ -6,7 +6,7 @@
 #include "RE/Bethesda/BSTEvent.h"
 #include "RE/Bethesda/CELLJobs.h"
 #include "RE/Bethesda/TESObjectREFRs.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 #include "RE/NetImmerse/NiTransform.h"
 
diff --git a/CommonLibF4/include/RE/Bethesda/ReferenceEffectController.h b/CommonLibF4/include/RE/Bethesda/ReferenceEffectController.h
@@ -2,7 +2,7 @@
 
 #include "RE/Bethesda/BSFixedString.h"
 #include "RE/Bethesda/BSPointerHandle.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/TESBoundAnimObjects.h b/CommonLibF4/include/RE/Bethesda/TESBoundAnimObjects.h
@@ -10,7 +10,7 @@
 #include "RE/Bethesda/TESBoundObjects.h"
 #include "RE/Bethesda/TESCondition.h"
 #include "RE/NetImmerse/NiColor.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h b/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h
@@ -13,7 +13,7 @@
 #include "RE/Bethesda/TESCondition.h"
 #include "RE/Bethesda/TESForms.h"
 #include "RE/NetImmerse/NiColor.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/TESCamera.h b/CommonLibF4/include/RE/Bethesda/TESCamera.h
@@ -9,8 +9,7 @@
 #include "RE/Bethesda/BSTSingleton.h"
 #include "RE/Bethesda/BSTSmartPointer.h"
 #include "RE/Havok/hkRefPtr.h"
-#include "RE/NetImmerse/NiPoint2.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiQuaternion.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
diff --git a/CommonLibF4/include/RE/Bethesda/TESForms.h b/CommonLibF4/include/RE/Bethesda/TESForms.h
@@ -22,8 +22,7 @@
 #include "RE/Bethesda/bhkPickData.h"
 #include "RE/NetImmerse/NiColor.h"
 #include "RE/NetImmerse/NiFlags.h"
-#include "RE/NetImmerse/NiPoint2.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h b/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h
@@ -11,7 +11,7 @@
 #include "RE/Bethesda/TESForms.h"
 #include "RE/Havok/hknpBodyId.h"
 #include "RE/Havok/hknpClosestUniqueBodyIdHitCollector.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiRefObject.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/TESPackages.h b/CommonLibF4/include/RE/Bethesda/TESPackages.h
@@ -5,7 +5,7 @@
 #include "RE/Bethesda/BSTList.h"
 #include "RE/Bethesda/TESCondition.h"
 #include "RE/Bethesda/TESForms.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/TESRace.h b/CommonLibF4/include/RE/Bethesda/TESRace.h
@@ -9,7 +9,7 @@
 #include "RE/Bethesda/Movement.h"
 #include "RE/Bethesda/TESCondition.h"
 #include "RE/Bethesda/TESForms.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/TESWaterForm.h b/CommonLibF4/include/RE/Bethesda/TESWaterForm.h
@@ -3,7 +3,7 @@
 #include "RE/Bethesda/FormComponents.h"
 #include "RE/Bethesda/TESForms.h"
 #include "RE/NetImmerse/NiColor.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/TESWorldSpace.h b/CommonLibF4/include/RE/Bethesda/TESWorldSpace.h
@@ -6,7 +6,7 @@
 #include "RE/Bethesda/BSTHashMap.h"
 #include "RE/Bethesda/FormComponents.h"
 #include "RE/Bethesda/TESForms.h"
-#include "RE/NetImmerse/NiPoint2.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 #include "RE/NetImmerse/NiTMap.h"
 
diff --git a/CommonLibF4/include/RE/Bethesda/Utilities.h b/CommonLibF4/include/RE/Bethesda/Utilities.h
@@ -5,7 +5,7 @@
 #include "RE/Bethesda/TESBoundObjects.h"
 #include "RE/Bethesda/bhkPickData.h"
 #include "RE/NetImmerse/NiAVObject.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/Workshop.h b/CommonLibF4/include/RE/Bethesda/Workshop.h
@@ -3,7 +3,7 @@
 #include "RE/Bethesda/BSExtraData.h"
 #include "RE/Bethesda/BSTArray.h"
 #include "RE/Bethesda/MemoryManager.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h b/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h
@@ -14,7 +14,7 @@
 #include "RE/NetImmerse/NiCollisionObject.h"
 #include "RE/NetImmerse/NiFlags.h"
 #include "RE/NetImmerse/NiMatrix3.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiSmartPointer.h"
 
 namespace RE
diff --git a/CommonLibF4/include/RE/Bethesda/bhkPickData.h b/CommonLibF4/include/RE/Bethesda/bhkPickData.h
@@ -4,7 +4,7 @@
 #include "RE/Bethesda/bhkCharacterController.h"
 #include "RE/Havok/hkVector4.h"
 #include "RE/Havok/hknpCollisionResult.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/Fallout.h b/CommonLibF4/include/RE/Fallout.h
@@ -278,9 +278,7 @@
 #include "RE/NetImmerse/NiNode.h"
 #include "RE/NetImmerse/NiObject.h"
 #include "RE/NetImmerse/NiObjectNET.h"
-#include "RE/NetImmerse/NiPoint2.h"
-#include "RE/NetImmerse/NiPoint3.h"
-#include "RE/NetImmerse/NiPoint4.h"
+#include "RE/NetImmerse/NiPoint.h"
 #include "RE/NetImmerse/NiProperty.h"
 #include "RE/NetImmerse/NiQuaternion.h"
 #include "RE/NetImmerse/NiRTTI.h"
diff --git a/CommonLibF4/include/RE/NetImmerse/NiBound.h b/CommonLibF4/include/RE/NetImmerse/NiBound.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/NetImmerse/NiCloningProcess.h b/CommonLibF4/include/RE/NetImmerse/NiCloningProcess.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "RE/Bethesda/BSTHashMap.h"
-#include "RE/NetImmerse/NiPoint3.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/NetImmerse/NiMatrix3.h b/CommonLibF4/include/RE/NetImmerse/NiMatrix3.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "RE/NetImmerse/NiPoint3.h"
-#include "RE/NetImmerse/NiPoint4.h"
+#include "RE/NetImmerse/NiPoint.h"
 
 namespace RE
 {
diff --git a/CommonLibF4/include/RE/NetImmerse/NiPoint.h b/CommonLibF4/include/RE/NetImmerse/NiPoint.h
diff --git a/CommonLibF4/include/RE/NetImmerse/NiPoint2.h b/CommonLibF4/include/RE/NetImmerse/NiPoint2.h
diff --git a/CommonLibF4/include/RE/NetImmerse/NiPoint3.h b/CommonLibF4/include/RE/NetImmerse/NiPoint3.h
diff --git a/CommonLibF4/include/RE/NetImmerse/NiPoint4.h b/CommonLibF4/include/RE/NetImmerse/NiPoint4.h
diff --git a/CommonLibF4/include/RE/NetImmerse/NiTransform.h b/CommonLibF4/include/RE/NetImmerse/NiTransform.h
diff --git a/CommonLibF4/src/RE/NetImmerse/NiPoint.cpp b/CommonLibF4/src/RE/NetImmerse/NiPoint.cpp
diff --git a/CommonLibF4/src/RE/NetImmerse/NiPoint2.cpp b/CommonLibF4/src/RE/NetImmerse/NiPoint2.cpp
diff --git a/CommonLibF4/src/RE/NetImmerse/NiPoint3.cpp b/CommonLibF4/src/RE/NetImmerse/NiPoint3.cpp
diff --git a/CommonLibF4/src/RE/NetImmerse/NiPoint4.cpp b/CommonLibF4/src/RE/NetImmerse/NiPoint4.cpp

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include "RE/Bethesda/BSFixedString.h"`
`6`	`6`	`#include "RE/Bethesda/BSTArray.h"`
`7`	`7`	`#include "RE/Bethesda/BSTHashMap.h"`
`8`		`-#include "RE/NetImmerse/NiPoint3.h"`
	`8`	`+#include "RE/NetImmerse/NiPoint.h"`
`9`	`9`
`10`	`10`	`namespace RE`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`	`3`	`#include "RE/NetImmerse/NiExtraData.h"`
`4`		`-#include "RE/NetImmerse/NiPoint3.h"`
	`4`	`+#include "RE/NetImmerse/NiPoint.h"`
`5`	`5`
`6`	`6`	`namespace RE`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include "RE/Bethesda/BSTSmartPointer.h"`
`8`	`8`	`#include "RE/Bethesda/BSTTuple.h"`
`9`	`9`	`#include "RE/Bethesda/MemoryManager.h"`
`10`		`-#include "RE/NetImmerse/NiPoint3.h"`
	`10`	`+#include "RE/NetImmerse/NiPoint.h"`
`11`	`11`
`12`	`12`	`namespace RE`
`13`	`13`	`{`