From 45923aecbe4d30f126718b8679ad916d320a8373 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Fri, 10 Mar 2023 10:51:56 +0100 Subject: [PATCH] move all sg array types into their corresponding *core modules --- SenseGlove.uplugin | 10 +++ .../Private/SGCore/SGHandPose.cpp | 2 +- .../Public/SGCore/SGBasicHandModel.h | 2 +- .../Public/SGCore/SGHandInterpolator.h | 2 +- .../SenseGloveCore/Public/SGCore/SGHandPose.h | 6 +- .../Public/SGCore/SGSenseGloveInfo.h | 2 +- .../Public/SGCore/SGSenseGlovePose.h | 6 +- .../Public/SGCore/SGSenseGloveSensorData.h | 2 +- Source/SenseGloveCore/SenseGloveCore.Build.cs | 7 ++ .../SGCoreKismet/SGAnatomyKismetLibrary.h | 2 +- .../SGBasicHandModelKismetLibrary.h | 2 +- .../SGHandInterpolatorKismetLibrary.h | 4 +- .../SGCoreKismet/SGHandPoseKismetLibrary.h | 6 +- .../SGNovaGloveCalibrationKismetLibrary.h | 2 +- .../SGCoreKismet/SGSenseComKismetLibrary.h | 2 +- .../SGSenseGloveInfoKismetLibrary.h | 4 +- .../SGCoreKismet/SGSenseGloveKismetLibrary.h | 2 +- .../SGSenseGlovePoseKismetLibrary.h | 6 +- .../SGSenseGloveSensorDataKismetLibrary.h | 2 +- .../SGSenseGloveVarsKismetLibrary.h | 2 +- .../SenseGloveCoreKismet.Build.cs | 1 + .../SGCoreTypes}/SGInterpolationSetArray.cpp | 2 +- .../Private/SenseGloveCoreTypes.cpp | 40 +++++++++++ .../Private/SenseGloveCoreTypes.h | 38 +++++++++++ .../Private/SenseGloveCoreTypesModule.cpp | 61 +++++++++++++++++ .../Private/SenseGloveCoreTypesModule.h | 51 ++++++++++++++ .../SGCoreTypes}/SGInterpolationSetArray.h | 4 +- .../SenseGloveCoreTypes.Build.cs | 68 +++++++++++++++++++ .../Private/SGTypes}/SGFloatArray.cpp | 2 +- .../Private/SGTypes/SGNameArray.cpp | 36 ++++++++++ .../Private/SGTypes}/SGQuatArray.cpp | 2 +- .../Private/SGTypes}/SGRotatorArray.cpp | 2 +- .../Private/SGTypes}/SGVectorArray.cpp | 2 +- .../Public/SGTypes}/SGFloatArray.h | 4 +- .../Public/SGTypes/SGNameArray.h | 50 ++++++++++++++ .../Public/SGTypes}/SGQuatArray.h | 4 +- .../Public/SGTypes}/SGRotatorArray.h | 4 +- .../Public/SGTypes}/SGVectorArray.h | 4 +- .../SenseGloveTypes/SenseGloveTypes.Build.cs | 2 +- 39 files changed, 406 insertions(+), 44 deletions(-) rename Source/{SenseGloveCore/Private/SGCore => SenseGloveCoreTypes/Private/SGCoreTypes}/SGInterpolationSetArray.cpp (96%) create mode 100644 Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.cpp create mode 100644 Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.h create mode 100644 Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.cpp create mode 100644 Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.h rename Source/{SenseGloveCore/Public/SGCore => SenseGloveCoreTypes/Public/SGCoreTypes}/SGInterpolationSetArray.h (90%) create mode 100644 Source/SenseGloveCoreTypes/SenseGloveCoreTypes.Build.cs rename Source/{SenseGloveCore/Private/SGCore => SenseGloveTypes/Private/SGTypes}/SGFloatArray.cpp (97%) create mode 100644 Source/SenseGloveTypes/Private/SGTypes/SGNameArray.cpp rename Source/{SenseGloveCore/Private/SGCore => SenseGloveTypes/Private/SGTypes}/SGQuatArray.cpp (97%) rename Source/{SenseGloveCore/Private/SGCore => SenseGloveTypes/Private/SGTypes}/SGRotatorArray.cpp (97%) rename Source/{SenseGloveCore/Private/SGCore => SenseGloveTypes/Private/SGTypes}/SGVectorArray.cpp (97%) rename Source/{SenseGloveCore/Public/SGCore => SenseGloveTypes/Public/SGTypes}/SGFloatArray.h (91%) create mode 100644 Source/SenseGloveTypes/Public/SGTypes/SGNameArray.h rename Source/{SenseGloveCore/Public/SGCore => SenseGloveTypes/Public/SGTypes}/SGQuatArray.h (91%) rename Source/{SenseGloveCore/Public/SGCore => SenseGloveTypes/Public/SGTypes}/SGRotatorArray.h (91%) rename Source/{SenseGloveCore/Public/SGCore => SenseGloveTypes/Public/SGTypes}/SGVectorArray.h (91%) diff --git a/SenseGlove.uplugin b/SenseGlove.uplugin index bf1ee287..b5705580 100644 --- a/SenseGlove.uplugin +++ b/SenseGlove.uplugin @@ -111,6 +111,16 @@ "Win64" ] }, + { + "Name": "SenseGloveCoreTypes", + "Type": "Runtime", + "LoadingPhase": "PreDefault", + "WhitelistPlatforms": [ + "Android", + "Linux", + "Win64" + ] + }, { "Name": "SenseGloveEditor", "Type": "Editor", diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp index e63ac462..cf59972c 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp @@ -36,7 +36,6 @@ #include "SGCore/SGHandPose.h" #include "Runtime/Launch/Resources/Version.h" -#include "SGCore/SGRotatorArray.h" #include "SGCore/SGBasicHandModel.h" #include "SGCoreImpl/SGExportedFunctions.h" @@ -48,6 +47,7 @@ #include "SGInterop/SGIC_TArray_float.h" #include "SGInterop/SGIC_TArray_TArray_FQuat.h" #include "SGInterop/SGIC_TArray_TArray_FVector.h" +#include "SGTypes/SGRotatorArray.h" #include "SGUtils/SGArrayUtils.h" struct USGHandPose::FImpl diff --git a/Source/SenseGloveCore/Public/SGCore/SGBasicHandModel.h b/Source/SenseGloveCore/Public/SGCore/SGBasicHandModel.h index 3fd4a46b..fd0cd407 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGBasicHandModel.h +++ b/Source/SenseGloveCore/Public/SGCore/SGBasicHandModel.h @@ -46,8 +46,8 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGFloatArray.h" #include "SGTypes/SGCoreTypes.h" +#include "SGTypes/SGFloatArray.h" #include "SGBasicHandModel.generated.h" diff --git a/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h b/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h index 026794a4..2b3cd3f8 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h @@ -44,7 +44,7 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGInterpolationSetArray.h" +#include "SGCoreTypes/SGInterpolationSetArray.h" #include "SGTypes/SGCoreTypes.h" #include "SGHandInterpolator.generated.h" diff --git a/Source/SenseGloveCore/Public/SGCore/SGHandPose.h b/Source/SenseGloveCore/Public/SGCore/SGHandPose.h index c3bd1b62..b451c3b6 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHandPose.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHandPose.h @@ -44,10 +44,10 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGQuatArray.h" -#include "SGCore/SGRotatorArray.h" -#include "SGCore/SGVectorArray.h" #include "SGTypes/SGCoreTypes.h" +#include "SGTypes/SGQuatArray.h" +#include "SGTypes/SGRotatorArray.h" +#include "SGTypes/SGVectorArray.h" #include "SGHandPose.generated.h" diff --git a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveInfo.h b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveInfo.h index 256010e3..db98654f 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveInfo.h +++ b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveInfo.h @@ -41,8 +41,8 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGVectorArray.h" #include "SGTypes/SGCoreTypes.h" +#include "SGTypes/SGVectorArray.h" #include "SGSenseGloveInfo.generated.h" diff --git a/Source/SenseGloveCore/Public/SGCore/SGSenseGlovePose.h b/Source/SenseGloveCore/Public/SGCore/SGSenseGlovePose.h index 6b6164ba..eaf3370b 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGSenseGlovePose.h +++ b/Source/SenseGloveCore/Public/SGCore/SGSenseGlovePose.h @@ -44,9 +44,9 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGQuatArray.h" -#include "SGCore/SGRotatorArray.h" -#include "SGCore/SGVectorArray.h" +#include "SGTypes/SGQuatArray.h" +#include "SGTypes/SGRotatorArray.h" +#include "SGTypes/SGVectorArray.h" #include "SGSenseGlovePose.generated.h" diff --git a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveSensorData.h b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveSensorData.h index f5f6e113..dc2d92e7 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGSenseGloveSensorData.h +++ b/Source/SenseGloveCore/Public/SGCore/SGSenseGloveSensorData.h @@ -42,8 +42,8 @@ #include "UObject/Object.h" #include "UObject/ObjectMacros.h" -#include "SGCore/SGFloatArray.h" #include "SGCore/SGSenseGloveInfo.h" +#include "SGTypes/SGFloatArray.h" #include "SGSenseGloveSensorData.generated.h" diff --git a/Source/SenseGloveCore/SenseGloveCore.Build.cs b/Source/SenseGloveCore/SenseGloveCore.Build.cs index 38493f60..c0e4dfba 100644 --- a/Source/SenseGloveCore/SenseGloveCore.Build.cs +++ b/Source/SenseGloveCore/SenseGloveCore.Build.cs @@ -62,5 +62,12 @@ public class SenseGloveCore : ModuleRules "SenseGloveUtils", } ); + + PrivateIncludePathModuleNames.AddRange( + new string[] + { + "SenseGloveCoreTypes", + } + ); } } diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGAnatomyKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGAnatomyKismetLibrary.h index c0f92c0c..f5e7ca6e 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGAnatomyKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGAnatomyKismetLibrary.h @@ -39,8 +39,8 @@ #include "Containers/Array.h" #include "HAL/Platform.h" -#include "SGCore/SGVectorArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" +#include "SGTypes/SGVectorArray.h" #include "SGAnatomyKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGBasicHandModelKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGBasicHandModelKismetLibrary.h index dcb8c53f..71d25bd0 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGBasicHandModelKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGBasicHandModelKismetLibrary.h @@ -38,8 +38,8 @@ #pragma once #include "SGKismet/SGBlueprintFunctionLibrary.h" -#include "SGCore/SGFloatArray.h" #include "SGTypes/SGCoreTypes.h" +#include "SGTypes/SGFloatArray.h" #include "SGBasicHandModelKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandInterpolatorKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandInterpolatorKismetLibrary.h index 67c3abae..b8e5c20f 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandInterpolatorKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandInterpolatorKismetLibrary.h @@ -36,10 +36,10 @@ #pragma once -#include "SGCore/SGInterpolationSetArray.h" -#include "SGCore/SGVectorArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" +#include "SGCoreTypes/SGInterpolationSetArray.h" #include "SGTypes/SGCoreTypes.h" +#include "SGTypes/SGVectorArray.h" #include "SGHandInterpolatorKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandPoseKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandPoseKismetLibrary.h index 0b30bd22..65d05f5c 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandPoseKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandPoseKismetLibrary.h @@ -36,11 +36,11 @@ #pragma once -#include "SGCore/SGQuatArray.h" -#include "SGCore/SGRotatorArray.h" -#include "SGCore/SGVectorArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" #include "SGTypes/SGCoreTypes.h" +#include "SGTypes/SGQuatArray.h" +#include "SGTypes//SGRotatorArray.h" +#include "SGTypes//SGVectorArray.h" #include "SGHandPoseKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGNovaGloveCalibrationKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGNovaGloveCalibrationKismetLibrary.h index 0165f831..16b8a692 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGNovaGloveCalibrationKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGNovaGloveCalibrationKismetLibrary.h @@ -38,8 +38,8 @@ #include "Containers/Array.h" #include "Math/Vector.h" -#include "SGCore/SGVectorArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" +#include "SGTypes/SGVectorArray.h" #include "SGNovaGloveCalibrationKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseComKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseComKismetLibrary.h index 44f54cc1..578a53f0 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseComKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseComKismetLibrary.h @@ -38,8 +38,8 @@ #include "Containers/Array.h" #include "HAL/Platform.h" -#include "SGCore/SGVectorArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" +#include "SGTypes/SGVectorArray.h" #include "SGSenseComKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveInfoKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveInfoKismetLibrary.h index ec76370f..0ea84238 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveInfoKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveInfoKismetLibrary.h @@ -35,10 +35,10 @@ #pragma once -#include "SGCore/SGFloatArray.h" -#include "SGCore/SGVectorArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" #include "SGTypes/SGCoreTypes.h" +#include "SGTypes/SGFloatArray.h" +#include "SGTypes/SGVectorArray.h" #include "SGSenseGloveInfoKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveKismetLibrary.h index e7d33d3e..8bd6dffd 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveKismetLibrary.h @@ -41,8 +41,8 @@ #include "SGCore/SGSenseGlove.h" #include "SGCore/SGSenseGlovePose.h" #include "SGCore/SGSenseGloveSensorData.h" -#include "SGCore/SGVectorArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" +#include "SGTypes/SGVectorArray.h" #include "SGSenseGloveKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGlovePoseKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGlovePoseKismetLibrary.h index 62a16d4e..63e08a05 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGlovePoseKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGlovePoseKismetLibrary.h @@ -36,10 +36,10 @@ #pragma once -#include "SGCore/SGQuatArray.h" -#include "SGCore/SGRotatorArray.h" -#include "SGCore/SGVectorArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" +#include "SGTypes/SGQuatArray.h" +#include "SGTypes/SGRotatorArray.h" +#include "SGTypes/SGVectorArray.h" #include "SGSenseGlovePoseKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveSensorDataKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveSensorDataKismetLibrary.h index c7bfca8e..2938e893 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveSensorDataKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveSensorDataKismetLibrary.h @@ -35,9 +35,9 @@ #pragma once -#include "SGCore/SGFloatArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" #include "SGTypes/SGCoreTypes.h" +#include "SGTypes/SGFloatArray.h" #include "SGSenseGloveSensorDataKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveVarsKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveVarsKismetLibrary.h index 1a009731..a41d566d 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveVarsKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGSenseGloveVarsKismetLibrary.h @@ -41,8 +41,8 @@ #include "Math/Quat.h" #include "Math/Vector.h" -#include "SGCore/SGVectorArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" +#include "SGTypes/SGVectorArray.h" #include "SGSenseGloveVarsKismetLibrary.generated.h" diff --git a/Source/SenseGloveCoreKismet/SenseGloveCoreKismet.Build.cs b/Source/SenseGloveCoreKismet/SenseGloveCoreKismet.Build.cs index f9950b47..95962ceb 100644 --- a/Source/SenseGloveCoreKismet/SenseGloveCoreKismet.Build.cs +++ b/Source/SenseGloveCoreKismet/SenseGloveCoreKismet.Build.cs @@ -55,6 +55,7 @@ public class SenseGloveCoreKismet : ModuleRules "CoreUObject", "Engine", "SenseGloveCore", + "SenseGloveCoreTypes", "SenseGloveLog", "SenseGloveKismet", "SenseGloveTypes", diff --git a/Source/SenseGloveCore/Private/SGCore/SGInterpolationSetArray.cpp b/Source/SenseGloveCoreTypes/Private/SGCoreTypes/SGInterpolationSetArray.cpp similarity index 96% rename from Source/SenseGloveCore/Private/SGCore/SGInterpolationSetArray.cpp rename to Source/SenseGloveCoreTypes/Private/SGCoreTypes/SGInterpolationSetArray.cpp index a2a935fc..ba851f7e 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGInterpolationSetArray.cpp +++ b/Source/SenseGloveCoreTypes/Private/SGCoreTypes/SGInterpolationSetArray.cpp @@ -33,4 +33,4 @@ */ -#include "SGCore/SGInterpolationSetArray.h" \ No newline at end of file +#include "SGCoreTypes/SGInterpolationSetArray.h" \ No newline at end of file diff --git a/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.cpp b/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.cpp new file mode 100644 index 00000000..d813aea9 --- /dev/null +++ b/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.cpp @@ -0,0 +1,40 @@ +/** + * @file + * + * @author Mamadou Babaei + * + * @section LICENSE + * + * (The MIT License) + * + * Copyright (c) 2020 - 2023 SenseGlove + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * @section DESCRIPTION + * + * + */ + + +#include "SenseGloveCoreTypes.h" +#include "Modules/ModuleManager.h" +#include "SenseGloveCoreTypesModule.h" + +IMPLEMENT_MODULE(FSenseGloveCoreTypesModule, SenseGloveCoreTypes) diff --git a/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.h b/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.h new file mode 100644 index 00000000..d891aa2a --- /dev/null +++ b/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.h @@ -0,0 +1,38 @@ +/** + * @file + * + * @author Mamadou Babaei + * + * @section LICENSE + * + * (The MIT License) + * + * Copyright (c) 2020 - 2023 SenseGlove + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * @section DESCRIPTION + * + * + */ + + +#pragma once + +#include "CoreMinimal.h" diff --git a/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.cpp b/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.cpp new file mode 100644 index 00000000..cc3f2f73 --- /dev/null +++ b/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.cpp @@ -0,0 +1,61 @@ +/** + * @file + * + * @author Mamadou Babaei + * + * @section LICENSE + * + * (The MIT License) + * + * Copyright (c) 2020 - 2023 SenseGlove + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * @section DESCRIPTION + * + * + */ + + +#include "SenseGloveCoreTypesModule.h" +#include "SGLog/SGLog.h" + +#define LOCTEXT_NAMESPACE "FSenseGloveCoreTypesModule" + +void FSenseGloveCoreTypesModule::StartupModule() +{ + SGLOG("Starting up SenseGloveCoreTypes module..."); +} + +void FSenseGloveCoreTypesModule::PreUnloadCallback() +{ + SGLOG("Unloading SenseGloveCoreTypes module..."); +} + +void FSenseGloveCoreTypesModule::PostLoadCallback() +{ + SGLOG("Loading of SenseGloveCoreTypes module has succeeded!"); +} + +void FSenseGloveCoreTypesModule::ShutdownModule() +{ + SGLOG("Shutting down SenseGloveCoreTypes module..."); +} + +#undef LOCTEXT_NAMESPACE diff --git a/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.h b/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.h new file mode 100644 index 00000000..a53161c5 --- /dev/null +++ b/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.h @@ -0,0 +1,51 @@ +/** + * @file + * + * @author Mamadou Babaei + * + * @section LICENSE + * + * (The MIT License) + * + * Copyright (c) 2020 - 2023 SenseGlove + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * @section DESCRIPTION + * + * + */ + + +#pragma once + +#include "Modules/ModuleInterface.h" + +#define LOCTEXT_NAMESPACE "SenseGloveCoreTypes" + +class FSenseGloveCoreTypesModule : public IModuleInterface +{ +public: + virtual void StartupModule() override; + virtual void PreUnloadCallback() override; + virtual void PostLoadCallback() override; + virtual void ShutdownModule() override; +}; + +#undef LOCTEXT_NAMESPACE diff --git a/Source/SenseGloveCore/Public/SGCore/SGInterpolationSetArray.h b/Source/SenseGloveCoreTypes/Public/SGCoreTypes/SGInterpolationSetArray.h similarity index 90% rename from Source/SenseGloveCore/Public/SGCore/SGInterpolationSetArray.h rename to Source/SenseGloveCoreTypes/Public/SGCoreTypes/SGInterpolationSetArray.h index ff1ae67f..7e0e13eb 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGInterpolationSetArray.h +++ b/Source/SenseGloveCoreTypes/Public/SGCoreTypes/SGInterpolationSetArray.h @@ -42,11 +42,11 @@ class FSGInterpolationSetImpl; USTRUCT(BlueprintType) -struct SENSEGLOVECORE_API FSGInterpolationSetArray +struct SENSEGLOVECORETYPES_API FSGInterpolationSetArray { GENERATED_BODY() public: - UPROPERTY(EditAnywhere, Category="SenseGlove | Core | Nested Arrays", BlueprintReadWrite) + UPROPERTY(EditAnywhere, Category="SenseGlove | Core | Types | Nested Arrays", BlueprintReadWrite) TArray InterpolationSetArray; }; \ No newline at end of file diff --git a/Source/SenseGloveCoreTypes/SenseGloveCoreTypes.Build.cs b/Source/SenseGloveCoreTypes/SenseGloveCoreTypes.Build.cs new file mode 100644 index 00000000..d5a869f0 --- /dev/null +++ b/Source/SenseGloveCoreTypes/SenseGloveCoreTypes.Build.cs @@ -0,0 +1,68 @@ +/** + * @file + * + * @author Mamadou Babaei + * + * @section LICENSE + * + * (The MIT License) + * + * Copyright (c) 2020 - 2023 SenseGlove + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * @section DESCRIPTION + * + * + */ + + +using System; +using UnrealBuildTool; + +public class SenseGloveCoreTypes : ModuleRules +{ + public SenseGloveCoreTypes(ReadOnlyTargetRules Target) : base(Target) + { + PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs; + + PublicDependencyModuleNames.AddRange( + new string[] + { + "Core", + } + ); + + PrivateDependencyModuleNames.AddRange( + new string[] + { + "CoreUObject", + "SenseGloveCore", + "SenseGloveLog", + } + ); + + PrivateIncludePathModuleNames.AddRange( + new string[] + { + "SenseGloveCore", + } + ); + } +} \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGFloatArray.cpp b/Source/SenseGloveTypes/Private/SGTypes/SGFloatArray.cpp similarity index 97% rename from Source/SenseGloveCore/Private/SGCore/SGFloatArray.cpp rename to Source/SenseGloveTypes/Private/SGTypes/SGFloatArray.cpp index b62d94eb..246829b8 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGFloatArray.cpp +++ b/Source/SenseGloveTypes/Private/SGTypes/SGFloatArray.cpp @@ -33,4 +33,4 @@ */ -#include "SGCore/SGFloatArray.h" \ No newline at end of file +#include "SGTypes/SGFloatArray.h" \ No newline at end of file diff --git a/Source/SenseGloveTypes/Private/SGTypes/SGNameArray.cpp b/Source/SenseGloveTypes/Private/SGTypes/SGNameArray.cpp new file mode 100644 index 00000000..16d0e597 --- /dev/null +++ b/Source/SenseGloveTypes/Private/SGTypes/SGNameArray.cpp @@ -0,0 +1,36 @@ +/** + * @file + * + * @author Mamadou Babaei + * + * @section LICENSE + * + * (The MIT License) + * + * Copyright (c) 2020 - 2023 SenseGlove + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * @section DESCRIPTION + * + * + */ + + +#include "SGTypes/SGNameArray.h" \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGQuatArray.cpp b/Source/SenseGloveTypes/Private/SGTypes/SGQuatArray.cpp similarity index 97% rename from Source/SenseGloveCore/Private/SGCore/SGQuatArray.cpp rename to Source/SenseGloveTypes/Private/SGTypes/SGQuatArray.cpp index e24ac863..7e4967e2 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGQuatArray.cpp +++ b/Source/SenseGloveTypes/Private/SGTypes/SGQuatArray.cpp @@ -33,4 +33,4 @@ */ -#include "SGCore/SGQuatArray.h" \ No newline at end of file +#include "SGTypes/SGQuatArray.h" \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGRotatorArray.cpp b/Source/SenseGloveTypes/Private/SGTypes/SGRotatorArray.cpp similarity index 97% rename from Source/SenseGloveCore/Private/SGCore/SGRotatorArray.cpp rename to Source/SenseGloveTypes/Private/SGTypes/SGRotatorArray.cpp index 42998da9..f1b0878c 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGRotatorArray.cpp +++ b/Source/SenseGloveTypes/Private/SGTypes/SGRotatorArray.cpp @@ -33,4 +33,4 @@ */ -#include "SGCore/SGRotatorArray.h" \ No newline at end of file +#include "SGTypes/SGRotatorArray.h" \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGVectorArray.cpp b/Source/SenseGloveTypes/Private/SGTypes/SGVectorArray.cpp similarity index 97% rename from Source/SenseGloveCore/Private/SGCore/SGVectorArray.cpp rename to Source/SenseGloveTypes/Private/SGTypes/SGVectorArray.cpp index a2321787..6b34b69e 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGVectorArray.cpp +++ b/Source/SenseGloveTypes/Private/SGTypes/SGVectorArray.cpp @@ -33,4 +33,4 @@ */ -#include "SGCore/SGVectorArray.h" \ No newline at end of file +#include "SGTypes/SGVectorArray.h" \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGFloatArray.h b/Source/SenseGloveTypes/Public/SGTypes/SGFloatArray.h similarity index 91% rename from Source/SenseGloveCore/Public/SGCore/SGFloatArray.h rename to Source/SenseGloveTypes/Public/SGTypes/SGFloatArray.h index d3fbd755..ac578512 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGFloatArray.h +++ b/Source/SenseGloveTypes/Public/SGTypes/SGFloatArray.h @@ -40,11 +40,11 @@ #include "SGFloatArray.generated.h" USTRUCT(BlueprintType) -struct SENSEGLOVECORE_API FSGFloatArray +struct SENSEGLOVETYPES_API FSGFloatArray { GENERATED_BODY() public: - UPROPERTY(EditAnywhere, Category="SenseGlove | Core | Nested Arrays", BlueprintReadWrite) + UPROPERTY(EditAnywhere, Category="SenseGlove | Types | Nested Arrays", BlueprintReadWrite) TArray FloatArray; }; \ No newline at end of file diff --git a/Source/SenseGloveTypes/Public/SGTypes/SGNameArray.h b/Source/SenseGloveTypes/Public/SGTypes/SGNameArray.h new file mode 100644 index 00000000..0ad20683 --- /dev/null +++ b/Source/SenseGloveTypes/Public/SGTypes/SGNameArray.h @@ -0,0 +1,50 @@ +/** + * @file + * + * @author Mamadou Babaei + * + * @section LICENSE + * + * (The MIT License) + * + * Copyright (c) 2020 - 2023 SenseGlove + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * @section DESCRIPTION + * + * + */ + + +#pragma once + +#include "UObject/NameTypes.h" + +#include "SGNameArray.generated.h" + +USTRUCT(BlueprintType) +struct SENSEGLOVETYPES_API FSGNameArray +{ + GENERATED_BODY() + +public: + UPROPERTY(EditAnywhere, Category="SenseGlove | Types | Nested Arrays", BlueprintReadWrite) + TArray NameArray; +}; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGQuatArray.h b/Source/SenseGloveTypes/Public/SGTypes/SGQuatArray.h similarity index 91% rename from Source/SenseGloveCore/Public/SGCore/SGQuatArray.h rename to Source/SenseGloveTypes/Public/SGTypes/SGQuatArray.h index f461f149..6d8d4c50 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGQuatArray.h +++ b/Source/SenseGloveTypes/Public/SGTypes/SGQuatArray.h @@ -40,11 +40,11 @@ #include "SGQuatArray.generated.h" USTRUCT(BlueprintType) -struct SENSEGLOVECORE_API FSGQuatArray +struct SENSEGLOVETYPES_API FSGQuatArray { GENERATED_BODY() public: - UPROPERTY(EditAnywhere, Category="SenseGlove | Core | Nested Arrays", BlueprintReadWrite) + UPROPERTY(EditAnywhere, Category="SenseGlove | Types | Nested Arrays", BlueprintReadWrite) TArray QuatArray; }; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGRotatorArray.h b/Source/SenseGloveTypes/Public/SGTypes/SGRotatorArray.h similarity index 91% rename from Source/SenseGloveCore/Public/SGCore/SGRotatorArray.h rename to Source/SenseGloveTypes/Public/SGTypes/SGRotatorArray.h index 096319d0..7c91308e 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGRotatorArray.h +++ b/Source/SenseGloveTypes/Public/SGTypes/SGRotatorArray.h @@ -40,11 +40,11 @@ #include "SGRotatorArray.generated.h" USTRUCT(BlueprintType) -struct SENSEGLOVECORE_API FSGRotatorArray +struct SENSEGLOVETYPES_API FSGRotatorArray { GENERATED_BODY() public: - UPROPERTY(EditAnywhere, Category="SenseGlove | Core | Nested Arrays", BlueprintReadWrite) + UPROPERTY(EditAnywhere, Category="SenseGlove | Types | Nested Arrays", BlueprintReadWrite) TArray RotatorArray; }; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGVectorArray.h b/Source/SenseGloveTypes/Public/SGTypes/SGVectorArray.h similarity index 91% rename from Source/SenseGloveCore/Public/SGCore/SGVectorArray.h rename to Source/SenseGloveTypes/Public/SGTypes/SGVectorArray.h index ebd19f00..7b15aa92 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGVectorArray.h +++ b/Source/SenseGloveTypes/Public/SGTypes/SGVectorArray.h @@ -40,11 +40,11 @@ #include "SGVectorArray.generated.h" USTRUCT(BlueprintType) -struct SENSEGLOVECORE_API FSGVectorArray +struct SENSEGLOVETYPES_API FSGVectorArray { GENERATED_BODY() public: - UPROPERTY(EditAnywhere, Category="SenseGlove | Core | Nested Arrays", BlueprintReadWrite) + UPROPERTY(EditAnywhere, Category="SenseGlove | Types | Nested Arrays", BlueprintReadWrite) TArray VectorArray; }; \ No newline at end of file diff --git a/Source/SenseGloveTypes/SenseGloveTypes.Build.cs b/Source/SenseGloveTypes/SenseGloveTypes.Build.cs index 04af16c8..f8c25264 100644 --- a/Source/SenseGloveTypes/SenseGloveTypes.Build.cs +++ b/Source/SenseGloveTypes/SenseGloveTypes.Build.cs @@ -57,4 +57,4 @@ public class SenseGloveTypes : ModuleRules } ); } -} +} \ No newline at end of file