diff --git a/CHANGELOG.md b/CHANGELOG.md index e2753bc6..2e25b0aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - SenseGlove libraries have been updated to v2.7.1-965f90c with support for Linux AArch64. +### Removed + +- Removed the redundant SenseGloveCoreTypes module which causes all kinds of packaging issues with certain versions of the engine. + ## [v1.3.1] - 2023-04-28 ### Fixed @@ -177,4 +181,4 @@ This is a minor release focusing on adherence to the Unreal Engine Marketplace G ### Added -- Initial public release of the SenseGlove haptic API for Unreal Engine with support for Microsoft Windows and GNU/Linux. +- Initial public release of the SenseGlove haptic API for Unreal Engine with support for Microsoft Windows and GNU/Linux. \ No newline at end of file diff --git a/SenseGlove.uplugin b/SenseGlove.uplugin index c5e8725b..3c893498 100644 --- a/SenseGlove.uplugin +++ b/SenseGlove.uplugin @@ -119,17 +119,6 @@ "Win64" ] }, - { - "Name": "SenseGloveCoreTypes", - "Type": "Runtime", - "LoadingPhase": "PreDefault", - "WhitelistPlatforms": [ - "Android", - "Linux", - "LinuxArm64", - "Win64" - ] - }, { "Name": "SenseGloveDebug", "Type": "Runtime", diff --git a/Source/SenseGloveCoreTypes/Private/SGCoreTypes/SGInterpolationSetArray.cpp b/Source/SenseGloveCore/Private/SGCore/SGInterpolationSetArray.cpp similarity index 93% rename from Source/SenseGloveCoreTypes/Private/SGCoreTypes/SGInterpolationSetArray.cpp rename to Source/SenseGloveCore/Private/SGCore/SGInterpolationSetArray.cpp index eae32472..a2a935fc 100644 --- a/Source/SenseGloveCoreTypes/Private/SGCoreTypes/SGInterpolationSetArray.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGInterpolationSetArray.cpp @@ -33,6 +33,4 @@ */ -#include "SGCoreTypes/SGInterpolationSetArray.h" - -#include "SGCore/SGInterpolationSet.h" \ No newline at end of file +#include "SGCore/SGInterpolationSetArray.h" \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h b/Source/SenseGloveCore/Public/SGCore/SGHandInterpolator.h index 2b3cd3f8..026794a4 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 "SGCoreTypes/SGInterpolationSetArray.h" +#include "SGCore/SGInterpolationSetArray.h" #include "SGTypes/SGCoreTypes.h" #include "SGHandInterpolator.generated.h" diff --git a/Source/SenseGloveCoreTypes/Public/SGCoreTypes/SGInterpolationSetArray.h b/Source/SenseGloveCore/Public/SGCore/SGInterpolationSetArray.h similarity index 88% rename from Source/SenseGloveCoreTypes/Public/SGCoreTypes/SGInterpolationSetArray.h rename to Source/SenseGloveCore/Public/SGCore/SGInterpolationSetArray.h index 0c2adb9a..354f2afb 100644 --- a/Source/SenseGloveCoreTypes/Public/SGCoreTypes/SGInterpolationSetArray.h +++ b/Source/SenseGloveCore/Public/SGCore/SGInterpolationSetArray.h @@ -35,16 +35,16 @@ #pragma once +#include "SGCore/SGInterpolationSet.h" + #include "SGInterpolationSetArray.generated.h" -class USGInterpolationSet; - USTRUCT(BlueprintType) -struct SENSEGLOVECORETYPES_API FSGInterpolationSetArray +struct SENSEGLOVECORE_API FSGInterpolationSetArray { GENERATED_BODY() public: - UPROPERTY(EditAnywhere, Category="SenseGlove | Core | Types | Nested Arrays", BlueprintReadWrite) + UPROPERTY(EditAnywhere, Category="SenseGlove | Types | Nested Arrays", BlueprintReadWrite) TArray InterpolationSetArray; }; \ No newline at end of file diff --git a/Source/SenseGloveCore/SenseGloveCore.Build.cs b/Source/SenseGloveCore/SenseGloveCore.Build.cs index 17eece8c..63aad41b 100644 --- a/Source/SenseGloveCore/SenseGloveCore.Build.cs +++ b/Source/SenseGloveCore/SenseGloveCore.Build.cs @@ -69,12 +69,5 @@ public class SenseGloveCore : ModuleRules "SenseGloveTypes", } ); - - PrivateIncludePathModuleNames.AddRange( - new string[] - { - "SenseGloveCoreTypes", - } - ); } } \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs index bf8f5f27..fbbd8673 100644 --- a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs +++ b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs @@ -66,13 +66,6 @@ public class SenseGloveCoreImpl : ModuleRules } ); - PrivateIncludePathModuleNames.AddRange( - new string[] - { - "SenseGloveCoreTypes", - } - ); - AddCoreLibrary(Target); PublicDefinitions.Add("SENSEGLOVE_BUILDING_CORE_IMPL_MODULE"); diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandInterpolatorKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandInterpolatorKismetLibrary.h index b8e5c20f..a467e254 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandInterpolatorKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHandInterpolatorKismetLibrary.h @@ -36,8 +36,8 @@ #pragma once +#include "SGCore/SGInterpolationSetArray.h" #include "SGKismet/SGBlueprintFunctionLibrary.h" -#include "SGCoreTypes/SGInterpolationSetArray.h" #include "SGTypes/SGCoreTypes.h" #include "SGTypes/SGVectorArray.h" diff --git a/Source/SenseGloveCoreKismet/SenseGloveCoreKismet.Build.cs b/Source/SenseGloveCoreKismet/SenseGloveCoreKismet.Build.cs index 95962ceb..f9950b47 100644 --- a/Source/SenseGloveCoreKismet/SenseGloveCoreKismet.Build.cs +++ b/Source/SenseGloveCoreKismet/SenseGloveCoreKismet.Build.cs @@ -55,7 +55,6 @@ public class SenseGloveCoreKismet : ModuleRules "CoreUObject", "Engine", "SenseGloveCore", - "SenseGloveCoreTypes", "SenseGloveLog", "SenseGloveKismet", "SenseGloveTypes", diff --git a/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.cpp b/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.cpp deleted file mode 100644 index d813aea9..00000000 --- a/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @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 deleted file mode 100644 index d891aa2a..00000000 --- a/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypes.h +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @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 deleted file mode 100644 index cc3f2f73..00000000 --- a/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/** - * @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 deleted file mode 100644 index a53161c5..00000000 --- a/Source/SenseGloveCoreTypes/Private/SenseGloveCoreTypesModule.h +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @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/SenseGloveCoreTypes/SenseGloveCoreTypes.Build.cs b/Source/SenseGloveCoreTypes/SenseGloveCoreTypes.Build.cs deleted file mode 100644 index 16f65049..00000000 --- a/Source/SenseGloveCoreTypes/SenseGloveCoreTypes.Build.cs +++ /dev/null @@ -1,61 +0,0 @@ -/** - * @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", - } - ); - } -} \ No newline at end of file