UnrealEngine/Plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move SGCoreImpl/SGPlatform to SGBuildHacks/SGPlatform and introduce SG_CPP20 and SG_CAPTURE_THIS

Browse Source
This commit is contained in:
Mamadou Babaei
2023-09-14 18:35:06 +02:00
parent d2495a3550
commit 8f78bb7228
40 changed files with 76 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/SenseGlove/Private/SenseGlove/GameFramework/SGPlayerController.cpp
+4 -3
View File
@@ -48,6 +48,7 @@
#include "SenseGlove/GameFramework/SGPawn.h"
#include "SenseGlove/Haptics/SGGrabState.h"
#include "SenseGlove/Haptics/SGTouchState.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGCore/SGBuzzCommand.h"
#include "SGCore/SGForceFeedbackCommand.h"
#include "SGCore/SGHapticGlove.h"
@@ -204,7 +205,7 @@ void ASGPlayerController::BeginPlay()
}
SGPawn->OnGrabStateUpdated().AddWeakLambda(
this, [=](const FSGGrabState& GrabState) -> void
this, [= SG_CAPTURE_THIS](const FSGGrabState& GrabState) -> void
{
if (!IsValid(SGPawn))
{
@@ -235,7 +236,7 @@ void ASGPlayerController::BeginPlay()
});
SGPawn->OnTouchStateUpdated().AddWeakLambda(
this, [=](const FSGTouchState& TouchState) -> void
this, [= SG_CAPTURE_THIS](const FSGTouchState& TouchState) -> void
{
Pimpl->UpdateHapticsFeedback(TouchState);
});
@@ -338,7 +339,7 @@ void ASGPlayerController::FImpl::UpdateHapticsFeedback(const FSGTouchState& Touc
Owner->GetWorldTimerManager().ClearTimer(TouchBuzzStopTimer);
FTimerDelegate TouchBuzzStopHandler;
TouchBuzzStopHandler.BindLambda([=]()-> void
TouchBuzzStopHandler.BindLambda([= SG_CAPTURE_THIS]()-> void
{
Glove->SendHaptics(USGBuzzCommand::Off(Owner));
});
Source/SenseGlove/SenseGlove.Build.cs
+7
View File
@@ -66,5 +66,12 @@ public class SenseGlove : ModuleRules
"SenseGloveTypes",
}
);
PrivateIncludePathModuleNames.AddRange(
new string[]
{
"SenseGloveBuildHacks",
}
);
}
}
Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGPlatform.cpp → Source/SenseGloveBuildHacks/Private/SGBuildHacks/SGPlatform.cpp
+1 -1
View File
@@ -33,4 +33,4 @@
*/
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGPlatform.h → Source/SenseGloveBuildHacks/Public/SGBuildHacks/SGPlatform.h
+15 -3
View File
@@ -41,8 +41,20 @@
#define SG_CPP17 0
#endif /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) */
#if SG_CPP17
#if ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 202002L ) || __cplusplus >= 202002L )
#define SG_CPP20 1
#else /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 202002L ) || __cplusplus >= 202002L ) */
#define SG_CPP20 0
#endif /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 202002L ) || __cplusplus >= 202002L ) */
#if SG_CPP17 || SG_CPP20
#define SG_NOEXCEPT noexcept
#else /* SG_CPP17 */
#else /* SG_CPP17 || SG_CPP20 */
#define SG_NOEXCEPT
#endif /* SG_CPP17 */
#endif /* SG_CPP17 || SG_CPP20 */
#if SG_CPP20
#define SG_CAPTURE_THIS , this
#else /* SG_CPP17 || SG_CPP20 */
#define SG_CAPTURE_THIS
#endif /* SG_CPP17 || SG_CPP20 */
Source/SenseGloveCore/SenseGloveCore.Build.cs
+2 -1
View File
@@ -63,9 +63,10 @@ public class SenseGloveCore : ModuleRules
}
);
PublicIncludePathModuleNames.AddRange(
PrivateIncludePathModuleNames.AddRange(
new string[]
{
"SenseGloveBuildHacks",
"SenseGloveTypes",
}
);
Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h
+1 -1
View File
@@ -40,7 +40,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
class FSGVect3DImpl;
Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h
+1 -1
View File
@@ -40,7 +40,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h
+1 -1
View File
@@ -43,8 +43,8 @@
#include "Templates/SharedPointer.h"
#include "Templates/UniquePtr.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGCoreImpl/SGDeviceImpl.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h
+1 -1
View File
@@ -39,8 +39,8 @@
#include "Templates/SharedPointer.h"
#include "Templates/UniquePtr.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGCoreImpl/SGFingerCommandImpl.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "Containers/UnrealString.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h
+1 -1
View File
@@ -41,7 +41,7 @@
#include "Templates/SharedPointer.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "Containers/UnrealString.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h
+1 -1
View File
@@ -40,7 +40,7 @@
#include "Templates/SharedPointer.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h
+1 -1
View File
@@ -39,8 +39,8 @@
#include "Templates/SharedPointer.h"
#include "Templates/UniquePtr.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGCoreImpl/SGFingerCommandImpl.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h
+1 -1
View File
@@ -40,7 +40,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
class FSGInterpolationSetImpl;
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "Containers/UnrealString.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
class FSGHandInterpolatorImpl;
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "Containers/UnrealString.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
class FSGHandInterpolatorImpl;
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h
+1 -1
View File
@@ -41,7 +41,7 @@
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "Containers/Array.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h
+1 -1
View File
@@ -44,8 +44,8 @@
#include "Templates/SharedPointer.h"
#include "Templates/UniquePtr.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGCoreImpl/SGDeviceImpl.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h
+1 -1
View File
@@ -39,8 +39,8 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h"
#include "SGCoreImpl/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "Containers/UnrealString.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "Containers/UnrealString.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
class FSGHandInterpolatorImpl;
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h
+1 -1
View File
@@ -44,8 +44,8 @@
#include "Templates/SharedPointer.h"
#include "Templates/UniquePtr.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGCoreImpl/SGHapticGloveImpl.h"
#include "SGCoreImpl/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "Containers/UnrealString.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
class FSGHandInterpolatorImpl;
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h
+1 -1
View File
@@ -44,8 +44,8 @@
#include "Templates/SharedPointer.h"
#include "Templates/UniquePtr.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGCoreImpl/SGHapticGloveImpl.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "Containers/UnrealString.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include "Math/Vector.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "HAL/Platform.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h
+1 -1
View File
@@ -40,8 +40,8 @@
#include "Templates/SharedPointer.h"
#include "Templates/UniquePtr.h"
#include "SGBuildHacks/SGPlatform.h"
#include "SGCoreImpl/SGBuzzCommandImpl.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGTypes/SGCoreTypes.h"
namespace SGCore
Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include "HAL/Platform.h"
#include "Templates/UniquePtr.h"
#include "SGCoreImpl/SGPlatform.h"
#include "SGBuildHacks/SGPlatform.h"
namespace SGCore
{
Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs
+7 -1
View File
@@ -58,7 +58,6 @@ public class SenseGloveCoreImpl : ModuleRules
PrivateDependencyModuleNames.AddRange(
new string[]
{
"SenseGloveBuildHacks",
"SenseGloveInterop",
"SenseGloveLog",
"SenseGloveTypes",
@@ -66,6 +65,13 @@ public class SenseGloveCoreImpl : ModuleRules
}
);
PrivateIncludePathModuleNames.AddRange(
new string[]
{
"SenseGloveBuildHacks",
}
);
AddCoreLibrary(Target);
PublicDefinitions.Add("SENSEGLOVE_BUILDING_CORE_IMPL_MODULE");
Source/SenseGloveInterop/SenseGloveInterop.Build.cs
+2 -1
View File
@@ -60,8 +60,9 @@ public class SenseGloveInterop : ModuleRules
PrivateIncludePathModuleNames.AddRange(
new string[]
{
"SenseGloveBuildHacks",
"SenseGloveCoreImpl",
}
);
}
}
}