From 585e8fb9d0dbbab25978f0b0a3430b93779743f2 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Fri, 25 Nov 2022 14:39:19 +0100 Subject: [PATCH] * Expose SenseGloveTypes as a public dependency in SenseGloveConnect and SenseGloveCore modules, so that the C++ users of the API don't need to explicitly add it as a dependency * Clean up the redundant headers/modules dependency from SGCore headers * Fix RunUAT build issues for Epic Store submission --- .../Private/SGCore/SGBasicHandModel.cpp | 1 + .../Private/SGCore/SGHandInterpolator.cpp | 1 + Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp | 1 + .../SenseGloveCore/Private/SGCore/SGHandProfile.cpp | 2 ++ .../Private/SGCore/SGHapticGloveCalibrationCheck.cpp | 1 + .../SGCore/SGHapticGloveCalibrationSequence.cpp | 5 +++++ .../Private/SGCore/SGHapticGloveHandProfiles.cpp | 1 + Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp | 5 +++++ .../Private/SGCore/SGNovaGloveCalibration.cpp | 2 ++ .../Private/SGCore/SGNovaGloveHandProfile.cpp | 1 + .../Private/SGCore/SGNovaGloveSensorData.cpp | 1 + .../Private/SGCore/SGSenseGloveHandProfile.cpp | 1 + .../Private/SGCore/SGSenseGlovePose.cpp | 2 ++ .../Private/SGCore/SGSenseGloveVars.cpp | 1 + .../Private/SGCore/SGTimedBuzzCommand.cpp | 1 + .../Private/SGCore/SGTimedThumpCommand.cpp | 1 + .../SenseGloveCore/Public/SGCore/SGBasicHandModel.h | 1 - Source/SenseGloveCore/Public/SGCore/SGBuzzCommand.h | 2 +- Source/SenseGloveCore/Public/SGCore/SGDeviceModel.h | 2 -- .../Public/SGCore/SGHandInterpolator.h | 3 +-- Source/SenseGloveCore/Public/SGCore/SGHandPose.h | 5 +++-- Source/SenseGloveCore/Public/SGCore/SGHandProfile.h | 5 ++--- .../Public/SGCore/SGHapticGloveCalibrationCheck.h | 2 +- .../Public/SGCore/SGHapticGloveCalibrationSequence.h | 12 ++++++------ .../Public/SGCore/SGHapticGloveHandProfiles.h | 5 ++--- .../SenseGloveCore/Public/SGCore/SGJointKinematics.h | 3 ++- Source/SenseGloveCore/Public/SGCore/SGNovaGlove.h | 6 ++---- .../Public/SGCore/SGNovaGloveCalibration.h | 4 ++-- .../Public/SGCore/SGNovaGloveHandProfile.h | 4 +--- .../SenseGloveCore/Public/SGCore/SGNovaGloveInfo.h | 3 --- .../Public/SGCore/SGNovaGloveSensorData.h | 3 +-- Source/SenseGloveCore/Public/SGCore/SGRotatorArray.h | 2 +- .../Public/SGCore/SGSenseGloveHandProfile.h | 2 +- .../SenseGloveCore/Public/SGCore/SGSenseGloveInfo.h | 1 - .../SenseGloveCore/Public/SGCore/SGSenseGlovePose.h | 6 ++---- .../Public/SGCore/SGSenseGloveSensorData.h | 3 +-- .../SenseGloveCore/Public/SGCore/SGSenseGloveVars.h | 6 +++--- .../Public/SGCore/SGTimedBuzzCommand.h | 3 +-- .../Public/SGCore/SGTimedThumpCommand.h | 3 +-- Source/SenseGloveCore/SenseGloveCore.Build.cs | 2 +- 40 files changed, 62 insertions(+), 53 deletions(-) diff --git a/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp b/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp index e27c827a..aff09539 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp @@ -47,6 +47,7 @@ #include "SGInterop/SGIC_TArray_FQuat.h" #include "SGInterop/SGIC_TArray_FVector.h" #include "SGInterop/SGIC_TArray_TArray_float.h" +#include "SGUtils/SGArrayUtils.h" struct USGBasicHandModel::FImpl { diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp index e6a0ff14..88c31a5f 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp @@ -37,6 +37,7 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGInterpolationSet.h" #include "SGCoreImpl/SGInterpolationSetImpl.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGCoreImpl/SGHandInterpolatorImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp index 5ac056f8..0b834d8a 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp @@ -38,6 +38,7 @@ #include "Runtime/Launch/Resources/Version.h" #include "SGCore/SGRotatorArray.h" +#include "SGCore/SGBasicHandModel.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGCoreImpl/SGHandPoseImpl.h" #include "SGInterop/SGIC_ESGFinger.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp index 273d30f1..d407230a 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp @@ -37,6 +37,8 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGNovaGloveHandProfile.h" +#include "SGCore/SGSenseGloveHandProfile.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGCoreImpl/SGHandProfileImpl.h" #include "SGInterop/SGIC_FSGHandProfileImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp index 9a71bd5f..507a6547 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp @@ -37,6 +37,7 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGSensorRange.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGInterop/SGIC_ESGCalibrationStage.h" #include "SGInterop/SGIC_ESGDeviceType.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp index 1f4b1c3c..3849efc0 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp @@ -37,6 +37,11 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGCalibrationDataPoint.h" +#include "SGCore/SGHandPose.h" +#include "SGCore/SGHandProfile.h" +#include "SGCore/SGHapticGlove.h" +#include "SGCore/SGSensorRange.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGInterop/SGIC_ESGDeviceType.h" #include "SGInterop/SGIC_FSGHandPoseImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveHandProfiles.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveHandProfiles.cpp index 6f94244e..2ad80903 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveHandProfiles.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveHandProfiles.cpp @@ -35,6 +35,7 @@ #include "SGCore/SGHapticGloveHandProfiles.h" +#include "SGCore/SGHandProfile.h" #include "SGCore/SGHapticGlove.h" #include "SGCore/SGSensorRange.h" #include "SGCoreImpl/SGHapticGloveImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp index 7d781058..3d1abaa2 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp @@ -37,9 +37,14 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGBasicHandModel.h" #include "SGCore/SGBuzzCommand.h" #include "SGCore/SGDeviceImplCast.h" #include "SGCore/SGForceFeedbackCommand.h" +#include "SGCore/SGHandPose.h" +#include "SGCore/SGHandProfile.h" +#include "SGCore/SGNovaGloveInfo.h" +#include "SGCore/SGNovaGloveSensorData.h" #include "SGCore/SGThumperCommand.h" #include "SGCoreImpl/SGDeviceImpl.h" #include "SGCoreImpl/SGHapticGloveImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveCalibration.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveCalibration.cpp index a806fc76..93e80a2a 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveCalibration.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveCalibration.cpp @@ -35,6 +35,8 @@ #include "SGCore/SGNovaGloveCalibration.h" +#include "SGCore/SGNovaGloveHandProfile.h" + #include "SGCore/SGNovaGloveHandProfile.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGInterop/SGIC_FSGNovaGloveHandProfileImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp index 36889874..e78a3fbc 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp @@ -37,6 +37,7 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGHandInterpolator.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGCoreImpl/SGNovaGloveHandProfileImpl.h" #include "SGInterop/SGIC_FSGHandInterpolatorImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp index 271211b5..6e0291c7 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp @@ -37,6 +37,7 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGNovaGloveInfo.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGCoreImpl/SGNovaGloveSensorDataImpl.h" #include "SGInterop/SGIC_FQuat.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp index 1f7be497..5b59660f 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp @@ -37,6 +37,7 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGHandInterpolator.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGCoreImpl/SGSenseGloveHandProfileImpl.h" #include "SGInterop/SGIC_ESGFingerSolver.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp index 0a2dad08..db5bbc92 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp @@ -37,6 +37,8 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGSenseGloveHandProfile.h" +#include "SGCore/SGSenseGloveInfo.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGCoreImpl/SGSenseGlovePoseImpl.h" #include "SGInterop/SGIC_FSGSenseGloveHandProfileImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveVars.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveVars.cpp index c5a2ed08..12dcc1f6 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveVars.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveVars.cpp @@ -35,6 +35,7 @@ #include "SGCore/SGSenseGloveVars.h" +#include "SGCore/SGSenseGloveInfo.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGInterop/SGIC_FQuat.h" #include "SGInterop/SGIC_FSGSenseGloveInfoImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGTimedBuzzCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGTimedBuzzCommand.cpp index c25277c5..8eaa8c6a 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGTimedBuzzCommand.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGTimedBuzzCommand.cpp @@ -38,6 +38,7 @@ #include "SGFingerCommandImplCast.h" #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGBuzzCommand.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGInterop/SGIC_ESGFinger.h" #include "SGInterop/SGIC_FSGBuzzCommandImpl.h" diff --git a/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp index 8d254171..665c7c3a 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp @@ -37,6 +37,7 @@ #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGThumperCommand.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGInterop/SGIC_FSGThumperCommandImpl.h" #include "SGInterop/SGIC_FSGTimedThumpCommandImpl.h" diff --git a/Source/SenseGloveCore/Public/SGCore/SGBasicHandModel.h b/Source/SenseGloveCore/Public/SGCore/SGBasicHandModel.h index ef8c3691..129e70f3 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGBasicHandModel.h +++ b/Source/SenseGloveCore/Public/SGCore/SGBasicHandModel.h @@ -48,7 +48,6 @@ #include "SGCore/SGFloatArray.h" #include "SGTypes/SGCoreTypes.h" -#include "SGUtils/SGArrayUtils.h" #include "SGBasicHandModel.generated.h" diff --git a/Source/SenseGloveCore/Public/SGCore/SGBuzzCommand.h b/Source/SenseGloveCore/Public/SGCore/SGBuzzCommand.h index c0011111..46ca86d6 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGBuzzCommand.h +++ b/Source/SenseGloveCore/Public/SGCore/SGBuzzCommand.h @@ -40,7 +40,7 @@ #include "Templates/UniquePtr.h" #include "UObject/ObjectMacros.h" -#include "SGFingerCommand.h" +#include "SGCore/SGFingerCommand.h" #include "SGTypes/SGCoreTypes.h" #include "SGBuzzCommand.generated.h" diff --git a/Source/SenseGloveCore/Public/SGCore/SGDeviceModel.h b/Source/SenseGloveCore/Public/SGCore/SGDeviceModel.h index 654f6946..faf937ca 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGDeviceModel.h +++ b/Source/SenseGloveCore/Public/SGCore/SGDeviceModel.h @@ -42,8 +42,6 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGTypes/SGCoreTypes.h" - #include "SGDeviceModel.generated.h" class FSGDeviceModelImpl; diff --git a/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h b/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h index b25d541c..a8a93dbf 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h @@ -44,14 +44,13 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGInterpolationSet.h" #include "SGCore/SGInterpolationSetArray.h" #include "SGTypes/SGCoreTypes.h" -#include "SGUtils/SGArrayUtils.h" #include "SGHandInterpolator.generated.h" class FSGHandInterpolatorImpl; +class USGHandInterpolator; /** * Contains interpolation sets of all joint movements that can be calculated into a HandPose. diff --git a/Source/SenseGloveCore/Public/SGCore/SGHandPose.h b/Source/SenseGloveCore/Public/SGCore/SGHandPose.h index 68a18923..3a321f0a 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHandPose.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHandPose.h @@ -44,15 +44,16 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGBasicHandModel.h" #include "SGCore/SGQuatArray.h" #include "SGCore/SGRotatorArray.h" #include "SGCore/SGVectorArray.h" -#include "SGUtils/SGArrayUtils.h" +#include "SGTypes/SGCoreTypes.h" #include "SGHandPose.generated.h" +class USGBasicHandModel; class FSGHandPoseImpl; +class USGHandPose; /** * Contains all variables required to draw or analyze a virtual hand. diff --git a/Source/SenseGloveCore/Public/SGCore/SGHandProfile.h b/Source/SenseGloveCore/Public/SGCore/SGHandProfile.h index e4b4bb6f..9fa649b3 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHandProfile.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHandProfile.h @@ -41,12 +41,11 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGNovaGloveHandProfile.h" -#include "SGCore/SGSenseGloveHandProfile.h" - #include "SGHandProfile.generated.h" class FSGHandProfileImpl; +class USGNovaGloveHandProfile; +class USGSenseGloveHandProfile; /** * Interpolation profiles for a user's hand, compatible with all HapticGloves. diff --git a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationCheck.h b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationCheck.h index 38d502e2..44c7a78c 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationCheck.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationCheck.h @@ -41,12 +41,12 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGSensorRange.h" #include "SGTypes/SGCoreTypes.h" #include "SGHapticGloveCalibrationCheck.generated.h" class FSGHapticGloveCalibrationCheckImpl; +class USGSensorRange; /** * An algorithm that checks whether or not our current user is running in the same calibration range as last time. diff --git a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationSequence.h b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationSequence.h index 43d1265e..ece8dd19 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationSequence.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationSequence.h @@ -40,17 +40,17 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGCalibrationDataPoint.h" -#include "SGCore/SGHandPose.h" -#include "SGCore/SGHandProfile.h" -#include "SGCore/SGHapticGlove.h" -#include "SGCore/SGSensorRange.h" #include "SGTypes/SGCoreTypes.h" #include "SGHapticGloveCalibrationSequence.generated.h" class FSGHapticGloveCalibrationSequenceImpl; class FSGHapticGloveQuickCalibrationImpl; +class USGCalibrationDataPoint; +class USGHandPose; +class USGHandProfile; +class USGHapticGlove; +class USGSensorRange; /** * A sequence which collects data points until specific criteria have been met. It must be 'fed' an Update command from your program in order to work. @@ -198,7 +198,7 @@ public: USGHapticGlove* GetLinkedGlove(UObject* Outer) const; /** - * + * */ void SetLinkedGlove(const USGHapticGlove* LinkedGlove); diff --git a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveHandProfiles.h b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveHandProfiles.h index af236885..b08961b6 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveHandProfiles.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveHandProfiles.h @@ -37,12 +37,11 @@ #include "Containers/UnrealString.h" -#include "SGCore/SGHandProfile.h" -#include "SGCore/SGSensorRange.h" - #include "SGHapticGloveHandProfiles.generated.h" +class USGHandProfile; class USGHapticGlove; +class USGSensorRange; /** * A glove developed by SenseGlove, that has hand tracking and/or haptic feedback functionality. diff --git a/Source/SenseGloveCore/Public/SGCore/SGJointKinematics.h b/Source/SenseGloveCore/Public/SGCore/SGJointKinematics.h index a6e46fd6..59429030 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGJointKinematics.h +++ b/Source/SenseGloveCore/Public/SGCore/SGJointKinematics.h @@ -39,11 +39,12 @@ #include "Math/Quat.h" #include "Math/Vector.h" -#include "SGCore/SGBasicHandModel.h" #include "SGTypes/SGCoreTypes.h" #include "SGJointKinematics.generated.h" +class USGBasicHandModel; + /** * */ diff --git a/Source/SenseGloveCore/Public/SGCore/SGNovaGlove.h b/Source/SenseGloveCore/Public/SGCore/SGNovaGlove.h index c3aa1f5c..18b34a22 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGNovaGlove.h +++ b/Source/SenseGloveCore/Public/SGCore/SGNovaGlove.h @@ -42,11 +42,7 @@ #include "Math/Quat.h" #include "Math/Vector.h" -#include "SGCore/SGBasicHandModel.h" -#include "SGCore/SGHandPose.h" -#include "SGCore/SGHandProfile.h" #include "SGCore/SGHapticGlove.h" -#include "SGCore/SGNovaGloveSensorData.h" #include "SGTypes/SGCoreTypes.h" #include "SGNovaGlove.generated.h" @@ -54,6 +50,8 @@ class FSGNovaGloveImpl; class USGBuzzCommand; class USGForceFeedbackCommand; +class USGNovaGloveInfo; +class USGNovaGloveSensorData; class USGThumperCommand; /** diff --git a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveCalibration.h b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveCalibration.h index a98ba1ba..0bec85c3 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveCalibration.h +++ b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveCalibration.h @@ -38,10 +38,10 @@ #include "Containers/Array.h" #include "Math/Vector.h" -#include "SGCore/SGNovaGloveHandProfile.h" - #include "SGNovaGloveCalibration.generated.h" +class USGNovaGloveHandProfile; + /** * */ diff --git a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveHandProfile.h b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveHandProfile.h index db33de73..64498ae2 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveHandProfile.h +++ b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveHandProfile.h @@ -42,12 +42,10 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGTypes/SGCoreTypes.h" -#include "SGCore/SGHandInterpolator.h" - #include "SGNovaGloveHandProfile.generated.h" class FSGNovaGloveHandProfileImpl; +class USGHandInterpolator; /** * Contains user-specific data for the Nova to convert sensor data into a hand pose. diff --git a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveInfo.h b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveInfo.h index 7a9f6617..d81aa3c7 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveInfo.h +++ b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveInfo.h @@ -42,9 +42,6 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGUtils/SGArrayUtils.h" -#include "SGTypes/SGCoreTypes.h" - #include "SGNovaGloveInfo.generated.h" class FSGNovaGloveInfoImpl; diff --git a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveSensorData.h b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveSensorData.h index dc8ba1c3..3d008aca 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveSensorData.h +++ b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveSensorData.h @@ -43,11 +43,10 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGNovaGloveInfo.h" - #include "SGNovaGloveSensorData.generated.h" class FSGNovaGloveSensorDataImpl; +class USGNovaGloveInfo; /** * Sensor Data coming from a Nova, converted into useful values. diff --git a/Source/SenseGloveCore/Public/SGCore/SGRotatorArray.h b/Source/SenseGloveCore/Public/SGCore/SGRotatorArray.h index 3060388a..ca5eac39 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGRotatorArray.h +++ b/Source/SenseGloveCore/Public/SGCore/SGRotatorArray.h @@ -45,6 +45,6 @@ struct SENSEGLOVECORE_API FSGRotatorArray GENERATED_BODY() public: - UPROPERTY(EditAnywhere, BlueprintReadWrite) + UPROPERTY(EditAnywhere, Category="SenseGlove | Core | Nested Arrays", BlueprintReadWrite) TArray RotatorArray; }; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveHandProfile.h b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveHandProfile.h index 67ff0972..e5240a5a 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveHandProfile.h +++ b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveHandProfile.h @@ -43,12 +43,12 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGHandInterpolator.h" #include "SGTypes/SGCoreTypes.h" #include "SGSenseGloveHandProfile.generated.h" class FSGSenseGloveHandProfileImpl; +class USGHandInterpolator; /** * Contains everything a Sense Glove needs to calculate a HandPose. diff --git a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveInfo.h b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveInfo.h index dac98080..0e276f43 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveInfo.h +++ b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveInfo.h @@ -42,7 +42,6 @@ #include "UObject/ObjectMacros.h" #include "SGCore/SGVectorArray.h" -#include "SGUtils/SGArrayUtils.h" #include "SGTypes/SGCoreTypes.h" #include "SGSenseGloveInfo.generated.h" diff --git a/Source/SenseGloveCore/Public/SGCore/SGSenseGlovePose.h b/Source/SenseGloveCore/Public/SGCore/SGSenseGlovePose.h index a2e7ba67..80d411f6 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGSenseGlovePose.h +++ b/Source/SenseGloveCore/Public/SGCore/SGSenseGlovePose.h @@ -44,17 +44,15 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGBasicHandModel.h" -#include "SGCore/SGSenseGloveInfo.h" -#include "SGCore/SGSenseGloveHandProfile.h" #include "SGCore/SGQuatArray.h" #include "SGCore/SGRotatorArray.h" #include "SGCore/SGVectorArray.h" -#include "SGUtils/SGArrayUtils.h" #include "SGSenseGlovePose.generated.h" class FSGSenseGlovePoseImpl; +class USGSenseGloveHandProfile; +class USGSenseGloveInfo; /** * Represents a pose of a Sense Glove exoskeleton. diff --git a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveSensorData.h b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveSensorData.h index fbb9da22..0100aef1 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveSensorData.h +++ b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveSensorData.h @@ -44,7 +44,6 @@ #include "SGCore/SGFloatArray.h" #include "SGCore/SGSenseGloveInfo.h" -#include "SGUtils/SGArrayUtils.h" #include "SGSenseGloveSensorData.generated.h" @@ -184,7 +183,7 @@ public: TArray> GetSensorAngles() const; /** - * + * */ FQuat GetImuRotationQ() const; diff --git a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveVars.h b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveVars.h index 7e394a62..dc9b71ee 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveVars.h +++ b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveVars.h @@ -41,10 +41,10 @@ #include "Math/Quat.h" #include "Math/Vector.h" -#include "SGCore/SGSenseGloveInfo.h" - #include "SGSenseGloveVars.generated.h" +class USGSenseGloveInfo; + /** * "Database" class containing Sense Glove internal variables. */ @@ -82,7 +82,7 @@ public: static TArray GetStartRotations(const FString& HardwareVersion, bool bRightHanded); /** - * Retrieve the glove finger lengths of a particular Sense Glove. + * Retrieve the glove finger lengths of a particular Sense Glove. */ static TArray> GetGloveLengths(const FString& HardwareVersion); diff --git a/Source/SenseGloveCore/Public/SGCore/SGTimedBuzzCommand.h b/Source/SenseGloveCore/Public/SGCore/SGTimedBuzzCommand.h index bd0d3c68..7106e6e9 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGTimedBuzzCommand.h +++ b/Source/SenseGloveCore/Public/SGCore/SGTimedBuzzCommand.h @@ -40,11 +40,10 @@ #include "Templates/UniquePtr.h" #include "UObject/ObjectMacros.h" -#include "SGBuzzCommand.h" - #include "SGTimedBuzzCommand.generated.h" class FSGTimedBuzzCommandImpl; +class USGBuzzCommand; /** * Buzz motor commands that is meant to stop after a few milliseconds. diff --git a/Source/SenseGloveCore/Public/SGCore/SGTimedThumpCommand.h b/Source/SenseGloveCore/Public/SGCore/SGTimedThumpCommand.h index c3c6b4ee..1db936e3 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGTimedThumpCommand.h +++ b/Source/SenseGloveCore/Public/SGCore/SGTimedThumpCommand.h @@ -40,11 +40,10 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGThumperCommand.h" - #include "SGTimedThumpCommand.generated.h" class FSGTimedThumpCommandImpl; +class USGThumperCommand; /** * diff --git a/Source/SenseGloveCore/SenseGloveCore.Build.cs b/Source/SenseGloveCore/SenseGloveCore.Build.cs index e174d69a..8bc122e0 100644 --- a/Source/SenseGloveCore/SenseGloveCore.Build.cs +++ b/Source/SenseGloveCore/SenseGloveCore.Build.cs @@ -47,6 +47,7 @@ public class SenseGloveCore : ModuleRules { "Core", "Engine", + "SenseGloveTypes", } ); @@ -57,7 +58,6 @@ public class SenseGloveCore : ModuleRules "SenseGloveCoreImpl", "SenseGloveInterop", "SenseGloveLog", - "SenseGloveTypes", "SenseGloveUtils", } );