diff --git a/Source/SenseGlove/Private/SenseGlove/Animation/SGVirtualHandAnimInstanceProxy.cpp b/Source/SenseGlove/Private/SenseGlove/Animation/SGVirtualHandAnimInstanceProxy.cpp index 710b239f..42370aa1 100644 --- a/Source/SenseGlove/Private/SenseGlove/Animation/SGVirtualHandAnimInstanceProxy.cpp +++ b/Source/SenseGlove/Private/SenseGlove/Animation/SGVirtualHandAnimInstanceProxy.cpp @@ -181,7 +181,13 @@ bool FSGVirtualHandAnimInstanceProxy::Evaluate(FPoseContext& Output) return FAnimInstanceProxy::Evaluate(Output); } - const USkeletalMesh* HandMesh = HandMeshComponent->SkeletalMesh; + const USkeletalMesh* HandMesh = +#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 1 + HandMeshComponent->GetSkeletalMeshAsset(); +#else + HandMeshComponent->SkeletalMesh; +#endif /* ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1 */ + if (!IsValid(HandMesh)) { return FAnimInstanceProxy::Evaluate(Output); diff --git a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGVirtualHand.cpp b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGVirtualHand.cpp index 45dc4598..3aeae2aa 100644 --- a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGVirtualHand.cpp +++ b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGVirtualHand.cpp @@ -209,7 +209,12 @@ void ASGVirtualHand::EditorTick(float DeltaSeconds) USkeletalMesh* ASGVirtualHand::GetHandMesh() const { - return Mesh->SkeletalMesh; + return +#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 1 + Mesh->GetSkeletalMeshAsset(); +#else + Mesh->SkeletalMesh; +#endif /* ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1 */ } void ASGVirtualHand::SetHandMesh(USkeletalMesh* VirtualHandMesh, const bool bReinitPos) const @@ -282,12 +287,24 @@ bool ASGVirtualHand::FImpl::IsUsingUserMesh() const { ensureAlwaysMsgf(IsValid(Owner->Mesh), TEXT("Invalid Mesh object!")); - if (!IsValid(Owner->Mesh->SkeletalMesh)) + if (!IsValid( +#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 1 + Owner->Mesh->GetSkeletalMeshAsset() +#else + Owner->Mesh->SkeletalMesh +#endif /* ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1 */ + )) { return false; } - const FString CurrentMeshPath(Owner->Mesh->SkeletalMesh->GetPathName()); + const FString CurrentMeshPath( +#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 1 + Owner->Mesh->GetSkeletalMeshAsset()->GetPathName() +#else + Owner->Mesh->SkeletalMesh->GetPathName() +#endif /* ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1 */ + ); const FString LeftHandDefaultMeshPath(GetDefaultLeftHandMeshPath()); const FString LeftHandDefaultMeshPathOnly(GetDefaultLeftHandMeshPathOnly()); const FString RightHandDefaultMeshPath(GetDefaultRightHandMeshPath()); diff --git a/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp b/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp index 79db051b..48bb078d 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp @@ -76,13 +76,6 @@ struct USGBasicHandModel::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGBasicHandModel* USGBasicHandModel::NewBasicHandModel(UObject* Outer, const FSGBasicHandModelImpl& BasicHandModelImpl) @@ -244,7 +237,6 @@ USGBasicHandModel::USGBasicHandModel() SGCoreImpl_FSGBasicHandModelImpl_ctor(&OutBasicHandModelImplContainer); Pimpl->BasicHandModelImpl = MoveTemp(OutBasicHandModelImplContainer.BasicHandModelImpl); - Pimpl->SyncUProperties(); } USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray>& Lengths, @@ -263,7 +255,6 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArrayBasicHandModelImpl = MoveTemp(OutBasicHandModelImplContainer.BasicHandModelImpl); - Pimpl->SyncUProperties(); } USGBasicHandModel::USGBasicHandModel(bool bRightHanded, const TArray& Lengths, @@ -284,7 +275,6 @@ USGBasicHandModel::USGBasicHandModel(bool bRightHanded, const TArrayBasicHandModelImpl = MoveTemp(OutBasicHandModelImplContainer.BasicHandModelImpl); - Pimpl->SyncUProperties(); } USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray>& Lengths, @@ -305,7 +295,6 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArrayBasicHandModelImpl = MoveTemp(OutBasicHandModelImplContainer.BasicHandModelImpl); - Pimpl->SyncUProperties(); } USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray>& Lengths, @@ -326,7 +315,6 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArrayBasicHandModelImpl = MoveTemp(OutBasicHandModelImplContainer.BasicHandModelImpl); - Pimpl->SyncUProperties(); } USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray& Lengths, @@ -349,7 +337,6 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArrayBasicHandModelImpl = MoveTemp(OutBasicHandModelImplContainer.BasicHandModelImpl); - Pimpl->SyncUProperties(); } USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray& Lengths, @@ -372,7 +359,6 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArrayBasicHandModelImpl = MoveTemp(OutBasicHandModelImplContainer.BasicHandModelImpl); - Pimpl->SyncUProperties(); } USGBasicHandModel::USGBasicHandModel(const FSGBasicHandModelImpl& BasicHandModelImpl) @@ -384,7 +370,6 @@ USGBasicHandModel::USGBasicHandModel(const FSGBasicHandModelImpl& BasicHandModel #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetBasicHandModelImpl(BasicHandModelImpl); - Pimpl->SyncUProperties(); } USGBasicHandModel::~USGBasicHandModel() = default; @@ -399,13 +384,11 @@ void USGBasicHandModel::SetBasicHandModelImpl(const FSGBasicHandModelImpl& Basic const FSGBasicHandModelImpl& USGBasicHandModel::ToBasicHandModelImpl() const { - Pimpl->SyncImplObject(); return Pimpl->BasicHandModelImpl; } FSGBasicHandModelImpl& USGBasicHandModel::ToBasicHandModelImpl() { - Pimpl->SyncImplObject(); return Pimpl->BasicHandModelImpl; } @@ -425,8 +408,6 @@ TArray> USGBasicHandModel::GetFingerLengths() const TArray USGBasicHandModel::GetFingerLengths(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_TArray_float OutLengthsContainer; FSGIC_ESGFinger FingerContainer{Finger}; @@ -437,26 +418,18 @@ TArray USGBasicHandModel::GetFingerLengths(const ESGFinger Finger) const void USGBasicHandModel::SetFingerLengths(const ESGFinger Finger, const TArray& Lengths) { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_ESGFinger FingerContainer{Finger}; FSGIC_TArray_float LengthsContainer{Lengths}; SGCoreImpl_FSGBasicHandModelImpl_SetFingerLengths_ESGFinger(&InstanceContainer, &FingerContainer, &LengthsContainer); - - Pimpl->SyncUProperties(); } void USGBasicHandModel::SetFingerLengths(const uint8 Finger, const TArray& Lengths) { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_TArray_float LengthsContainer{Lengths}; SGCoreImpl_FSGBasicHandModelImpl_SetFingerLengths_uint8Finger(&InstanceContainer, Finger, &LengthsContainer); - - Pimpl->SyncUProperties(); } TArray> USGBasicHandModel::GetFingerRatios() const @@ -469,8 +442,6 @@ TArray> USGBasicHandModel::GetFingerRatios() const TArray USGBasicHandModel::GetFingerRatios(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_ESGFinger FingerContainer{Finger}; FSGIC_TArray_float OutRatiosContainer; @@ -489,26 +460,18 @@ TArray USGBasicHandModel::GetStartJointPositions() const void USGBasicHandModel::SetStartJointPosition(const ESGFinger Finger, const FVector& Position) { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_ESGFinger FingerContainer{Finger}; FSGIC_FVector PositionContainer{Position}; SGCoreImpl_FSGBasicHandModelImpl_SetStartJointPosition_ESGFinger(&InstanceContainer, &FingerContainer, &PositionContainer); - - Pimpl->SyncUProperties(); } void USGBasicHandModel::SetStartJointPosition(const uint8 Finger, const FVector& Position) { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FVector PositionContainer{Position}; SGCoreImpl_FSGBasicHandModelImpl_SetStartJointPosition_uin8Finger(&InstanceContainer, Finger, &PositionContainer); - - Pimpl->SyncUProperties(); } TArray USGBasicHandModel::GetStartJointRotationsQ() const @@ -529,74 +492,53 @@ TArray USGBasicHandModel::GetStartJointRotations() const FVector USGBasicHandModel::GetJointPosition(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FVector OutPositionContainer; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_GetJointPosition(&InstanceContainer, &OutPositionContainer, &FingerContainer); - return MoveTemp(OutPositionContainer.Vector); } void USGBasicHandModel::SetJointPosition(const FVector& NewPosition, const ESGFinger Finger) { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FVector NewPositionContainer{NewPosition}; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_SetJointPosition(&InstanceContainer, &NewPositionContainer, &FingerContainer); - - Pimpl->SyncUProperties(); } FQuat USGBasicHandModel::GetJointRotationQ(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FQuat OutRotationContainer; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_GetJointRotation(&InstanceContainer, &OutRotationContainer, &FingerContainer); - return MoveTemp(OutRotationContainer.Quat); } FRotator USGBasicHandModel::GetJointRotation(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FQuat OutRotationContainer; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_GetJointRotation(&InstanceContainer, &OutRotationContainer, &FingerContainer); - return OutRotationContainer.Quat.Rotator(); } void USGBasicHandModel::SetJointRotation(const FQuat& NewRotation, const ESGFinger Finger) { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FQuat NewRotationContainer{NewRotation}; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_SetJointRotation(&InstanceContainer, &NewRotationContainer, &FingerContainer); - - Pimpl->SyncUProperties(); } void USGBasicHandModel::SetJointRotation(const FRotator& NewRotation, const ESGFinger Finger) { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FQuat NewRotationContainer{NewRotation.Quaternion()}; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_SetJointRotation(&InstanceContainer, &NewRotationContainer, &FingerContainer); - - Pimpl->SyncUProperties(); } TArray USGBasicHandModel::GetTotalLengths() const @@ -609,8 +551,6 @@ TArray USGBasicHandModel::GetTotalLengths() const float USGBasicHandModel::GetTotalLength(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_ESGFinger FingerContainer{Finger}; return SGCoreImpl_FSGBasicHandModelImpl_GetTotalLength(&InstanceContainer, &FingerContainer); @@ -618,8 +558,6 @@ float USGBasicHandModel::GetTotalLength(const ESGFinger Finger) const TArray USGBasicHandModel::Get3DLengths(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_TArray_FVector OutLengthsContainer; FSGIC_ESGFinger FingerContainer{Finger}; @@ -630,8 +568,6 @@ TArray USGBasicHandModel::Get3DLengths(const ESGFinger Finger) const bool USGBasicHandModel::Equals(const USGBasicHandModel* BasicHandModel) const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FSGBasicHandModelImpl BasicHandModelContainer{BasicHandModel->ToBasicHandModelImpl()}; return SGCoreImpl_FSGBasicHandModelImpl_Equals(&InstanceContainer, &BasicHandModelContainer); @@ -639,8 +575,6 @@ bool USGBasicHandModel::Equals(const USGBasicHandModel* BasicHandModel) const FString USGBasicHandModel::ToString() const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBasicHandModelImpl_ToString(&InstanceContainer, &OutStringContainer); @@ -649,8 +583,6 @@ FString USGBasicHandModel::ToString() const FString USGBasicHandModel::ToString(const bool bLengthsOnly) const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBasicHandModelImpl_ToString_bLengthsOnly(&InstanceContainer, &OutStringContainer, bLengthsOnly); @@ -659,8 +591,6 @@ FString USGBasicHandModel::ToString(const bool bLengthsOnly) const FString USGBasicHandModel::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBasicHandModelImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -677,12 +607,4 @@ USGBasicHandModel::FImpl::~FImpl() = default; void USGBasicHandModel::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGBasicHandModel::FImpl::SyncUProperties() -{ -} - -void USGBasicHandModel::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGBetaDevice.cpp b/Source/SenseGloveCore/Private/SGCore/SGBetaDevice.cpp index 18b133b9..563cfc59 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGBetaDevice.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGBetaDevice.cpp @@ -46,42 +46,6 @@ #include "SGInterop/SGIC_FString.h" #include "SGInterop/SGIC_TSharedPtr_FSGBetaDeviceImpl.h" -struct USGBetaDevice::FImpl -{ - /************************ - * Member variables - ************************/ - - - /************************ - * Owner object - ************************/ - - USGBetaDevice* Owner; - - /************************ - * Constructor / Destructor - ************************/ - - explicit FImpl(USGBetaDevice* InOwner); - ~FImpl(); - - /************************ - * Default copy constructor & copy assignment operator - ************************/ - - FImpl(const FImpl& Rhs) = default; - FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); -}; - USGBetaDevice* USGBetaDevice::NewBetaDevice(UObject* Outer, const FSGBetaDeviceImpl& BetaDeviceImpl) { USGBetaDevice* Instance = NewObject(Outer); @@ -128,29 +92,18 @@ USGBetaDevice* USGBetaDevice::Parse(UObject* Outer, const FString& String) } USGBetaDevice::USGBetaDevice() - : USGDevice(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice() { FSGIC_TSharedPtr_FSGBetaDeviceImpl OutSharedPtrContainer; SGCoreImpl_FSGBetaDeviceImpl_ctor_MakeShared(&OutSharedPtrContainer); SetSGDeviceImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGBetaDevice::USGBetaDevice(const FString& ConstantsString, const FString& DeviceId, const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion) - : USGDevice(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice() { FSGIC_TSharedPtr_FSGBetaDeviceImpl OutSharedPtrContainer; FSGIC_FString ConstantsStringContainer{ConstantsString}; @@ -161,55 +114,27 @@ USGBetaDevice::USGBetaDevice(const FString& ConstantsString, const FString& Devi &HardwareVersionContainer, FirmwareVersion, SubFirmwareVersion); SetSGDeviceImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGBetaDevice::USGBetaDevice(const FSGBetaDeviceImpl& BetaDeviceImpl) - : USGDevice(BetaDeviceImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(BetaDeviceImpl) { - Pimpl->SyncUProperties(); } USGBetaDevice::USGBetaDevice(TSharedRef BetaDeviceImpl) - : USGDevice(MoveTemp(BetaDeviceImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(MoveTemp(BetaDeviceImpl)) { - Pimpl->SyncUProperties(); } USGBetaDevice::~USGBetaDevice() = default; TSharedRef USGBetaDevice::ToBetaDeviceImpl() const { - SyncImplObject(); return FSGDeviceImplCast::ToBetaDeviceImpl(ToSGDeviceImpl()); } -void USGBetaDevice::SyncImplObject() const -{ - Super::SyncImplObject(); - Pimpl->SyncImplObject(); -} - -void USGBetaDevice::SyncUProperties() -{ - Super::SyncUProperties(); - Pimpl->SyncUProperties(); -} - ESGDeviceType USGBetaDevice::GetDeviceType() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_ESGDeviceType OutTypeContainer; SGCoreImpl_FSGBetaDeviceImpl_GetDeviceType(&InstanceContainer, &OutTypeContainer); @@ -218,8 +143,6 @@ ESGDeviceType USGBetaDevice::GetDeviceType() const FString USGBetaDevice::GetDeviceId() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGBetaDeviceImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); @@ -228,8 +151,6 @@ FString USGBetaDevice::GetDeviceId() const FString USGBetaDevice::GetHardwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString VersionContainer; SGCoreImpl_FSGBetaDeviceImpl_GetHardwareVersion(&InstanceContainer, &VersionContainer); @@ -238,24 +159,18 @@ FString USGBetaDevice::GetHardwareVersion() const int32 USGBetaDevice::GetFirmwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; return SGCoreImpl_FSGBetaDeviceImpl_GetFirmwareVersion(&InstanceContainer); } int32 USGBetaDevice::GetSubFirmwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; return SGCoreImpl_FSGBetaDeviceImpl_GetSubFirmwareVersion(&InstanceContainer); } FString USGBetaDevice::GetConstantsString() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBetaDeviceImpl_GetConstantsString(&InstanceContainer, &OutStringContainer); @@ -264,8 +179,6 @@ FString USGBetaDevice::GetConstantsString() const FString USGBetaDevice::GetSensorData() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutDataContainer; SGCoreImpl_FSGBetaDeviceImpl_GetSensorData(&InstanceContainer, &OutDataContainer); @@ -274,8 +187,6 @@ FString USGBetaDevice::GetSensorData() const FString USGBetaDevice::GetLastCommand() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutCommandContainer; SGCoreImpl_FSGBetaDeviceImpl_GetLastCommand(&InstanceContainer, &OutCommandContainer); @@ -284,8 +195,6 @@ FString USGBetaDevice::GetLastCommand() const bool USGBetaDevice::SendHaptics(const FString& Command) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString CommandContainer{Command}; return SGCoreImpl_FSGBetaDeviceImpl_SendHaptics(&InstanceContainer, &CommandContainer); @@ -293,30 +202,8 @@ bool USGBetaDevice::SendHaptics(const FString& Command) const FString USGBetaDevice::ToString() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBetaDeviceImpl_ToString(&InstanceContainer, &OutStringContainer); return MoveTemp(OutStringContainer.String); -} - -USGBetaDevice::FImpl::FImpl(USGBetaDevice* InOwner) - : Owner(InOwner) -{ -} - -USGBetaDevice::FImpl::~FImpl() = default; - -void USGBetaDevice::FImplDeleter::operator()(const FImpl* P) const -{ - delete P; -} - -void USGBetaDevice::FImpl::SyncUProperties() -{ -} - -void USGBetaDevice::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGBuzzCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGBuzzCommand.cpp index caeed70b..8df860fe 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGBuzzCommand.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGBuzzCommand.cpp @@ -44,42 +44,6 @@ #include "SGInterop/SGIC_TArray_int32.h" #include "SGInterop/SGIC_TSharedPtr_FSGBuzzCommandImpl.h" -struct USGBuzzCommand::FImpl -{ - /************************ - * Member variables - ************************/ - - - /************************ - * Owner object - ************************/ - - USGBuzzCommand* Owner; - - /************************ - * Constructor / Destructor - ************************/ - - explicit FImpl(USGBuzzCommand* InOwner); - ~FImpl(); - - /************************ - * Default copy constructor & copy assignment operator - ************************/ - - FImpl(const FImpl& Rhs) = default; - FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); -}; - USGBuzzCommand* USGBuzzCommand::NewBuzzCommand(UObject* Outer, const FSGBuzzCommandImpl& BuzzCommandImpl) { USGBuzzCommand* Instance = NewObject(Outer); @@ -140,27 +104,16 @@ USGBuzzCommand* USGBuzzCommand::Off(UObject* Outer) } USGBuzzCommand::USGBuzzCommand() - : USGFingerCommand(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand() { FSGIC_TSharedPtr_FSGBuzzCommandImpl OutSharedPtrContainer; SGCoreImpl_FSGBuzzCommandImpl_ctor_MakeShared(&OutSharedPtrContainer); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGBuzzCommand::USGBuzzCommand(const TArray& BuzzLevels) - : USGFingerCommand(BuzzLevels), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand(BuzzLevels) { FSGIC_TSharedPtr_FSGBuzzCommandImpl OutSharedPtrContainer; FSGIC_TArray_int32 BuzzLevelsContainer{BuzzLevels}; @@ -168,33 +121,21 @@ USGBuzzCommand::USGBuzzCommand(const TArray& BuzzLevels) &OutSharedPtrContainer, &BuzzLevelsContainer); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGBuzzCommand::USGBuzzCommand( const int32 Thumb, const int32 Index, const int32 Middle, const int32 Ring, const int32 Pinky) - : USGFingerCommand(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand() { FSGIC_TSharedPtr_FSGBuzzCommandImpl OutSharedPtrContainer; SGCoreImpl_FSGBuzzCommandImpl_ctor_Thumb_Index_Middle_Ring_Pinky_MakeShared( &OutSharedPtrContainer, Thumb, Index, Middle, Ring, Pinky); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGBuzzCommand::USGBuzzCommand(const ESGFinger Finger, const int32 BuzzLevel) - : USGFingerCommand(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand() { FSGIC_TSharedPtr_FSGBuzzCommandImpl OutSharedPtrContainer; FSGIC_ESGFinger FingerContainer{Finger}; @@ -202,55 +143,27 @@ USGBuzzCommand::USGBuzzCommand(const ESGFinger Finger, const int32 BuzzLevel) &OutSharedPtrContainer, &FingerContainer, BuzzLevel); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGBuzzCommand::USGBuzzCommand(const FSGBuzzCommandImpl& BuzzCommandImpl) - : USGFingerCommand(BuzzCommandImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand(BuzzCommandImpl) { - Pimpl->SyncUProperties(); } USGBuzzCommand::USGBuzzCommand(TSharedRef BuzzCommandImpl) - : USGFingerCommand(MoveTemp(BuzzCommandImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand(MoveTemp(BuzzCommandImpl)) { - Pimpl->SyncUProperties(); } USGBuzzCommand::~USGBuzzCommand() = default; TSharedRef USGBuzzCommand::ToBuzzCommandImpl() const { - SyncImplObject(); return FSGFingerCommandImplCast::ToBuzzCommandImpl(ToFingerCommandImpl()); } -void USGBuzzCommand::SyncImplObject() const -{ - Super::SyncImplObject(); - Pimpl->SyncImplObject(); -} - -void USGBuzzCommand::SyncUProperties() -{ - Super::SyncUProperties(); - Pimpl->SyncUProperties(); -} - USGBuzzCommand* USGBuzzCommand::Copy(UObject* Outer) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBuzzCommandImpl InstanceContainer{ToBuzzCommandImpl()}; FSGIC_FSGBuzzCommandImpl OutBuzzCommandImplContainer; SGCoreImpl_FSGBuzzCommandImpl_Copy(&InstanceContainer, &OutBuzzCommandImplContainer); @@ -259,31 +172,9 @@ USGBuzzCommand* USGBuzzCommand::Copy(UObject* Outer) const USGBuzzCommand* USGBuzzCommand::Merge(UObject* Outer, const USGBuzzCommand* BuzzCommand) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGBuzzCommandImpl InstanceContainer{ToBuzzCommandImpl()}; FSGIC_FSGBuzzCommandImpl BuzzCommandImplContainer{BuzzCommand->ToBuzzCommandImpl().Get()}; FSGIC_FSGBuzzCommandImpl OutBuzzCommandImplContainer; SGCoreImpl_FSGBuzzCommandImpl_Merge(&InstanceContainer, &OutBuzzCommandImplContainer, &BuzzCommandImplContainer); return NewBuzzCommand(Outer, MoveTemp(OutBuzzCommandImplContainer.BuzzCommandImpl)); -} - -USGBuzzCommand::FImpl::FImpl(USGBuzzCommand* InOwner) - : Owner(InOwner) -{ -} - -USGBuzzCommand::FImpl::~FImpl() = default; - -void USGBuzzCommand::FImplDeleter::operator()(const FImpl* P) const -{ - delete P; -} - -void USGBuzzCommand::FImpl::SyncUProperties() -{ -} - -void USGBuzzCommand::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGCalibrationDataPoint.cpp b/Source/SenseGloveCore/Private/SGCore/SGCalibrationDataPoint.cpp index d6ee9c65..4bece09c 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGCalibrationDataPoint.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGCalibrationDataPoint.cpp @@ -69,14 +69,6 @@ struct USGCalibrationDataPoint::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); }; USGCalibrationDataPoint* USGCalibrationDataPoint::NewCalibrationDataPoint( @@ -118,7 +110,6 @@ USGCalibrationDataPoint::USGCalibrationDataPoint() SGCoreImpl_FSGCalibrationDataPointImpl_ctor(&OutCalibrationDataPointImplContainer); Pimpl->CalibrationDataPointImpl = MoveTemp(OutCalibrationDataPointImplContainer.CalibrationDataPointImpl); - Pimpl->SyncUProperties(); } USGCalibrationDataPoint::USGCalibrationDataPoint(const int32 CurrentStage, const TArray& CalibrationValues) @@ -135,7 +126,6 @@ USGCalibrationDataPoint::USGCalibrationDataPoint(const int32 CurrentStage, const &OutCalibrationDataPointImplContainer, CurrentStage, &CalibrationValuesContainer); Pimpl->CalibrationDataPointImpl = MoveTemp(OutCalibrationDataPointImplContainer.CalibrationDataPointImpl); - Pimpl->SyncUProperties(); } USGCalibrationDataPoint::USGCalibrationDataPoint(const FSGCalibrationDataPointImpl& CalibrationDataPointImpl) @@ -147,7 +137,6 @@ USGCalibrationDataPoint::USGCalibrationDataPoint(const FSGCalibrationDataPointIm #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetCalibrationDataPointImpl(CalibrationDataPointImpl); - Pimpl->SyncUProperties(); } USGCalibrationDataPoint::~USGCalibrationDataPoint() = default; @@ -162,7 +151,6 @@ void USGCalibrationDataPoint::SetCalibrationDataPointImpl(const FSGCalibrationDa const FSGCalibrationDataPointImpl& USGCalibrationDataPoint::ToCalibrationDataPointImpl() const { - Pimpl->SyncImplObject(); return Pimpl->CalibrationDataPointImpl; } @@ -199,12 +187,4 @@ USGCalibrationDataPoint::FImpl::~FImpl() = default; void USGCalibrationDataPoint::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGCalibrationDataPoint::FImpl::SyncUProperties() -{ -} - -void USGCalibrationDataPoint::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp b/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp index 9fd45d6d..dc5b0824 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp @@ -85,14 +85,6 @@ struct USGDevice::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); }; void USGDevice::ParseFirmware(const FString& RawFirmware, int32& OutMainVersion, int32& OutSubVersion) @@ -121,7 +113,6 @@ USGDevice::USGDevice() SGCoreImpl_FSGDeviceImpl_ctor_MakeShared(&OutSharedPtrContainer); Pimpl->SGDeviceImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGDevice::USGDevice(const FSGDeviceImpl& SGDeviceImpl) @@ -137,7 +128,6 @@ USGDevice::USGDevice(const FSGDeviceImpl& SGDeviceImpl) SGCoreImpl_FSGDeviceImpl_ctor_copy_MakeShared(&OutSharedPtrContainer, &RhsContainer); Pimpl->SGDeviceImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGDevice::USGDevice(const FSGBetaDeviceImpl& BetaDeviceImpl) @@ -168,7 +158,6 @@ USGDevice::USGDevice(const FSGHapticGloveImpl& HapticGloveImpl) SGCoreImpl_FSGHapticGloveImpl_ctor_copy_MakeShared(&OutSharedPtrContainer, &RhsContainer); Pimpl->SGDeviceImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGDevice::USGDevice(const FSGNovaGloveImpl& NovaGloveImpl) @@ -184,7 +173,6 @@ USGDevice::USGDevice(const FSGNovaGloveImpl& NovaGloveImpl) SGCoreImpl_FSGNovaGloveImpl_ctor_copy_MakeShared(&OutSharedPtrContainer, &RhsContainer); Pimpl->SGDeviceImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGDevice::USGDevice(const FSGSenseGloveImpl& SenseGloveImpl) @@ -200,7 +188,6 @@ USGDevice::USGDevice(const FSGSenseGloveImpl& SenseGloveImpl) SGCoreImpl_FSGSenseGloveImpl_ctor_copy_MakeShared(&OutSharedPtrContainer, &RhsContainer); Pimpl->SGDeviceImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGDevice::USGDevice(TSharedRef SGDeviceImpl) @@ -212,7 +199,6 @@ USGDevice::USGDevice(TSharedRef SGDeviceImpl) #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->SGDeviceImpl = MoveTemp(SGDeviceImpl); - Pimpl->SyncUProperties(); } USGDevice::USGDevice(TSharedRef BetaDeviceImpl) @@ -224,7 +210,6 @@ USGDevice::USGDevice(TSharedRef BetaDeviceImpl) #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->SGDeviceImpl = MoveTemp(BetaDeviceImpl); - Pimpl->SyncUProperties(); } USGDevice::USGDevice(TSharedRef HapticGloveImpl) @@ -236,7 +221,6 @@ USGDevice::USGDevice(TSharedRef HapticGloveImpl) #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->SGDeviceImpl = MoveTemp(HapticGloveImpl); - Pimpl->SyncUProperties(); } USGDevice::USGDevice(TSharedRef NovaGloveImpl) @@ -248,7 +232,6 @@ USGDevice::USGDevice(TSharedRef NovaGloveImpl) #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->SGDeviceImpl = MoveTemp(NovaGloveImpl); - Pimpl->SyncUProperties(); } USGDevice::USGDevice(TSharedRef SenseGloveImpl) @@ -260,7 +243,6 @@ USGDevice::USGDevice(TSharedRef SenseGloveImpl) #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->SGDeviceImpl = MoveTemp(SenseGloveImpl); - Pimpl->SyncUProperties(); } USGDevice::~USGDevice() = default; @@ -332,24 +314,11 @@ void USGDevice::SetSGDeviceImpl(TSharedRef SenseGloveImpl) TSharedRef USGDevice::ToSGDeviceImpl() const { - SyncImplObject(); return Pimpl->SGDeviceImpl.ToSharedRef(); } -void USGDevice::SyncImplObject() const -{ - Pimpl->SyncImplObject(); -} - -void USGDevice::SyncUProperties() -{ - Pimpl->SyncUProperties(); -} - ESGDeviceType USGDevice::GetDeviceType() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; FSGIC_ESGDeviceType OutTypeContainer; SGCoreImpl_FSGDeviceImpl_GetDeviceType(&InstanceContainer, &OutTypeContainer); @@ -358,16 +327,12 @@ ESGDeviceType USGDevice::GetDeviceType() const int32 USGDevice::GetSubFirmwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; return SGCoreImpl_FSGDeviceImpl_GetSubFirmwareVersion(&InstanceContainer); } FString USGDevice::GetFirmwareString() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGDeviceImpl_GetFirmwareString(&InstanceContainer, &OutStringContainer); @@ -376,8 +341,6 @@ FString USGDevice::GetFirmwareString() const FString USGDevice::GetAddress() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; FSGIC_FString AddressContainer; SGCoreImpl_FSGDeviceImpl_GetAddress(&InstanceContainer, &AddressContainer); @@ -386,16 +349,12 @@ FString USGDevice::GetAddress() const bool USGDevice::IsConnected() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; return SGCoreImpl_FSGDeviceImpl_IsConnected(&InstanceContainer); } ESGConnectionType USGDevice::GetConnectionType() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; FSGIC_ESGConnectionType OutTypeContainer; SGCoreImpl_FSGDeviceImpl_GetConnectionType(&InstanceContainer, &OutTypeContainer); @@ -404,82 +363,57 @@ ESGConnectionType USGDevice::GetConnectionType() const int32 USGDevice::PacketsPerSecondReceived() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; return SGCoreImpl_FSGDeviceImpl_PacketsPerSecondReceived(&InstanceContainer); } int32 USGDevice::PacketsPerSecondSent() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; return SGCoreImpl_FSGDeviceImpl_PacketsPerSecondSent(&InstanceContainer); } int32 USGDevice::GetDeviceIndex() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; return SGCoreImpl_FSGDeviceImpl_GetDeviceIndex(&InstanceContainer); } void USGDevice::SetDeviceIndex(const int32 NewIndex) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; SGCoreImpl_FSGDeviceImpl_SetDeviceIndex(&InstanceContainer, NewIndex); - - SyncUProperties(); } bool USGDevice::IsWireless() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; return SGCoreImpl_FSGDeviceImpl_IsWireless(&InstanceContainer); } bool USGDevice::HasBattery() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; return SGCoreImpl_FSGDeviceImpl_HasBattery(&InstanceContainer); } bool USGDevice::IsCharging() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; const bool bResult = SGCoreImpl_FSGDeviceImpl_IsCharging(&InstanceContainer); - SyncUProperties(); - return bResult; } bool USGDevice::GetBatteryLevel(float& OutLevel) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; const bool bResult = SGCoreImpl_FSGDeviceImpl_GetBatteryLevel(&InstanceContainer, &OutLevel); - - SyncUProperties(); - return bResult; } FString USGDevice::ToString() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGDeviceImpl_ToString(&InstanceContainer, &OutStringContainer); @@ -496,12 +430,4 @@ USGDevice::FImpl::~FImpl() = default; void USGDevice::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGDevice::FImpl::SyncUProperties() -{ -} - -void USGDevice::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp b/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp index 36c672b1..82355e5b 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp @@ -69,13 +69,6 @@ struct USGDeviceModel::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGDeviceModel* USGDeviceModel::NewDeviceModel(UObject* Outer, const FSGDeviceModelImpl& DeviceModelImpl) @@ -131,7 +124,6 @@ USGDeviceModel::USGDeviceModel() SGCoreImpl_FSGDeviceModelImpl_ctor(&OutDeviceModelImplContainer); Pimpl->DeviceModelImpl = MoveTemp(OutDeviceModelImplContainer.DeviceModelImpl); - Pimpl->SyncUProperties(); } USGDeviceModel::USGDeviceModel(const FString& Id, const FString& HardwareVersion, @@ -150,7 +142,6 @@ USGDeviceModel::USGDeviceModel(const FString& Id, const FString& HardwareVersion &OutDeviceModelImplContainer, &IdContainer, &HardwareVersionContainer, FirmwareVersion, SubFirmwareVersion); Pimpl->DeviceModelImpl = MoveTemp(OutDeviceModelImplContainer.DeviceModelImpl); - Pimpl->SyncUProperties(); } USGDeviceModel::USGDeviceModel(const FSGDeviceModelImpl& DeviceModelImpl) @@ -162,7 +153,6 @@ USGDeviceModel::USGDeviceModel(const FSGDeviceModelImpl& DeviceModelImpl) #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetDeviceModelImpl(DeviceModelImpl); - Pimpl->SyncUProperties(); } USGDeviceModel::~USGDeviceModel() = default; @@ -177,13 +167,11 @@ void USGDeviceModel::SetDeviceModelImpl(const FSGDeviceModelImpl& DeviceModelImp const FSGDeviceModelImpl& USGDeviceModel::ToDeviceModelImpl() const { - Pimpl->SyncImplObject(); return Pimpl->DeviceModelImpl; } FSGDeviceModelImpl& USGDeviceModel::ToDeviceModelImpl() { - Pimpl->SyncImplObject(); return Pimpl->DeviceModelImpl; } @@ -225,12 +213,4 @@ USGDeviceModel::FImpl::~FImpl() = default; void USGDeviceModel::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGDeviceModel::FImpl::SyncUProperties() -{ -} - -void USGDeviceModel::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGFingerCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGFingerCommand.cpp index 8521f251..16dbae50 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGFingerCommand.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGFingerCommand.cpp @@ -76,14 +76,6 @@ struct USGFingerCommand::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); }; USGFingerCommand::USGFingerCommand() @@ -98,7 +90,6 @@ USGFingerCommand::USGFingerCommand() SGCoreImpl_FSGFingerCommandImpl_ctor_MakeShared(&OutSharedPtrContainer); Pimpl->FingerCommandImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGFingerCommand::USGFingerCommand(const TArray& InLevels) @@ -114,7 +105,6 @@ USGFingerCommand::USGFingerCommand(const TArray& InLevels) SGCoreImpl_FSGFingerCommandImpl_ctor_Levels_MakeShared(&OutSharedPtrContainer, &LevelsContainer); Pimpl->FingerCommandImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGFingerCommand::USGFingerCommand(const FSGFingerCommandImpl& FingerCommandImpl) @@ -131,7 +121,6 @@ USGFingerCommand::USGFingerCommand(const FSGFingerCommandImpl& FingerCommandImpl &OutSharedPtrContainer, &RhsContainer); Pimpl->FingerCommandImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGFingerCommand::USGFingerCommand(const FSGBuzzCommandImpl& BuzzCommandImpl) @@ -148,7 +137,6 @@ USGFingerCommand::USGFingerCommand(const FSGBuzzCommandImpl& BuzzCommandImpl) &OutSharedPtrContainer, &RhsContainer); Pimpl->FingerCommandImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGFingerCommand::USGFingerCommand(const FSGForceFeedbackCommandImpl& ForceFeedbackCommandImpl) @@ -165,7 +153,6 @@ USGFingerCommand::USGFingerCommand(const FSGForceFeedbackCommandImpl& ForceFeedb &OutSharedPtrContainer, &RhsContainer); Pimpl->FingerCommandImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGFingerCommand::USGFingerCommand(const FSGTimedBuzzCommandImpl& TimedBuzzCommandImpl) @@ -182,7 +169,6 @@ USGFingerCommand::USGFingerCommand(const FSGTimedBuzzCommandImpl& TimedBuzzComma &OutSharedPtrContainer, &RhsContainer); Pimpl->FingerCommandImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGFingerCommand::USGFingerCommand(TSharedRef FingerCommandImpl) @@ -194,7 +180,6 @@ USGFingerCommand::USGFingerCommand(TSharedRef FingerComman #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->FingerCommandImpl = MoveTemp(FingerCommandImpl); - Pimpl->SyncUProperties(); } USGFingerCommand::USGFingerCommand(TSharedRef BuzzCommandImpl) @@ -206,7 +191,6 @@ USGFingerCommand::USGFingerCommand(TSharedRef BuzzCommandImp #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->FingerCommandImpl = MoveTemp(BuzzCommandImpl); - Pimpl->SyncUProperties(); } USGFingerCommand::USGFingerCommand(TSharedRef ForceFeedbackCommandImpl) @@ -218,7 +202,6 @@ USGFingerCommand::USGFingerCommand(TSharedRef Force #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->FingerCommandImpl = MoveTemp(ForceFeedbackCommandImpl); - Pimpl->SyncUProperties(); } USGFingerCommand::USGFingerCommand(TSharedRef TimedBuzzCommandImpl) @@ -230,7 +213,6 @@ USGFingerCommand::USGFingerCommand(TSharedRef TimedBuzz #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->FingerCommandImpl = MoveTemp(TimedBuzzCommandImpl); - Pimpl->SyncUProperties(); } USGFingerCommand::~USGFingerCommand() = default; @@ -289,20 +271,9 @@ void USGFingerCommand::SetFingerCommandImpl(TSharedRef TSharedRef USGFingerCommand::ToFingerCommandImpl() const { - SyncImplObject(); return Pimpl->FingerCommandImpl.ToSharedRef(); } -void USGFingerCommand::SyncImplObject() const -{ - Pimpl->SyncImplObject(); -} - -void USGFingerCommand::SyncUProperties() -{ - Pimpl->SyncUProperties(); -} - TArray USGFingerCommand::GetLevels() const { FSGIC_TSharedPtr_FSGFingerCommandImpl InstanceContainer{ToFingerCommandImpl()}; @@ -313,28 +284,19 @@ TArray USGFingerCommand::GetLevels() const int32 USGFingerCommand::GetLevel(const int32 Finger) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGFingerCommandImpl InstanceContainer{ToFingerCommandImpl()}; const int32 Level = SGCoreImpl_FSGFingerCommandImpl_GetLevel(&InstanceContainer, Finger); - return Level; } void USGFingerCommand::SetLevel(const int32 Finger, const int32 Value) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGFingerCommandImpl InstanceContainer{ToFingerCommandImpl()}; SGCoreImpl_FSGFingerCommandImpl_SetLevel(&InstanceContainer, Finger, Value); - - SyncUProperties(); } bool USGFingerCommand::Equals(const USGFingerCommand* FingerCommand) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGFingerCommandImpl InstanceContainer{ToFingerCommandImpl()}; FSGIC_FSGFingerCommandImpl FingerCommandImplContainer{FingerCommand->ToFingerCommandImpl().Get()}; const bool bEquals = SGCoreImpl_FSGFingerCommandImpl_Equals(&InstanceContainer, &FingerCommandImplContainer); @@ -343,8 +305,6 @@ bool USGFingerCommand::Equals(const USGFingerCommand* FingerCommand) const FString USGFingerCommand::ToString() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGFingerCommandImpl InstanceContainer{ToFingerCommandImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGFingerCommandImpl_ToString(&InstanceContainer, &OutStringContainer); @@ -361,12 +321,4 @@ USGFingerCommand::FImpl::~FImpl() = default; void USGFingerCommand::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGFingerCommand::FImpl::SyncUProperties() -{ -} - -void USGFingerCommand::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGForceFeedbackCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGForceFeedbackCommand.cpp index 9ba36e28..31f0e8ff 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGForceFeedbackCommand.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGForceFeedbackCommand.cpp @@ -42,42 +42,6 @@ #include "SGInterop/SGIC_TArray_int32.h" #include "SGInterop/SGIC_TSharedPtr_FSGForceFeedbackCommandImpl.h" -struct USGForceFeedbackCommand::FImpl -{ - /************************ - * Member variables - ************************/ - - - /************************ - * Owner object - ************************/ - - USGForceFeedbackCommand* Owner; - - /************************ - * Constructor / Destructor - ************************/ - - explicit FImpl(USGForceFeedbackCommand* InOwner); - ~FImpl(); - - /************************ - * Default copy constructor & copy assignment operator - ************************/ - - FImpl(const FImpl& Rhs) = default; - FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); -}; - USGForceFeedbackCommand* USGForceFeedbackCommand::NewForceFeedbackCommand(UObject* Outer, const FSGForceFeedbackCommandImpl& ForceFeedbackCommandImpl) @@ -144,27 +108,16 @@ USGForceFeedbackCommand* USGForceFeedbackCommand::Off(UObject* Outer) } USGForceFeedbackCommand::USGForceFeedbackCommand() - : USGFingerCommand(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand() { FSGIC_TSharedPtr_FSGForceFeedbackCommandImpl OutSharedPtrContainer; SGCoreImpl_FSGForceFeedbackCommandImpl_ctor_MakeShared(&OutSharedPtrContainer); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGForceFeedbackCommand::USGForceFeedbackCommand(const TArray& ForceFeedbackLevels) - : USGFingerCommand(ForceFeedbackLevels), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand(ForceFeedbackLevels) { FSGIC_TSharedPtr_FSGForceFeedbackCommandImpl OutSharedPtrContainer; FSGIC_TArray_int32 ForceFeedbackLevelsContainer{ForceFeedbackLevels}; @@ -172,33 +125,21 @@ USGForceFeedbackCommand::USGForceFeedbackCommand(const TArray& ForceFeedb &OutSharedPtrContainer, &ForceFeedbackLevelsContainer); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGForceFeedbackCommand::USGForceFeedbackCommand( const int32 Thumb, const int32 Index, const int32 Middle, const int32 Ring, const int32 Pinky) - : USGFingerCommand(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand() { FSGIC_TSharedPtr_FSGForceFeedbackCommandImpl OutSharedPtrContainer; SGCoreImpl_FSGForceFeedbackCommandImpl_ctor_Thumb_Index_Middle_Ring_Pinky_MakeShared( &OutSharedPtrContainer, Thumb, Index, Middle, Ring, Pinky); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGForceFeedbackCommand::USGForceFeedbackCommand(const ESGFinger Finger, const int32 BuzzLevel) - : USGFingerCommand(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand() { FSGIC_TSharedPtr_FSGForceFeedbackCommandImpl OutSharedPtrContainer; FSGIC_ESGFinger FingerContainer{Finger}; @@ -206,55 +147,27 @@ USGForceFeedbackCommand::USGForceFeedbackCommand(const ESGFinger Finger, const i &OutSharedPtrContainer, &FingerContainer, BuzzLevel); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGForceFeedbackCommand::USGForceFeedbackCommand(const FSGForceFeedbackCommandImpl& ForceFeedbackCommandImpl) - : USGFingerCommand(ForceFeedbackCommandImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand(ForceFeedbackCommandImpl) { - Pimpl->SyncUProperties(); } USGForceFeedbackCommand::USGForceFeedbackCommand(TSharedRef ForceFeedbackCommandImpl) - : USGFingerCommand(MoveTemp(ForceFeedbackCommandImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGFingerCommand(MoveTemp(ForceFeedbackCommandImpl)) { - Pimpl->SyncUProperties(); } USGForceFeedbackCommand::~USGForceFeedbackCommand() = default; TSharedRef USGForceFeedbackCommand::ToForceFeedbackCommandImpl() const { - SyncImplObject(); return FSGFingerCommandImplCast::ToForceFeedbackCommandImpl(ToFingerCommandImpl()); } -void USGForceFeedbackCommand::SyncImplObject() const -{ - Super::SyncImplObject(); - Pimpl->SyncImplObject(); -} - -void USGForceFeedbackCommand::SyncUProperties() -{ - Super::SyncUProperties(); - Pimpl->SyncUProperties(); -} - USGForceFeedbackCommand* USGForceFeedbackCommand::Copy(UObject* Outer) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGForceFeedbackCommandImpl InstanceContainer{ToForceFeedbackCommandImpl()}; FSGIC_FSGForceFeedbackCommandImpl OutForceFeedbackCommandImplContainer; SGCoreImpl_FSGForceFeedbackCommandImpl_Copy(&InstanceContainer, &OutForceFeedbackCommandImplContainer); @@ -264,8 +177,6 @@ USGForceFeedbackCommand* USGForceFeedbackCommand::Copy(UObject* Outer) const USGForceFeedbackCommand* USGForceFeedbackCommand::Merge(UObject* Outer, const USGForceFeedbackCommand* ForceFeedbackCommand) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGForceFeedbackCommandImpl InstanceContainer{ToForceFeedbackCommandImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandImplContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get()}; @@ -273,24 +184,4 @@ USGForceFeedbackCommand* USGForceFeedbackCommand::Merge(UObject* Outer, SGCoreImpl_FSGForceFeedbackCommandImpl_Merge(&InstanceContainer, &OutForceFeedbackCommandImplContainer, &ForceFeedbackCommandImplContainer); return NewForceFeedbackCommand(Outer, MoveTemp(OutForceFeedbackCommandImplContainer.ForceFeedbackCommandImpl)); -} - -USGForceFeedbackCommand::FImpl::FImpl(USGForceFeedbackCommand* InOwner) - : Owner(InOwner) -{ -} - -USGForceFeedbackCommand::FImpl::~FImpl() = default; - -void USGForceFeedbackCommand::FImplDeleter::operator()(const FImpl* P) const -{ - delete P; -} - -void USGForceFeedbackCommand::FImpl::SyncUProperties() -{ -} - -void USGForceFeedbackCommand::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp index 599898e4..a63f95ff 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp @@ -81,13 +81,6 @@ struct USGHandInterpolator::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGHandInterpolator* USGHandInterpolator::NewHandInterpolator( @@ -267,7 +260,6 @@ USGHandInterpolator::USGHandInterpolator() SGCoreImpl_FSGHandInterpolatorImpl_ctor(&OutHandInterpolatorImplContainer); Pimpl->HandInterpolatorImpl = MoveTemp(OutHandInterpolatorImplContainer.HandInterpolatorImpl); - Pimpl->SyncUProperties(); } USGHandInterpolator::USGHandInterpolator(const TArray>& JointInterpolations) @@ -286,7 +278,6 @@ USGHandInterpolator::USGHandInterpolator(const TArrayHandInterpolatorImpl = MoveTemp(OutHandInterpolatorImplContainer.HandInterpolatorImpl); - Pimpl->SyncUProperties(); } USGHandInterpolator::USGHandInterpolator(const TArray& JointInterpolations) @@ -308,7 +299,6 @@ USGHandInterpolator::USGHandInterpolator(const TArray& &JointInterpolationsContainer); Pimpl->HandInterpolatorImpl = MoveTemp(OutHandInterpolatorImplContainer.HandInterpolatorImpl); - Pimpl->SyncUProperties(); } USGHandInterpolator::USGHandInterpolator(const TArray>& JointInterpolations, @@ -329,7 +319,6 @@ USGHandInterpolator::USGHandInterpolator(const TArrayHandInterpolatorImpl = MoveTemp(OutHandInterpolatorImplContainer.HandInterpolatorImpl); - Pimpl->SyncUProperties(); } USGHandInterpolator::USGHandInterpolator(const TArray>& JointInterpolations, @@ -350,7 +339,6 @@ USGHandInterpolator::USGHandInterpolator(const TArrayHandInterpolatorImpl = MoveTemp(OutHandInterpolatorImplContainer.HandInterpolatorImpl); - Pimpl->SyncUProperties(); } USGHandInterpolator::USGHandInterpolator(const TArray& JointInterpolations, @@ -374,7 +362,6 @@ USGHandInterpolator::USGHandInterpolator(const TArray& &OutHandInterpolatorImplContainer, &JointInterpolationsContainer, &CmcStartRotationContainer); Pimpl->HandInterpolatorImpl = MoveTemp(OutHandInterpolatorImplContainer.HandInterpolatorImpl); - Pimpl->SyncUProperties(); } USGHandInterpolator::USGHandInterpolator(const TArray& JointInterpolations, @@ -398,7 +385,6 @@ USGHandInterpolator::USGHandInterpolator(const TArray& &OutHandInterpolatorImplContainer, &JointInterpolationsContainer, &CmcStartRotationContainer); Pimpl->HandInterpolatorImpl = MoveTemp(OutHandInterpolatorImplContainer.HandInterpolatorImpl); - Pimpl->SyncUProperties(); } USGHandInterpolator::USGHandInterpolator(const FSGHandInterpolatorImpl& HandInterpolatorImpl) @@ -410,7 +396,6 @@ USGHandInterpolator::USGHandInterpolator(const FSGHandInterpolatorImpl& HandInte #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetHandInterpolatorImpl(HandInterpolatorImpl); - Pimpl->SyncUProperties(); } USGHandInterpolator::~USGHandInterpolator() = default; @@ -425,7 +410,6 @@ void USGHandInterpolator::SetHandInterpolatorImpl(const FSGHandInterpolatorImpl& const FSGHandInterpolatorImpl& USGHandInterpolator::ToHandInterpolatorImpl() const { - Pimpl->SyncImplObject(); return Pimpl->HandInterpolatorImpl; } @@ -462,8 +446,6 @@ FRotator USGHandInterpolator::GetCmcStartRotation() const float USGHandInterpolator::CalculateAngle(const ESGFinger Finger, const int32 Movement, const float Value) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; FSGIC_ESGFinger FingerContainer{Finger}; const float Angle = SGCoreImpl_FSGHandInterpolatorImpl_CalculateAngle_Finger_int32Movement_Value( @@ -474,8 +456,6 @@ float USGHandInterpolator::CalculateAngle(const ESGFinger Finger, const int32 Mo float USGHandInterpolator::CalculateAngle(const ESGFinger Finger, const ESGFingerMovement Movement, const float Value) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; FSGIC_ESGFinger FingerContainer{Finger}; FSGIC_ESGFingerMovement MovementContainer{Movement}; @@ -487,8 +467,6 @@ float USGHandInterpolator::CalculateAngle(const ESGFinger Finger, const ESGFinge float USGHandInterpolator::CalculateAngle(const ESGFinger Finger, const ESGThumbMovement Movement, const float Value) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; FSGIC_ESGFinger FingerContainer{Finger}; FSGIC_ESGThumbMovement MovementContainer{Movement}; @@ -500,48 +478,34 @@ float USGHandInterpolator::CalculateAngle(const ESGFinger Finger, const ESGThumb void USGHandInterpolator::SetInterpolation(const int32 Finger, const int32 Movement, const float InputAt0, const float InputAt1, const float AngleAt0, const float AngleAt1) { - Pimpl->SyncImplObject(); - FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; SGCoreImpl_FSGHandInterpolatorImpl_SetInterpolation_int32Finger_int32Movement_InputAt0_InputAt1_AngleAt0_AngleAt1( &InstanceContainer, Finger, Movement, InputAt0, InputAt1, AngleAt0, AngleAt1); - - Pimpl->SyncUProperties(); } void USGHandInterpolator::SetInterpolation(const ESGFinger Finger, const ESGFingerMovement Movement, const float InputAt0, const float InputAt1, const float AngleAt0, const float AngleAt1) { - Pimpl->SyncImplObject(); - FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; FSGIC_ESGFinger FingerContainer{Finger}; FSGIC_ESGFingerMovement MovementContainer{Movement}; SGCoreImpl_FSGHandInterpolatorImpl_SetInterpolation_ESGFinger_ESGFingerMovement_InputAt0_InputAt1_AngleAt0_AngleAt1( &InstanceContainer, &FingerContainer, &MovementContainer, InputAt0, InputAt1, AngleAt0, AngleAt1); - - Pimpl->SyncUProperties(); } void USGHandInterpolator::SetInterpolation(const ESGThumbMovement Movement, const float InputAt0, const float InputAt1, const float AngleAt0, const float AngleAt1) { - Pimpl->SyncImplObject(); - FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; FSGIC_ESGThumbMovement MovementContainer{Movement}; SGCoreImpl_FSGHandInterpolatorImpl_SetInterpolation_Movement_InputAt0_InputAt1_AngleAt0_AngleAt1( &InstanceContainer, &MovementContainer, InputAt0, InputAt1, AngleAt0, AngleAt1); - - Pimpl->SyncUProperties(); } USGInterpolationSet* USGHandInterpolator::GetInterpolation(UObject* Outer, const int32 Finger, const int32 Movement) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; FSGIC_FSGInterpolationSetImpl OutInterpolationContainer; SGCoreImpl_FSGHandInterpolatorImpl_GetInterpolation(&InstanceContainer, &OutInterpolationContainer, Finger, @@ -551,8 +515,6 @@ USGInterpolationSet* USGHandInterpolator::GetInterpolation(UObject* Outer, bool USGHandInterpolator::Equals(const USGHandInterpolator* HandInterpolator) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; FSGIC_FSGHandInterpolatorImpl HandInterpolatorContainer{HandInterpolator->ToHandInterpolatorImpl()}; const bool bEquals = SGCoreImpl_FSGHandInterpolatorImpl_Equals(&InstanceContainer, &HandInterpolatorContainer); @@ -561,8 +523,6 @@ bool USGHandInterpolator::Equals(const USGHandInterpolator* HandInterpolator) co FString USGHandInterpolator::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHandInterpolatorImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -579,12 +539,4 @@ USGHandInterpolator::FImpl::~FImpl() = default; void USGHandInterpolator::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGHandInterpolator::FImpl::SyncUProperties() -{ -} - -void USGHandInterpolator::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp index 1f0d56ac..c692ae3b 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp @@ -48,6 +48,7 @@ #include "SGInterop/SGIC_TArray_float.h" #include "SGInterop/SGIC_TArray_TArray_FQuat.h" #include "SGInterop/SGIC_TArray_TArray_FVector.h" +#include "SGUtils/SGArrayUtils.h" struct USGHandPose::FImpl { @@ -76,13 +77,6 @@ struct USGHandPose::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGHandPose* USGHandPose::NewHandPose(UObject* Outer, const FSGHandPoseImpl& HandPoseImpl) @@ -295,7 +289,6 @@ USGHandPose::USGHandPose() SGCoreImpl_FSGHandPoseImpl_ctor(&OutHandPoseImplContainer); Pimpl->HandPoseImpl = MoveTemp(OutHandPoseImplContainer.HandPoseImpl); - Pimpl->SyncUProperties(); } USGHandPose::USGHandPose(const bool bRightHanded, @@ -317,7 +310,6 @@ USGHandPose::USGHandPose(const bool bRightHanded, &JointRotationsContainer, &HandAnglesContainer); Pimpl->HandPoseImpl = MoveTemp(OutHandPoseImplContainer.HandPoseImpl); - Pimpl->SyncUProperties(); } USGHandPose::USGHandPose(const bool bRightHanded, @@ -339,7 +331,6 @@ USGHandPose::USGHandPose(const bool bRightHanded, &JointRotationsContainer, &HandAnglesContainer); Pimpl->HandPoseImpl = MoveTemp(OutHandPoseImplContainer.HandPoseImpl); - Pimpl->SyncUProperties(); } USGHandPose::USGHandPose(const bool bRightHanded, const @@ -367,7 +358,6 @@ USGHandPose::USGHandPose(const bool bRightHanded, const &JointRotationsContainer, &HandAnglesContainer); Pimpl->HandPoseImpl = MoveTemp(OutHandPoseImplContainer.HandPoseImpl); - Pimpl->SyncUProperties(); } USGHandPose::USGHandPose(const bool bRightHanded, @@ -395,7 +385,6 @@ USGHandPose::USGHandPose(const bool bRightHanded, &JointRotationsContainer, &HandAnglesContainer); Pimpl->HandPoseImpl = MoveTemp(OutHandPoseImplContainer.HandPoseImpl); - Pimpl->SyncUProperties(); } USGHandPose::USGHandPose(const FSGHandPoseImpl& HandPoseImpl) @@ -407,7 +396,6 @@ USGHandPose::USGHandPose(const FSGHandPoseImpl& HandPoseImpl) #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetHandPoseImpl(HandPoseImpl); - Pimpl->SyncUProperties(); } USGHandPose::~USGHandPose() = default; @@ -422,7 +410,6 @@ void USGHandPose::SetHandPoseImpl(const FSGHandPoseImpl& HandPoseImpl) const FSGHandPoseImpl& USGHandPose::ToHandPoseImpl() const { - Pimpl->SyncImplObject(); return Pimpl->HandPoseImpl; } @@ -466,7 +453,6 @@ TArray> USGHandPose::GetHandAngles() const bool USGHandPose::Equals(const USGHandPose* HandPose) const { - Pimpl->SyncImplObject(); FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_FSGHandPoseImpl HandPoseContainer{HandPose->ToHandPoseImpl()}; @@ -475,8 +461,6 @@ bool USGHandPose::Equals(const USGHandPose* HandPose) const float USGHandPose::GetNormalizedFlexion(const ESGFinger Finger, const bool bClamp01) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_ESGFinger FingerContainer{Finger}; return SGCoreImpl_FSGHandPoseImpl_GetNormalizedFlexion_Finger_bClamp01( @@ -485,8 +469,6 @@ float USGHandPose::GetNormalizedFlexion(const ESGFinger Finger, const bool bClam TArray USGHandPose::GetNormalizedFlexion(const bool bClamp01) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_TArray_float OutFlexionContainer; SGCoreImpl_FSGHandPoseImpl_GetNormalizedFlexion_bClamp01(&InstanceContainer, &OutFlexionContainer, bClamp01); @@ -495,8 +477,6 @@ TArray USGHandPose::GetNormalizedFlexion(const bool bClamp01) const FString USGHandPose::ToString(const bool bShortFormat) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHandPoseImpl_ToString(&InstanceContainer, &OutStringContainer, bShortFormat); @@ -505,8 +485,6 @@ FString USGHandPose::ToString(const bool bShortFormat) const FString USGHandPose::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHandPoseImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -523,12 +501,4 @@ USGHandPose::FImpl::~FImpl() = default; void USGHandPose::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGHandPose::FImpl::SyncUProperties() -{ -} - -void USGHandPose::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp index b99a6c8f..7e1669d0 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp @@ -73,13 +73,6 @@ struct USGHandProfile::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGHandProfile* USGHandProfile::NewHandProfile(UObject* Outer, const FSGHandProfileImpl& HandProfileImpl) @@ -197,7 +190,6 @@ USGHandProfile::USGHandProfile() SGCoreImpl_FSGHandProfileImpl_ctor(&OutHandProfileImplContainer); Pimpl->HandProfileImpl = MoveTemp(OutHandProfileImplContainer.HandProfileImpl); - Pimpl->SyncUProperties(); } USGHandProfile::USGHandProfile(const bool bRightHanded, @@ -219,7 +211,6 @@ USGHandProfile::USGHandProfile(const bool bRightHanded, &OutHandProfileImplContainer, bRightHanded, &SenseGloveHandProfileContainer, &NovaGloveHandProfileContainer); Pimpl->HandProfileImpl = MoveTemp(OutHandProfileImplContainer.HandProfileImpl); - Pimpl->SyncUProperties(); } USGHandProfile::USGHandProfile(const FSGHandProfileImpl& HandProfileImpl) @@ -231,7 +222,6 @@ USGHandProfile::USGHandProfile(const FSGHandProfileImpl& HandProfileImpl) #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetHandProfileImpl(HandProfileImpl); - Pimpl->SyncUProperties(); } USGHandProfile::~USGHandProfile() = default; @@ -246,7 +236,6 @@ void USGHandProfile::SetHandProfileImpl(const FSGHandProfileImpl& HandProfileImp const FSGHandProfileImpl& USGHandProfile::ToHandProfileImpl() const { - Pimpl->SyncImplObject(); return Pimpl->HandProfileImpl; } @@ -278,8 +267,6 @@ USGNovaGloveHandProfile* USGHandProfile::GetNovaGloveHandProfile(UObject* Outer) bool USGHandProfile::Equals(const USGHandProfile* HandProfile) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandProfileImpl InstanceContainer{ToHandProfileImpl()}; FSGIC_FSGHandProfileImpl HandProfileContainer{HandProfile->ToHandProfileImpl()}; return SGCoreImpl_FSGHandProfileImpl_Equals(&InstanceContainer, &HandProfileContainer); @@ -287,18 +274,12 @@ bool USGHandProfile::Equals(const USGHandProfile* HandProfile) const void USGHandProfile::Reset() { - Pimpl->SyncImplObject(); - FSGIC_FSGHandProfileImpl InstanceContainer{ToHandProfileImpl()}; SGCoreImpl_FSGHandProfileImpl_Reset(&InstanceContainer); - - Pimpl->SyncUProperties(); } FString USGHandProfile::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGHandProfileImpl InstanceContainer{ToHandProfileImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHandProfileImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -315,12 +296,4 @@ USGHandProfile::FImpl::~FImpl() = default; void USGHandProfile::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGHandProfile::FImpl::SyncUProperties() -{ -} - -void USGHandProfile::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGlove.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGlove.cpp index e1d9508c..de9cda11 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticGlove.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGlove.cpp @@ -58,42 +58,6 @@ #include "SGInterop/SGIC_TArray_TSharedRef_FSGHapticGloveImpl.h" #include "SGInterop/SGIC_TSharedPtr_FSGHapticGloveImpl.h" -struct USGHapticGlove::FImpl -{ - /************************ - * Member variables - ************************/ - - - /************************ - * Owner object - ************************/ - - USGHapticGlove* Owner; - - /************************ - * Constructor / Destructor - ************************/ - - explicit FImpl(USGHapticGlove* InOwner); - ~FImpl(); - - /************************ - * Default copy constructor & copy assignment operator - ************************/ - - FImpl(const FImpl& Rhs) = default; - FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); -}; - USGHapticGlove* USGHapticGlove::NewHapticGlove(UObject* Outer, const FSGHapticGloveImpl& HapticGloveImpl) { USGHapticGlove* Instance = NewObject(Outer); @@ -155,132 +119,63 @@ bool USGHapticGlove::GetGlove(UObject* Outer, const bool bRightHanded, USGHaptic } USGHapticGlove::USGHapticGlove() - : USGDevice(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice() { FSGIC_TSharedPtr_FSGHapticGloveImpl OutSharedPtrContainer; SGCoreImpl_FSGBetaDeviceImpl_ctor_MakeShared(&OutSharedPtrContainer); SetSGDeviceImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGHapticGlove::USGHapticGlove(const FSGDeviceImpl& SGDeviceImpl) - : USGDevice(SGDeviceImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(SGDeviceImpl) { - Pimpl->SyncUProperties(); } USGHapticGlove::USGHapticGlove(const FSGHapticGloveImpl& HapticGloveImpl) - : USGDevice(HapticGloveImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(HapticGloveImpl) { - Pimpl->SyncUProperties(); } USGHapticGlove::USGHapticGlove(const FSGNovaGloveImpl& NovaGloveImpl) - : USGDevice(NovaGloveImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(NovaGloveImpl) { - Pimpl->SyncUProperties(); } USGHapticGlove::USGHapticGlove(const FSGSenseGloveImpl& SenseGloveImpl) - : USGDevice(SenseGloveImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(SenseGloveImpl) { - Pimpl->SyncUProperties(); } USGHapticGlove::USGHapticGlove(TSharedRef SGDeviceImpl) - : USGDevice(MoveTemp(SGDeviceImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(MoveTemp(SGDeviceImpl)) { - Pimpl->SyncUProperties(); } USGHapticGlove::USGHapticGlove(TSharedRef HapticGloveImpl) - : USGDevice(MoveTemp(HapticGloveImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(MoveTemp(HapticGloveImpl)) { - Pimpl->SyncUProperties(); } USGHapticGlove::USGHapticGlove(TSharedRef NovaGloveImpl) - : USGDevice(MoveTemp(NovaGloveImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(MoveTemp(NovaGloveImpl)) { - Pimpl->SyncUProperties(); } USGHapticGlove::USGHapticGlove(TSharedRef SenseGloveImpl) - : USGDevice(MoveTemp(SenseGloveImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGDevice(MoveTemp(SenseGloveImpl)) { - Pimpl->SyncUProperties(); } USGHapticGlove::~USGHapticGlove() = default; TSharedRef USGHapticGlove::ToHapticGloveImpl() const { - SyncImplObject(); return FSGDeviceImplCast::ToHapticGloveImpl(ToSGDeviceImpl()); } -void USGHapticGlove::SyncImplObject() const -{ - Super::SyncImplObject(); - Pimpl->SyncImplObject(); -} - -void USGHapticGlove::SyncUProperties() -{ - Super::SyncUProperties(); - Pimpl->SyncUProperties(); -} - ESGDeviceType USGHapticGlove::GetDeviceType() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_ESGDeviceType OutTypeContainer; SGCoreImpl_FSGHapticGloveImpl_GetDeviceType(&InstanceContainer, &OutTypeContainer); @@ -289,8 +184,6 @@ ESGDeviceType USGHapticGlove::GetDeviceType() const FString USGHapticGlove::GetDeviceId() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGHapticGloveImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); @@ -299,8 +192,6 @@ FString USGHapticGlove::GetDeviceId() const FString USGHapticGlove::GetHardwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGHapticGloveImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); @@ -309,38 +200,28 @@ FString USGHapticGlove::GetHardwareVersion() const int32 USGHapticGlove::GetFirmwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; return SGCoreImpl_FSGHapticGloveImpl_GetFirmwareVersion(&InstanceContainer); } int32 USGHapticGlove::GetSubFirmwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; return SGCoreImpl_FSGHapticGloveImpl_GetSubFirmwareVersion(&InstanceContainer); } bool USGHapticGlove::IsRight() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; return SGCoreImpl_FSGHapticGloveImpl_IsRight(&InstanceContainer); } bool USGHapticGlove::GetImuRotation(FQuat& OutImu) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FQuat OutImuContainer; const bool bResult = SGCoreImpl_FSGHapticGloveImpl_GetImuRotation(&InstanceContainer, &OutImuContainer); - SyncUProperties(); - if (bResult) { OutImu = MoveTemp(OutImuContainer.Quat); @@ -351,14 +232,10 @@ bool USGHapticGlove::GetImuRotation(FQuat& OutImu) bool USGHapticGlove::GetImuRotation(FRotator& OutImu) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FQuat OutImuContainer; const bool bResult = SGCoreImpl_FSGHapticGloveImpl_GetImuRotation(&InstanceContainer, &OutImuContainer); - SyncUProperties(); - if (bResult) { OutImu = OutImuContainer.Quat.Rotator(); @@ -371,8 +248,6 @@ bool USGHapticGlove::GetHandPose( UObject* Outer, const USGBasicHandModel* HandGeometry, const USGHandProfile* HandProfile, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGBasicHandModelImpl HandGeometryContainer{HandGeometry->ToBasicHandModelImpl()}; FSGIC_FSGHandProfileImpl HandProfileContainer{HandProfile->ToHandProfileImpl()}; @@ -380,8 +255,6 @@ bool USGHapticGlove::GetHandPose( const bool bResult = SGCoreImpl_FSGHapticGloveImpl_GetHandPose_HandGeometry_HandProfile_OutHandPose( &InstanceContainer, &HandGeometryContainer, &HandProfileContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -392,16 +265,12 @@ bool USGHapticGlove::GetHandPose( bool USGHapticGlove::GetHandPose(UObject* Outer, const USGHandProfile* HandProfile, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGHandProfileImpl HandProfileContainer{HandProfile->ToHandProfileImpl()}; FSGIC_FSGHandPoseImpl OutHandPoseContainer; const bool bResult = SGCoreImpl_FSGHapticGloveImpl_GetHandPose_HandProfile_OutHandPose( &InstanceContainer, &HandProfileContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -412,16 +281,12 @@ bool USGHapticGlove::GetHandPose(UObject* Outer, const USGHandProfile* HandProfi bool USGHapticGlove::GetHandPose(UObject* Outer, const USGBasicHandModel* HandGeometry, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGBasicHandModelImpl HandGeometryContainer{HandGeometry->ToBasicHandModelImpl()}; FSGIC_FSGHandPoseImpl OutHandPoseContainer; const bool bResult = SGCoreImpl_FSGHapticGloveImpl_GetHandPose_HandGeometry_OutHandPose( &InstanceContainer, &HandGeometryContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -432,15 +297,11 @@ bool USGHapticGlove::GetHandPose(UObject* Outer, const USGBasicHandModel* HandGe bool USGHapticGlove::GetHandPose(UObject* Outer, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGHandPoseImpl OutHandPoseContainer; const bool bResult = SGCoreImpl_FSGHapticGloveImpl_GetHandPose_OutHandPose( &InstanceContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -451,79 +312,53 @@ bool USGHapticGlove::GetHandPose(UObject* Outer, USGHandPose*& OutHandPose) void USGHapticGlove::StopHaptics() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; SGCoreImpl_FSGHapticGloveImpl_StopHaptics(&InstanceContainer); - - SyncUProperties(); } void USGHapticGlove::StopVibrations() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; SGCoreImpl_FSGHapticGloveImpl_StopVibrations(&InstanceContainer); - - SyncUProperties(); } void USGHapticGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get()}; SGCoreImpl_FSGHapticGloveImpl_SendHaptics_ForceFeedbackCommand(&InstanceContainer, &ForceFeedbackCommandContainer); - - SyncUProperties(); } void USGHapticGlove::SendHaptics(const USGBuzzCommand* BuzzCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGBuzzCommandImpl BuzzCommandContainer{BuzzCommand->ToBuzzCommandImpl().Get()}; SGCoreImpl_FSGHapticGloveImpl_SendHaptics_BuzzCommand(&InstanceContainer, &BuzzCommandContainer); - - SyncUProperties(); } void USGHapticGlove::SendHaptics(const USGThumperCommand* ThumperCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGThumperCommandImpl ThumperCommandContainer{ThumperCommand->ToThumperCommandImpl()}; SGCoreImpl_FSGHapticGloveImpl_SendHaptics_ThumperCommand(&InstanceContainer, &ThumperCommandContainer); - - SyncUProperties(); } void USGHapticGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackCommand, const USGBuzzCommand* BuzzCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get()}; FSGIC_FSGBuzzCommandImpl BuzzCommandContainer{BuzzCommand->ToBuzzCommandImpl().Get()}; SGCoreImpl_FSGHapticGloveImpl_SendHaptics_ForceFeedbackCommand_BuzzCommand( &InstanceContainer, &ForceFeedbackCommandContainer, &BuzzCommandContainer); - - SyncUProperties(); } void USGHapticGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackCommand, const USGBuzzCommand* BuzzCommand, const USGThumperCommand* ThumperCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get()}; @@ -531,20 +366,14 @@ void USGHapticGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackCom FSGIC_FSGThumperCommandImpl ThumperCommandContainer{ThumperCommand->ToThumperCommandImpl()}; SGCoreImpl_FSGHapticGloveImpl_SendHaptics_ForceFeedbackCommand_BuzzCommand_ThumperCommand( &InstanceContainer, &ForceFeedbackCommandContainer, &BuzzCommandContainer, &ThumperCommandContainer); - - SyncUProperties(); } bool USGHapticGlove::GetCalibrationValues(TArray& OutValues) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_TArray_FVector OutValuesContainer; const bool bResult = SGCoreImpl_FSGHapticGloveImpl_GetCalibrationValues(&InstanceContainer, &OutValuesContainer); - SyncUProperties(); - if (bResult) { OutValues = MoveTemp(OutValuesContainer.Array); @@ -555,68 +384,46 @@ bool USGHapticGlove::GetCalibrationValues(TArray& OutValues) void USGHapticGlove::ResetCalibrationRange() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; SGCoreImpl_FSGHapticGloveImpl_ResetCalibrationRange(&InstanceContainer); - - SyncUProperties(); } void USGHapticGlove::UpdateCalibrationRange() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; SGCoreImpl_FSGHapticGloveImpl_UpdateCalibrationRange(&InstanceContainer); - - SyncUProperties(); } void USGHapticGlove::UpdateCalibrationRange(const TArray& CalibrationValues) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_TArray_FVector CalibrationValuesContainer{CalibrationValues}; SGCoreImpl_FSGHapticGloveImpl_UpdateCalibrationRange_CalibrationValues( &InstanceContainer, &CalibrationValuesContainer); - - SyncUProperties(); } void USGHapticGlove::GetCalibrationRange(TArray& OutMinValues, TArray& OutMaxValues) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_TArray_FVector OutMinValuesContainer; FSGIC_TArray_FVector OutMaxValuesContainer; SGCoreImpl_FSGHapticGloveImpl_GetCalibrationRange(&InstanceContainer, &OutMinValues, &OutMaxValues); - SyncUProperties(); - OutMinValues = MoveTemp(OutMinValuesContainer.Array); OutMaxValues = MoveTemp(OutMaxValuesContainer.Array); } void USGHapticGlove::UpdateCalibration(UObject* Outer, USGHandProfile*& OutProfile) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGHandProfileImpl OutProfileContainer; SGCoreImpl_FSGHapticGloveImpl_UpdateCalibration(&InstanceContainer, &OutProfileContainer); - SyncUProperties(); - OutProfile = USGHandProfile::NewHandProfile(Outer, MoveTemp(OutProfileContainer.HandProfileImpl)); } void USGHapticGlove::ApplyCalibration(UObject* Outer, USGHandProfile*& OutProfile) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FSGHandProfileImpl OutProfileContainer; SGCoreImpl_FSGHapticGloveImpl_ApplyCalibration(&InstanceContainer, &OutProfileContainer); @@ -628,8 +435,6 @@ void USGHapticGlove::GetWristLocation(const FVector& ReferencePosition, const FQ const ESGPositionalTrackingHardware TrackingHardware, FVector& OutWristPosition, FQuat& OutWristRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation}; @@ -650,8 +455,6 @@ void USGHapticGlove::GetWristLocation(const FVector& ReferencePosition, const FR const ESGPositionalTrackingHardware TrackingHardware, FVector& OutWristPosition, FRotator& OutWristRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation.Quaternion()}; @@ -672,8 +475,6 @@ void USGHapticGlove::GetGloveLocation(const FVector& ReferencePosition, const FQ const ESGPositionalTrackingHardware TrackingHardware, FVector& OutGlovePosition, FQuat& OutGloveRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation}; @@ -695,8 +496,6 @@ void USGHapticGlove::GetGloveLocation(const FVector& ReferencePosition, const FR const ESGPositionalTrackingHardware TrackingHardware, FVector& OutGlovePosition, FRotator& OutGloveRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation.Quaternion()}; @@ -712,24 +511,4 @@ void USGHapticGlove::GetGloveLocation(const FVector& ReferencePosition, const FR OutGlovePosition = MoveTemp(OutGlovePositionContainer.Vector); OutGloveRotation = OutGloveRotationContainer.Quat.Rotator(); -} - -USGHapticGlove::FImpl::FImpl(USGHapticGlove* InOwner) - : Owner(InOwner) -{ -} - -USGHapticGlove::FImpl::~FImpl() = default; - -void USGHapticGlove::FImplDeleter::operator()(const FImpl* P) const -{ - delete P; -} - -void USGHapticGlove::FImpl::SyncUProperties() -{ -} - -void USGHapticGlove::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp index f24a70ed..f5001120 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp @@ -74,13 +74,6 @@ struct USGHapticGloveCalibrationCheck::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGHapticGloveCalibrationCheck* USGHapticGloveCalibrationCheck::NewHapticGloveCalibrationCheck( @@ -188,7 +181,6 @@ USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck() Pimpl->HapticGloveCalibrationCheckImpl = MoveTemp( OutHapticGloveCalibrationCheckImplContainer.HapticGloveCalibrationCheckImpl); - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck(const USGSensorRange* LastCalibrationRange) @@ -206,7 +198,6 @@ USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck(const USGSensorRa Pimpl->HapticGloveCalibrationCheckImpl = MoveTemp( OutHapticGloveCalibrationCheckImplContainer.HapticGloveCalibrationCheckImpl); - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck( @@ -219,7 +210,6 @@ USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck( #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetHapticGloveCalibrationCheckImpl(HapticGloveCalibrationCheckImpl); - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationCheck::~USGHapticGloveCalibrationCheck() = default; @@ -236,22 +226,11 @@ void USGHapticGloveCalibrationCheck::SetHapticGloveCalibrationCheckImpl( const FSGHapticGloveCalibrationCheckImpl& USGHapticGloveCalibrationCheck::ToHapticGloveCalibrationCheckImpl() const { - Pimpl->SyncImplObject(); return Pimpl->HapticGloveCalibrationCheckImpl; } -USGSensorRange* USGHapticGloveCalibrationCheck::GetLastSensorRange(UObject* Outer) const -{ - FSGIC_FSGHapticGloveCalibrationCheckImpl InstanceContainer{ToHapticGloveCalibrationCheckImpl()}; - FSGIC_FSGSensorRangeImpl OutLastSensorRangeContainer; - SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_GetLastSensorRange(&InstanceContainer, &OutLastSensorRangeContainer); - return USGSensorRange::NewSensorRange(Outer, MoveTemp(OutLastSensorRangeContainer.SensorRangeImpl)); -} - ESGCalibrationStage USGHapticGloveCalibrationCheck::GetCalibrationStage() const { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCalibrationCheckImpl InstanceContainer{ToHapticGloveCalibrationCheckImpl()}; FSGIC_ESGCalibrationStage OutStageContainer; SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_GetCalibrationStage(&InstanceContainer, &OutStageContainer); @@ -261,7 +240,6 @@ ESGCalibrationStage USGHapticGloveCalibrationCheck::GetCalibrationStage() const bool USGHapticGloveCalibrationCheck::ReachedConclusion() const { - Pimpl->SyncImplObject(); FSGIC_FSGHapticGloveCalibrationCheckImpl InstanceContainer{ToHapticGloveCalibrationCheckImpl()}; return SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_ReachedConclusion(&InstanceContainer); @@ -269,26 +247,18 @@ bool USGHapticGloveCalibrationCheck::ReachedConclusion() const void USGHapticGloveCalibrationCheck::Reset() { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCalibrationCheckImpl InstanceContainer{ToHapticGloveCalibrationCheckImpl()}; SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_Reset(&InstanceContainer); - - Pimpl->SyncUProperties(); } void USGHapticGloveCalibrationCheck::CheckRange( const TArray& CurrentValues, const float DeltaSeconds, const ESGDeviceType DeviceType) { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCalibrationCheckImpl InstanceContainer{ToHapticGloveCalibrationCheckImpl()}; FSGIC_TArray_FVector CurrentValuesContainer{CurrentValues}; FSGIC_ESGDeviceType DeviceTypeContainer{DeviceType}; SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_CheckRange(&InstanceContainer, &CurrentValuesContainer, DeltaSeconds, &DeviceTypeContainer); - - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationCheck::FImpl::FImpl(USGHapticGloveCalibrationCheck* InOwner) @@ -301,12 +271,4 @@ USGHapticGloveCalibrationCheck::FImpl::~FImpl() = default; void USGHapticGloveCalibrationCheck::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGHapticGloveCalibrationCheck::FImpl::SyncUProperties() -{ -} - -void USGHapticGloveCalibrationCheck::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp index 2d26231f..400fbf1d 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp @@ -84,14 +84,6 @@ struct USGHapticGloveCalibrationSequence::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); }; USGHapticGloveCalibrationSequence* USGHapticGloveCalibrationSequence::NewHapticGloveCalibrationSequence(UObject* Outer, @@ -165,7 +157,6 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence() SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_ctor_MakeShared(&OutSharedPtrContainer); Pimpl->HapticGloveCalibrationSequenceImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(const USGHapticGlove* LinkedGlove) @@ -182,7 +173,6 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(const USGHa &OutSharedPtrContainer, &LinkedGloveContainer); Pimpl->HapticGloveCalibrationSequenceImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence( @@ -200,7 +190,6 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence( &OutSharedPtrContainer, &RhsContainer); Pimpl->HapticGloveCalibrationSequenceImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence( @@ -218,7 +207,6 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence( &OutSharedPtrContainer, &RhsContainer); Pimpl->HapticGloveCalibrationSequenceImpl = MoveTemp(OutSharedPtrContainer.Ptr); - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence( @@ -231,7 +219,6 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence( #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->HapticGloveCalibrationSequenceImpl = MoveTemp(HapticGloveCalibrationSequenceImpl); - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence( @@ -244,7 +231,6 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence( #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { Pimpl->HapticGloveCalibrationSequenceImpl = MoveTemp(HapticGloveQuickCalibrationImpl); - Pimpl->SyncUProperties(); } USGHapticGloveCalibrationSequence::~USGHapticGloveCalibrationSequence() = default; @@ -282,24 +268,11 @@ void USGHapticGloveCalibrationSequence::SetHapticGloveCalibrationSequenceImpl( TSharedRef USGHapticGloveCalibrationSequence::ToHapticGloveCalibrationSequenceImpl() const { - SyncImplObject(); return Pimpl->HapticGloveCalibrationSequenceImpl.ToSharedRef(); } -void USGHapticGloveCalibrationSequence::SyncImplObject() const -{ - Pimpl->SyncImplObject(); -} - -void USGHapticGloveCalibrationSequence::SyncUProperties() -{ - Pimpl->SyncUProperties(); -} - USGHapticGlove* USGHapticGloveCalibrationSequence::GetLinkedGlove(UObject* Outer) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; FSGIC_TSharedPtr_FSGHapticGloveImpl OutGloveContainer; SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_GetLinkedGlove(&InstanceContainer, &OutGloveContainer); @@ -308,19 +281,13 @@ USGHapticGlove* USGHapticGloveCalibrationSequence::GetLinkedGlove(UObject* Outer void USGHapticGloveCalibrationSequence::SetLinkedGlove(const USGHapticGlove* LinkedGlove) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; FSGIC_TSharedPtr_FSGHapticGloveImpl LinkedGloveContainer{LinkedGlove->ToHapticGloveImpl()}; SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_SetLinkedGlove(&InstanceContainer, &LinkedGloveContainer); - - SyncUProperties(); } TArray USGHapticGloveCalibrationSequence::GetCalibrationPoints(UObject* Outer) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; FSGIC_TArray_FSGCalibrationDataPointImpl OutPoints; SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_GetCalibrationPoints(&InstanceContainer, &OutPoints); @@ -336,97 +303,67 @@ TArray USGHapticGloveCalibrationSequence::GetCalibrati float USGHapticGloveCalibrationSequence::GetElapsedTime() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; return SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_GetElapsedTime(&InstanceContainer); } bool USGHapticGloveCalibrationSequence::IsManuallyCompleted() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; return SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_IsManuallyCompleted(&InstanceContainer); } int32 USGHapticGloveCalibrationSequence::GetCurrentStage() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; return SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_GetCurrentStage(&InstanceContainer); } SIZE_T USGHapticGloveCalibrationSequence::GetCalibrationPointsCount() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; return SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_GetCalibrationPointsCount(&InstanceContainer); } bool USGHapticGloveCalibrationSequence::AutoCompleted() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; return SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_AutoCompleted(&InstanceContainer); } bool USGHapticGloveCalibrationSequence::Completed() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; return SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_Completed(&InstanceContainer); } void USGHapticGloveCalibrationSequence::Reset() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_Reset(&InstanceContainer); - - SyncUProperties(); } void USGHapticGloveCalibrationSequence::AddDataPoint(const TArray& CalibrationPoints) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; FSGIC_TArray_FVector CalibrationPointsContainer{CalibrationPoints}; SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_AddDataPoint(&InstanceContainer, &CalibrationPointsContainer); - - SyncUProperties(); } void USGHapticGloveCalibrationSequence::Update(const float DeltaSeconds) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_Update(&InstanceContainer, DeltaSeconds); - - SyncUProperties(); } void USGHapticGloveCalibrationSequence::ConfirmCurrentStep() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_ConfirmCurrentStep(&InstanceContainer); - - SyncUProperties(); } bool USGHapticGloveCalibrationSequence::CompileRange(UObject* Outer, USGSensorRange*& OutSensorRange) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; FSGIC_FSGSensorRangeImpl OutSensorRangeContainer; const bool bResult = SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_CompileRange( @@ -444,8 +381,6 @@ bool USGHapticGloveCalibrationSequence::CompileProfile(UObject* Outer, const ESGDeviceType ForDevice, const bool bRightHanded, USGHandProfile*& OutProfile) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; FSGIC_ESGDeviceType ForDeviceContainer{ForDevice}; FSGIC_FSGHandProfileImpl OutProfileContainer; @@ -463,8 +398,6 @@ bool USGHapticGloveCalibrationSequence::CompileProfile(UObject* Outer, bool USGHapticGloveCalibrationSequence::GetHandPose(UObject* Outer, USGHandPose*& OutCurrentHandPose) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; FSGIC_FSGHandPoseImpl OutCurrentHandPoseContainer; const bool bResult = SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_GetHandPose_OutCurrentHandPose( @@ -481,8 +414,6 @@ bool USGHapticGloveCalibrationSequence::GetHandPose(UObject* Outer, USGHandPose* bool USGHapticGloveCalibrationSequence::GetHandPose(UObject* Outer, const bool bRightHanded, USGHandPose*& OutCurrentHandPose) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; FSGIC_FSGHandPoseImpl OutCurrentHandPoseContainer; const bool bResult = SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_GetHandPose_bRightHanded_OutCurrentHandPose( @@ -498,8 +429,6 @@ bool USGHapticGloveCalibrationSequence::GetHandPose(UObject* Outer, FString USGHapticGloveCalibrationSequence::GetCurrentInstruction(const FString& NextStepKey) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl InstanceContainer{ToHapticGloveCalibrationSequenceImpl()}; FSGIC_FString OutInstructionContainer; FSGIC_FString NextStepKeyContainer{NextStepKey}; @@ -519,12 +448,4 @@ USGHapticGloveCalibrationSequence::FImpl::~FImpl() = default; void USGHapticGloveCalibrationSequence::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGHapticGloveCalibrationSequence::FImpl::SyncUProperties() -{ -} - -void USGHapticGloveCalibrationSequence::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCommandBuffer.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCommandBuffer.cpp index cba69106..96a9f772 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCommandBuffer.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCommandBuffer.cpp @@ -80,13 +80,6 @@ struct USGHapticGloveCommandBuffer::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGHapticGloveCommandBuffer* USGHapticGloveCommandBuffer::NewHapticGloveCommandBuffer( @@ -134,7 +127,6 @@ USGHapticGloveCommandBuffer::USGHapticGloveCommandBuffer() Pimpl->HapticGloveCommandBufferImpl = MoveTemp( OutHapticGloveCommandBufferImplContainer.HapticGloveCommandBufferImpl); - Pimpl->SyncUProperties(); } USGHapticGloveCommandBuffer::USGHapticGloveCommandBuffer( @@ -147,7 +139,6 @@ USGHapticGloveCommandBuffer::USGHapticGloveCommandBuffer( #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetHapticGloveCommandBufferImpl(HapticGloveCommandBufferImpl); - Pimpl->SyncUProperties(); } USGHapticGloveCommandBuffer::~USGHapticGloveCommandBuffer() = default; @@ -163,14 +154,11 @@ void USGHapticGloveCommandBuffer::SetHapticGloveCommandBufferImpl( const FSGHapticGloveCommandBufferImpl& USGHapticGloveCommandBuffer::ToHapticGloveCommandBufferImpl() const { - Pimpl->SyncImplObject(); return Pimpl->HapticGloveCommandBufferImpl; } TArray USGHapticGloveCommandBuffer::GetForceFeedbackCommandsQueue(UObject* Outer) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_TArray_FSGForceFeedbackCommandImpl OutForceFeedbackCommandsQueueContainer; SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetForceFeedbackCommandsQueue(&InstanceContainer, @@ -188,8 +176,6 @@ TArray USGHapticGloveCommandBuffer::GetForceFeedbackCo TArray USGHapticGloveCommandBuffer::GetBuzzCommandsQueue(UObject* Outer) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_TArray_FSGTimedBuzzCommandImpl OutBuzzCommandsQueueContainer; SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetBuzzCommandsQueue(&InstanceContainer, &OutBuzzCommandsQueueContainer); @@ -205,8 +191,6 @@ TArray USGHapticGloveCommandBuffer::GetBuzzCommandsQueue(U TArray USGHapticGloveCommandBuffer::GetThumperCommandsQueue(UObject* Outer) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_TArray_FSGTimedThumpCommandImpl OutThumperCommandsQueueContainer; SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetThumperCommandsQueue(&InstanceContainer, @@ -223,84 +207,54 @@ TArray USGHapticGloveCommandBuffer::GetThumperCommandsQue void USGHapticGloveCommandBuffer::ClearForceFeedbackCommandsQueue() { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; SGCoreImpl_FSGHapticGloveCommandBufferImpl_ClearForceFeedbackCommandsQueue(&InstanceContainer); - - Pimpl->SyncUProperties(); } void USGHapticGloveCommandBuffer::ClearVibrations() { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; SGCoreImpl_FSGHapticGloveCommandBufferImpl_ClearVibrations(&InstanceContainer); - - Pimpl->SyncUProperties(); } void USGHapticGloveCommandBuffer::Clear() { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; SGCoreImpl_FSGHapticGloveCommandBufferImpl_Clear(&InstanceContainer); - - Pimpl->SyncUProperties(); } void USGHapticGloveCommandBuffer::AddCommand(const USGForceFeedbackCommand* ForceFeedbackCommand) { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get()}; SGCoreImpl_FSGHapticGloveCommandBufferImpl_AddCommand_ForceFeedbackCommand( &InstanceContainer, &ForceFeedbackCommandContainer); - - Pimpl->SyncUProperties(); } void USGHapticGloveCommandBuffer::AddCommand(const USGTimedBuzzCommand* BuzzCommand) { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_FSGTimedBuzzCommandImpl BuzzCommandContainer{BuzzCommand->ToTimedBuzzCommandImpl().Get()}; SGCoreImpl_FSGHapticGloveCommandBufferImpl_AddCommand_BuzzCommand(&InstanceContainer, &BuzzCommandContainer); - - Pimpl->SyncUProperties(); } void USGHapticGloveCommandBuffer::AddCommand(const USGTimedThumpCommand* ThumpCommand) { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_FSGTimedThumpCommandImpl ThumpCommandContainer{ThumpCommand->ToTimedThumpCommandImpl()}; SGCoreImpl_FSGHapticGloveCommandBufferImpl_AddCommand_ThumpCommand(&InstanceContainer, &ThumpCommandContainer); - - Pimpl->SyncUProperties(); } void USGHapticGloveCommandBuffer::UpdateTimedCommands(const float DeltaSeconds) { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; SGCoreImpl_FSGHapticGloveCommandBufferImpl_UpdateTimedCommands(&InstanceContainer, DeltaSeconds); - - Pimpl->SyncUProperties(); } USGForceFeedbackCommand* USGHapticGloveCommandBuffer::GetTotalForceFeedbackLevels( UObject* Outer, const USGForceFeedbackCommand* LastForceFeedbackCommand) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_FSGForceFeedbackCommandImpl OutForceFeedbackCommandImplContainer; FSGIC_FSGForceFeedbackCommandImpl LastForceFeedbackCommandContainer{ @@ -314,8 +268,6 @@ USGForceFeedbackCommand* USGHapticGloveCommandBuffer::GetTotalForceFeedbackLevel USGForceFeedbackCommand* USGHapticGloveCommandBuffer::GetTotalForceFeedbackLevels(UObject* Outer) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_FSGForceFeedbackCommandImpl OutForceFeedbackCommandImplContainer; SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetTotalForceFeedbackLevels( @@ -327,8 +279,6 @@ USGForceFeedbackCommand* USGHapticGloveCommandBuffer::GetTotalForceFeedbackLevel USGBuzzCommand* USGHapticGloveCommandBuffer::GetTotalBuzzLevels(UObject* Outer) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_FSGBuzzCommandImpl OutBuzzCommandImplContainer; SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetTotalBuzzLevels(&InstanceContainer, &OutBuzzCommandImplContainer); @@ -338,8 +288,6 @@ USGBuzzCommand* USGHapticGloveCommandBuffer::GetTotalBuzzLevels(UObject* Outer) USGThumperCommand* USGHapticGloveCommandBuffer::GetTotalThumperLevels(UObject* Outer) const { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_FSGThumperCommandImpl OutThumperCommandImplContainer; SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetTotalThumperLevels(&InstanceContainer, @@ -355,8 +303,6 @@ void USGHapticGloveCommandBuffer::FlushHaptics(UObject* Outer, USGThumperCommand*& OutThumperCommand, const bool bClearForceFeedbackQueue) { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_FSGForceFeedbackCommandImpl LastBrakeLevelContainer{LastBrakeLevel->ToForceFeedbackCommandImpl().Get()}; FSGIC_FSGForceFeedbackCommandImpl OutForceFeedbackCommandImplContainer; @@ -371,8 +317,6 @@ void USGHapticGloveCommandBuffer::FlushHaptics(UObject* Outer, OutBuzzCommand = USGBuzzCommand::NewBuzzCommand(Outer, MoveTemp(OutBuzzCommandImplContainer.BuzzCommandImpl)); OutThumperCommand = USGThumperCommand::NewThumperCommand( Outer, MoveTemp(OutThumperCommandImplContainer.ThumperCommandImpl)); - - Pimpl->SyncUProperties(); } void USGHapticGloveCommandBuffer::FlushHaptics(UObject* Outer, @@ -382,8 +326,6 @@ void USGHapticGloveCommandBuffer::FlushHaptics(UObject* Outer, USGBuzzCommand*& OutBuzzCommand, USGThumperCommand*& OutThumperCommand) { - Pimpl->SyncImplObject(); - FSGIC_FSGHapticGloveCommandBufferImpl InstanceContainer{ToHapticGloveCommandBufferImpl()}; FSGIC_FSGForceFeedbackCommandImpl LastBrakeLevelContainer{LastBrakeLevel->ToForceFeedbackCommandImpl().Get()}; FSGIC_FSGForceFeedbackCommandImpl OutForceFeedbackCommandImplContainer; @@ -398,8 +340,6 @@ void USGHapticGloveCommandBuffer::FlushHaptics(UObject* Outer, OutBuzzCommand = USGBuzzCommand::NewBuzzCommand(Outer, MoveTemp(OutBuzzCommandImplContainer.BuzzCommandImpl)); OutThumperCommand = USGThumperCommand::NewThumperCommand( Outer, MoveTemp(OutThumperCommandImplContainer.ThumperCommandImpl)); - - Pimpl->SyncUProperties(); } USGHapticGloveCommandBuffer::FImpl::FImpl(USGHapticGloveCommandBuffer* InOwner) @@ -412,12 +352,4 @@ USGHapticGloveCommandBuffer::FImpl::~FImpl() = default; void USGHapticGloveCommandBuffer::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGHapticGloveCommandBuffer::FImpl::SyncUProperties() -{ -} - -void USGHapticGloveCommandBuffer::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveQuickCalibration.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveQuickCalibration.cpp index db1b1781..bff5c2c6 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveQuickCalibration.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveQuickCalibration.cpp @@ -38,6 +38,9 @@ #include "SGHapticGloveCalibrationSequenceImplCast.h" #include "Runtime/Launch/Resources/Version.h" +#include "SGCore/SGHandPose.h" +#include "SGCore/SGHandProfile.h" +#include "SGCore/SGSensorRange.h" #include "SGCoreImpl/SGExportedFunctions.h" #include "SGInterop/SGIC_FSGHandPoseImpl.h" #include "SGInterop/SGIC_FSGHandProfileImpl.h" @@ -48,42 +51,6 @@ #include "SGInterop/SGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl.h" #include "SGUtils/SGArrayUtils.h" -struct USGHapticGloveQuickCalibration::FImpl -{ - /************************ - * Member variables - ************************/ - - - /************************ - * Owner object - ************************/ - - USGHapticGloveQuickCalibration* Owner; - - /************************ - * Constructor / Destructor - ************************/ - - explicit FImpl(USGHapticGloveQuickCalibration* InOwner); - ~FImpl(); - - /************************ - * Default copy constructor & copy assignment operator - ************************/ - - FImpl(const FImpl& Rhs) = default; - FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); -}; - USGHapticGloveQuickCalibration* USGHapticGloveQuickCalibration::NewHapticGloveQuickCalibration(UObject* Outer, const FSGHapticGloveQuickCalibrationImpl& HapticGloveQuickCalibration) { @@ -125,28 +92,17 @@ float USGHapticGloveQuickCalibration::GetDefaultAutoEndTimeout() } USGHapticGloveQuickCalibration::USGHapticGloveQuickCalibration() - : USGHapticGloveCalibrationSequence(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGloveCalibrationSequence() { FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl OutSharedPtrContainer; SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_ctor_MakeShared(&OutSharedPtrContainer); SetHapticGloveCalibrationSequenceImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGHapticGloveQuickCalibration::USGHapticGloveQuickCalibration( const USGHapticGlove* GloveToCalibrate, const float AutoEndTimeout) - : USGHapticGloveCalibrationSequence(GloveToCalibrate), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGloveCalibrationSequence(GloveToCalibrate) { FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl OutSharedPtrContainer; FSGIC_TSharedPtr_FSGHapticGloveImpl GloveToCalibrateContainer{GloveToCalibrate->ToHapticGloveImpl()}; @@ -154,54 +110,28 @@ USGHapticGloveQuickCalibration::USGHapticGloveQuickCalibration( &OutSharedPtrContainer, &GloveToCalibrateContainer, AutoEndTimeout); SetHapticGloveCalibrationSequenceImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGHapticGloveQuickCalibration::USGHapticGloveQuickCalibration( const FSGHapticGloveQuickCalibrationImpl& HapticGloveQuickCalibrationImpl) - : USGHapticGloveCalibrationSequence(HapticGloveQuickCalibrationImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGloveCalibrationSequence(HapticGloveQuickCalibrationImpl) { - Pimpl->SyncUProperties(); } USGHapticGloveQuickCalibration::USGHapticGloveQuickCalibration( TSharedRef HapticGloveQuickCalibrationImpl) - : USGHapticGloveCalibrationSequence(MoveTemp(HapticGloveQuickCalibrationImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGloveCalibrationSequence(MoveTemp(HapticGloveQuickCalibrationImpl)) { - Pimpl->SyncUProperties(); } USGHapticGloveQuickCalibration::~USGHapticGloveQuickCalibration() = default; TSharedRef USGHapticGloveQuickCalibration::ToHapticGloveQuickCalibrationImpl() const { - SyncImplObject(); return FSGHapticGloveCalibrationSequenceImplCast::ToHapticGloveQuickCalibrationImpl( ToHapticGloveCalibrationSequenceImpl()); } -void USGHapticGloveQuickCalibration::SyncImplObject() const -{ - Super::SyncImplObject(); - Pimpl->SyncImplObject(); -} - -void USGHapticGloveQuickCalibration::SyncUProperties() -{ - Super::SyncUProperties(); - Pimpl->SyncUProperties(); -} - float USGHapticGloveQuickCalibration::GetAutoEndTimeout() const { FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; @@ -210,16 +140,12 @@ float USGHapticGloveQuickCalibration::GetAutoEndTimeout() const int32 USGHapticGloveQuickCalibration::GetSmoothingSamples() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; return SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_GetSmoothingSamples(&InstanceContainer); } USGSensorRange* USGHapticGloveQuickCalibration::GetSensorRange(UObject* Outer) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; FSGIC_FSGSensorRangeImpl OutRangeContainer; SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_GetSensorRange(&InstanceContainer, &OutRangeContainer); @@ -229,8 +155,6 @@ USGSensorRange* USGHapticGloveQuickCalibration::GetSensorRange(UObject* Outer) c USGHandProfile* USGHapticGloveQuickCalibration::GetTemporaryProfile(UObject* Outer) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; FSGIC_FSGHandProfileImpl OutProfileContainer; SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_GetTemporaryProfile(&InstanceContainer, &OutProfileContainer); @@ -240,65 +164,43 @@ USGHandProfile* USGHapticGloveQuickCalibration::GetTemporaryProfile(UObject* Out bool USGHapticGloveQuickCalibration::CanAnimate() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; return SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_CanAnimate(&InstanceContainer); } bool USGHapticGloveQuickCalibration::AutoCompleted() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; return SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_AutoCompleted(&InstanceContainer); } void USGHapticGloveQuickCalibration::Reset() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_Reset(&InstanceContainer); - - SyncUProperties(); } void USGHapticGloveQuickCalibration::Update(const float DeltaSeconds) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_Update(&InstanceContainer, DeltaSeconds); - - SyncUProperties(); } void USGHapticGloveQuickCalibration::AddDataPoint(const TArray& CalibrationPoints) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; FSGIC_TArray_FVector CalibrationPointsContainer{CalibrationPoints}; SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_AddDataPoint(&InstanceContainer, &CalibrationPointsContainer); - - SyncUProperties(); } void USGHapticGloveQuickCalibration::ConfirmCurrentStep() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_ConfirmCurrentStep(&InstanceContainer); - - SyncUProperties(); } bool USGHapticGloveQuickCalibration::CompileRange(UObject* Outer, USGSensorRange*& OutSensorRange) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; FSGIC_FSGSensorRangeImpl OutSensorRangeContainer; const bool bResult = SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_CompileRange( @@ -312,8 +214,6 @@ bool USGHapticGloveQuickCalibration::CompileRange(UObject* Outer, USGSensorRange bool USGHapticGloveQuickCalibration::GetHandPose(UObject* Outer, const bool bRightHanded, USGHandPose*& OutCurrentHandPose) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; FSGIC_FSGHandPoseImpl OutCurrentHandPoseContainer; const bool bResult = SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_GetHandPose( @@ -326,8 +226,6 @@ bool USGHapticGloveQuickCalibration::GetHandPose(UObject* Outer, FString USGHapticGloveQuickCalibration::GetCurrentInstruction(const FString& NextStepKey) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl InstanceContainer{ToHapticGloveQuickCalibrationImpl()}; FSGIC_FString OutInstructionContainer; FSGIC_FString NextStepKeyContainer{NextStepKey}; @@ -335,24 +233,4 @@ FString USGHapticGloveQuickCalibration::GetCurrentInstruction(const FString& Nex &InstanceContainer, &OutInstructionContainer, &NextStepKeyContainer); return MoveTemp(OutInstructionContainer.String); -} - -USGHapticGloveQuickCalibration::FImpl::FImpl(USGHapticGloveQuickCalibration* InOwner) - : Owner(InOwner) -{ -} - -USGHapticGloveQuickCalibration::FImpl::~FImpl() = default; - -void USGHapticGloveQuickCalibration::FImplDeleter::operator()(const FImpl* P) const -{ - delete P; -} - -void USGHapticGloveQuickCalibration::FImpl::SyncUProperties() -{ -} - -void USGHapticGloveQuickCalibration::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp b/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp index cc8bb7cf..86207630 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp @@ -69,13 +69,6 @@ struct USGInterpolationSet::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGInterpolationSet* USGInterpolationSet::NewInterpolationSet(UObject* Outer, @@ -136,7 +129,6 @@ USGInterpolationSet::USGInterpolationSet() SGCoreImpl_FSGInterpolationSetImpl_ctor(&OutInterpolationSetImplContainer); Pimpl->InterpolationSetImpl = MoveTemp(OutInterpolationSetImplContainer.InterpolationSetImpl); - Pimpl->SyncUProperties(); } USGInterpolationSet::USGInterpolationSet(const float From1, const float From2, const float To1, const float To2) @@ -152,7 +144,6 @@ USGInterpolationSet::USGInterpolationSet(const float From1, const float From2, c From1, From2, To1, To2); Pimpl->InterpolationSetImpl = MoveTemp(OutInterpolationSetImplContainer.InterpolationSetImpl); - Pimpl->SyncUProperties(); } USGInterpolationSet::USGInterpolationSet(const float From1, const float From2, const float To1, const float To2, @@ -169,7 +160,6 @@ USGInterpolationSet::USGInterpolationSet(const float From1, const float From2, c From1, From2, To1, To2, Min, Max); Pimpl->InterpolationSetImpl = MoveTemp(OutInterpolationSetImplContainer.InterpolationSetImpl); - Pimpl->SyncUProperties(); } USGInterpolationSet::USGInterpolationSet(const FSGInterpolationSetImpl& InterpolationSetImpl) @@ -181,7 +171,6 @@ USGInterpolationSet::USGInterpolationSet(const FSGInterpolationSetImpl& Interpol #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetInterpolationSetImpl(InterpolationSetImpl); - Pimpl->SyncUProperties(); } USGInterpolationSet::~USGInterpolationSet() = default; @@ -196,7 +185,6 @@ void USGInterpolationSet::SetInterpolationSetImpl(const FSGInterpolationSetImpl& const FSGInterpolationSetImpl& USGInterpolationSet::ToInterpolationSetImpl() const { - Pimpl->SyncImplObject(); return Pimpl->InterpolationSetImpl; } @@ -274,16 +262,12 @@ void USGInterpolationSet::SetMax(const float Max) float USGInterpolationSet::Get(const float Value, const bool bLimit, const bool bNormalizeAngle) const { - Pimpl->SyncImplObject(); - FSGIC_FSGInterpolationSetImpl InstanceContainer{ToInterpolationSetImpl()}; return SGCoreImpl_FSGInterpolationSetImpl_Get(&InstanceContainer, Value, bLimit, bNormalizeAngle); } bool USGInterpolationSet::Equals(const USGInterpolationSet* InterpolationSet) const { - Pimpl->SyncImplObject(); - FSGIC_FSGInterpolationSetImpl InstanceContainer{ToInterpolationSetImpl()}; FSGIC_FSGInterpolationSetImpl InterpolationSetContainer{InterpolationSet->ToInterpolationSetImpl()}; return SGCoreImpl_FSGInterpolationSetImpl_Equals(&InstanceContainer, &InterpolationSetContainer); @@ -291,8 +275,6 @@ bool USGInterpolationSet::Equals(const USGInterpolationSet* InterpolationSet) co FString USGInterpolationSet::ToString() const { - Pimpl->SyncImplObject(); - FSGIC_FSGInterpolationSetImpl InstanceContainer{ToInterpolationSetImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGInterpolationSetImpl_ToString(&InstanceContainer, &OutStringContainer); @@ -301,8 +283,6 @@ FString USGInterpolationSet::ToString() const FString USGInterpolationSet::ToString(const bool bLimits) const { - Pimpl->SyncImplObject(); - FSGIC_FSGInterpolationSetImpl InstanceContainer{ToInterpolationSetImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGInterpolationSetImpl_ToString_bLimits(&InstanceContainer, &OutStringContainer, bLimits); @@ -311,8 +291,6 @@ FString USGInterpolationSet::ToString(const bool bLimits) const FString USGInterpolationSet::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGInterpolationSetImpl InstanceContainer{ToInterpolationSetImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGInterpolationSetImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -329,12 +307,4 @@ USGInterpolationSet::FImpl::~FImpl() = default; void USGInterpolationSet::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGInterpolationSet::FImpl::SyncUProperties() -{ -} - -void USGInterpolationSet::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGJointKinematics.cpp b/Source/SenseGloveCore/Private/SGCore/SGJointKinematics.cpp index d342840e..88d697a4 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGJointKinematics.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGJointKinematics.cpp @@ -43,6 +43,7 @@ #include "SGInterop/SGIC_FVector.h" #include "SGInterop/SGIC_TArray_FQuat.h" #include "SGInterop/SGIC_TArray_FVector.h" +#include "SGUtils/SGArrayUtils.h" bool FSGJointKinematics::ForwardKinematics( const FVector& StartPosition, const FQuat& StartRotation, const TArray& JointLengths, diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp index f757db1f..ba10dafe 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp @@ -43,6 +43,7 @@ #include "SGCore/SGForceFeedbackCommand.h" #include "SGCore/SGHandPose.h" #include "SGCore/SGHandProfile.h" +#include "SGCore/SGNovaGloveHandProfile.h" #include "SGCore/SGNovaGloveInfo.h" #include "SGCore/SGNovaGloveSensorData.h" #include "SGCore/SGThumperCommand.h" @@ -69,42 +70,6 @@ #include "SGInterop/SGIC_TArray_FVector.h" #include "SGInterop/SGIC_TSharedPtr_FSGNovaGloveImpl.h" -struct USGNovaGlove::FImpl -{ - /************************ - * Member variables - ************************/ - - - /************************ - * Owner object - ************************/ - - USGNovaGlove* Owner; - - /************************ - * Constructor / Destructor - ************************/ - - explicit FImpl(USGNovaGlove* InOwner); - ~FImpl(); - - /************************ - * Default copy constructor & copy assignment operator - ************************/ - - FImpl(const FImpl& Rhs) = default; - FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); -}; - USGNovaGlove* USGNovaGlove::NewNovaGlove(UObject* Outer, const FSGNovaGloveImpl& NovaGloveImpl) { USGNovaGlove* Instance = NewObject(Outer); @@ -335,126 +300,63 @@ FString USGNovaGlove::ToBytes(const USGBuzzCommand* BuzzCommand) } USGNovaGlove::USGNovaGlove() - : USGHapticGlove(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove() { FSGIC_TSharedPtr_FSGNovaGloveImpl OutSharedPtrContainer; SGCoreImpl_FSGSenseGloveImpl_ctor_MakeShared(&OutSharedPtrContainer); SetSGDeviceImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGNovaGlove::USGNovaGlove(const USGNovaGloveInfo& DeviceInfo) - : USGHapticGlove(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove() { FSGIC_TSharedPtr_FSGNovaGloveImpl OutSharedPtrContainer; FSGIC_FSGNovaGloveInfoImpl DeviceInfoContainer{DeviceInfo.ToNovaGloveInfoImpl()}; SGCoreImpl_FSGSenseGloveImpl_ctor_Model_MakeShared(&OutSharedPtrContainer, &DeviceInfoContainer); SetSGDeviceImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGNovaGlove::USGNovaGlove(const FSGDeviceImpl& SGDeviceImpl) - : USGHapticGlove(SGDeviceImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(SGDeviceImpl) { - Pimpl->SyncUProperties(); } USGNovaGlove::USGNovaGlove(const FSGHapticGloveImpl& HapticGloveImpl) - : USGHapticGlove(HapticGloveImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(HapticGloveImpl) { - Pimpl->SyncUProperties(); } USGNovaGlove::USGNovaGlove(const FSGNovaGloveImpl& NovaGloveImpl) - : USGHapticGlove(NovaGloveImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(NovaGloveImpl) { - Pimpl->SyncUProperties(); } USGNovaGlove::USGNovaGlove(const TSharedRef SGDeviceImpl) - : USGHapticGlove(SGDeviceImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(SGDeviceImpl) { - Pimpl->SyncUProperties(); } USGNovaGlove::USGNovaGlove(const TSharedRef HapticGloveImpl) - : USGHapticGlove(HapticGloveImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(HapticGloveImpl) { - Pimpl->SyncUProperties(); } USGNovaGlove::USGNovaGlove(const TSharedRef NovaGloveImpl) - : USGHapticGlove(NovaGloveImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(NovaGloveImpl) { - Pimpl->SyncUProperties(); } USGNovaGlove::~USGNovaGlove() = default; TSharedRef USGNovaGlove::ToNovaGloveImpl() const { - SyncImplObject(); return FSGDeviceImplCast::ToNovaGloveImpl(ToSGDeviceImpl()); } -void USGNovaGlove::SyncImplObject() const -{ - Super::SyncImplObject(); - Pimpl->SyncImplObject(); -} - -void USGNovaGlove::SyncUProperties() -{ - Super::SyncUProperties(); - Pimpl->SyncUProperties(); -} - ESGDeviceType USGNovaGlove::GetDeviceType() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_ESGDeviceType OutTypeContainer; SGCoreImpl_FSGNovaGloveImpl_GetDeviceType(&InstanceContainer, &OutTypeContainer); @@ -463,8 +365,6 @@ ESGDeviceType USGNovaGlove::GetDeviceType() const FString USGNovaGlove::GetDeviceId() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGNovaGloveImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); @@ -473,8 +373,6 @@ FString USGNovaGlove::GetDeviceId() const FString USGNovaGlove::GetHardwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGNovaGloveImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); @@ -483,56 +381,38 @@ FString USGNovaGlove::GetHardwareVersion() const int32 USGNovaGlove::GetFirmwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; return SGCoreImpl_FSGNovaGloveImpl_GetFirmwareVersion(&InstanceContainer); } int32 USGNovaGlove::GetSubFirmwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; return SGCoreImpl_FSGNovaGloveImpl_GetSubFirmwareVersion(&InstanceContainer); } bool USGNovaGlove::HasBattery() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; return SGCoreImpl_FSGNovaGloveImpl_HasBattery(&InstanceContainer); } bool USGNovaGlove::IsCharging() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; const bool bResult = SGCoreImpl_FSGNovaGloveImpl_IsCharging(&InstanceContainer); - - SyncUProperties(); - return bResult; } bool USGNovaGlove::GetBatteryLevel(float& OutBatteryLevel) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; const bool bResult = SGCoreImpl_FSGNovaGloveImpl_GetBatteryLevel(&InstanceContainer, &OutBatteryLevel); - - SyncUProperties(); - return bResult; } bool USGNovaGlove::GetSensorData(UObject* Outer, USGNovaGloveSensorData*& OutSensorData) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGNovaGloveSensorDataImpl OutSensorDataContainer; const bool bResult = SGCoreImpl_FSGNovaGloveImpl_GetSensorData(&InstanceContainer, &OutSensorDataContainer); @@ -548,14 +428,10 @@ bool USGNovaGlove::GetSensorData(UObject* Outer, USGNovaGloveSensorData*& OutSen bool USGNovaGlove::GetImuRotation(FQuat& OutImu) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FQuat OutImuContainer; const bool bResult = SGCoreImpl_FSGNovaGloveImpl_GetImuRotation(&InstanceContainer, &OutImuContainer); - SyncUProperties(); - if (bResult) { OutImu = MoveTemp(OutImuContainer.Quat); @@ -566,14 +442,10 @@ bool USGNovaGlove::GetImuRotation(FQuat& OutImu) bool USGNovaGlove::GetImuRotation(FRotator& OutImu) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FQuat OutImuContainer; const bool bResult = SGCoreImpl_FSGNovaGloveImpl_GetImuRotation(&InstanceContainer, &OutImuContainer); - SyncUProperties(); - if (bResult) { OutImu = OutImuContainer.Quat.Rotator(); @@ -586,8 +458,6 @@ bool USGNovaGlove::GetHandPose( UObject* Outer, const USGBasicHandModel* HandModel, const USGNovaGloveHandProfile* Profile, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGBasicHandModelImpl HandModelContainer{HandModel->ToBasicHandModelImpl()}; FSGIC_FSGNovaGloveHandProfileImpl ProfileContainer{Profile->ToNovaGloveHandProfileImpl()}; @@ -595,8 +465,6 @@ bool USGNovaGlove::GetHandPose( const bool bResult = SGCoreImpl_FSGNovaGloveImpl_GetHandPose_HandModel_Profile_OutHandPose( &InstanceContainer, &HandModelContainer, &ProfileContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -608,8 +476,6 @@ bool USGNovaGlove::GetHandPose( bool USGNovaGlove::GetHandPose(UObject* Outer, const USGBasicHandModel* HandGeometry, const USGHandProfile* HandProfile, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGBasicHandModelImpl HandGeometryContainer{HandGeometry->ToBasicHandModelImpl()}; FSGIC_FSGHandProfileImpl ProfileContainer{HandProfile->ToHandProfileImpl()}; @@ -617,8 +483,6 @@ bool USGNovaGlove::GetHandPose(UObject* Outer, const USGBasicHandModel* HandGeom const bool bResult = SGCoreImpl_FSGNovaGloveImpl_GetHandPose_HandGeometry_HandProfile_OutHandPose( &InstanceContainer, &HandGeometryContainer, &ProfileContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -629,16 +493,12 @@ bool USGNovaGlove::GetHandPose(UObject* Outer, const USGBasicHandModel* HandGeom bool USGNovaGlove::GetHandPose(UObject* Outer, const USGHandProfile* HandProfile, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGHandProfileImpl ProfileContainer{HandProfile->ToHandProfileImpl()}; FSGIC_FSGHandPoseImpl OutHandPoseContainer; const bool bResult = SGCoreImpl_FSGNovaGloveImpl_GetHandPose_HandProfile_OutHandPose( &InstanceContainer, &ProfileContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -651,8 +511,6 @@ void USGNovaGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackComma const USGBuzzCommand* BuzzCommand, const USGThumperCommand* ThumperCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get()}; @@ -660,55 +518,37 @@ void USGNovaGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackComma FSGIC_FSGThumperCommandImpl ThumperCommandContainer{ThumperCommand->ToThumperCommandImpl()}; SGCoreImpl_FSGNovaGloveImpl_SendHaptics_ForceFeedbackCommand_BuzzCommand_ThumperCommand( &InstanceContainer, &ForceFeedbackCommandContainer, &BuzzCommandContainer, &ThumperCommandContainer); - - SyncUProperties(); } void USGNovaGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get()}; SGCoreImpl_FSGNovaGloveImpl_SendHaptics_ForceFeedbackCommand(&InstanceContainer, &ForceFeedbackCommandContainer); - - SyncUProperties(); } void USGNovaGlove::SendHaptics(const USGBuzzCommand* BuzzCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGBuzzCommandImpl BuzzCommandContainer{BuzzCommand->ToBuzzCommandImpl().Get()}; SGCoreImpl_FSGNovaGloveImpl_SendHaptics_ForceFeedbackCommand(&InstanceContainer, &BuzzCommandContainer); - - SyncUProperties(); } void USGNovaGlove::SendHaptics(const USGThumperCommand* ThumperCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGThumperCommandImpl ThumperCommandContainer{ThumperCommand->ToThumperCommandImpl()}; SGCoreImpl_FSGNovaGloveImpl_SendHaptics_ForceFeedbackCommand(&InstanceContainer, &ThumperCommandContainer); - - SyncUProperties(); } bool USGNovaGlove::GetCalibrationValues(TArray& OutValues) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_TArray_FVector OutValuesContainer; const bool bResult = SGCoreImpl_FSGNovaGloveImpl_GetCalibrationValues_OutValues( &InstanceContainer, &OutValuesContainer); - SyncUProperties(); - if (bResult) { OutValues = MoveTemp(OutValuesContainer.Array); @@ -719,8 +559,6 @@ bool USGNovaGlove::GetCalibrationValues(TArray& OutValues) void USGNovaGlove::ApplyCalibration(UObject* Outer, USGHandProfile*& OutProfile) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGHandProfileImpl OutProfileContainer; SGCoreImpl_FSGNovaGloveImpl_ApplyCalibration_HandProfile(&InstanceContainer, &OutProfileContainer); @@ -729,8 +567,6 @@ void USGNovaGlove::ApplyCalibration(UObject* Outer, USGHandProfile*& OutProfile) void USGNovaGlove::ApplyCalibration(UObject* Outer, USGNovaGloveHandProfile*& OutProfile) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FSGNovaGloveHandProfileImpl OutProfileContainer; SGCoreImpl_FSGNovaGloveImpl_ApplyCalibration_NovaGloveHandProfile(&InstanceContainer, &OutProfileContainer); @@ -742,8 +578,6 @@ void USGNovaGlove::GetGloveLocation(const FVector& ReferencePosition, const FQua const ESGPositionalTrackingHardware TrackingHardware, FVector& OutGlovePosition, FQuat& OutGloveRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation}; @@ -765,8 +599,6 @@ void USGNovaGlove::GetGloveLocation(const FVector& ReferencePosition, const FRot const ESGPositionalTrackingHardware TrackingHardware, FVector& OutGlovePosition, FRotator& OutGloveRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation.Quaternion()}; @@ -788,8 +620,6 @@ void USGNovaGlove::GetWristLocation(const FVector& ReferencePosition, const FQua const ESGPositionalTrackingHardware TrackingHardware, FVector& OutWristPosition, FQuat& OutWristRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation}; @@ -810,8 +640,6 @@ void USGNovaGlove::GetWristLocation(const FVector& ReferencePosition, const FRot const ESGPositionalTrackingHardware TrackingHardware, FVector& OutWristPosition, FRotator& OutWristRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation.Quaternion()}; @@ -830,30 +658,8 @@ void USGNovaGlove::GetWristLocation(const FVector& ReferencePosition, const FRot FString USGNovaGlove::ToString() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveImpl_ToString(&InstanceContainer, &OutStringContainer); return MoveTemp(OutStringContainer.String);; -} - -USGNovaGlove::FImpl::FImpl(USGNovaGlove* InOwner) - : Owner(InOwner) -{ -} - -USGNovaGlove::FImpl::~FImpl() = default; - -void USGNovaGlove::FImplDeleter::operator()(const FImpl* P) const -{ - delete P; -} - -void USGNovaGlove::FImpl::SyncUProperties() -{ -} - -void USGNovaGlove::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp index 48314fe4..c27d2cab 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp @@ -71,14 +71,6 @@ struct USGNovaGloveHandProfile::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); }; USGNovaGloveHandProfile* USGNovaGloveHandProfile::NewNovaGloveHandProfile( @@ -138,7 +130,6 @@ USGNovaGloveHandProfile::USGNovaGloveHandProfile() SGCoreImpl_FSGNovaGloveHandProfileImpl_ctor(&OutNovaGloveHandProfileImplContainer); Pimpl->NovaGloveHandProfileImpl = MoveTemp(OutNovaGloveHandProfileImplContainer.NovaGloveHandProfileImpl); - Pimpl->SyncUProperties(); } USGNovaGloveHandProfile::USGNovaGloveHandProfile(const bool bRightHanded, const USGHandInterpolator* Interpolator) @@ -155,7 +146,6 @@ USGNovaGloveHandProfile::USGNovaGloveHandProfile(const bool bRightHanded, const &OutNovaGloveHandProfileImplContainer, bRightHanded, &InterpolatorContainer); Pimpl->NovaGloveHandProfileImpl = MoveTemp(OutNovaGloveHandProfileImplContainer.NovaGloveHandProfileImpl); - Pimpl->SyncUProperties(); } USGNovaGloveHandProfile::USGNovaGloveHandProfile(const FSGNovaGloveHandProfileImpl& NovaGloveHandProfileImpl) @@ -167,7 +157,6 @@ USGNovaGloveHandProfile::USGNovaGloveHandProfile(const FSGNovaGloveHandProfileIm #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetNovaGloveHandProfileImpl(NovaGloveHandProfileImpl); - Pimpl->SyncUProperties(); } USGNovaGloveHandProfile::~USGNovaGloveHandProfile() = default; @@ -182,7 +171,6 @@ void USGNovaGloveHandProfile::SetNovaGloveHandProfileImpl(const FSGNovaGloveHand const FSGNovaGloveHandProfileImpl& USGNovaGloveHandProfile::ToNovaGloveHandProfileImpl() const { - Pimpl->SyncImplObject(); return Pimpl->NovaGloveHandProfileImpl; } @@ -203,8 +191,6 @@ USGHandInterpolator* USGNovaGloveHandProfile::GetInterpolationSet(UObject* Outer bool USGNovaGloveHandProfile::Equals(const USGNovaGloveHandProfile* NovaGloveHandProfile) const { - Pimpl->SyncImplObject(); - FSGIC_FSGNovaGloveHandProfileImpl InstanceContainer{ToNovaGloveHandProfileImpl()}; FSGIC_FSGNovaGloveHandProfileImpl NovaGloveHandProfileContainer{NovaGloveHandProfile->ToNovaGloveHandProfileImpl()}; return SGCoreImpl_FSGNovaGloveHandProfileImpl_Equals(&InstanceContainer, &NovaGloveHandProfileContainer); @@ -212,18 +198,12 @@ bool USGNovaGloveHandProfile::Equals(const USGNovaGloveHandProfile* NovaGloveHan void USGNovaGloveHandProfile::Reset() { - Pimpl->SyncImplObject(); - FSGIC_FSGNovaGloveHandProfileImpl InstanceContainer{ToNovaGloveHandProfileImpl()}; SGCoreImpl_FSGNovaGloveHandProfileImpl_Reset(&InstanceContainer); - - Pimpl->SyncUProperties(); } FString USGNovaGloveHandProfile::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGNovaGloveHandProfileImpl InstanceContainer{ToNovaGloveHandProfileImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveHandProfileImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -240,12 +220,4 @@ USGNovaGloveHandProfile::FImpl::~FImpl() = default; void USGNovaGloveHandProfile::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGNovaGloveHandProfile::FImpl::SyncUProperties() -{ -} - -void USGNovaGloveHandProfile::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp index 822e1a13..bb94e456 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp @@ -69,13 +69,6 @@ struct USGNovaGloveInfo::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGNovaGloveInfo* USGNovaGloveInfo::NewNovaGloveInfo(UObject* Outer, const FSGNovaGloveInfoImpl& NovaGloveInfoImpl) @@ -145,7 +138,6 @@ USGNovaGloveInfo::USGNovaGloveInfo() SGCoreImpl_FSGNovaGloveInfoImpl_ctor(&OutNovaGloveInfoImplContainer); Pimpl->NovaGloveInfoImpl = MoveTemp(OutNovaGloveInfoImplContainer.NovaGloveInfoImpl); - Pimpl->SyncUProperties(); } USGNovaGloveInfo::USGNovaGloveInfo( @@ -169,7 +161,6 @@ USGNovaGloveInfo::USGNovaGloveInfo( bRightHanded, &ImuCorrectionContainer, NumberOfSensors); Pimpl->NovaGloveInfoImpl = MoveTemp(OutNovaGloveInfoImplContainer.NovaGloveInfoImpl); - Pimpl->SyncUProperties(); } USGNovaGloveInfo::USGNovaGloveInfo(const FSGNovaGloveInfoImpl& NovaGloveInfoImpl) @@ -181,7 +172,6 @@ USGNovaGloveInfo::USGNovaGloveInfo(const FSGNovaGloveInfoImpl& NovaGloveInfoImpl #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetNovaGloveInfoImpl(NovaGloveInfoImpl); - Pimpl->SyncUProperties(); } USGNovaGloveInfo::~USGNovaGloveInfo() = default; @@ -196,13 +186,11 @@ void USGNovaGloveInfo::SetNovaGloveInfoImpl(const FSGNovaGloveInfoImpl& NovaGlov const FSGNovaGloveInfoImpl& USGNovaGloveInfo::ToNovaGloveInfoImpl() const { - Pimpl->SyncImplObject(); return Pimpl->NovaGloveInfoImpl; } FSGNovaGloveInfoImpl& USGNovaGloveInfo::ToNovaGloveInfoImpl() { - Pimpl->SyncImplObject(); return Pimpl->NovaGloveInfoImpl; } @@ -264,8 +252,6 @@ int32 USGNovaGloveInfo::GetNumberOfSensors() const bool USGNovaGloveInfo::Equals(const USGNovaGloveInfo* NovaGloveInfo) const { - Pimpl->SyncImplObject(); - FSGIC_FSGNovaGloveInfoImpl InstanceContainer{ToNovaGloveInfoImpl()}; FSGIC_FSGNovaGloveInfoImpl NovaGloveInfoImplContainer{NovaGloveInfo->ToNovaGloveInfoImpl()}; return SGCoreImpl_FSGNovaGloveInfoImpl_Equals(&InstanceContainer, &NovaGloveInfoImplContainer); @@ -273,8 +259,6 @@ bool USGNovaGloveInfo::Equals(const USGNovaGloveInfo* NovaGloveInfo) const FString USGNovaGloveInfo::ToString() const { - Pimpl->SyncImplObject(); - FSGIC_FSGNovaGloveInfoImpl InstanceContainer{ToNovaGloveInfoImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveInfoImpl_ToString(&InstanceContainer, &OutStringContainer); @@ -283,8 +267,6 @@ FString USGNovaGloveInfo::ToString() const FString USGNovaGloveInfo::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGNovaGloveInfoImpl InstanceContainer{ToNovaGloveInfoImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveInfoImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -301,12 +283,4 @@ USGNovaGloveInfo::FImpl::~FImpl() = default; void USGNovaGloveInfo::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGNovaGloveInfo::FImpl::SyncUProperties() -{ -} - -void USGNovaGloveInfo::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp index ecdc60a2..160446d9 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp @@ -73,13 +73,6 @@ struct USGNovaGloveSensorData::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGNovaGloveSensorData* USGNovaGloveSensorData::NewNovaGloveSensorData( @@ -167,7 +160,6 @@ USGNovaGloveSensorData::USGNovaGloveSensorData() SGCoreImpl_FSGNovaGloveSensorDataImpl_ctor(&OutNovaGloveSensorDataImplContainer); Pimpl->NovaGloveSensorDataImpl = MoveTemp(OutNovaGloveSensorDataImplContainer.NovaGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGNovaGloveSensorData::USGNovaGloveSensorData(const TArray& Values, const int32 ParsedValues, @@ -188,7 +180,6 @@ USGNovaGloveSensorData::USGNovaGloveSensorData(const TArray& Values, co &ImuRotationContainer, bImuParsed, BatteryLevel, bCharging); Pimpl->NovaGloveSensorDataImpl = MoveTemp(OutNovaGloveSensorDataImplContainer.NovaGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGNovaGloveSensorData::USGNovaGloveSensorData(const TArray& Values, const int32 ParsedValues, @@ -209,7 +200,6 @@ USGNovaGloveSensorData::USGNovaGloveSensorData(const TArray& Values, co &ImuRotationContainer, bImuParsed, BatteryLevel, bCharging); Pimpl->NovaGloveSensorDataImpl = MoveTemp(OutNovaGloveSensorDataImplContainer.NovaGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGNovaGloveSensorData::USGNovaGloveSensorData(const FSGNovaGloveSensorDataImpl& NovaGloveSensorDataImpl) @@ -221,7 +211,6 @@ USGNovaGloveSensorData::USGNovaGloveSensorData(const FSGNovaGloveSensorDataImpl& #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetNovaGloveSensorDataImpl(NovaGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGNovaGloveSensorData::~USGNovaGloveSensorData() = default; @@ -236,7 +225,6 @@ void USGNovaGloveSensorData::SetNovaGloveSensorDataImpl(const FSGNovaGloveSensor const FSGNovaGloveSensorDataImpl& USGNovaGloveSensorData::ToNovaGloveSensorDataImpl() const { - Pimpl->SyncImplObject(); return Pimpl->NovaGloveSensorDataImpl; } @@ -290,8 +278,6 @@ bool USGNovaGloveSensorData::IsCharging() const bool USGNovaGloveSensorData::Equals(const USGNovaGloveSensorData* NovaGloveSensorData) const { - Pimpl->SyncImplObject(); - FSGIC_FSGNovaGloveSensorDataImpl InstanceContainer{ToNovaGloveSensorDataImpl()}; FSGIC_FSGNovaGloveSensorDataImpl NovaGloveSensorDataContainer{NovaGloveSensorData->ToNovaGloveSensorDataImpl()}; return SGCoreImpl_FSGNovaGloveSensorDataImpl_Equals(&InstanceContainer, &NovaGloveSensorDataContainer); @@ -299,8 +285,6 @@ bool USGNovaGloveSensorData::Equals(const USGNovaGloveSensorData* NovaGloveSenso FString USGNovaGloveSensorData::ToString() const { - Pimpl->SyncImplObject(); - FSGIC_FSGNovaGloveSensorDataImpl InstanceContainer{ToNovaGloveSensorDataImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveSensorDataImpl_ToString(&InstanceContainer, &OutStringContainer); @@ -309,8 +293,6 @@ FString USGNovaGloveSensorData::ToString() const FString USGNovaGloveSensorData::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGNovaGloveSensorDataImpl InstanceContainer{ToNovaGloveSensorDataImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveSensorDataImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -327,12 +309,4 @@ USGNovaGloveSensorData::FImpl::~FImpl() = default; void USGNovaGloveSensorData::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGNovaGloveSensorData::FImpl::SyncUProperties() -{ -} - -void USGNovaGloveSensorData::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGlove.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGlove.cpp index 3a64f1ec..3bde9717 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGlove.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGlove.cpp @@ -67,42 +67,6 @@ #include "SGInterop/SGIC_TArray_TArray_FVector.h" #include "SGInterop/SGIC_TSharedPtr_FSGSenseGloveImpl.h" -struct USGSenseGlove::FImpl -{ - /************************ - * Member variables - ************************/ - - - /************************ - * Owner object - ************************/ - - USGSenseGlove* Owner; - - /************************ - * Constructor / Destructor - ************************/ - - explicit FImpl(USGSenseGlove* InOwner); - ~FImpl(); - - /************************ - * Default copy constructor & copy assignment operator - ************************/ - - FImpl(const FImpl& Rhs) = default; - FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); -}; - USGSenseGlove* USGSenseGlove::NewSenseGlove(UObject* Outer, const FSGSenseGloveImpl& SenseGloveImpl) { USGSenseGlove* Instance = NewObject(Outer); @@ -354,126 +318,58 @@ void USGSenseGlove::CalculateWristLocation(const FVector& ReferencePosition, con } USGSenseGlove::USGSenseGlove() - : USGHapticGlove(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove() { FSGIC_TSharedPtr_FSGSenseGloveImpl OutSharedPtrContainer; SGCoreImpl_FSGSenseGloveImpl_ctor_MakeShared(&OutSharedPtrContainer); SetSGDeviceImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGSenseGlove::USGSenseGlove(const USGSenseGloveInfo& Model) - : USGHapticGlove(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove() { - FSGIC_TSharedPtr_FSGSenseGloveImpl OutSharedPtrContainer; - FSGIC_FSGSenseGloveInfoImpl ModelContainer{Model.ToSenseGloveInfoImpl()}; - SGCoreImpl_FSGSenseGloveImpl_ctor_Model_MakeShared(&OutSharedPtrContainer, &ModelContainer); - - SetSGDeviceImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGSenseGlove::USGSenseGlove(const FSGDeviceImpl& SGDeviceImpl) - : USGHapticGlove(SGDeviceImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(SGDeviceImpl) { - Pimpl->SyncUProperties(); } USGSenseGlove::USGSenseGlove(const FSGHapticGloveImpl& HapticGloveImpl) - : USGHapticGlove(HapticGloveImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(HapticGloveImpl) { - Pimpl->SyncUProperties(); } USGSenseGlove::USGSenseGlove(const FSGSenseGloveImpl& SenseGloveImpl) - : USGHapticGlove(SenseGloveImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(SenseGloveImpl) { - Pimpl->SyncUProperties(); } USGSenseGlove::USGSenseGlove(TSharedRef SGDeviceImpl) - : USGHapticGlove(MoveTemp(SGDeviceImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(MoveTemp(SGDeviceImpl)) { - Pimpl->SyncUProperties(); } USGSenseGlove::USGSenseGlove(TSharedRef HapticGloveImpl) - : USGHapticGlove(MoveTemp(HapticGloveImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(MoveTemp(HapticGloveImpl)) { - Pimpl->SyncUProperties(); } USGSenseGlove::USGSenseGlove(TSharedRef SenseGloveImpl) - : USGHapticGlove(MoveTemp(SenseGloveImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGHapticGlove(MoveTemp(SenseGloveImpl)) { - Pimpl->SyncUProperties(); } USGSenseGlove::~USGSenseGlove() = default; TSharedRef USGSenseGlove::ToSenseGloveImpl() const { - SyncImplObject(); return FSGDeviceImplCast::ToSenseGloveImpl(ToSGDeviceImpl()); } -void USGSenseGlove::SyncImplObject() const -{ - Super::SyncImplObject(); - Pimpl->SyncImplObject(); -} - -void USGSenseGlove::SyncUProperties() -{ - Super::SyncUProperties(); - Pimpl->SyncUProperties(); -} - USGSenseGloveInfo* USGSenseGlove::GetGloveModel(UObject* Outer) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGSenseGloveInfoImpl OutModelContainer; SGCoreImpl_FSGSenseGloveImpl_GetGloveModel(&InstanceContainer, &OutModelContainer); @@ -483,16 +379,12 @@ USGSenseGloveInfo* USGSenseGlove::GetGloveModel(UObject* Outer) const bool USGSenseGlove::IsRight() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; return SGCoreImpl_FSGSenseGloveImpl_IsRight(&InstanceContainer); } ESGDeviceType USGSenseGlove::GetDeviceType() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_ESGDeviceType OutTypeContainer; SGCoreImpl_FSGSenseGloveImpl_GetDeviceType(&InstanceContainer, &OutTypeContainer); @@ -501,8 +393,6 @@ ESGDeviceType USGSenseGlove::GetDeviceType() const FString USGSenseGlove::GetDeviceId() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGSenseGloveImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); @@ -511,8 +401,6 @@ FString USGSenseGlove::GetDeviceId() const FString USGSenseGlove::GetHardwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGSenseGloveImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); @@ -521,24 +409,18 @@ FString USGSenseGlove::GetHardwareVersion() const int32 USGSenseGlove::GetFirmwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; return SGCoreImpl_FSGSenseGloveImpl_GetFirmwareVersion(&InstanceContainer); } int32 USGSenseGlove::GetSubFirmwareVersion() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; return SGCoreImpl_FSGSenseGloveImpl_GetSubFirmwareVersion(&InstanceContainer); } bool USGSenseGlove::GetSensorData(UObject* Outer, USGSenseGloveSensorData*& OutSensorData) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGSenseGloveSensorDataImpl OutSensorDataContainer; const bool bResult = SGCoreImpl_FSGSenseGloveImpl_GetSensorData(&InstanceContainer, &OutSensorDataContainer); @@ -554,14 +436,10 @@ bool USGSenseGlove::GetSensorData(UObject* Outer, USGSenseGloveSensorData*& OutS bool USGSenseGlove::GetImuRotation(FQuat& OutImu) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FQuat OutImuContainer; const bool bResult = SGCoreImpl_FSGSenseGloveImpl_GetImuRotation(&InstanceContainer, &OutImuContainer); - SyncUProperties(); - if (bResult) { OutImu = MoveTemp(OutImuContainer.Quat); @@ -572,14 +450,10 @@ bool USGSenseGlove::GetImuRotation(FQuat& OutImu) bool USGSenseGlove::GetImuRotation(FRotator& OutImu) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FQuat OutImuContainer; const bool bResult = SGCoreImpl_FSGSenseGloveImpl_GetImuRotation(&InstanceContainer, &OutImuContainer); - SyncUProperties(); - if (bResult) { OutImu = OutImuContainer.Quat.Rotator(); @@ -590,15 +464,11 @@ bool USGSenseGlove::GetImuRotation(FRotator& OutImu) bool USGSenseGlove::GetGlovePose(UObject* Outer, USGSenseGlovePose*& OutGlovePose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGSenseGlovePoseImpl OutGlovePoseContainer; const bool bResult = SGCoreImpl_FSGSenseGloveImpl_GetGlovePose_OutGlovePose( &InstanceContainer, &OutGlovePoseContainer); - SyncUProperties(); - if (bResult) { OutGlovePose = USGSenseGlovePose::NewSenseGlovePose(Outer, MoveTemp(OutGlovePoseContainer.SenseGlovePoseImpl)); @@ -610,16 +480,12 @@ bool USGSenseGlove::GetGlovePose(UObject* Outer, USGSenseGlovePose*& OutGlovePos bool USGSenseGlove::GetGlovePose( UObject* Outer, const USGSenseGloveSensorData* SensorData, USGSenseGlovePose*& OutGlovePose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGSenseGloveSensorDataImpl SensorDataContainer{SensorData->ToSenseGloveSensorDataImpl()}; FSGIC_FSGSenseGlovePoseImpl OutGlovePoseContainer; const bool bResult = SGCoreImpl_FSGSenseGloveImpl_GetGlovePose_SensorData_OutGlovePose( &InstanceContainer, &SensorDataContainer, &OutGlovePoseContainer); - SyncUProperties(); - if (bResult) { OutGlovePose = USGSenseGlovePose::NewSenseGlovePose(Outer, MoveTemp(OutGlovePoseContainer.SenseGlovePoseImpl)); @@ -632,8 +498,6 @@ bool USGSenseGlove::GetHandPose( UObject* Outer, const USGBasicHandModel* HandModel, const USGSenseGloveHandProfile* Profile, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGBasicHandModelImpl HandModelContainer{HandModel->ToBasicHandModelImpl()}; FSGIC_FSGSenseGloveHandProfileImpl ProfileContainer{Profile->ToSenseGloveHandProfileImpl()}; @@ -641,8 +505,6 @@ bool USGSenseGlove::GetHandPose( const bool bResult = SGCoreImpl_FSGSenseGloveImpl_GetHandPose_HandModel_Profile_OutHandPose( &InstanceContainer, &HandModelContainer, &ProfileContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -654,8 +516,6 @@ bool USGSenseGlove::GetHandPose( bool USGSenseGlove::GetHandPose( UObject* Outer, const USGBasicHandModel* HandGeometry, const USGHandProfile* HandProfile, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGBasicHandModelImpl HandGeometryContainer{HandGeometry->ToBasicHandModelImpl()}; FSGIC_FSGHandProfileImpl ProfileContainer{HandProfile->ToHandProfileImpl()}; @@ -663,8 +523,6 @@ bool USGSenseGlove::GetHandPose( const bool bResult = SGCoreImpl_FSGSenseGloveImpl_GetHandPose_HandGeometry_HandProfile_OutHandPose( &InstanceContainer, &HandGeometryContainer, &ProfileContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -675,16 +533,12 @@ bool USGSenseGlove::GetHandPose( bool USGSenseGlove::GetHandPose(UObject* Outer, const USGHandProfile* HandProfile, USGHandPose*& OutHandPose) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGHandProfileImpl ProfileContainer{HandProfile->ToHandProfileImpl()}; FSGIC_FSGHandPoseImpl OutHandPoseContainer; const bool bResult = SGCoreImpl_FSGSenseGloveImpl_GetHandPose_HandProfile_OutHandPose( &InstanceContainer, &ProfileContainer, &OutHandPoseContainer); - SyncUProperties(); - if (bResult) { OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl)); @@ -696,8 +550,6 @@ bool USGSenseGlove::GetHandPose(UObject* Outer, const USGHandProfile* HandProfil bool USGSenseGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackCommand, const USGBuzzCommand* BuzzCommand, ESGSenseGloveThumperCommand ThumperCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get() @@ -710,55 +562,39 @@ bool USGSenseGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackComm SGCoreImpl_FSGSenseGloveImpl_SendHaptics_ForceFeedbackCommand_BuzzCommand_ESenseGloveThumperCommand( &InstanceContainer, &ForceFeedbackCommandContainer, &BuzzCommandContainer, &ThumperCommandContainer); - SyncUProperties(); - return bResult; } bool USGSenseGlove::SendHaptics(ESGSenseGloveThumperCommand ThumperCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_ESGSenseGloveThumperCommand ThumperCommandContainer{ThumperCommand}; const bool bResult = SGCoreImpl_FSGSenseGloveImpl_SendHaptics_ThumperCommand( &InstanceContainer, &ThumperCommandContainer); - SyncUProperties(); - return bResult; } void USGSenseGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get() }; SGCoreImpl_FSGSenseGloveImpl_SendHaptics_ForceFeedbackCommand(&InstanceContainer, &ForceFeedbackCommandContainer); - - SyncUProperties(); } void USGSenseGlove::SendHaptics(const USGBuzzCommand* BuzzCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGBuzzCommandImpl BuzzCommandContainer{BuzzCommand->ToBuzzCommandImpl().Get()}; SGCoreImpl_FSGSenseGloveImpl_SendHaptics_ForceFeedbackCommand(&InstanceContainer, &BuzzCommandContainer); - - SyncUProperties(); } void USGSenseGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackCommand, const USGBuzzCommand* BuzzCommand, const USGThumperCommand* ThumperCommand) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGForceFeedbackCommandImpl ForceFeedbackCommandContainer{ ForceFeedbackCommand->ToForceFeedbackCommandImpl().Get() @@ -767,21 +603,15 @@ void USGSenseGlove::SendHaptics(const USGForceFeedbackCommand* ForceFeedbackComm FSGIC_FSGThumperCommandImpl ThumperCommandContainer{ThumperCommand->ToThumperCommandImpl()}; SGCoreImpl_FSGSenseGloveImpl_SendHaptics_ForceFeedbackCommand_BuzzCommand_ThumperCommand( &InstanceContainer, &ForceFeedbackCommandContainer, &BuzzCommandContainer, &ThumperCommandContainer); - - SyncUProperties(); } bool USGSenseGlove::GetCalibrationValues(TArray& OutValues) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_TArray_FVector OutValuesContainer; const bool bResult = SGCoreImpl_FSGSenseGloveImpl_GetCalibrationValues_OutValues( &InstanceContainer, &OutValuesContainer); - SyncUProperties(); - if (bResult) { OutValues = MoveTemp(OutValuesContainer.Array); @@ -792,18 +622,12 @@ bool USGSenseGlove::GetCalibrationValues(TArray& OutValues) void USGSenseGlove::ResetCalibrationRange() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; SGCoreImpl_FSGSenseGloveImpl_ResetCalibrationRange(&InstanceContainer); - - SyncUProperties(); } void USGSenseGlove::ApplyCalibration(UObject* Outer, USGHandProfile*& OutProfile) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGHandProfileImpl OutProfileContainer; SGCoreImpl_FSGSenseGloveImpl_ApplyCalibration_HandProfile(&InstanceContainer, &OutProfileContainer); @@ -812,8 +636,6 @@ void USGSenseGlove::ApplyCalibration(UObject* Outer, USGHandProfile*& OutProfile void USGSenseGlove::ApplyCalibration(UObject* Outer, USGSenseGloveHandProfile*& OutProfile) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FSGSenseGloveHandProfileImpl OutProfileContainer; SGCoreImpl_FSGSenseGloveImpl_ApplyCalibration_SenseGloveHandProfile(&InstanceContainer, &OutProfileContainer); @@ -825,8 +647,6 @@ void USGSenseGlove::GetGloveLocation(const FVector& ReferencePosition, const FQu const ESGPositionalTrackingHardware TrackingHardware, FVector& OutGlovePosition, FQuat& OutGloveRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation}; @@ -848,8 +668,6 @@ void USGSenseGlove::GetGloveLocation(const FVector& ReferencePosition, const FRo const ESGPositionalTrackingHardware TrackingHardware, FVector& OutGlovePosition, FRotator& OutGloveRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation.Quaternion()}; @@ -871,8 +689,6 @@ void USGSenseGlove::GetGloveLocation(const FVector& ReferencePosition, const FQu const ESGPositionalTrackingHardware TrackingHardware, const ESGFinger MountedOn, FVector& OutGlovePosition, FQuat& OutGloveRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation}; @@ -895,8 +711,6 @@ void USGSenseGlove::GetGloveLocation(const FVector& ReferencePosition, const FRo const ESGPositionalTrackingHardware TrackingHardware, const ESGFinger MountedOn, FVector& OutGlovePosition, FRotator& OutGloveRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation.Quaternion()}; @@ -919,8 +733,6 @@ void USGSenseGlove::GetWristLocation(const FVector& ReferencePosition, const FQu const ESGPositionalTrackingHardware TrackingHardware, FVector& OutWristPosition, FQuat& OutWristRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation}; @@ -941,8 +753,6 @@ void USGSenseGlove::GetWristLocation(const FVector& ReferencePosition, const FRo const ESGPositionalTrackingHardware TrackingHardware, FVector& OutWristPosition, FRotator& OutWristRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation.Quaternion()}; @@ -965,8 +775,6 @@ void USGSenseGlove::GetWristLocation(const FVector& ReferencePosition, const FQu const FQuat& GloveWristRotationOffset, FVector& OutWristPosition, FQuat& OutWristRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation}; @@ -992,8 +800,6 @@ void USGSenseGlove::GetWristLocation(const FVector& ReferencePosition, const FRo const FRotator& GloveWristRotationOffset, FVector& OutWristPosition, FRotator& OutWristRotation) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FVector ReferencePositionContainer{ReferencePosition}; FSGIC_FQuat ReferenceRotationContainer{ReferenceRotation.Quaternion()}; @@ -1015,30 +821,8 @@ void USGSenseGlove::GetWristLocation(const FVector& ReferencePosition, const FRo FString USGSenseGlove::ToString() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveImpl_ToString(&InstanceContainer, &OutStringContainer); return MoveTemp(OutStringContainer.String);; -} - -USGSenseGlove::FImpl::FImpl(USGSenseGlove* InOwner) - : Owner(InOwner) -{ -} - -USGSenseGlove::FImpl::~FImpl() = default; - -void USGSenseGlove::FImplDeleter::operator()(const FImpl* P) const -{ - delete P; -} - -void USGSenseGlove::FImpl::SyncUProperties() -{ -} - -void USGSenseGlove::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp index 83d20987..8c0eec74 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp @@ -75,13 +75,6 @@ struct USGSenseGloveHandProfile::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGSenseGloveHandProfile* USGSenseGloveHandProfile::NewSenseGloveHandProfile( @@ -153,7 +146,6 @@ USGSenseGloveHandProfile::USGSenseGloveHandProfile() SGCoreImpl_FSGSenseGloveHandProfileImpl_ctor(&OutSenseGloveHandProfileImplContainer); Pimpl->SenseGloveHandProfileImpl = MoveTemp(OutSenseGloveHandProfileImplContainer.SenseGloveHandProfileImpl); - Pimpl->SyncUProperties(); } USGSenseGloveHandProfile::USGSenseGloveHandProfile(const bool bRightHanded, const USGHandInterpolator* Interpolator, @@ -176,7 +168,6 @@ USGSenseGloveHandProfile::USGSenseGloveHandProfile(const bool bRightHanded, cons &ThumbSolverContainer, &FingerSolverContainer, &FingerThimbleOffsetContainer); Pimpl->SenseGloveHandProfileImpl = MoveTemp(OutSenseGloveHandProfileImplContainer.SenseGloveHandProfileImpl); - Pimpl->SyncUProperties(); } USGSenseGloveHandProfile::USGSenseGloveHandProfile(const FSGSenseGloveHandProfileImpl& SenseGloveHandProfileImpl) @@ -188,7 +179,6 @@ USGSenseGloveHandProfile::USGSenseGloveHandProfile(const FSGSenseGloveHandProfil #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetSenseGloveHandProfileImpl(SenseGloveHandProfileImpl); - Pimpl->SyncUProperties(); } USGSenseGloveHandProfile::~USGSenseGloveHandProfile() = default; @@ -204,7 +194,6 @@ void USGSenseGloveHandProfile::SetSenseGloveHandProfileImpl( const FSGSenseGloveHandProfileImpl& USGSenseGloveHandProfile::ToSenseGloveHandProfileImpl() const { - Pimpl->SyncImplObject(); return Pimpl->SenseGloveHandProfileImpl; } @@ -249,8 +238,6 @@ TArray USGSenseGloveHandProfile::GetFingerThimbleOffset() const bool USGSenseGloveHandProfile::Equals(const USGSenseGloveHandProfile* SenseGloveHandProfile) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveHandProfileImpl InstanceContainer{ToSenseGloveHandProfileImpl()}; FSGIC_FSGSenseGloveHandProfileImpl SenseGloveHandProfileContainer{ SenseGloveHandProfile->ToSenseGloveHandProfileImpl()}; @@ -259,18 +246,12 @@ bool USGSenseGloveHandProfile::Equals(const USGSenseGloveHandProfile* SenseGlove void USGSenseGloveHandProfile::Reset() { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveHandProfileImpl InstanceContainer{ToSenseGloveHandProfileImpl()}; SGCoreImpl_FSGSenseGloveHandProfileImpl_Reset(&InstanceContainer); - - Pimpl->SyncUProperties(); } FString USGSenseGloveHandProfile::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveHandProfileImpl InstanceContainer{ToSenseGloveHandProfileImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveHandProfileImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -287,12 +268,4 @@ USGSenseGloveHandProfile::FImpl::~FImpl() = default; void USGSenseGloveHandProfile::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGSenseGloveHandProfile::FImpl::SyncUProperties() -{ -} - -void USGSenseGloveHandProfile::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp index ace764f3..1607bbca 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp @@ -48,6 +48,7 @@ #include "SGInterop/SGIC_TArray_FVector.h" #include "SGInterop/SGIC_TArray_TArray_float.h" #include "SGInterop/SGIC_TArray_TArray_FVector.h" +#include "SGUtils/SGArrayUtils.h" struct USGSenseGloveInfo::FImpl { @@ -76,13 +77,6 @@ struct USGSenseGloveInfo::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGSenseGloveInfo* USGSenseGloveInfo::NewSenseGloveInfo(UObject* Outer, const FSGSenseGloveInfoImpl& SenseGloveInfoImpl) @@ -249,7 +243,6 @@ USGSenseGloveInfo::USGSenseGloveInfo() SGCoreImpl_FSGSenseGloveInfoImpl_ctor(&OutSenseGloveInfoImplContainer); Pimpl->SenseGloveInfoImpl = MoveTemp(OutSenseGloveInfoImplContainer.SenseGloveInfoImpl); - Pimpl->SyncUProperties(); } USGSenseGloveInfo::USGSenseGloveInfo( @@ -281,7 +274,6 @@ USGSenseGloveInfo::USGSenseGloveInfo( &GloveLengthsContainer, &FunctionsContainer); Pimpl->SenseGloveInfoImpl = MoveTemp(OutSenseGloveInfoImplContainer.SenseGloveInfoImpl); - Pimpl->SyncUProperties(); } USGSenseGloveInfo::USGSenseGloveInfo( @@ -313,7 +305,6 @@ USGSenseGloveInfo::USGSenseGloveInfo( &GloveLengthsContainer, &FunctionsContainer); Pimpl->SenseGloveInfoImpl = MoveTemp(OutSenseGloveInfoImplContainer.SenseGloveInfoImpl); - Pimpl->SyncUProperties(); } USGSenseGloveInfo::USGSenseGloveInfo( @@ -341,7 +332,6 @@ USGSenseGloveInfo::USGSenseGloveInfo( &GloveLengthsContainer, &FunctionsContainer); Pimpl->SenseGloveInfoImpl = MoveTemp(OutSenseGloveInfoImplContainer.SenseGloveInfoImpl); - Pimpl->SyncUProperties(); } USGSenseGloveInfo::USGSenseGloveInfo( @@ -369,7 +359,6 @@ USGSenseGloveInfo::USGSenseGloveInfo( &GloveLengthsContainer, &FunctionsContainer); Pimpl->SenseGloveInfoImpl = MoveTemp(OutSenseGloveInfoImplContainer.SenseGloveInfoImpl); - Pimpl->SyncUProperties(); } USGSenseGloveInfo::USGSenseGloveInfo(const FSGSenseGloveInfoImpl& SenseGloveInfoImpl) @@ -381,7 +370,6 @@ USGSenseGloveInfo::USGSenseGloveInfo(const FSGSenseGloveInfoImpl& SenseGloveInfo #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetSenseGloveInfoImpl(SenseGloveInfoImpl); - Pimpl->SyncUProperties(); } USGSenseGloveInfo::~USGSenseGloveInfo() = default; @@ -396,13 +384,11 @@ void USGSenseGloveInfo::SetSenseGloveInfoImpl(const FSGSenseGloveInfoImpl& Sense const FSGSenseGloveInfoImpl& USGSenseGloveInfo::ToSenseGloveInfoImpl() const { - Pimpl->SyncImplObject(); return Pimpl->SenseGloveInfoImpl; } FSGSenseGloveInfoImpl& USGSenseGloveInfo::ToSenseGloveInfoImpl() { - Pimpl->SyncImplObject(); return Pimpl->SenseGloveInfoImpl; } @@ -504,8 +490,6 @@ TArray USGSenseGloveInfo::GetFunctions() const FVector USGSenseGloveInfo::GetStartPosition(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FVector OutPositionContainer; FSGIC_ESGFinger FingerContainer{Finger}; @@ -515,8 +499,6 @@ FVector USGSenseGloveInfo::GetStartPosition(const ESGFinger Finger) const FQuat USGSenseGloveInfo::GetStartRotationQ(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FQuat OutRotationContainer; FSGIC_ESGFinger FingerContainer{Finger}; @@ -526,8 +508,6 @@ FQuat USGSenseGloveInfo::GetStartRotationQ(const ESGFinger Finger) const FRotator USGSenseGloveInfo::GetStartRotation(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FQuat OutRotationContainer; FSGIC_ESGFinger FingerContainer{Finger}; @@ -537,8 +517,6 @@ FRotator USGSenseGloveInfo::GetStartRotation(const ESGFinger Finger) const TArray USGSenseGloveInfo::GetGloveLengths(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_TArray_FVector OutLengths; FSGIC_ESGFinger FingerContainer{Finger}; @@ -548,8 +526,6 @@ TArray USGSenseGloveInfo::GetGloveLengths(const ESGFinger Finger) const TArray> USGSenseGloveInfo::ToGloveAngles(const TArray>& SensorAngles) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_TArray_TArray_FVector OutAnglesContainer; FSGIC_TArray_TArray_float SensorAnglesContainer{SensorAngles}; @@ -559,8 +535,6 @@ TArray> USGSenseGloveInfo::ToGloveAngles(const TArraySyncImplObject(); - FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FSGSenseGloveInfoImpl SenseGloveInfoImplContainer{SenseGloveInfo->ToSenseGloveInfoImpl()}; return SGCoreImpl_FSGSenseGloveInfoImpl_Equals(&InstanceContainer, &SenseGloveInfoImplContainer); @@ -568,8 +542,6 @@ bool USGSenseGloveInfo::Equals(const USGSenseGloveInfo* SenseGloveInfo) const FString USGSenseGloveInfo::ToString() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveInfoImpl_ToString(&InstanceContainer, &OutStringContainer); @@ -578,8 +550,6 @@ FString USGSenseGloveInfo::ToString() const FString USGSenseGloveInfo::ToString(const bool bShortNotation) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveInfoImpl_ToString_bShortNotation(&InstanceContainer, &OutStringContainer, bShortNotation); @@ -588,8 +558,6 @@ FString USGSenseGloveInfo::ToString(const bool bShortNotation) const FString USGSenseGloveInfo::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveInfoImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -606,12 +574,4 @@ USGSenseGloveInfo::FImpl::~FImpl() = default; void USGSenseGloveInfo::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGSenseGloveInfo::FImpl::SyncUProperties() -{ -} - -void USGSenseGloveInfo::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp index 0a713fb4..ffe9a56a 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp @@ -49,6 +49,7 @@ #include "SGInterop/SGIC_TArray_FVector.h" #include "SGInterop/SGIC_TArray_TArray_FQuat.h" #include "SGInterop/SGIC_TArray_TArray_FVector.h" +#include "SGUtils/SGArrayUtils.h" struct USGSenseGlovePose::FImpl { @@ -77,13 +78,6 @@ struct USGSenseGlovePose::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGSenseGlovePose* USGSenseGlovePose::NewSenseGlovePose(UObject* Outer, const FSGSenseGlovePoseImpl& SenseGlovePoseImpl) @@ -207,7 +201,6 @@ USGSenseGlovePose::USGSenseGlovePose() SGCoreImpl_FSGSenseGlovePoseImpl_ctor(&OutSenseGlovePoseImplContainer); Pimpl->SenseGlovePoseImpl = MoveTemp(OutSenseGlovePoseImplContainer.SenseGlovePoseImpl); - Pimpl->SyncUProperties(); } USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded, @@ -230,7 +223,6 @@ USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded, &JointRotationsContainer, &GloveAnglesContainer); Pimpl->SenseGlovePoseImpl = MoveTemp(OutSenseGlovePoseImplContainer.SenseGlovePoseImpl); - Pimpl->SyncUProperties(); } USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded, @@ -253,7 +245,6 @@ USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded, &JointRotationsContainer, &GloveAnglesContainer); Pimpl->SenseGlovePoseImpl = MoveTemp(OutSenseGlovePoseImplContainer.SenseGlovePoseImpl); - Pimpl->SyncUProperties(); } USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded, @@ -276,7 +267,6 @@ USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded, &JointRotationsContainer, &GloveAnglesContainer); Pimpl->SenseGlovePoseImpl = MoveTemp(OutSenseGlovePoseImplContainer.SenseGlovePoseImpl); - Pimpl->SyncUProperties(); } USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded, @@ -299,7 +289,6 @@ USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded, &JointRotationsContainer, &GloveAnglesContainer); Pimpl->SenseGlovePoseImpl = MoveTemp(OutSenseGlovePoseImplContainer.SenseGlovePoseImpl); - Pimpl->SyncUProperties(); } USGSenseGlovePose::USGSenseGlovePose(const FSGSenseGlovePoseImpl& SenseGlovePoseImpl) @@ -311,7 +300,6 @@ USGSenseGlovePose::USGSenseGlovePose(const FSGSenseGlovePoseImpl& SenseGlovePose #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetSenseGlovePoseImpl(SenseGlovePoseImpl); - Pimpl->SyncUProperties(); } USGSenseGlovePose::~USGSenseGlovePose() = default; @@ -326,7 +314,6 @@ void USGSenseGlovePose::SetSenseGlovePoseImpl(const FSGSenseGlovePoseImpl& Sense const FSGSenseGlovePoseImpl& USGSenseGlovePose::ToSenseGlovePoseImpl() const { - Pimpl->SyncImplObject(); return Pimpl->SenseGlovePoseImpl; } @@ -370,8 +357,6 @@ TArray> USGSenseGlovePose::GetGloveAngles() const TArray USGSenseGlovePose::GetThimblePositions() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_FVector OutPositionsContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetThimblePositions(&InstanceContainer, &OutPositionsContainer); @@ -380,8 +365,6 @@ TArray USGSenseGlovePose::GetThimblePositions() const TArray USGSenseGlovePose::GetThimbleRotationsQ() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_FQuat OutRotationsContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetThimbleRotations(&InstanceContainer, &OutRotationsContainer); @@ -390,8 +373,6 @@ TArray USGSenseGlovePose::GetThimbleRotationsQ() const TArray USGSenseGlovePose::GetThimbleRotations() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_FQuat OutRotationsContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetThimbleRotations(&InstanceContainer, &OutRotationsContainer); @@ -400,8 +381,6 @@ TArray USGSenseGlovePose::GetThimbleRotations() const TArray USGSenseGlovePose::GetTotalGloveAngles() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_FVector OutAnglesContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetTotalGloveAngles(&InstanceContainer, &OutAnglesContainer); @@ -410,8 +389,6 @@ TArray USGSenseGlovePose::GetTotalGloveAngles() const TArray USGSenseGlovePose::CalculateFingerTips(const USGSenseGloveHandProfile* SenseGloveHandProfile) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_FVector OutFingerTipsContainer; FSGIC_FSGSenseGloveHandProfileImpl SenseGloveHandProfileImplContainer{ @@ -423,8 +400,6 @@ TArray USGSenseGlovePose::CalculateFingerTips(const USGSenseGloveHandPr TArray USGSenseGlovePose::CalculateFingerTips(const TArray& FingerOffsets) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_FVector OutFingerTipsContainer; FSGIC_TArray_FVector FingerOffsetsContainer{FingerOffsets}; @@ -435,8 +410,6 @@ TArray USGSenseGlovePose::CalculateFingerTips(const TArray& Fi bool USGSenseGlovePose::Equals(const USGSenseGlovePose* SenseGlovePose) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_FSGSenseGlovePoseImpl SenseGlovePoseContainer{SenseGlovePose->ToSenseGlovePoseImpl()}; return SGCoreImpl_FSGSenseGlovePoseImpl_Equals(&InstanceContainer, &SenseGlovePoseContainer); @@ -444,8 +417,6 @@ bool USGSenseGlovePose::Equals(const USGSenseGlovePose* SenseGlovePose) const FString USGSenseGlovePose::ToString(const bool bShortFormat) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGlovePoseImpl_ToString(&InstanceContainer, &OutStringContainer, bShortFormat); @@ -454,8 +425,6 @@ FString USGSenseGlovePose::ToString(const bool bShortFormat) const FString USGSenseGlovePose::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGlovePoseImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -472,12 +441,4 @@ USGSenseGlovePose::FImpl::~FImpl() = default; void USGSenseGlovePose::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGSenseGlovePose::FImpl::SyncUProperties() -{ -} - -void USGSenseGlovePose::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp index e5ca6023..9e09c16b 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp @@ -46,6 +46,7 @@ #include "SGInterop/SGIC_FString.h" #include "SGInterop/SGIC_TArray_float.h" #include "SGInterop/SGIC_TArray_TArray_float.h" +#include "SGUtils/SGArrayUtils.h" struct USGSenseGloveSensorData::FImpl { @@ -74,13 +75,6 @@ struct USGSenseGloveSensorData::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGSenseGloveSensorData* USGSenseGloveSensorData::NewSenseGloveSensorData( @@ -197,7 +191,6 @@ USGSenseGloveSensorData::USGSenseGloveSensorData() SGCoreImpl_FSGSenseGloveSensorDataImpl_ctor(&OutSenseGloveSensorDataImplContainer); Pimpl->SenseGloveSensorDataImpl = MoveTemp(OutSenseGloveSensorDataImplContainer.SenseGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray>& SensorAngles, const FQuat& ImuRotation, @@ -216,7 +209,6 @@ USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray>& Se &OutSenseGloveSensorDataImplContainer, &SensorAnglesContainer, &ImuRotationContainer, ParsedValues, bImuParsed); Pimpl->SenseGloveSensorDataImpl = MoveTemp(OutSenseGloveSensorDataImplContainer.SenseGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray>& SensorAngles, const FRotator& ImuRotation, @@ -235,7 +227,6 @@ USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray>& Se &OutSenseGloveSensorDataImplContainer, &SensorAnglesContainer, &ImuRotationContainer, ParsedValues, bImuParsed); Pimpl->SenseGloveSensorDataImpl = MoveTemp(OutSenseGloveSensorDataImplContainer.SenseGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray& SensorAngles, const FQuat& ImuRotation, @@ -250,7 +241,6 @@ USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray& Se &OutSenseGloveSensorDataImplContainer, &SensorAnglesContainer, &ImuRotationContainer, ParsedValues, bImuParsed); Pimpl->SenseGloveSensorDataImpl = MoveTemp(OutSenseGloveSensorDataImplContainer.SenseGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray& SensorAngles, const FRotator& ImuRotation, @@ -265,7 +255,6 @@ USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray& Se &OutSenseGloveSensorDataImplContainer, &SensorAnglesContainer, &ImuRotationContainer, ParsedValues, bImuParsed); Pimpl->SenseGloveSensorDataImpl = MoveTemp(OutSenseGloveSensorDataImplContainer.SenseGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGSenseGloveSensorData::USGSenseGloveSensorData(const FSGSenseGloveSensorDataImpl& SenseGloveSensorDataImpl) @@ -277,7 +266,6 @@ USGSenseGloveSensorData::USGSenseGloveSensorData(const FSGSenseGloveSensorDataIm #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetSenseGloveSensorDataImpl(SenseGloveSensorDataImpl); - Pimpl->SyncUProperties(); } USGSenseGloveSensorData::~USGSenseGloveSensorData() = default; @@ -292,7 +280,6 @@ void USGSenseGloveSensorData::SetSenseGloveSensorDataImpl(const FSGSenseGloveSen const FSGSenseGloveSensorDataImpl& USGSenseGloveSensorData::ToSenseGloveSensorDataImpl() const { - Pimpl->SyncImplObject(); return Pimpl->SenseGloveSensorDataImpl; } @@ -334,8 +321,6 @@ bool USGSenseGloveSensorData::IsImuParsed() const TArray USGSenseGloveSensorData::GetSensorAngles(const ESGFinger Finger) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveSensorDataImpl InstanceContainer{ToSenseGloveSensorDataImpl()}; FSGIC_TArray_float OutAnglesContainer; FSGIC_ESGFinger FingerContainer{Finger}; @@ -354,8 +339,6 @@ TArray USGSenseGloveSensorData::GetAngleSequence() const bool USGSenseGloveSensorData::Equals(const USGSenseGloveSensorData* SenseGloveSensorData) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveSensorDataImpl InstanceContainer{ToSenseGloveSensorDataImpl()}; FSGIC_FSGSenseGloveSensorDataImpl SenseGloveSensorDataContainer{SenseGloveSensorData->ToSenseGloveSensorDataImpl()}; return SGCoreImpl_FSGSenseGloveSensorDataImpl_Equals(&InstanceContainer, &SenseGloveSensorDataContainer); @@ -363,8 +346,6 @@ bool USGSenseGloveSensorData::Equals(const USGSenseGloveSensorData* SenseGloveSe FString USGSenseGloveSensorData::ToString() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveSensorDataImpl InstanceContainer{ToSenseGloveSensorDataImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveSensorDataImpl_ToString(&InstanceContainer, &OutStringContainer); @@ -373,8 +354,6 @@ FString USGSenseGloveSensorData::ToString() const FString USGSenseGloveSensorData::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSenseGloveSensorDataImpl InstanceContainer{ToSenseGloveSensorDataImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveSensorDataImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -391,12 +370,4 @@ USGSenseGloveSensorData::FImpl::~FImpl() = default; void USGSenseGloveSensorData::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGSenseGloveSensorData::FImpl::SyncUProperties() -{ -} - -void USGSenseGloveSensorData::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGSensorRange.cpp b/Source/SenseGloveCore/Private/SGCore/SGSensorRange.cpp index c63060e8..5817cf14 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSensorRange.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSensorRange.cpp @@ -70,13 +70,6 @@ struct USGSensorRange::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGSensorRange* USGSensorRange::NewSensorRange(UObject* Outer, const FSGSensorRangeImpl& SensorRangeImpl) @@ -151,7 +144,6 @@ USGSensorRange::USGSensorRange() SGCoreImpl_FSGSensorRangeImpl_ctor(&OutSensorRangeImplContainer); Pimpl->SensorRangeImpl = MoveTemp(OutSensorRangeImplContainer.SensorRangeImpl); - Pimpl->SyncUProperties(); } USGSensorRange::USGSensorRange(const TArray& MinValues, const TArray& MaxValues) @@ -169,7 +161,6 @@ USGSensorRange::USGSensorRange(const TArray& MinValues, const TArraySensorRangeImpl = MoveTemp(OutSensorRangeImplContainer.SensorRangeImpl); - Pimpl->SyncUProperties(); } USGSensorRange::USGSensorRange(const FSGSensorRangeImpl& SensorRangeImpl) @@ -181,7 +172,6 @@ USGSensorRange::USGSensorRange(const FSGSensorRangeImpl& SensorRangeImpl) #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetSensorRangeImpl(SensorRangeImpl); - Pimpl->SyncUProperties(); } USGSensorRange::~USGSensorRange() = default; @@ -196,7 +186,6 @@ void USGSensorRange::SetSensorRangeImpl(const FSGSensorRangeImpl& SensorRangeImp const FSGSensorRangeImpl& USGSensorRange::ToSensorRangeImpl() const { - Pimpl->SyncImplObject(); return Pimpl->SensorRangeImpl; } @@ -240,29 +229,19 @@ TArray USGSensorRange::GetRange() const void USGSensorRange::UpdateRange() { - Pimpl->SyncImplObject(); - FSGIC_FSGSensorRangeImpl InstanceContainer{ToSensorRangeImpl()}; SGCoreImpl_FSGSensorRangeImpl_UpdateRange(&InstanceContainer); - - Pimpl->SyncUProperties(); } void USGSensorRange::CheckForExtremes(const TArray& OtherValues) { - Pimpl->SyncImplObject(); - FSGIC_FSGSensorRangeImpl InstanceContainer{ToSensorRangeImpl()}; FSGIC_TArray_FVector OtherValuesContainer{OtherValues}; SGCoreImpl_FSGSensorRangeImpl_CheckForExtremes(&InstanceContainer, &OtherValuesContainer); - - Pimpl->SyncUProperties(); } FString USGSensorRange::RangeString(const bool bYOnly) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSensorRangeImpl InstanceContainer{ToSensorRangeImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSensorRangeImpl_RangeString(&InstanceContainer, &OutStringContainer, bYOnly); @@ -271,8 +250,6 @@ FString USGSensorRange::RangeString(const bool bYOnly) const FString USGSensorRange::ToString(const bool bYOnly) const { - Pimpl->SyncImplObject(); - FSGIC_FSGSensorRangeImpl InstanceContainer{ToSensorRangeImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSensorRangeImpl_ToString(&InstanceContainer, &OutStringContainer, bYOnly); @@ -281,8 +258,6 @@ FString USGSensorRange::ToString(const bool bYOnly) const FString USGSensorRange::SGSerialize() const { - Pimpl->SyncImplObject(); - FSGIC_FSGSensorRangeImpl InstanceContainer{ToSensorRangeImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSensorRangeImpl_Serialize(&InstanceContainer, &OutStringContainer); @@ -299,12 +274,4 @@ USGSensorRange::FImpl::~FImpl() = default; void USGSensorRange::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGSensorRange::FImpl::SyncUProperties() -{ -} - -void USGSensorRange::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGThumperCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGThumperCommand.cpp index 1a2b49b5..224ddfc7 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGThumperCommand.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGThumperCommand.cpp @@ -65,13 +65,6 @@ struct USGThumperCommand::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGThumperCommand* USGThumperCommand::NewThumperCommand(UObject* Outer, const FSGThumperCommandImpl& ThumperCommandImpl) @@ -117,7 +110,6 @@ USGThumperCommand::USGThumperCommand() SGCoreImpl_FSGThumperCommandImpl_ctor(&OutThumperCommandImplContainer); Pimpl->ThumperCommandImpl = MoveTemp(OutThumperCommandImplContainer.ThumperCommandImpl); - Pimpl->SyncUProperties(); } USGThumperCommand::USGThumperCommand(const int32 Magnitude) @@ -132,7 +124,6 @@ USGThumperCommand::USGThumperCommand(const int32 Magnitude) SGCoreImpl_FSGThumperCommandImpl_ctor_Magnitude(&OutThumperCommandImplContainer, Magnitude); Pimpl->ThumperCommandImpl = MoveTemp(OutThumperCommandImplContainer.ThumperCommandImpl); - Pimpl->SyncUProperties(); } USGThumperCommand::USGThumperCommand(const FSGThumperCommandImpl& ThumperCommandImpl) @@ -144,7 +135,6 @@ USGThumperCommand::USGThumperCommand(const FSGThumperCommandImpl& ThumperCommand #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetThumperCommandImpl(ThumperCommandImpl); - Pimpl->SyncUProperties(); } USGThumperCommand::~USGThumperCommand() = default; @@ -164,26 +154,18 @@ const FSGThumperCommandImpl& USGThumperCommand::ToThumperCommandImpl() const int32 USGThumperCommand::GetMagnitude() const { - Pimpl->SyncImplObject(); - FSGIC_FSGThumperCommandImpl ThumperCommandImplContainer{ToThumperCommandImpl()}; return SGCoreImpl_FSGThumperCommandImpl_GetMagnitude(&ThumperCommandImplContainer); } void USGThumperCommand::SetMagnitude(const int32 Magnitude) { - Pimpl->SyncImplObject(); - FSGIC_FSGThumperCommandImpl ThumperCommandImplContainer{ToThumperCommandImpl()}; SGCoreImpl_FSGThumperCommandImpl_SetMagnitude(&ThumperCommandImplContainer, Magnitude); - - Pimpl->SyncUProperties(); } USGThumperCommand* USGThumperCommand::Copy(UObject* Outer) const { - Pimpl->SyncImplObject(); - FSGIC_FSGThumperCommandImpl InstanceContainer{ToThumperCommandImpl()}; FSGIC_FSGThumperCommandImpl OutThumperCommandImplContainer; SGCoreImpl_FSGThumperCommandImpl_Copy(&InstanceContainer, &OutThumperCommandImplContainer); @@ -192,8 +174,6 @@ USGThumperCommand* USGThumperCommand::Copy(UObject* Outer) const USGThumperCommand* USGThumperCommand::Merge(UObject* Outer, const USGThumperCommand* ThumperCommand) const { - Pimpl->SyncImplObject(); - FSGIC_FSGThumperCommandImpl InstanceContainer{ToThumperCommandImpl()}; FSGIC_FSGThumperCommandImpl ThumperCommandImplContainer{ThumperCommand->ToThumperCommandImpl()}; FSGIC_FSGThumperCommandImpl OutThumperCommandImplContainer; @@ -204,8 +184,6 @@ USGThumperCommand* USGThumperCommand::Merge(UObject* Outer, const USGThumperComm bool USGThumperCommand::Equals(const USGThumperCommand* ThumperCommand) const { - Pimpl->SyncImplObject(); - FSGIC_FSGThumperCommandImpl InstanceContainer{ToThumperCommandImpl()}; FSGIC_FSGThumperCommandImpl ThumperCommandImplContainer{ThumperCommand->ToThumperCommandImpl()}; return SGCoreImpl_FSGThumperCommandImpl_Equals(&InstanceContainer, &ThumperCommandImplContainer); @@ -221,12 +199,4 @@ USGThumperCommand::FImpl::~FImpl() = default; void USGThumperCommand::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGThumperCommand::FImpl::SyncImplObject() -{ -} - -void USGThumperCommand::FImpl::SyncUProperties() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGTimedBuzzCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGTimedBuzzCommand.cpp index f52f7bfb..214c8040 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGTimedBuzzCommand.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGTimedBuzzCommand.cpp @@ -47,42 +47,6 @@ #include "SGInterop/SGIC_FString.h" #include "SGInterop/SGIC_TSharedPtr_FSGTimedBuzzCommandImpl.h" -struct USGTimedBuzzCommand::FImpl -{ - /************************ - * Member variables - ************************/ - - - /************************ - * Owner object - ************************/ - - USGTimedBuzzCommand* Owner; - - /************************ - * Constructor / Destructor - ************************/ - - explicit FImpl(USGTimedBuzzCommand* InOwner); - ~FImpl(); - - /************************ - * Default copy constructor & copy assignment operator - ************************/ - - FImpl(const FImpl& Rhs) = default; - FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - - void SyncImplObject(); -}; - USGTimedBuzzCommand* USGTimedBuzzCommand::NewTimedBuzzCommand( UObject* Outer, const FSGTimedBuzzCommandImpl& TimedBuzzCommandImpl) { @@ -132,28 +96,17 @@ USGTimedBuzzCommand* USGTimedBuzzCommand::NewTimedBuzzCommand( } USGTimedBuzzCommand::USGTimedBuzzCommand() - : USGBuzzCommand(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGBuzzCommand() { FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl OutTimedBuzzCommandImplContainer; SGCoreImpl_FSGTimedBuzzCommandImpl_ctor_MakeShared(&OutTimedBuzzCommandImplContainer); SetFingerCommandImpl(OutTimedBuzzCommandImplContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGTimedBuzzCommand::USGTimedBuzzCommand(const ESGFinger Finger, const int32 Magnitude, const float DurationSeconds, const float StartTimeSeconds) - : USGBuzzCommand(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGBuzzCommand() { FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl OutSharedPtrContainer; FSGIC_ESGFinger FingerContainer{Finger}; @@ -161,17 +114,11 @@ USGTimedBuzzCommand::USGTimedBuzzCommand(const ESGFinger Finger, const int32 Mag &OutSharedPtrContainer, &FingerContainer, Magnitude, DurationSeconds, StartTimeSeconds); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGTimedBuzzCommand::USGTimedBuzzCommand(const USGBuzzCommand* BaseCommand, const float DurationSeconds, const float StartTimeSeconds) - : USGBuzzCommand(), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGBuzzCommand() { FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl OutSharedPtrContainer; FSGIC_FSGBuzzCommandImpl BaseCommandContainer{BaseCommand->ToBuzzCommandImpl().Get()}; @@ -179,55 +126,27 @@ USGTimedBuzzCommand::USGTimedBuzzCommand(const USGBuzzCommand* BaseCommand, &OutSharedPtrContainer, &BaseCommandContainer, DurationSeconds, StartTimeSeconds); SetFingerCommandImpl(OutSharedPtrContainer.Ptr.ToSharedRef()); - Pimpl->SyncUProperties(); } USGTimedBuzzCommand::USGTimedBuzzCommand(const FSGTimedBuzzCommandImpl& TimedBuzzCommandImpl) - : USGBuzzCommand(TimedBuzzCommandImpl), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGBuzzCommand(TimedBuzzCommandImpl) { - Pimpl->SyncUProperties(); } USGTimedBuzzCommand::USGTimedBuzzCommand(TSharedRef TimedBuzzCommandImpl) - : USGBuzzCommand(MoveTemp(TimedBuzzCommandImpl)), -#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ + : USGBuzzCommand(MoveTemp(TimedBuzzCommandImpl)) { - Pimpl->SyncUProperties(); } USGTimedBuzzCommand::~USGTimedBuzzCommand() = default; TSharedRef USGTimedBuzzCommand::ToTimedBuzzCommandImpl() const { - SyncImplObject(); return FSGFingerCommandImplCast::ToTimedBuzzCommandImpl(ToFingerCommandImpl()); } -void USGTimedBuzzCommand::SyncImplObject() const -{ - Super::SyncImplObject(); - Pimpl->SyncImplObject(); -} - -void USGTimedBuzzCommand::SyncUProperties() -{ - Super::SyncUProperties(); - Pimpl->SyncUProperties(); -} - USGBuzzCommand* USGTimedBuzzCommand::Copy(UObject* Outer) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl InstanceContainer{ToTimedBuzzCommandImpl()}; FSGIC_FSGBuzzCommandImpl OutBuzzCommandImplContainer; SGCoreImpl_FSGTimedBuzzCommandImpl_Copy(&InstanceContainer, &OutBuzzCommandImplContainer); @@ -237,8 +156,6 @@ USGBuzzCommand* USGTimedBuzzCommand::Copy(UObject* Outer) const USGBuzzCommand* USGTimedBuzzCommand::Merge(UObject* Outer, const USGBuzzCommand* BuzzCommand) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl InstanceContainer{ToTimedBuzzCommandImpl()}; FSGIC_FSGBuzzCommandImpl BuzzCommandImplContainer{BuzzCommand->ToBuzzCommandImpl().Get()}; FSGIC_FSGBuzzCommandImpl OutBuzzCommandImplContainer; @@ -256,12 +173,6 @@ USGBuzzCommand* USGTimedBuzzCommand::GetBaseCommand(UObject* Outer) const return NewBuzzCommand(Outer, MoveTemp(OutCommandContainer.BuzzCommandImpl)); } -int32 USGTimedBuzzCommand::GetMagnitude() const -{ - FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl InstanceContainer{ToTimedBuzzCommandImpl()}; - return SGCoreImpl_FSGTimedBuzzCommandImpl_GetMagnitude(&InstanceContainer); -} - float USGTimedBuzzCommand::GetDuration() const { FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl InstanceContainer{ToTimedBuzzCommandImpl()}; @@ -276,66 +187,32 @@ float USGTimedBuzzCommand::GetElapsedTime() const bool USGTimedBuzzCommand::HasTimeElapsed() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl InstanceContainer{ToTimedBuzzCommandImpl()}; return SGCoreImpl_FSGTimedBuzzCommandImpl_HasTimeElapsed(&InstanceContainer); } float USGTimedBuzzCommand::NormalizedTime(const bool bClamp01) const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl InstanceContainer{ToTimedBuzzCommandImpl()}; return SGCoreImpl_FSGTimedBuzzCommandImpl_NormalizedTime(&InstanceContainer, bClamp01); } void USGTimedBuzzCommand::ResetTiming() { - SyncImplObject(); - FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl InstanceContainer{ToTimedBuzzCommandImpl()}; SGCoreImpl_FSGTimedBuzzCommandImpl_ResetTiming(&InstanceContainer); - - SyncUProperties(); } void USGTimedBuzzCommand::UpdateTiming(const float DeltaSeconds) { - SyncImplObject(); - FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl InstanceContainer{ToTimedBuzzCommandImpl()}; SGCoreImpl_FSGTimedBuzzCommandImpl_UpdateTiming(&InstanceContainer, DeltaSeconds); - - SyncUProperties(); } FString USGTimedBuzzCommand::ToString() const { - SyncImplObject(); - FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl InstanceContainer{ToTimedBuzzCommandImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGTimedBuzzCommandImpl_ToString(&InstanceContainer, &OutStringContainer); return MoveTemp(OutStringContainer.String); -} - -USGTimedBuzzCommand::FImpl::FImpl(USGTimedBuzzCommand* InOwner) - : Owner(InOwner) -{ -} - -USGTimedBuzzCommand::FImpl::~FImpl() = default; - -void USGTimedBuzzCommand::FImplDeleter::operator()(const FImpl* P) const -{ - delete P; -} - -void USGTimedBuzzCommand::FImpl::SyncUProperties() -{ -} - -void USGTimedBuzzCommand::FImpl::SyncImplObject() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp index 6683ffea..e04bfcc8 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp @@ -70,13 +70,6 @@ struct USGTimedThumpCommand::FImpl FImpl(const FImpl& Rhs) = default; FImpl& operator=(const FImpl& Rhs) = default; - - /************************ - * Methods - ************************/ - - void SyncUProperties(); - void SyncImplObject(); }; USGTimedThumpCommand* USGTimedThumpCommand::NewTimedThumpCommand( @@ -128,7 +121,6 @@ USGTimedThumpCommand::USGTimedThumpCommand() SGCoreImpl_FSGTimedThumpCommandImpl_ctor(&OutTimedThumpCommandImplContainer); Pimpl->TimedThumpCommandImpl = MoveTemp(OutTimedThumpCommandImplContainer.TimedThumpCommandImpl); - Pimpl->SyncUProperties(); } USGTimedThumpCommand::USGTimedThumpCommand(const int32 Magnitude, @@ -145,7 +137,6 @@ USGTimedThumpCommand::USGTimedThumpCommand(const int32 Magnitude, &OutTimedThumpCommandImplContainer, Magnitude, DurationSeconds, StartTimeSeconds); Pimpl->TimedThumpCommandImpl = MoveTemp(OutTimedThumpCommandImplContainer.TimedThumpCommandImpl); - Pimpl->SyncUProperties(); } USGTimedThumpCommand::USGTimedThumpCommand(const USGThumperCommand* BaseCommand, @@ -163,7 +154,6 @@ USGTimedThumpCommand::USGTimedThumpCommand(const USGThumperCommand* BaseCommand, &OutTimedThumpCommandImplContainer, &BaseCommandContainer, DurationSeconds, StartTimeSeconds); Pimpl->TimedThumpCommandImpl = MoveTemp(OutTimedThumpCommandImplContainer.TimedThumpCommandImpl); - Pimpl->SyncUProperties(); } USGTimedThumpCommand::USGTimedThumpCommand(const FSGTimedThumpCommandImpl& TimedThumpCommandImpl) @@ -175,7 +165,6 @@ USGTimedThumpCommand::USGTimedThumpCommand(const FSGTimedThumpCommandImpl& Timed #endif /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */ { SetTimedThumpCommandImpl(TimedThumpCommandImpl); - Pimpl->SyncUProperties(); } USGTimedThumpCommand::~USGTimedThumpCommand() = default; @@ -190,7 +179,6 @@ void USGTimedThumpCommand::SetTimedThumpCommandImpl(const FSGTimedThumpCommandIm const FSGTimedThumpCommandImpl& USGTimedThumpCommand::ToTimedThumpCommandImpl() const { - Pimpl->SyncImplObject(); return Pimpl->TimedThumpCommandImpl; } @@ -200,48 +188,26 @@ int32 USGTimedThumpCommand::GetMagnitude() const return SGCoreImpl_FSGTimedThumpCommandImpl_GetMagnitude(&InstanceContainer); } -void USGTimedThumpCommand::SetMagnitude(int32 Magnitude) -{ - FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; - SGCoreImpl_FSGTimedThumpCommandImpl_SetMagnitude(&InstanceContainer, Magnitude); -} - float USGTimedThumpCommand::GetDuration() const { FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; return SGCoreImpl_FSGTimedThumpCommandImpl_GetDuration(&InstanceContainer); } -void USGTimedThumpCommand::SetDuration(const float Duration) -{ - FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; - SGCoreImpl_FSGTimedThumpCommandImpl_SetDuration(&InstanceContainer, Duration); -} - float USGTimedThumpCommand::GetElapsedTime() const { FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; return SGCoreImpl_FSGTimedThumpCommandImpl_GetElapsedTime(&InstanceContainer); } -void USGTimedThumpCommand::SetElapsedTime(const float ElapsedTime) -{ - FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; - SGCoreImpl_FSGTimedThumpCommandImpl_SetElapsedTime(&InstanceContainer, ElapsedTime); -} - bool USGTimedThumpCommand::HasTimeElapsed() const { - Pimpl->SyncImplObject(); - FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; return SGCoreImpl_FSGTimedThumpCommandImpl_HasTimeElapsed(&InstanceContainer); } USGTimedThumpCommand* USGTimedThumpCommand::Copy(UObject* Outer, const bool bCopyElapsed) const { - Pimpl->SyncImplObject(); - FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; FSGIC_FSGTimedThumpCommandImpl OutTimedThumpCommandImplContainer; SGCoreImpl_FSGTimedThumpCommandImpl_Copy(&InstanceContainer, &OutTimedThumpCommandImplContainer, bCopyElapsed); @@ -251,16 +217,12 @@ USGTimedThumpCommand* USGTimedThumpCommand::Copy(UObject* Outer, const bool bCop void USGTimedThumpCommand::Update(const float DeltaSeconds) { - Pimpl->SyncImplObject(); - FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; SGCoreImpl_FSGTimedThumpCommandImpl_Update(&InstanceContainer, DeltaSeconds); } bool USGTimedThumpCommand::Equals(const USGTimedThumpCommand* TimedThumpCommand) const { - Pimpl->SyncImplObject(); - FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; FSGIC_FSGTimedThumpCommandImpl TimedThumpCommandImplContainer{TimedThumpCommand->ToTimedThumpCommandImpl()}; return SGCoreImpl_FSGTimedThumpCommandImpl_Equals(&InstanceContainer, &TimedThumpCommandImplContainer); @@ -268,8 +230,6 @@ bool USGTimedThumpCommand::Equals(const USGTimedThumpCommand* TimedThumpCommand) FString USGTimedThumpCommand::ToString() const { - Pimpl->SyncImplObject(); - FSGIC_FSGTimedThumpCommandImpl InstanceContainer{ToTimedThumpCommandImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGTimedThumpCommandImpl_ToString(&InstanceContainer, &OutStringContainer); @@ -286,12 +246,4 @@ USGTimedThumpCommand::FImpl::~FImpl() = default; void USGTimedThumpCommand::FImplDeleter::operator()(const FImpl* P) const { delete P; -} - -void USGTimedThumpCommand::FImpl::SyncImplObject() -{ -} - -void USGTimedThumpCommand::FImpl::SyncUProperties() -{ } \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGAnatomy.h b/Source/SenseGloveCore/Public/SGCore/SGAnatomy.h index 8d8c2a22..141c9ead 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGAnatomy.h +++ b/Source/SenseGloveCore/Public/SGCore/SGAnatomy.h @@ -110,4 +110,4 @@ public: * Get Hand Angles that would make a fist. */ static TArray> GetFistHandAngles(bool bRightHanded); -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGBetaDevice.h b/Source/SenseGloveCore/Public/SGCore/SGBetaDevice.h index f3d1776c..76e3d53c 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGBetaDevice.h +++ b/Source/SenseGloveCore/Public/SGCore/SGBetaDevice.h @@ -38,8 +38,6 @@ #pragma once -#include "Templates/UniquePtr.h" - #include "SGCore/SGDevice.h" #include "SGTypes/SGCoreTypes.h" @@ -81,17 +79,6 @@ public: */ static USGBetaDevice* Parse(UObject* Outer, const FString& String); -private: - struct FImpl; - - struct FImplDeleter - { - void operator()(const FImpl* P) const; - }; - - TUniquePtr Pimpl; - FImplDeleter PimplDeleter; - public: /** * The basic class constructor. @@ -128,17 +115,6 @@ protected: */ TSharedRef ToBetaDeviceImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const override; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties() override; - public: /** * Get the DeviceType enumerator of this SenseGlove, used in DeviceList enumeration. @@ -192,4 +168,4 @@ public: * Create a string representation of this device for reporting purposes. */ virtual FString ToString() const override; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGBuzzCommand.h b/Source/SenseGloveCore/Public/SGCore/SGBuzzCommand.h index cb6a277a..03865f2a 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGBuzzCommand.h +++ b/Source/SenseGloveCore/Public/SGCore/SGBuzzCommand.h @@ -37,7 +37,6 @@ #include "HAL/Platform.h" #include "Templates/SharedPointer.h" -#include "Templates/UniquePtr.h" #include "UObject/ObjectMacros.h" #include "SGCore/SGFingerCommand.h" @@ -88,17 +87,6 @@ public: */ static USGBuzzCommand* Off(UObject* Outer); -private: - struct FImpl; - - struct FImplDeleter - { - void operator()(const FImpl* P) const; - }; - - TUniquePtr Pimpl; - FImplDeleter PimplDeleter; - public: /** * The basic constructor. @@ -144,17 +132,6 @@ public: */ TSharedRef ToBuzzCommandImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const override; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties() override; - public: /** * Copy this Buzz Command into a new object. @@ -165,4 +142,4 @@ public: * Merge this command with another, taking the maximum value between the two. */ USGBuzzCommand* Merge(UObject* Outer, const USGBuzzCommand* BuzzCommand) const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGCalibrationDataPoint.h b/Source/SenseGloveCore/Public/SGCore/SGCalibrationDataPoint.h index d47f3b71..70a21b57 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGCalibrationDataPoint.h +++ b/Source/SenseGloveCore/Public/SGCore/SGCalibrationDataPoint.h @@ -134,4 +134,4 @@ public: * Log Calibration values for storing on disk. */ FString ToLogData(const FString& Delimiter = "\t") const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGDevice.h b/Source/SenseGloveCore/Public/SGCore/SGDevice.h index 5f1c3c82..b0f07277 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGDevice.h +++ b/Source/SenseGloveCore/Public/SGCore/SGDevice.h @@ -202,17 +202,6 @@ public: */ TSharedRef ToSGDeviceImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties(); - public: /** * Check which DeviceType this class belongs to. @@ -303,4 +292,4 @@ public: * Get a string representation of this SGDevice, used for debugging. */ virtual FString ToString() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGFingerCommand.h b/Source/SenseGloveCore/Public/SGCore/SGFingerCommand.h index 83c78e0d..6e274cd0 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGFingerCommand.h +++ b/Source/SenseGloveCore/Public/SGCore/SGFingerCommand.h @@ -174,17 +174,6 @@ public: */ TSharedRef ToFingerCommandImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties(); - public: /** * @@ -211,4 +200,4 @@ public: * Create a string representation of this finger command. */ FString ToString() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGForceFeedbackCommand.h b/Source/SenseGloveCore/Public/SGCore/SGForceFeedbackCommand.h index 1190681c..4973f335 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGForceFeedbackCommand.h +++ b/Source/SenseGloveCore/Public/SGCore/SGForceFeedbackCommand.h @@ -37,7 +37,6 @@ #include "HAL/Platform.h" #include "Templates/SharedPointer.h" -#include "Templates/UniquePtr.h" #include "UObject/ObjectMacros.h" #include "SGCore/SGFingerCommand.h" @@ -92,17 +91,6 @@ public: */ static USGForceFeedbackCommand* Off(UObject* Outer); -private: - struct FImpl; - - struct FImplDeleter - { - void operator()(const FImpl* P) const; - }; - - TUniquePtr Pimpl; - FImplDeleter PimplDeleter; - public: /** * Empty constructor for internal initialization. @@ -148,17 +136,6 @@ public: */ TSharedRef ToForceFeedbackCommandImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const override; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties() override; - public: /** * Copy this ForceFeedback Command into a new object. @@ -169,4 +146,4 @@ public: * Merge this finger command with another, taking the maximum value between the two. */ USGForceFeedbackCommand* Merge(UObject* Outer, const USGForceFeedbackCommand* ForceFeedbackCommand) const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGHapticGlove.h b/Source/SenseGloveCore/Public/SGCore/SGHapticGlove.h index fb8b5003..c246d3dd 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHapticGlove.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHapticGlove.h @@ -94,17 +94,6 @@ public: */ static bool GetGlove(UObject* Outer, bool bRightHanded, USGHapticGlove*& OutGlove); -private: - struct FImpl; - - struct FImplDeleter - { - void operator()(const FImpl* P) const; - }; - - TUniquePtr Pimpl; - FImplDeleter PimplDeleter; - protected: /** * The basic constructor. @@ -165,17 +154,6 @@ public: */ TSharedRef ToHapticGloveImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const override; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties() override; - public: /** * Get the DeviceType enumerator of this device; used to check if its a SenseGlove/Nova/etc. diff --git a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationCheck.h b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationCheck.h index bf6fcf21..03613e30 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationCheck.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationCheck.h @@ -172,12 +172,6 @@ public: */ const FSGHapticGloveCalibrationCheckImpl& ToHapticGloveCalibrationCheckImpl() const; -public: - /** - * - */ - USGSensorRange* GetLastSensorRange(UObject* Outer) const; - public: /** * diff --git a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationSequence.h b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationSequence.h index 53a039fa..cb417d32 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationSequence.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveCalibrationSequence.h @@ -180,17 +180,6 @@ public: */ TSharedRef ToHapticGloveCalibrationSequenceImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties(); - public: /** * Glove linked to this calibration sequence. Will attempt to grab data from this glove evey time Update() is called. diff --git a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveQuickCalibration.h b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveQuickCalibration.h index 69019de9..28570532 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGHapticGloveQuickCalibration.h +++ b/Source/SenseGloveCore/Public/SGCore/SGHapticGloveQuickCalibration.h @@ -37,7 +37,6 @@ #include "Containers/Array.h" #include "Containers/UnrealString.h" -#include "Templates/UniquePtr.h" #include "SGCore/SGHapticGloveCalibrationSequence.h" @@ -76,21 +75,10 @@ public: public: /** - * Default time in seconds, to end this sequence. 15 seconds is very quick for some people. + * Default time in seconds, to end this sequence. 15 seconds is very quick for some people. */ static float GetDefaultAutoEndTimeout(); -private: - struct FImpl; - - struct FImplDeleter - { - void operator()(const FImpl* P) const; - }; - - TUniquePtr Pimpl; - FImplDeleter PimplDeleter; - public: /** * @@ -128,17 +116,6 @@ public: */ TSharedRef ToHapticGloveQuickCalibrationImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const override; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties() override; - public: /** * Time, in seconds, after which this sequence stops gathering data. Based on the deltaSeconds variable passed in the Update() function. diff --git a/Source/SenseGloveCore/Public/SGCore/SGNovaGlove.h b/Source/SenseGloveCore/Public/SGCore/SGNovaGlove.h index 7c5aee80..b772403b 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGNovaGlove.h +++ b/Source/SenseGloveCore/Public/SGCore/SGNovaGlove.h @@ -177,17 +177,6 @@ public: */ static FString ToBytes(const USGBuzzCommand* BuzzCommand); -private: - struct FImpl; - - struct FImplDeleter - { - void operator()(const FImpl* P) const; - }; - - TUniquePtr Pimpl; - FImplDeleter PimplDeleter; - protected: USGNovaGlove(); @@ -237,17 +226,6 @@ public: */ TSharedRef ToNovaGloveImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const override; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties() override; - public: /** * Return the DeviceType of this Nova. diff --git a/Source/SenseGloveCore/Public/SGCore/SGSenseGlove.h b/Source/SenseGloveCore/Public/SGCore/SGSenseGlove.h index f3c672e3..fa349b6c 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGSenseGlove.h +++ b/Source/SenseGloveCore/Public/SGCore/SGSenseGlove.h @@ -190,17 +190,6 @@ public: const FRotator& GloveWristRotationOffset, FVector& OutWristPosition, FRotator& OutWristRotation); -private: - struct FImpl; - - struct FImplDeleter - { - void operator()(const FImpl* P) const; - }; - - TUniquePtr Pimpl; - FImplDeleter PimplDeleter; - protected: /** * @@ -256,17 +245,6 @@ public: */ TSharedRef ToSenseGloveImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const override; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties() override; - public: /** * Retrieve this glove's hardware model, which contains its hardware data. diff --git a/Source/SenseGloveCore/Public/SGCore/SGTimedBuzzCommand.h b/Source/SenseGloveCore/Public/SGCore/SGTimedBuzzCommand.h index 5ca2a0bf..1039dfa5 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGTimedBuzzCommand.h +++ b/Source/SenseGloveCore/Public/SGCore/SGTimedBuzzCommand.h @@ -37,7 +37,6 @@ #include "HAL/Platform.h" #include "Templates/SharedPointer.h" -#include "Templates/UniquePtr.h" #include "UObject/ObjectMacros.h" #include "SGTimedBuzzCommand.generated.h" @@ -82,17 +81,6 @@ public: UObject* Outer, const USGBuzzCommand* BaseCommand, float DurationSeconds, float StartTimeSeconds = 0.0f); -private: - struct FImpl; - - struct FImplDeleter - { - void operator()(const FImpl* P) const; - }; - - TUniquePtr Pimpl; - FImplDeleter PimplDeleter; - public: /** * Empty constructor for inheritance. @@ -133,17 +121,6 @@ public: */ TSharedRef ToTimedBuzzCommandImpl() const; -protected: - /** - * Allows the child classes to synchronize the parent's underlying object at any time. - */ - virtual void SyncImplObject() const override; - - /** - * Allows the child classes to synchronize the parent's uproperties at any time. - */ - virtual void SyncUProperties() override; - public: /** * Copy this Buzz Command's values into a new object. @@ -161,11 +138,6 @@ public: */ USGBuzzCommand* GetBaseCommand(UObject* Outer) const; - /** - * - */ - int32 GetMagnitude() const; - /** * The total time [milliseconds] each buzz motor should be vibrating for. */ @@ -202,4 +174,4 @@ public: * */ FString ToString() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCore/Public/SGCore/SGTimedThumpCommand.h b/Source/SenseGloveCore/Public/SGCore/SGTimedThumpCommand.h index 2de8b709..39d09621 100644 --- a/Source/SenseGloveCore/Public/SGCore/SGTimedThumpCommand.h +++ b/Source/SenseGloveCore/Public/SGCore/SGTimedThumpCommand.h @@ -132,31 +132,16 @@ public: */ int32 GetMagnitude() const; - /** - * - */ - void SetMagnitude(int32 Magnitude); - /** * Duration in seconds. */ float GetDuration() const; - /** - * - */ - void SetDuration(float Duration); - /** * The elapsed time so far. */ float GetElapsedTime() const; - /** - * - */ - void SetElapsedTime(float ElapsedTime); - public: /** * Returns true if the timed command has elapsed. diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp index 987a3268..b4d2b237 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp @@ -227,11 +227,6 @@ bool FSGBasicHandModelImpl::IsRight() const return Pimpl->BasicHandModel.IsRight(); } -void FSGBasicHandModelImpl::SetIsRight(const bool bRightHanded) -{ - Pimpl->BasicHandModel.SetIsRight(bRightHanded); -} - TArray> FSGBasicHandModelImpl::GetFingerLengths() const { TArray> FingerLengths{ @@ -240,14 +235,6 @@ TArray> FSGBasicHandModelImpl::GetFingerLengths() const return MoveTemp(FingerLengths); } -void FSGBasicHandModelImpl::SetFingerLengths(const TArray>& FingerLengths) -{ - std::vector> FingerLengthsVector{ - FSGArrayUtils::ToMillimeters(FingerLengths) - }; - Pimpl->BasicHandModel.SetFingerLengths(MoveTemp(FingerLengthsVector)); -} - TArray FSGBasicHandModelImpl::GetFingerLengths(const ESGFinger Finger) const { TArray FingerLengths{ @@ -297,14 +284,6 @@ TArray FSGBasicHandModelImpl::GetStartJointPositions() const return MoveTemp(StartJointPositions); } -void FSGBasicHandModelImpl::SetStartJointPositions(const TArray& StartJointPositions) -{ - std::vector StartJointPositionsVector{ - FSGArrayUtils::ToMillimeters(StartJointPositions) - }; - Pimpl->BasicHandModel.SetStartJointPositions(MoveTemp(StartJointPositionsVector)); -} - void FSGBasicHandModelImpl::SetStartJointPosition(const ESGFinger Finger, const FVector& Position) { Pimpl->BasicHandModel.SetStartJointPosition( @@ -329,15 +308,6 @@ TArray FSGBasicHandModelImpl::GetStartJointRotations() const return MoveTemp(StartJointRotations); } -void FSGBasicHandModelImpl::SetStartJointRotations(const TArray& StartJointRotations) -{ - std::vector StartJointRotationsVector{ - FSGArrayUtils::ToStdVector< - FQuat, FSGQuatImpl::FQuatType, FSGQuatImpl, &FSGQuatImpl::ToQuat>(StartJointRotations) - }; - Pimpl->BasicHandModel.SetStartJointRotations(MoveTemp(StartJointRotationsVector)); -} - FVector FSGBasicHandModelImpl::GetJointPosition(const ESGFinger Finger) const { return FSGUnits::MillimetersToCentimeters( diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCalibrationDataPointImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCalibrationDataPointImpl.cpp index eaaeffcb..c48196a8 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCalibrationDataPointImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCalibrationDataPointImpl.cpp @@ -159,25 +159,11 @@ TArray FSGCalibrationDataPointImpl::GetCalibrationValues() const return CalibrationValues; } -void FSGCalibrationDataPointImpl::SetCalibrationValues(const TArray& CalibrationValues) -{ - std::vector CalibrationValuesVector{ - FSGArrayUtils::ToStdVector( - CalibrationValues) - }; - Pimpl->CalibrationDataPoint.SetCalibrationValues(MoveTemp(CalibrationValuesVector)); -} - int32 FSGCalibrationDataPointImpl::GetStage() const { return Pimpl->CalibrationDataPoint.GetStage(); } -void FSGCalibrationDataPointImpl::SetStage(const int32 Stage) -{ - Pimpl->CalibrationDataPoint.SetStage(Stage); -} - FString FSGCalibrationDataPointImpl::ToLogData(const FString& Delimiter) const { std::string DelimiterString(TCHAR_TO_UTF8(*Delimiter)); @@ -195,4 +181,4 @@ FSGCalibrationDataPointImpl::FImpl::~FImpl() = default; void FSGCalibrationDataPointImpl::FImplDeleter::operator()(const FImpl* P) const { delete P; -} +} \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp index f78732b4..633ce75c 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp @@ -174,42 +174,22 @@ FString FSGDeviceModelImpl::GetDeviceId() const return MoveTemp(DeviceId); } -void FSGDeviceModelImpl::SetDeviceId(const FString& Id) const -{ - Pimpl->DeviceModel.SetDeviceId(TCHAR_TO_UTF8(*Id)); -} - FString FSGDeviceModelImpl::GetHardwareVersion() const { FString HardwareVersion(UTF8_TO_TCHAR(Pimpl->DeviceModel.GetHardwareVersion().c_str())); return MoveTemp(HardwareVersion); } -void FSGDeviceModelImpl::SetHardwareVersion(const FString& Version) const -{ - Pimpl->DeviceModel.SetHardwareVersion(TCHAR_TO_UTF8(*Version)); -} - int32 FSGDeviceModelImpl::GetFirmwareVersion() const { return Pimpl->DeviceModel.GetFirmwareVersion(); } -void FSGDeviceModelImpl::SetFirmwareVersion(const int32 Version) const -{ - Pimpl->DeviceModel.SetFirmwareVersion(Version); -} - int32 FSGDeviceModelImpl::GetSubFirmwareVersion() const { return Pimpl->DeviceModel.GetSubFirmwareVersion(); } -void FSGDeviceModelImpl::SetSubFirmwareVersion(const int32 Version) const -{ - Pimpl->DeviceModel.SetSubFirmwareVersion(Version); -} - FSGDeviceModelImpl::FImpl::FImpl(FSGDeviceModelImpl* InOwner) : Owner(InOwner) { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGExportedFunctions.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGExportedFunctions.cpp index 5c353a2a..ffbcff39 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGExportedFunctions.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGExportedFunctions.cpp @@ -347,21 +347,6 @@ bool SGCoreImpl_FSGBasicHandModelImpl_IsRight( return StaticCast(Instance)->BasicHandModelImpl.IsRight(); } -void SGCoreImpl_FSGBasicHandModelImpl_SetIsRight( - void* Instance, - const bool bRightHanded) -{ - StaticCast(Instance)->BasicHandModelImpl.SetIsRight(bRightHanded); -} - -void SGCoreImpl_FSGBasicHandModelImpl_SetFingerLengths( - void* Instance, - void* FingerLengths) -{ - StaticCast(Instance)->BasicHandModelImpl.SetFingerLengths( - StaticCast(FingerLengths)->Array); -} - void SGCoreImpl_FSGBasicHandModelImpl_GetFingerLengths( void* Instance, void* OutLengths) @@ -426,14 +411,6 @@ void SGCoreImpl_FSGBasicHandModelImpl_GetStartJointPositions( StaticCast(Instance)->BasicHandModelImpl.GetStartJointPositions(); } -void SGCoreImpl_FSGBasicHandModelImpl_SetStartJointPositions( - void* Instance, - void* StartJointPositions) -{ - StaticCast(Instance)->BasicHandModelImpl.SetStartJointPositions( - StaticCast(StartJointPositions)->Array); -} - void SGCoreImpl_FSGBasicHandModelImpl_SetStartJointPosition_ESGFinger( void* Instance, void* Finger, @@ -462,14 +439,6 @@ void SGCoreImpl_FSGBasicHandModelImpl_GetStartJointRotations( StaticCast(Instance)->BasicHandModelImpl.GetStartJointRotations(); } -void SGCoreImpl_FSGBasicHandModelImpl_SetStartJointRotations( - void* Instance, - void* StartJointRotations) -{ - StaticCast(Instance)->BasicHandModelImpl.SetStartJointRotations( - StaticCast(StartJointRotations)->Array); -} - void SGCoreImpl_FSGBasicHandModelImpl_GetJointPosition( void* Instance, void* OutPosition, @@ -912,27 +881,12 @@ void SGCoreImpl_FSGCalibrationDataPointImpl_GetCalibrationValues( StaticCast(Instance)->CalibrationDataPointImpl.GetCalibrationValues(); } -void SGCoreImpl_FSGCalibrationDataPointImpl_SetCalibrationValues( - void* Instance, - void* CalibrationValues) -{ - StaticCast(Instance)->CalibrationDataPointImpl.SetCalibrationValues( - StaticCast(CalibrationValues)->Array); -} - int32 SGCoreImpl_FSGCalibrationDataPointImpl_GetStage( void* Instance) { return StaticCast(Instance)->CalibrationDataPointImpl.GetStage(); } -void SGCoreImpl_FSGCalibrationDataPointImpl_SetStage( - void* Instance, - const int32 Stage) -{ - StaticCast(Instance)->CalibrationDataPointImpl.SetStage(Stage); -} - void SGCoreImpl_FSGCalibrationDataPointImpl_ToLogData( void* Instance, void* OutData, @@ -1337,14 +1291,6 @@ void SGCoreImpl_FSGDeviceModelImpl_GetDeviceId( StaticCast(Instance)->DeviceModelImpl.GetDeviceId(); } -void SGCoreImpl_FSGDeviceModelImpl_SetDeviceId( - void* Instance, - void* Id) -{ - StaticCast(Instance)->DeviceModelImpl.SetDeviceId( - StaticCast(Id)->String); -} - void SGCoreImpl_FSGDeviceModelImpl_GetHardwareVersion( void* Instance, void* OutVersion) @@ -1353,41 +1299,18 @@ void SGCoreImpl_FSGDeviceModelImpl_GetHardwareVersion( StaticCast(Instance)->DeviceModelImpl.GetHardwareVersion(); } -void SGCoreImpl_FSGDeviceModelImpl_SetHardwareVersion( - void* Instance, - void* Version) -{ - StaticCast(Instance)->DeviceModelImpl.SetHardwareVersion( - StaticCast(Version)->String); -} - int32 SGCoreImpl_FSGDeviceModelImpl_GetFirmwareVersion( void* Instance) { return StaticCast(Instance)->DeviceModelImpl.GetFirmwareVersion(); } -void SGCoreImpl_FSGDeviceModelImpl_SetFirmwareVersion( - void* Instance, - const int32 Version) -{ - StaticCast(Instance)->DeviceModelImpl.SetFirmwareVersion( - Version); -} - int32 SGCoreImpl_FSGDeviceModelImpl_GetSubFirmwareVersion( void* Instance) { return StaticCast(Instance)->DeviceModelImpl.GetSubFirmwareVersion(); } -void SGCoreImpl_FSGDeviceModelImpl_SetSubFirmwareVersion( - void* Instance, - const int32 Version) -{ - StaticCast(Instance)->DeviceModelImpl.SetSubFirmwareVersion(Version); -} - /******************************************************************************* * SGFingerCommandImpl.h ******************************************************************************/ @@ -1487,14 +1410,6 @@ void SGCoreImpl_FSGFingerCommandImpl_GetLevels( StaticCast(Instance)->Ptr->GetLevels(); } -void SGCoreImpl_FSGFingerCommandImpl_SetLevels( - void* Instance, - void* Levels) -{ - StaticCast(Instance)->Ptr->SetLevels( - StaticCast(Levels)->Array); -} - int32 SGCoreImpl_FSGFingerCommandImpl_GetLevel( void* Instance, const int32 Finger) @@ -1773,14 +1688,6 @@ void SGCoreImpl_FSGHandInterpolatorImpl_GetJointInterpolations( StaticCast(Instance)->HandInterpolatorImpl.GetJointInterpolations(); } -void SGCoreImpl_FSGHandInterpolatorImpl_SetJointInterpolations( - void* Instance, - void* OutJointInterpolations) -{ - StaticCast(Instance)->HandInterpolatorImpl.SetJointInterpolations( - StaticCast(OutJointInterpolations)->Array); -} - void SGCoreImpl_FSGHandInterpolatorImpl_GetCmcStartRotation( void* Instance, void* OutRotation) @@ -1789,14 +1696,6 @@ void SGCoreImpl_FSGHandInterpolatorImpl_GetCmcStartRotation( StaticCast(Instance)->HandInterpolatorImpl.GetCmcStartRotation(); } -void SGCoreImpl_FSGHandInterpolatorImpl_SetCmcStartRotation( - void* Instance, - void* CmcStartRotation) -{ - StaticCast(Instance)->HandInterpolatorImpl.SetCmcStartRotation( - StaticCast(CmcStartRotation)->Quat); -} - float SGCoreImpl_FSGHandInterpolatorImpl_CalculateAngle_Finger_int32Movement_Value( void* Instance, void* Finger, @@ -2073,13 +1972,6 @@ bool SGCoreImpl_FSGHandPoseImpl_IsRight( return StaticCast(Instance)->HandPoseImpl.IsRight(); } -void SGCoreImpl_FSGHandPoseImpl_SetIsRight( - void* Instance, - const bool bRightHanded) -{ - StaticCast(Instance)->HandPoseImpl.SetIsRight(bRightHanded); -} - void SGCoreImpl_FSGHandPoseImpl_GetJointPositions( void* Instance, void* OutPositions) @@ -2088,14 +1980,6 @@ void SGCoreImpl_FSGHandPoseImpl_GetJointPositions( StaticCast(Instance)->HandPoseImpl.GetJointPositions(); } -void SGCoreImpl_FSGHandPoseImpl_SetJointPositions( - void* Instance, - void* JointPositions) -{ - StaticCast(Instance)->HandPoseImpl.SetJointPositions( - StaticCast(JointPositions)->Array); -} - void SGCoreImpl_FSGHandPoseImpl_GetJointRotations( void* Instance, void* OutRotations) @@ -2104,14 +1988,6 @@ void SGCoreImpl_FSGHandPoseImpl_GetJointRotations( StaticCast(Instance)->HandPoseImpl.GetJointRotations(); } -void SGCoreImpl_FSGHandPoseImpl_SetJointRotations( - void* Instance, - void* JointRotations) -{ - StaticCast(Instance)->HandPoseImpl.SetJointRotations( - StaticCast(JointRotations)->Array); -} - void SGCoreImpl_FSGHandPoseImpl_GetHandAngles( void* Instance, void* OutAngles) @@ -2120,14 +1996,6 @@ void SGCoreImpl_FSGHandPoseImpl_GetHandAngles( StaticCast(Instance)->HandPoseImpl.GetHandAngles(); } -void SGCoreImpl_FSGHandPoseImpl_SetHandAngles( - void* Instance, - void* HandAngles) -{ - StaticCast(Instance)->HandPoseImpl.SetHandAngles( - StaticCast(HandAngles)->Array); -} - bool SGCoreImpl_FSGHandPoseImpl_Equals( void* Instance, void* HandPoseImpl) @@ -2292,13 +2160,6 @@ bool SGCoreImpl_FSGHandProfileImpl_IsRight( return StaticCast(Instance)->HandProfileImpl.IsRight(); } -void SGCoreImpl_FSGHandProfileImpl_SetIsRight( - void* Instance, - const bool bRightHanded) -{ - StaticCast(Instance)->HandProfileImpl.SetIsRight(bRightHanded); -} - void SGCoreImpl_FSGHandProfileImpl_GetSenseGloveHandProfile( void* Instance, void* OutProfile) @@ -2307,14 +2168,6 @@ void SGCoreImpl_FSGHandProfileImpl_GetSenseGloveHandProfile( StaticCast(Instance)->HandProfileImpl.GetSenseGloveHandProfile(); } -void SGCoreImpl_FSGHandProfileImpl_SetSenseGloveHandProfile( - void* Instance, - void* SenseGloveHandProfile) -{ - StaticCast(Instance)->HandProfileImpl.SetSenseGloveHandProfile( - StaticCast(SenseGloveHandProfile)->SenseGloveHandProfileImpl); -} - void SGCoreImpl_FSGHandProfileImpl_GetNovaGloveHandProfile( void* Instance, void* OutProfile) @@ -2323,14 +2176,6 @@ void SGCoreImpl_FSGHandProfileImpl_GetNovaGloveHandProfile( StaticCast(Instance)->HandProfileImpl.GetNovaGloveHandProfile(); } -void SGCoreImpl_FSGHandProfileImpl_SetNovaGloveHandProfile( - void* Instance, - void* NovaGloveHandProfile) -{ - StaticCast(Instance)->HandProfileImpl.SetNovaGloveHandProfile( - StaticCast(NovaGloveHandProfile)->NovaGloveHandProfileImpl); -} - bool SGCoreImpl_FSGHandProfileImpl_Equals( void* Instance, void* HandProfileImpl) @@ -2756,24 +2601,6 @@ void SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_ctor_copy_assignment( HapticGloveCalibrationCheckImpl; } -void SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_GetLastSensorRange( - void* Instance, - void* OutLastSensorRange) -{ - StaticCast(OutLastSensorRange)->SensorRangeImpl = - StaticCast( - Instance)->HapticGloveCalibrationCheckImpl.GetLastSensorRange(); -} - -void SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_SetLastSensorRange( - void* Instance, - void* LastSensorRange) -{ - StaticCast( - Instance)->HapticGloveCalibrationCheckImpl.SetLastSensorRange( - StaticCast(LastSensorRange)->SensorRangeImpl); -} - void SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_GetCalibrationStage( void* Instance, void* OutStage) @@ -3101,17 +2928,6 @@ void SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetForceFeedbackCommandsQueue( GetForceFeedbackCommandsQueue(); } -void SGCoreImpl_FSGHapticGloveCommandBufferImpl_SetForceFeedbackCommandsQueue( - void* Instance, - void* ForceFeedbackCommandsQueue) -{ - StaticCast(Instance)->HapticGloveCommandBufferImpl. - SetForceFeedbackCommandsQueue( - StaticCast< - FSGIC_TArray_FSGForceFeedbackCommandImpl*>( - ForceFeedbackCommandsQueue)->Array); -} - void SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetBuzzCommandsQueue( void* Instance, void* OutBuzzCommandsQueue) @@ -3121,16 +2937,6 @@ void SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetBuzzCommandsQueue( GetBuzzCommandsQueue(); } -void SGCoreImpl_FSGHapticGloveCommandBufferImpl_SetBuzzCommandsQueue( - void* Instance, - void* BuzzCommandsQueue) -{ - StaticCast(Instance)->HapticGloveCommandBufferImpl. - SetBuzzCommandsQueue( - StaticCast( - BuzzCommandsQueue)->Array); -} - void SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetThumperCommandsQueue( void* Instance, void* OutThumperCommandsQueue) @@ -3140,17 +2946,6 @@ void SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetThumperCommandsQueue( GetThumperCommandsQueue(); } -void SGCoreImpl_FSGHapticGloveCommandBufferImpl_SetThumperCommandsQueue( - void* Instance, - void* ThumperCommandsQueue) -{ - StaticCast(Instance)->HapticGloveCommandBufferImpl. - SetThumperCommandsQueue( - StaticCast( - ThumperCommandsQueue)->Array); -} - void SGCoreImpl_FSGHapticGloveCommandBufferImpl_ClearForceFeedbackCommandsQueue( void* Instance) { @@ -3456,14 +3251,6 @@ float SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_GetAutoEndTimeout( return StaticCast(Instance)->Ptr->GetAutoEndTimeout(); } -void SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_SetAutoEndTimeout( - void* Instance, - const float AutoEndTimeout) -{ - StaticCast(Instance)->Ptr->SetAutoEndTimeout( - AutoEndTimeout); -} - int32 SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_GetSmoothingSamples( void* Instance) { @@ -4305,13 +4092,6 @@ bool SGCoreImpl_FSGNovaGloveHandProfileImpl_IsRight( return StaticCast(Instance)->NovaGloveHandProfileImpl.IsRight(); } -void SGCoreImpl_FSGNovaGloveHandProfileImpl_SetIsRight( - void* Instance, - const bool bRightHanded) -{ - StaticCast(Instance)->NovaGloveHandProfileImpl.SetIsRight(bRightHanded); -} - void SGCoreImpl_FSGNovaGloveHandProfileImpl_GetInterpolationSet( void* Instance, void* OutSet) @@ -4320,14 +4100,6 @@ void SGCoreImpl_FSGNovaGloveHandProfileImpl_GetInterpolationSet( StaticCast(Instance)->NovaGloveHandProfileImpl.GetInterpolationSet(); } -void SGCoreImpl_FSGNovaGloveHandProfileImpl_SetInterpolationSet( - void* Instance, - void* InterpolationSet) -{ - StaticCast(Instance)->NovaGloveHandProfileImpl.SetInterpolationSet( - StaticCast(InterpolationSet)->HandInterpolatorImpl); -} - bool SGCoreImpl_FSGNovaGloveHandProfileImpl_Equals( void* Instance, void* NovaGloveHandProfileImpl) @@ -4424,14 +4196,6 @@ void SGCoreImpl_FSGNovaGloveInfoImpl_GetDeviceId( StaticCast(Instance)->NovaGloveInfoImpl.GetDeviceId(); } -void SGCoreImpl_FSGNovaGloveInfoImpl_SetDeviceId( - void* Instance, - void* DeviceId) -{ - StaticCast(Instance)->NovaGloveInfoImpl.SetDeviceId( - StaticCast(DeviceId)->String); -} - void SGCoreImpl_FSGNovaGloveInfoImpl_GetHardwareVersion( void* Instance, void* OutVersion) @@ -4440,53 +4204,24 @@ void SGCoreImpl_FSGNovaGloveInfoImpl_GetHardwareVersion( StaticCast(Instance)->NovaGloveInfoImpl.GetHardwareVersion(); } -void SGCoreImpl_FSGNovaGloveInfoImpl_SetHardwareVersion( - void* Instance, - void* HardwareVersion) -{ - StaticCast(Instance)->NovaGloveInfoImpl.SetHardwareVersion( - StaticCast(HardwareVersion)->String); -} - int32 SGCoreImpl_FSGNovaGloveInfoImpl_GetFirmwareVersion( void* Instance) { return StaticCast(Instance)->NovaGloveInfoImpl.GetFirmwareVersion(); } -void SGCoreImpl_FSGNovaGloveInfoImpl_SetFirmwareVersion( - void* Instance, - const int32 FirmwareVersion) -{ - StaticCast(Instance)->NovaGloveInfoImpl.SetFirmwareVersion(FirmwareVersion); -} - int32 SGCoreImpl_FSGNovaGloveInfoImpl_GetSubFirmwareVersion( void* Instance) { return StaticCast(Instance)->NovaGloveInfoImpl.GetSubFirmwareVersion(); } -void SGCoreImpl_FSGNovaGloveInfoImpl_SetSubFirmwareVersion( - void* Instance, - const int32 SubFirmwareVersion) -{ - StaticCast(Instance)->NovaGloveInfoImpl.SetSubFirmwareVersion(SubFirmwareVersion); -} - bool SGCoreImpl_FSGNovaGloveInfoImpl_IsRight( void* Instance) { return StaticCast(Instance)->NovaGloveInfoImpl.IsRight(); } -void SGCoreImpl_FSGNovaGloveInfoImpl_SetIsRight( - void* Instance, - const bool bRightHanded) -{ - StaticCast(Instance)->NovaGloveInfoImpl.SetIsRight(bRightHanded); -} - void SGCoreImpl_FSGNovaGloveInfoImpl_GetImuCorrection( void* Instance, void* OutCorrection) @@ -4495,27 +4230,12 @@ void SGCoreImpl_FSGNovaGloveInfoImpl_GetImuCorrection( StaticCast(Instance)->NovaGloveInfoImpl.GetImuCorrection(); } -void SGCoreImpl_FSGNovaGloveInfoImpl_SetImuCorrection( - void* Instance, - void* ImuCorrection) -{ - StaticCast(Instance)->NovaGloveInfoImpl.SetImuCorrection( - StaticCast(ImuCorrection)->Quat); -} - int32 SGCoreImpl_FSGNovaGloveInfoImpl_GetNumberOfSensors( void* Instance) { return StaticCast(Instance)->NovaGloveInfoImpl.GetNumberOfSensors(); } -void SGCoreImpl_FSGNovaGloveInfoImpl_SetNumberOfSensors( - void* Instance, - const int32 NumberOfSensors) -{ - StaticCast(Instance)->NovaGloveInfoImpl.SetNumberOfSensors(NumberOfSensors); -} - bool SGCoreImpl_FSGNovaGloveInfoImpl_Equals( void* Instance, void* NovaGloveInfoImpl) @@ -4621,14 +4341,6 @@ void SGCoreImpl_FSGNovaGloveSensorDataImpl_GetSensorValues( StaticCast(Instance)->NovaGloveSensorDataImpl.GetSensorValues(); } -void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetSensorValues( - void* Instance, - void* SensorValues) -{ - StaticCast(Instance)->NovaGloveSensorDataImpl.SetSensorValues( - StaticCast(SensorValues)->Array); -} - void SGCoreImpl_FSGNovaGloveSensorDataImpl_GetImuRotation( void* Instance, void* OutRotation) @@ -4637,66 +4349,30 @@ void SGCoreImpl_FSGNovaGloveSensorDataImpl_GetImuRotation( StaticCast(Instance)->NovaGloveSensorDataImpl.GetImuRotation(); } -void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetImuRotation( - void* Instance, - void* ImuRotation) -{ - StaticCast(Instance)->NovaGloveSensorDataImpl.SetImuRotation( - StaticCast(ImuRotation)->Quat); -} - int32 SGCoreImpl_FSGNovaGloveSensorDataImpl_GetParsedValues( void* Instance) { return StaticCast(Instance)->NovaGloveSensorDataImpl.GetParsedValues(); } -void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetParsedValues( - void* Instance, - const int32 ParsedValues) -{ - StaticCast(Instance)->NovaGloveSensorDataImpl.SetParsedValues(ParsedValues); -} - bool SGCoreImpl_FSGNovaGloveSensorDataImpl_IsImuParsed( void* Instance) { return StaticCast(Instance)->NovaGloveSensorDataImpl.IsImuParsed(); } -void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetImuParsed( - void* Instance, - const bool bImuParsed) -{ - StaticCast(Instance)->NovaGloveSensorDataImpl.SetImuParsed(bImuParsed); -} - float SGCoreImpl_FSGNovaGloveSensorDataImpl_GetBatteryLevel( void* Instance) { return StaticCast(Instance)->NovaGloveSensorDataImpl.GetBatteryLevel(); } -void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetBatteryLevel( - void* Instance, - const float BatteryLevel) -{ - StaticCast(Instance)->NovaGloveSensorDataImpl.SetBatteryLevel(BatteryLevel); -} - bool SGCoreImpl_FSGNovaGloveSensorDataImpl_IsCharging( void* Instance) { return StaticCast(Instance)->NovaGloveSensorDataImpl.IsCharging(); } -void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetIsCharging( - void* Instance, - const bool bCharging) -{ - StaticCast(Instance)->NovaGloveSensorDataImpl.SetIsCharging(bCharging); -} - bool SGCoreImpl_FSGNovaGloveSensorDataImpl_Equals( void* Instance, void* NovaGloveSensorDataImpl) @@ -5306,13 +4982,6 @@ bool SGCoreImpl_FSGSenseGloveHandProfileImpl_IsRight( return StaticCast(Instance)->SenseGloveHandProfileImpl.IsRight(); } -void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetIsRight( - void* Instance, - const bool bRightHanded) -{ - StaticCast(Instance)->SenseGloveHandProfileImpl.SetIsRight(bRightHanded); -} - void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetInterpolationSet( void* Instance, void* OutSet) @@ -5321,14 +4990,6 @@ void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetInterpolationSet( StaticCast(Instance)->SenseGloveHandProfileImpl.GetInterpolationSet(); } -void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetInterpolationSet( - void* Instance, - void* InterpolationSet) -{ - StaticCast(Instance)->SenseGloveHandProfileImpl.SetInterpolationSet( - StaticCast(InterpolationSet)->HandInterpolatorImpl); -} - void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetThumbSolver( void* Instance, void* OutSolver) @@ -5337,14 +4998,6 @@ void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetThumbSolver( StaticCast(Instance)->SenseGloveHandProfileImpl.GetThumbSolver(); } -void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetThumbSolver( - void* Instance, - void* ThumbSolver) -{ - StaticCast(Instance)->SenseGloveHandProfileImpl.SetThumbSolver( - StaticCast(ThumbSolver)->Solver); -} - void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetFingerSolver( void* Instance, void* OutSolver) @@ -5353,14 +5006,6 @@ void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetFingerSolver( StaticCast(Instance)->SenseGloveHandProfileImpl.GetFingerSolver(); } -void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetFingerSolver( - void* Instance, - void* FingerSolver) -{ - StaticCast(Instance)->SenseGloveHandProfileImpl.SetFingerSolver( - StaticCast(FingerSolver)->Solver); -} - void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetFingerThimbleOffset( void* Instance, void* OutOffset) @@ -5369,14 +5014,6 @@ void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetFingerThimbleOffset( StaticCast(Instance)->SenseGloveHandProfileImpl.GetFingerThimbleOffset(); } -void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetFingerThimbleOffset( - void* Instance, - void* FingerThimbleOffset) -{ - StaticCast(Instance)->SenseGloveHandProfileImpl.SetFingerThimbleOffset( - StaticCast(FingerThimbleOffset)->Array); -} - bool SGCoreImpl_FSGSenseGloveHandProfileImpl_Equals( void* Instance, void* SenseGloveHandProfileImpl) @@ -5483,14 +5120,6 @@ void SGCoreImpl_FSGSenseGloveInfoImpl_GetDeviceId( StaticCast(Instance)->SenseGloveInfoImpl.GetDeviceId(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetDeviceId( - void* Instance, - void* DeviceId) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetDeviceId( - StaticCast(DeviceId)->String); -} - void SGCoreImpl_FSGSenseGloveInfoImpl_GetHardwareVersion( void* Instance, void* OutVersion) @@ -5499,66 +5128,30 @@ void SGCoreImpl_FSGSenseGloveInfoImpl_GetHardwareVersion( StaticCast(Instance)->SenseGloveInfoImpl.GetHardwareVersion(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetHardwareVersion( - void* Instance, - void* HardwareVersion) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetHardwareVersion( - StaticCast(HardwareVersion)->String); -} - int32 SGCoreImpl_FSGSenseGloveInfoImpl_GetFirmwareVersion( void* Instance) { return StaticCast(Instance)->SenseGloveInfoImpl.GetFirmwareVersion(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetFirmwareVersion( - void* Instance, - const int32 FirmwareVersion) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetFirmwareVersion(FirmwareVersion); -} - int32 SGCoreImpl_FSGSenseGloveInfoImpl_GetSubFirmwareVersion( void* Instance) { return StaticCast(Instance)->SenseGloveInfoImpl.GetSubFirmwareVersion(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetSubFirmwareVersion( - void* Instance, - const int32 SubFirmwareVersion) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetSubFirmwareVersion(SubFirmwareVersion); -} - bool SGCoreImpl_FSGSenseGloveInfoImpl_IsRight( void* Instance) { return StaticCast(Instance)->SenseGloveInfoImpl.IsRight(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetIsRight( - void* Instance, - const bool bRightHanded) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetIsRight(bRightHanded); -} - int32 SGCoreImpl_FSGSenseGloveInfoImpl_GetNumberOfSensors( void* Instance) { return StaticCast(Instance)->SenseGloveInfoImpl.GetNumberOfSensors(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetNumberOfSensors( - void* Instance, - const int32 NumberOfSensors) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetNumberOfSensors(NumberOfSensors); -} - void SGCoreImpl_FSGSenseGloveInfoImpl_GetImuCorrection( void* Instance, void* OutCorrection) @@ -5567,14 +5160,6 @@ void SGCoreImpl_FSGSenseGloveInfoImpl_GetImuCorrection( StaticCast(Instance)->SenseGloveInfoImpl.GetImuCorrection(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetImuCorrection( - void* Instance, - void* ImuCorrection) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetImuCorrection( - StaticCast(ImuCorrection)->Quat); -} - void SGCoreImpl_FSGSenseGloveInfoImpl_GetStartPositions( void* Instance, void* OutPositions) @@ -5583,14 +5168,6 @@ void SGCoreImpl_FSGSenseGloveInfoImpl_GetStartPositions( StaticCast(Instance)->SenseGloveInfoImpl.GetStartPositions(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetStartPositions( - void* Instance, - void* StartPositions) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetStartPositions( - StaticCast(StartPositions)->Array); -} - void SGCoreImpl_FSGSenseGloveInfoImpl_GetStartRotations( void* Instance, void* OutRotations) @@ -5599,14 +5176,6 @@ void SGCoreImpl_FSGSenseGloveInfoImpl_GetStartRotations( StaticCast(Instance)->SenseGloveInfoImpl.GetStartRotations(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetStartRotations( - void* Instance, - void* StartRotations) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetStartRotations( - StaticCast(StartRotations)->Array); -} - void SGCoreImpl_FSGSenseGloveInfoImpl_GetGloveLengths( void* Instance, void* OutLengths) @@ -5615,14 +5184,6 @@ void SGCoreImpl_FSGSenseGloveInfoImpl_GetGloveLengths( StaticCast(Instance)->SenseGloveInfoImpl.GetGloveLengths(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetGloveLengths( - void* Instance, - void* GloveLengths) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetGloveLengths( - StaticCast(GloveLengths)->Array); -} - void SGCoreImpl_FSGSenseGloveInfoImpl_GetFunctions( void* Instance, void* OutFunctions) @@ -5631,14 +5192,6 @@ void SGCoreImpl_FSGSenseGloveInfoImpl_GetFunctions( StaticCast(Instance)->SenseGloveInfoImpl.GetFunctions(); } -void SGCoreImpl_FSGSenseGloveInfoImpl_SetFunctions( - void* Instance, - void* Functions) -{ - StaticCast(Instance)->SenseGloveInfoImpl.SetFunctions( - StaticCast(Functions)->Array); -} - void SGCoreImpl_FSGSenseGloveInfoImpl_GetStartPosition( void* Instance, void* OutPosition, @@ -5777,13 +5330,6 @@ bool SGCoreImpl_FSGSenseGlovePoseImpl_IsRight( return StaticCast(Instance)->SenseGlovePoseImpl.IsRight(); } -void SGCoreImpl_FSGSenseGlovePoseImpl_SetIsRight( - void* Instance, - const bool bRightGloveed) -{ - StaticCast(Instance)->SenseGlovePoseImpl.SetIsRight(bRightGloveed); -} - void SGCoreImpl_FSGSenseGlovePoseImpl_GetJointPositions( void* Instance, void* OutPositions) @@ -5792,14 +5338,6 @@ void SGCoreImpl_FSGSenseGlovePoseImpl_GetJointPositions( StaticCast(Instance)->SenseGlovePoseImpl.GetJointPositions(); } -void SGCoreImpl_FSGSenseGlovePoseImpl_SetJointPositions( - void* Instance, - void* JointPositions) -{ - StaticCast(Instance)->SenseGlovePoseImpl.SetJointPositions( - StaticCast(JointPositions)->Array); -} - void SGCoreImpl_FSGSenseGlovePoseImpl_GetJointRotations( void* Instance, void* OutRotations) @@ -5808,14 +5346,6 @@ void SGCoreImpl_FSGSenseGlovePoseImpl_GetJointRotations( StaticCast(Instance)->SenseGlovePoseImpl.GetJointRotations(); } -void SGCoreImpl_FSGSenseGlovePoseImpl_SetJointRotations( - void* Instance, - void* JointRotations) -{ - StaticCast(Instance)->SenseGlovePoseImpl.SetJointRotations( - StaticCast(JointRotations)->Array); -} - void SGCoreImpl_FSGSenseGlovePoseImpl_GetGloveAngles( void* Instance, void* OutAngles) @@ -5824,14 +5354,6 @@ void SGCoreImpl_FSGSenseGlovePoseImpl_GetGloveAngles( StaticCast(Instance)->SenseGlovePoseImpl.GetGloveAngles(); } -void SGCoreImpl_FSGSenseGlovePoseImpl_SetGloveAngles( - void* Instance, - void* GloveAngles) -{ - StaticCast(Instance)->SenseGlovePoseImpl.SetGloveAngles( - StaticCast(GloveAngles)->Array); -} - void SGCoreImpl_FSGSenseGlovePoseImpl_GetThimblePositions( void* Instance, void* OutPositions) @@ -5978,14 +5500,6 @@ void SGCoreImpl_FSGSenseGloveSensorDataImpl_GetSensorAngles( StaticCast(Instance)->SenseGloveSensorDataImpl.GetSensorAngles(); } -void SGCoreImpl_FSGSenseGloveSensorDataImpl_SetSensorAngles( - void* Instance, - void* SensorAngles) -{ - StaticCast(Instance)->SenseGloveSensorDataImpl.SetSensorAngles( - StaticCast(SensorAngles)->Array); -} - void SGCoreImpl_FSGSenseGloveSensorDataImpl_GetSensorAngles_Finger( void* Instance, void* OutAngles, @@ -6012,40 +5526,18 @@ void SGCoreImpl_FSGSenseGloveSensorDataImpl_GetImuRotation( StaticCast(Instance)->SenseGloveSensorDataImpl.GetImuRotation(); } -void SGCoreImpl_FSGSenseGloveSensorDataImpl_SetImuRotation( - void* Instance, - void* ImuRotation) -{ - StaticCast(Instance)->SenseGloveSensorDataImpl.SetImuRotation( - StaticCast(ImuRotation)->Quat); -} - int32 SGCoreImpl_FSGSenseGloveSensorDataImpl_GetParsedValues( void* Instance) { return StaticCast(Instance)->SenseGloveSensorDataImpl.GetParsedValues(); } -void SGCoreImpl_FSGSenseGloveSensorDataImpl_SetParsedValues( - void* Instance, - const int32 ParsedValues) -{ - StaticCast(Instance)->SenseGloveSensorDataImpl.SetParsedValues(ParsedValues); -} - bool SGCoreImpl_FSGSenseGloveSensorDataImpl_IsImuParsed( void* Instance) { return StaticCast(Instance)->SenseGloveSensorDataImpl.IsImuParsed(); } -void SGCoreImpl_FSGSenseGloveSensorDataImpl_SetImuParsed( - void* Instance, - const bool bImuParsed) -{ - StaticCast(Instance)->SenseGloveSensorDataImpl.SetImuParsed(bImuParsed); -} - bool SGCoreImpl_FSGSenseGloveSensorDataImpl_Equals( void* Instance, void* SenseGloveSensorDataImpl) @@ -6548,53 +6040,18 @@ void SGCoreImpl_FSGTimedBuzzCommandImpl_GetBaseCommand( StaticCast(Instance)->Ptr->GetBaseCommand(); } -void SGCoreImpl_FSGTimedBuzzCommandImpl_SetBaseCommand( - void* Instance, - void* BaseCommand) -{ - StaticCast(Instance)->Ptr->SetBaseCommand( - StaticCast(BaseCommand)->BuzzCommandImpl); -} - -int32 SGCoreImpl_FSGTimedBuzzCommandImpl_GetMagnitude( - void* Instance) -{ - return StaticCast(Instance)->Ptr->GetMagnitude(); -} - -void SGCoreImpl_FSGTimedBuzzCommandImpl_SetMagnitude( - void* Instance, - const int32 Magnitude) -{ - return StaticCast(Instance)->Ptr->SetMagnitude(Magnitude); -} - float SGCoreImpl_FSGTimedBuzzCommandImpl_GetDuration( void* Instance) { return StaticCast(Instance)->Ptr->GetDuration(); } -void SGCoreImpl_FSGTimedBuzzCommandImpl_SetDuration( - void* Instance, - const float Duration) -{ - return StaticCast(Instance)->Ptr->SetDuration(Duration); -} - float SGCoreImpl_FSGTimedBuzzCommandImpl_GetElapsedTime( void* Instance) { return StaticCast(Instance)->Ptr->GetElapsedTime(); } -void SGCoreImpl_FSGTimedBuzzCommandImpl_SetElapsedTime( - void* Instance, - const float ElapsedTime) -{ - return StaticCast(Instance)->Ptr->SetElapsedTime(ElapsedTime); -} - bool SGCoreImpl_FSGTimedBuzzCommandImpl_HasTimeElapsed( void* Instance) { @@ -6690,39 +6147,18 @@ int32 SGCoreImpl_FSGTimedThumpCommandImpl_GetMagnitude( return StaticCast(Instance)->TimedThumpCommandImpl.GetMagnitude(); } -void SGCoreImpl_FSGTimedThumpCommandImpl_SetMagnitude( - void* Instance, - const int32 Magnitude) -{ - StaticCast(Instance)->TimedThumpCommandImpl.SetMagnitude(Magnitude); -} - float SGCoreImpl_FSGTimedThumpCommandImpl_GetDuration( void* Instance) { return StaticCast(Instance)->TimedThumpCommandImpl.GetDuration(); } -void SGCoreImpl_FSGTimedThumpCommandImpl_SetDuration( - void* Instance, - const float Duration) -{ - StaticCast(Instance)->TimedThumpCommandImpl.SetDuration(Duration); -} - float SGCoreImpl_FSGTimedThumpCommandImpl_GetElapsedTime( void* Instance) { return StaticCast(Instance)->TimedThumpCommandImpl.GetElapsedTime(); } -void SGCoreImpl_FSGTimedThumpCommandImpl_SetElapsedTime( - void* Instance, - const float ElapsedTime) -{ - StaticCast(Instance)->TimedThumpCommandImpl.SetElapsedTime(ElapsedTime); -} - bool SGCoreImpl_FSGTimedThumpCommandImpl_HasTimeElapsed( void* Instance) { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGFingerCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGFingerCommandImpl.cpp index a7638ee7..8e07c0ba 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGFingerCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGFingerCommandImpl.cpp @@ -213,12 +213,6 @@ TArray FSGFingerCommandImpl::GetLevels() const return FSGArrayUtils::FromStdVector(Pimpl->FingerCommand->GetLevels()); } -void FSGFingerCommandImpl::SetLevels(const TArray& Levels) -{ - std::vector LevelsVector{FSGArrayUtils::ToStdVector(Levels)}; - Pimpl->FingerCommand->SetLevels(MoveTemp(LevelsVector)); -} - int32 FSGFingerCommandImpl::GetLevel(const int32 Finger) const { return Pimpl->FingerCommand->GetLevel(Finger); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp index 45a5f6e9..4cd4f76a 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp @@ -231,23 +231,11 @@ TArray> FSGHandInterpolatorImpl::GetJointInterpo return JointInterpolations; } -void FSGHandInterpolatorImpl::SetJointInterpolations(const TArray>& JointInterpolations) -{ - Pimpl->HandInterpolator.SetJointInterpolations( - FSGArrayUtils::ToStdVector(JointInterpolations)); -} - FQuat FSGHandInterpolatorImpl::GetCmcStartRotation() const { return FSGQuatImpl(Pimpl->HandInterpolator.GetCmcStartRotation()).ToFQuat(); } -void FSGHandInterpolatorImpl::SetCmcStartRotation(const FQuat& CmcStartRotation) -{ - Pimpl->HandInterpolator.SetCmcStartRotation(FSGQuatImpl(CmcStartRotation).ToQuat()); -} - float FSGHandInterpolatorImpl::CalculateAngle(const ESGFinger Finger, const int32 Movement, const float Value) const { return FSGCoordinates::TransformToUnreal( diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp index 0a185e2b..0edd204d 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp @@ -232,11 +232,6 @@ bool FSGHandPoseImpl::IsRight() const return Pimpl->HandPose.IsRight(); } -void FSGHandPoseImpl::SetIsRight(const bool bRightHanded) const -{ - Pimpl->HandPose.SetIsRight(bRightHanded); -} - TArray> FSGHandPoseImpl::GetJointPositions() const { TArray> JointPositions{ @@ -246,15 +241,6 @@ TArray> FSGHandPoseImpl::GetJointPositions() const return MoveTemp(JointPositions); } -void FSGHandPoseImpl::SetJointPositions(const TArray>& JointPositions) const -{ - std::vector> JointPositionsVector{ - FSGArrayUtils::ToMillimeters( - JointPositions) - }; - Pimpl->HandPose.SetJointPositions(MoveTemp(JointPositionsVector)); -} - TArray> FSGHandPoseImpl::GetJointRotations() const { TArray> JointRotations{ @@ -264,15 +250,6 @@ TArray> FSGHandPoseImpl::GetJointRotations() const return MoveTemp(JointRotations); } -void FSGHandPoseImpl::SetJointRotations(const TArray>& JointRotations) const -{ - std::vector> JointRotationsVector{ - FSGArrayUtils::ToStdVector( - JointRotations) - }; - Pimpl->HandPose.SetJointRotations(MoveTemp(JointRotationsVector)); -} - TArray> FSGHandPoseImpl::GetHandAngles() const { TArray> HandAngles{ @@ -281,14 +258,6 @@ TArray> FSGHandPoseImpl::GetHandAngles() const return MoveTemp(HandAngles); } -void FSGHandPoseImpl::SetHandAngles(const TArray>& HandAngles) const -{ - std::vector> HandAnglesVector{ - FSGArrayUtils::ToSenseGloveAngles(HandAngles) - }; - Pimpl->HandPose.SetHandAngles(MoveTemp(HandAnglesVector)); -} - bool FSGHandPoseImpl::Equals(const FSGHandPoseImpl& HandPoseImpl) const { return Pimpl->HandPose.Equals(HandPoseImpl.ToHandPose()); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandProfileImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandProfileImpl.cpp index fe6d40e4..3e51dc5c 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandProfileImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandProfileImpl.cpp @@ -218,31 +218,16 @@ bool FSGHandProfileImpl::IsRight() const return Pimpl->HandProfile.IsRight(); } -void FSGHandProfileImpl::SetIsRight(const bool bRightHanded) const -{ - Pimpl->HandProfile.SetIsRight(bRightHanded); -} - FSGSenseGloveHandProfileImpl FSGHandProfileImpl::GetSenseGloveHandProfile() const { return FSGSenseGloveHandProfileImpl(Pimpl->HandProfile.GetSenseGloveHandProfile()); } -void FSGHandProfileImpl::SetSenseGloveHandProfile(const FSGSenseGloveHandProfileImpl& SenseGloveHandProfile) -{ - Pimpl->HandProfile.SetSenseGloveHandProfile(SenseGloveHandProfile.ToSenseGloveHandProfile()); -} - FSGNovaGloveHandProfileImpl FSGHandProfileImpl::GetNovaGloveHandProfile() const { return FSGNovaGloveHandProfileImpl(Pimpl->HandProfile.GetNovaGloveHandProfile()); } -void FSGHandProfileImpl::SetNovaGloveHandProfile(const FSGNovaGloveHandProfileImpl& NovaGloveHandProfile) -{ - Pimpl->HandProfile.SetNovaGloveHandProfile(NovaGloveHandProfile.ToNovaGloveHandProfile()); -} - bool FSGHandProfileImpl::Equals(const FSGHandProfileImpl& HandProfileImpl) const { return Pimpl->HandProfile.Equals(HandProfileImpl.ToHandProfile()); @@ -269,4 +254,4 @@ FSGHandProfileImpl::FImpl::~FImpl() = default; void FSGHandProfileImpl::FImplDeleter::operator()(const FImpl* P) const { delete P; -} +} \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.cpp index 52463858..4a140542 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.cpp @@ -231,16 +231,6 @@ FSGHapticGloveCalibrationCheckImpl::ToHapticGloveCalibrationCheck() const return Pimpl->HapticGloveCalibrationCheck; } -FSGSensorRangeImpl FSGHapticGloveCalibrationCheckImpl::GetLastSensorRange() const -{ - return FSGSensorRangeImpl{Pimpl->HapticGloveCalibrationCheck.GetLastSensorRange()}; -} - -void FSGHapticGloveCalibrationCheckImpl::SetLastSensorRange(const FSGSensorRangeImpl& LastSensorRange) -{ - Pimpl->HapticGloveCalibrationCheck.SetLastSensorRange(LastSensorRange.ToSensorRange()); -} - ESGCalibrationStage FSGHapticGloveCalibrationCheckImpl::GetCalibrationStage() const { return FSGCoreEnumCast::ToESGCalibrationStage(Pimpl->HapticGloveCalibrationCheck.GetCalibrationStage()); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCommandBufferImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCommandBufferImpl.cpp index 043672e1..23253def 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCommandBufferImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCommandBufferImpl.cpp @@ -170,16 +170,6 @@ TArray FSGHapticGloveCommandBufferImpl::GetForceFee return MoveTemp(ForceFeedbackCommandQueue); } -void FSGHapticGloveCommandBufferImpl::SetForceFeedbackCommandsQueue( - const TArray& ForceFeedbackCommandsQueue) -{ - std::vector ForceFeedbackCommandsQueueVector{ - FSGArrayUtils::ToStdVector(ForceFeedbackCommandsQueue) - }; - Pimpl->HapticGloveCommandBuffer.SetForceFeedbackCommandsQueue(MoveTemp(ForceFeedbackCommandsQueueVector)); -} - TArray FSGHapticGloveCommandBufferImpl::GetBuzzCommandsQueue() const { TArray TimedBuzzCommandQueue{ @@ -189,16 +179,6 @@ TArray FSGHapticGloveCommandBufferImpl::GetBuzzCommands return MoveTemp(TimedBuzzCommandQueue); } -void FSGHapticGloveCommandBufferImpl::SetBuzzCommandsQueue( - const TArray& TimedBuzzCommandsQueue) -{ - std::vector TimedBuzzCommandsQueueVector{ - FSGArrayUtils::ToStdVector(TimedBuzzCommandsQueue) - }; - Pimpl->HapticGloveCommandBuffer.SetBuzzCommandsQueue(MoveTemp(TimedBuzzCommandsQueueVector)); -} - TArray FSGHapticGloveCommandBufferImpl::GetThumperCommandsQueue() const { TArray ThumperCommandQueue{ @@ -208,16 +188,6 @@ TArray FSGHapticGloveCommandBufferImpl::GetThumperComm return MoveTemp(ThumperCommandQueue); } -void FSGHapticGloveCommandBufferImpl::SetThumperCommandsQueue( - const TArray& TimedThumpCommandsQueue) -{ - std::vector TimedThumpCommandsQueueVector{ - FSGArrayUtils::ToStdVector(TimedThumpCommandsQueue) - }; - Pimpl->HapticGloveCommandBuffer.SetThumperCommandsQueue(MoveTemp(TimedThumpCommandsQueueVector)); -} - void FSGHapticGloveCommandBufferImpl::ClearForceFeedbackCommandsQueue() { Pimpl->HapticGloveCommandBuffer.ClearForceFeedbackCommandsQueue(); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.cpp index b6f6052d..50c5340f 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.cpp @@ -171,11 +171,6 @@ float FSGHapticGloveQuickCalibrationImpl::GetAutoEndTimeout() const return ToHapticGloveQuickCalibrationRef()->GetAutoEndTimeout(); } -void FSGHapticGloveQuickCalibrationImpl::SetAutoEndTimeout(const float AutoEndTimeout) -{ - ToHapticGloveQuickCalibrationRef()->SetAutoEndTimeout(AutoEndTimeout); -} - int32 FSGHapticGloveQuickCalibrationImpl::GetSmoothingSamples() const { return ToHapticGloveQuickCalibrationRef()->GetSmoothingSamples(); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveHandProfileImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveHandProfileImpl.cpp index 9b32b5c3..b590fa40 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveHandProfileImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveHandProfileImpl.cpp @@ -163,11 +163,6 @@ bool FSGNovaGloveHandProfileImpl::IsRight() const return Pimpl->NovaGloveHandProfile.IsRight(); } -void FSGNovaGloveHandProfileImpl::SetIsRight(const bool bRightHanded) -{ - Pimpl->NovaGloveHandProfile.SetIsRight(bRightHanded); -} - FSGHandInterpolatorImpl FSGNovaGloveHandProfileImpl::GetInterpolationSet() const { const FSGHandInterpolatorImpl HandInterpolatorImpl( @@ -175,11 +170,6 @@ FSGHandInterpolatorImpl FSGNovaGloveHandProfileImpl::GetInterpolationSet() const return HandInterpolatorImpl; } -void FSGNovaGloveHandProfileImpl::SetInterpolationSet(const FSGHandInterpolatorImpl& InterpolationSet) -{ - Pimpl->NovaGloveHandProfile.SetInterpolationSet(InterpolationSet.ToHandInterpolator()); -} - bool FSGNovaGloveHandProfileImpl::Equals(const FSGNovaGloveHandProfileImpl& NovaGloveHandProfileImpl) const { return Pimpl->NovaGloveHandProfile.Equals(NovaGloveHandProfileImpl.ToNovaGloveHandProfile()); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveInfoImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveInfoImpl.cpp index 16917d36..b93a7dfd 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveInfoImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveInfoImpl.cpp @@ -177,73 +177,38 @@ FString FSGNovaGloveInfoImpl::GetDeviceId() const return DeviceId; } -void FSGNovaGloveInfoImpl::SetDeviceId(const FString& DeviceId) -{ - return Pimpl->NovaGloveInfo.SetDeviceId(TCHAR_TO_UTF8(*DeviceId)); -} - FString FSGNovaGloveInfoImpl::GetHardwareVersion() const { const FString HardwareVersion(UTF8_TO_TCHAR(Pimpl->NovaGloveInfo.GetHardwareVersion().c_str())); return HardwareVersion; } -void FSGNovaGloveInfoImpl::SetHardwareVersion(const FString& HardwareVersion) -{ - Pimpl->NovaGloveInfo.SetHardwareVersion(TCHAR_TO_UTF8(*HardwareVersion)); -} - int32 FSGNovaGloveInfoImpl::GetFirmwareVersion() const { return Pimpl->NovaGloveInfo.GetFirmwareVersion(); } -void FSGNovaGloveInfoImpl::SetFirmwareVersion(const int32 FirmwareVersion) -{ - Pimpl->NovaGloveInfo.SetFirmwareVersion(FirmwareVersion); -} - int32 FSGNovaGloveInfoImpl::GetSubFirmwareVersion() const { return Pimpl->NovaGloveInfo.GetSubFirmwareVersion(); } -void FSGNovaGloveInfoImpl::SetSubFirmwareVersion(const int32 SubFirmwareVersion) -{ - Pimpl->NovaGloveInfo.SetSubFirmwareVersion(SubFirmwareVersion); -} - bool FSGNovaGloveInfoImpl::IsRight() const { return Pimpl->NovaGloveInfo.IsRight(); } -void FSGNovaGloveInfoImpl::SetIsRight(const bool bRightHanded) -{ - Pimpl->NovaGloveInfo.SetIsRight(bRightHanded); -} - FQuat FSGNovaGloveInfoImpl::GetImuCorrection() const { const FQuat ImuCorrection(FSGQuatImpl(Pimpl->NovaGloveInfo.GetImuCorrection()).ToFQuat()); return ImuCorrection; } -void FSGNovaGloveInfoImpl::SetImuCorrection(const FQuat& ImuCorrection) -{ - Pimpl->NovaGloveInfo.SetImuCorrection(FSGQuatImpl(ImuCorrection).ToQuat()); -} - int32 FSGNovaGloveInfoImpl::GetNumberOfSensors() const { return Pimpl->NovaGloveInfo.GetNumberOfSensors(); } -void FSGNovaGloveInfoImpl::SetNumberOfSensors(const int32 NumberOfSensors) -{ - Pimpl->NovaGloveInfo.SetNumberOfSensors(NumberOfSensors); -} - bool FSGNovaGloveInfoImpl::Equals(const FSGNovaGloveInfoImpl& SGNovaGloveInfo) const { return Pimpl->NovaGloveInfo.Equals(SGNovaGloveInfo.ToNovaGloveInfo()); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp index dbac89fd..c3623216 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp @@ -188,65 +188,31 @@ TArray FSGNovaGloveSensorDataImpl::GetSensorValues() const return MoveTemp(SensorValues); } -void FSGNovaGloveSensorDataImpl::SetSensorValues(const TArray& SensorValues) const -{ - std::vector SensorValuesVector{ - FSGArrayUtils::ToStdVector( - SensorValues) - }; - Pimpl->NovaGloveSensorData.SetSensorValues(MoveTemp(SensorValuesVector)); -} - FQuat FSGNovaGloveSensorDataImpl::GetImuRotation() const { return FSGQuatImpl(Pimpl->NovaGloveSensorData.GetImuRotation()).ToFQuat(); } -void FSGNovaGloveSensorDataImpl::SetImuRotation(const FQuat& ImuRotation) -{ - Pimpl->NovaGloveSensorData.SetImuRotation(FSGQuatImpl(ImuRotation).ToQuat()); -} - int32 FSGNovaGloveSensorDataImpl::GetParsedValues() const { return Pimpl->NovaGloveSensorData.GetParsedValues(); } -void FSGNovaGloveSensorDataImpl::SetParsedValues(const int32 ParsedValues) -{ - Pimpl->NovaGloveSensorData.SetParsedValues(ParsedValues); -} - bool FSGNovaGloveSensorDataImpl::IsImuParsed() const { return Pimpl->NovaGloveSensorData.IsImuParsed(); } -void FSGNovaGloveSensorDataImpl::SetImuParsed(const bool bImuParsed) -{ - Pimpl->NovaGloveSensorData.SetImuParsed(bImuParsed); -} - float FSGNovaGloveSensorDataImpl::GetBatteryLevel() const { return Pimpl->NovaGloveSensorData.GetBatteryLevel(); } -void FSGNovaGloveSensorDataImpl::SetBatteryLevel(const float BatteryLevel) -{ - Pimpl->NovaGloveSensorData.SetBatteryLevel(BatteryLevel); -} - bool FSGNovaGloveSensorDataImpl::IsCharging() const { return Pimpl->NovaGloveSensorData.IsCharging(); } -void FSGNovaGloveSensorDataImpl::SetIsCharging(const bool bCharging) -{ - Pimpl->NovaGloveSensorData.SetIsCharging(bCharging); -} - bool FSGNovaGloveSensorDataImpl::Equals(const FSGNovaGloveSensorDataImpl& NovaGloveSensorDataImpl) const { return Pimpl->NovaGloveSensorData.Equals(NovaGloveSensorDataImpl.ToNovaGloveSensorData()); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveHandProfileImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveHandProfileImpl.cpp index b77f1465..6d2ce951 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveHandProfileImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveHandProfileImpl.cpp @@ -184,11 +184,6 @@ bool FSGSenseGloveHandProfileImpl::IsRight() const return Pimpl->SenseGloveHandProfile.IsRight(); } -void FSGSenseGloveHandProfileImpl::SetIsRight(const bool bRightHanded) -{ - Pimpl->SenseGloveHandProfile.SetIsRight(bRightHanded); -} - FSGHandInterpolatorImpl FSGSenseGloveHandProfileImpl::GetInterpolationSet() const { const FSGHandInterpolatorImpl HandInterpolatorImpl( @@ -196,31 +191,16 @@ FSGHandInterpolatorImpl FSGSenseGloveHandProfileImpl::GetInterpolationSet() cons return HandInterpolatorImpl; } -void FSGSenseGloveHandProfileImpl::SetInterpolationSet(const FSGHandInterpolatorImpl& InterpolationSet) -{ - Pimpl->SenseGloveHandProfile.SetInterpolationSet(InterpolationSet.ToHandInterpolator()); -} - ESGThumbSolver FSGSenseGloveHandProfileImpl::GetThumbSolver() const { return FSGCoreEnumCast::ToESGThumbSolver(Pimpl->SenseGloveHandProfile.GetThumbSolver()); } -void FSGSenseGloveHandProfileImpl::SetThumbSolver(const ESGThumbSolver ThumbSolver) -{ - Pimpl->SenseGloveHandProfile.SetThumbSolver(FSGCoreEnumCast::ToEThumbSolver(ThumbSolver)); -} - ESGFingerSolver FSGSenseGloveHandProfileImpl::GetFingerSolver() const { return FSGCoreEnumCast::ToESGFingerSolver(Pimpl->SenseGloveHandProfile.GetFingerSolver()); } -void FSGSenseGloveHandProfileImpl::SetFingerSolver(const ESGFingerSolver FingerSolver) -{ - Pimpl->SenseGloveHandProfile.SetFingerSolver(FSGCoreEnumCast::ToEFingerSolver(FingerSolver)); -} - TArray FSGSenseGloveHandProfileImpl::GetFingerThimbleOffset() const { const TArray FingerThimbleOffset{ @@ -230,14 +210,6 @@ TArray FSGSenseGloveHandProfileImpl::GetFingerThimbleOffset() const return FingerThimbleOffset; } -void FSGSenseGloveHandProfileImpl::SetFingerThimbleOffset(const TArray& FingerThimbleOffset) -{ - std::vector FingerThimbleOffsetVector{ - FSGArrayUtils::ToMillimeters(FingerThimbleOffset) - }; - Pimpl->SenseGloveHandProfile.SetFingerThimbleOffset(MoveTemp(FingerThimbleOffsetVector)); -} - bool FSGSenseGloveHandProfileImpl::Equals(const FSGSenseGloveHandProfileImpl& SenseGloveHandProfileImpl) const { return Pimpl->SenseGloveHandProfile.Equals(SenseGloveHandProfileImpl.ToSenseGloveHandProfile()); @@ -264,4 +236,4 @@ FSGSenseGloveHandProfileImpl::FImpl::~FImpl() = default; void FSGSenseGloveHandProfileImpl::FImplDeleter::operator()(const FImpl* P) const { delete P; -} +} \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp index 12c4ce96..758d39b6 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp @@ -203,73 +203,38 @@ FString FSGSenseGloveInfoImpl::GetDeviceId() const return MoveTemp(DeviceId); } -void FSGSenseGloveInfoImpl::SetDeviceId(const FString& DeviceId) -{ - return Pimpl->SenseGloveInfo.SetDeviceId(TCHAR_TO_UTF8(*DeviceId)); -} - FString FSGSenseGloveInfoImpl::GetHardwareVersion() const { FString HardwareVersion(UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.GetHardwareVersion().c_str())); return MoveTemp(HardwareVersion); } -void FSGSenseGloveInfoImpl::SetHardwareVersion(const FString& HardwareVersion) -{ - Pimpl->SenseGloveInfo.SetHardwareVersion(TCHAR_TO_UTF8(*HardwareVersion)); -} - int32 FSGSenseGloveInfoImpl::GetFirmwareVersion() const { return Pimpl->SenseGloveInfo.GetFirmwareVersion(); } -void FSGSenseGloveInfoImpl::SetFirmwareVersion(const int32 FirmwareVersion) -{ - Pimpl->SenseGloveInfo.SetFirmwareVersion(FirmwareVersion); -} - int32 FSGSenseGloveInfoImpl::GetSubFirmwareVersion() const { return Pimpl->SenseGloveInfo.GetSubFirmwareVersion(); } -void FSGSenseGloveInfoImpl::SetSubFirmwareVersion(const int32 SubFirmwareVersion) -{ - Pimpl->SenseGloveInfo.SetSubFirmwareVersion(SubFirmwareVersion); -} - bool FSGSenseGloveInfoImpl::IsRight() const { return Pimpl->SenseGloveInfo.IsRight(); } -void FSGSenseGloveInfoImpl::SetIsRight(const bool bRightHanded) -{ - Pimpl->SenseGloveInfo.SetIsRight(bRightHanded); -} - int32 FSGSenseGloveInfoImpl::GetNumberOfSensors() const { return Pimpl->SenseGloveInfo.GetNumberOfSensors(); } -void FSGSenseGloveInfoImpl::SetNumberOfSensors(const int32 NumberOfSensors) -{ - Pimpl->SenseGloveInfo.SetNumberOfSensors(NumberOfSensors); -} - FQuat FSGSenseGloveInfoImpl::GetImuCorrection() const { FQuat ImuCorrection(FSGQuatImpl(Pimpl->SenseGloveInfo.GetImuCorrection()).ToFQuat()); return MoveTemp(ImuCorrection); } -void FSGSenseGloveInfoImpl::SetImuCorrection(const FQuat& ImuCorrection) -{ - Pimpl->SenseGloveInfo.SetImuCorrection(FSGQuatImpl(ImuCorrection).ToQuat()); -} - TArray FSGSenseGloveInfoImpl::GetStartPositions() const { TArray StartPositionsArray{ @@ -278,14 +243,6 @@ TArray FSGSenseGloveInfoImpl::GetStartPositions() const return MoveTemp(StartPositionsArray); } -void FSGSenseGloveInfoImpl::SetStartPositions(const TArray& StartPositions) -{ - std::vector StartPositionsVector{ - FSGArrayUtils::ToMillimeters(StartPositions) - }; - Pimpl->SenseGloveInfo.SetStartPositions(MoveTemp(StartPositionsVector)); -} - TArray FSGSenseGloveInfoImpl::GetStartRotations() const { TArray StartRotationsArray{ @@ -294,15 +251,6 @@ TArray FSGSenseGloveInfoImpl::GetStartRotations() const return MoveTemp(StartRotationsArray); } -void FSGSenseGloveInfoImpl::SetStartRotations(const TArray& StartRotations) -{ - std::vector StartRotationsVector{ - FSGArrayUtils::ToStdVector( - StartRotations) - }; - Pimpl->SenseGloveInfo.SetStartRotations(MoveTemp(StartRotationsVector)); -} - TArray> FSGSenseGloveInfoImpl::GetGloveLengths() const { TArray> GloveLengths{ @@ -312,26 +260,12 @@ TArray> FSGSenseGloveInfoImpl::GetGloveLengths() const return MoveTemp(GloveLengths); } -void FSGSenseGloveInfoImpl::SetGloveLengths(const TArray>& GloveLengths) const -{ - std::vector> GloveLengthsVector{ - FSGArrayUtils::ToMillimeters(GloveLengths) - }; - Pimpl->SenseGloveInfo.SetGloveLengths(MoveTemp(GloveLengthsVector)); -} - TArray FSGSenseGloveInfoImpl::GetFunctions() const { TArray FunctionsArray{FSGArrayUtils::FromStdVector(Pimpl->SenseGloveInfo.GetFunctions())}; return MoveTemp(FunctionsArray); } -void FSGSenseGloveInfoImpl::SetFunctions(const TArray& Functions) const -{ - std::vector FunctionsVector{FSGArrayUtils::ToStdVector(Functions)}; - Pimpl->SenseGloveInfo.SetFunctions(MoveTemp(FunctionsVector)); -} - FVector FSGSenseGloveInfoImpl::GetStartPosition(const ESGFinger Finger) const { FVector StartPosition{FSGUnits::MillimetersToCentimeters( diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp index 70cd7459..4200e914 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp @@ -181,11 +181,6 @@ bool FSGSenseGlovePoseImpl::IsRight() const return Pimpl->SenseGlovePose.IsRight(); } -void FSGSenseGlovePoseImpl::SetIsRight(const bool bRightHanded) const -{ - Pimpl->SenseGlovePose.SetIsRight(bRightHanded); -} - TArray> FSGSenseGlovePoseImpl::GetJointPositions() const { TArray> JointPositions{ @@ -195,14 +190,6 @@ TArray> FSGSenseGlovePoseImpl::GetJointPositions() const return MoveTemp(JointPositions); } -void FSGSenseGlovePoseImpl::SetJointPositions(const TArray>& JointPositions) const -{ - std::vector> JointPositionsVector{ - FSGArrayUtils::ToMillimeters(JointPositions) - }; - Pimpl->SenseGlovePose.SetJointPositions(MoveTemp(JointPositionsVector)); -} - TArray> FSGSenseGlovePoseImpl::GetJointRotations() const { TArray> JointRotations{ @@ -212,15 +199,6 @@ TArray> FSGSenseGlovePoseImpl::GetJointRotations() const return MoveTemp(JointRotations); } -void FSGSenseGlovePoseImpl::SetJointRotations(const TArray>& JointRotations) const -{ - std::vector> JointRotationsVector{ - FSGArrayUtils::ToStdVector( - JointRotations) - }; - Pimpl->SenseGlovePose.SetJointRotations(MoveTemp(JointRotationsVector)); -} - TArray> FSGSenseGlovePoseImpl::GetGloveAngles() const { TArray> GloveAngles{ @@ -230,15 +208,6 @@ TArray> FSGSenseGlovePoseImpl::GetGloveAngles() const return MoveTemp(GloveAngles); } -void FSGSenseGlovePoseImpl::SetGloveAngles(const TArray>& GloveAngles) const -{ - std::vector> HandAnglesVector{ - FSGArrayUtils::ToSenseGloveAngles( - GloveAngles) - }; - Pimpl->SenseGlovePose.SetGloveAngles(MoveTemp(HandAnglesVector)); -} - TArray FSGSenseGlovePoseImpl::GetThimblePositions() const { TArray ThimblePositions{ diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp index d76bb6f5..002c505d 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp @@ -182,12 +182,6 @@ TArray> FSGSenseGloveSensorDataImpl::GetSensorAngles() const return MoveTemp(SensorAngles); } -void FSGSenseGloveSensorDataImpl::SetSensorAngles(const TArray>& SensorAngles) -{ - std::vector> SensorAnglesVector{FSGArrayUtils::ToStdVector(SensorAngles)}; - Pimpl->SenseGloveSensorData.SetSensorAngles(MoveTemp(SensorAnglesVector)); -} - TArray FSGSenseGloveSensorDataImpl::GetSensorAngles(ESGFinger Finger) const { TArray SensorAngles{ @@ -210,31 +204,16 @@ FQuat FSGSenseGloveSensorDataImpl::GetImuRotation() const return FSGQuatImpl(Pimpl->SenseGloveSensorData.GetImuRotation()).ToFQuat(); } -void FSGSenseGloveSensorDataImpl::SetImuRotation(const FQuat& ImuRotation) -{ - Pimpl->SenseGloveSensorData.SetImuRotation(FSGQuatImpl{ImuRotation}.ToQuat()); -} - int32 FSGSenseGloveSensorDataImpl::GetParsedValues() const { return Pimpl->SenseGloveSensorData.GetParsedValues(); } -void FSGSenseGloveSensorDataImpl::SetParsedValues(const int32 ParsedValues) -{ - Pimpl->SenseGloveSensorData.SetParsedValues(ParsedValues); -} - bool FSGSenseGloveSensorDataImpl::IsImuParsed() const { return Pimpl->SenseGloveSensorData.IsImuParsed(); } -void FSGSenseGloveSensorDataImpl::SetImuParsed(bool bImuParsed) -{ - Pimpl->SenseGloveSensorData.SetImuParsed(bImuParsed); -} - bool FSGSenseGloveSensorDataImpl::Equals(const FSGSenseGloveSensorDataImpl& SenseGloveSensorDataImpl) const { return Pimpl->SenseGloveSensorData.Equals(SenseGloveSensorDataImpl.ToSenseGloveSensorData()); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedBuzzCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedBuzzCommandImpl.cpp index cf9377ab..13559919 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedBuzzCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedBuzzCommandImpl.cpp @@ -189,41 +189,16 @@ FSGBuzzCommandImpl FSGTimedBuzzCommandImpl::GetBaseCommand() const return FSGBuzzCommandImpl{MakeShared(ToTimedBuzzCommandRef()->GetBaseCommand())}; } -void FSGTimedBuzzCommandImpl::SetBaseCommand(const FSGBuzzCommandImpl& BaseCommand) -{ - ToTimedBuzzCommandRef()->SetBaseCommand(BaseCommand.ToBuzzCommand()); -} - -int32 FSGTimedBuzzCommandImpl::GetMagnitude() const -{ - return ToTimedBuzzCommandRef()->GetMagnitude(); -} - -void FSGTimedBuzzCommandImpl::SetMagnitude(const int32 Magnitude) -{ - ToTimedBuzzCommandRef()->SetMagnitude(Magnitude); -} - float FSGTimedBuzzCommandImpl::GetDuration() const { return ToTimedBuzzCommandRef()->GetDuration(); } -void FSGTimedBuzzCommandImpl::SetDuration(const float Duration) -{ - ToTimedBuzzCommandRef()->SetDuration(Duration); -} - float FSGTimedBuzzCommandImpl::GetElapsedTime() const { return ToTimedBuzzCommandRef()->GetElapsedTime(); } -void FSGTimedBuzzCommandImpl::SetElapsedTime(const float ElapsedTime) -{ - ToTimedBuzzCommandRef()->SetElapsedTime(ElapsedTime); -} - bool FSGTimedBuzzCommandImpl::HasTimeElapsed() const { return ToTimedBuzzCommandRef()->HasTimeElapsed(); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedThumpCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedThumpCommandImpl.cpp index 6ce44f2d..084f4c82 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedThumpCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedThumpCommandImpl.cpp @@ -158,31 +158,16 @@ int32 FSGTimedThumpCommandImpl::GetMagnitude() const return Pimpl->TimedThumpCommand.GetMagnitude(); } -void FSGTimedThumpCommandImpl::SetMagnitude(const int32 Magnitude) -{ - Pimpl->TimedThumpCommand.SetMagnitude(Magnitude); -} - float FSGTimedThumpCommandImpl::GetDuration() const { return Pimpl->TimedThumpCommand.GetDuration(); } -void FSGTimedThumpCommandImpl::SetDuration(const float Duration) -{ - Pimpl->TimedThumpCommand.SetDuration(Duration); -} - float FSGTimedThumpCommandImpl::GetElapsedTime() const { return Pimpl->TimedThumpCommand.GetElapsedTime(); } -void FSGTimedThumpCommandImpl::SetElapsedTime(const float ElapsedTime) -{ - Pimpl->TimedThumpCommand.SetElapsedTime(ElapsedTime); -} - bool FSGTimedThumpCommandImpl::HasTimeElapsed() const { return Pimpl->TimedThumpCommand.HasTimeElapsed(); diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h index c7f510bd..271d4cf3 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h @@ -139,11 +139,9 @@ public: public: bool IsRight() const; - void SetIsRight(bool bRightHanded); public: TArray> GetFingerLengths() const; - void SetFingerLengths(const TArray>& FingerLengths); TArray GetFingerLengths(ESGFinger Finger) const; @@ -156,13 +154,11 @@ public: TArray GetFingerRatios(ESGFinger Finger) const; TArray GetStartJointPositions() const; - void SetStartJointPositions(const TArray& StartJointPositions); void SetStartJointPosition(ESGFinger Finger, const FVector& Position); void SetStartJointPosition(uint8 Finger, const FVector& Position); TArray GetStartJointRotations() const; - void SetStartJointRotations(const TArray& StartJointRotations); FVector GetJointPosition(ESGFinger Finger) const; @@ -188,4 +184,4 @@ public: FString ToString(bool bLengthsOnly) const; FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h index a880eb05..55f5394a 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h @@ -154,4 +154,4 @@ public: virtual FSGBuzzCommandImpl Copy() const; virtual FSGBuzzCommandImpl Merge(const FSGBuzzCommandImpl& Command) const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h index 0740b8ef..42cea2a9 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h @@ -121,12 +121,8 @@ public: public: TArray GetCalibrationValues() const; - void SetCalibrationValues(const TArray& CalibrationValues); - int32 GetStage() const; - void SetStage(int32 Stage); - public: FString ToLogData(const FString& Delimiter = "\t") const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h index 486acddc..94dd4b3f 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h @@ -189,4 +189,4 @@ public: virtual bool GetBatteryLevel(float& OutLevel); virtual FString ToString() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceListImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceListImpl.h index d94c9763..1706fa46 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceListImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceListImpl.h @@ -101,4 +101,4 @@ public: public: FSGDeviceListImpl() = delete; virtual ~FSGDeviceListImpl() = delete; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h index 2f81c8f9..af569822 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h @@ -123,14 +123,10 @@ public: public: FString GetDeviceId() const; - void SetDeviceId(const FString& Id) const; FString GetHardwareVersion() const; - void SetHardwareVersion(const FString& Version) const; int32 GetFirmwareVersion() const; - void SetFirmwareVersion(int32 Version) const; int32 GetSubFirmwareVersion() const; - void SetSubFirmwareVersion(int32 Version) const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGExportedFunctions.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGExportedFunctions.h index b0154d49..2ef3d29f 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGExportedFunctions.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGExportedFunctions.h @@ -173,18 +173,10 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_ctor_copy_as SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGBasicHandModelImpl_IsRight( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_SetIsRight( - void* Instance, - bool bRightHanded); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_GetFingerLengths( void* Instance, void* OutLengths); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_SetFingerLengths( - void* Instance, - void* FingerLengths); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_GetFingerLengths_Finger( void* Instance, void* OutLengths, @@ -213,10 +205,6 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_GetStartJoin void* Instance, void* OutPositions); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_SetStartJointPositions( - void* Instance, - void* StartJointPositions); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_SetStartJointPosition_ESGFinger( void* Instance, void* Finger, @@ -231,10 +219,6 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_GetStartJoin void* Instance, void* OutRotations); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_SetStartJointRotations( - void* Instance, - void* StartJointRotations); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGBasicHandModelImpl_GetJointPosition( void* Instance, void* OutPosition, @@ -459,17 +443,9 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGCalibrationDataPointImpl_GetCal void* Instance, void* Values); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGCalibrationDataPointImpl_SetCalibrationValues( - void* Instance, - void* CalibrationValues); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGCalibrationDataPointImpl_GetStage( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGCalibrationDataPointImpl_SetStage( - void* Instance, - int32 Stage); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGCalibrationDataPointImpl_ToLogData( void* Instance, void* OutData, @@ -679,32 +655,16 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGDeviceModelImpl_GetDeviceId( void* Instance, void* OutId); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGDeviceModelImpl_SetDeviceId( - void* Instance, - void* Id); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGDeviceModelImpl_GetHardwareVersion( void* Instance, void* OutVersion); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGDeviceModelImpl_SetHardwareVersion( - void* Instance, - void* Version); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGDeviceModelImpl_GetFirmwareVersion( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGDeviceModelImpl_SetFirmwareVersion( - void* Instance, - int32 Version); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGDeviceModelImpl_GetSubFirmwareVersion( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGDeviceModelImpl_SetSubFirmwareVersion( - void* Instance, - int32 Version); - /******************************************************************************* * SGFingerCommandImpl.h ******************************************************************************/ @@ -755,10 +715,6 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGFingerCommandImpl_GetLevels( void* Instance, void* OutLevels); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGFingerCommandImpl_SetLevels( - void* Instance, - void* Levels); - SENSEGLOVECOREIMPL_PUBLIC_API int SGCoreImpl_FSGFingerCommandImpl_GetLevel( void* Instance, int32 Finger); @@ -896,18 +852,10 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandInterpolatorImpl_GetJointIn void* Instance, void* OutInterpolations); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandInterpolatorImpl_SetJointInterpolations( - void* Instance, - void* OutJointInterpolations); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandInterpolatorImpl_GetCmcStartRotation( void* Instance, void* OutRotation); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandInterpolatorImpl_SetCmcStartRotation( - void* Instance, - void* CmcStartRotation); - SENSEGLOVECOREIMPL_PUBLIC_API float SGCoreImpl_FSGHandInterpolatorImpl_CalculateAngle_Finger_int32Movement_Value( void* Instance, void* Finger, @@ -1046,34 +994,18 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandPoseImpl_ctor_copy_assignme SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGHandPoseImpl_IsRight( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandPoseImpl_SetIsRight( - void* Instance, - bool bRightHanded); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandPoseImpl_GetJointPositions( void* Instance, void* OutPositions); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandPoseImpl_SetJointPositions( - void* Instance, - void* JointPositions); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandPoseImpl_GetJointRotations( void* Instance, void* OutRotations); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandPoseImpl_SetJointRotations( - void* Instance, - void* JointRotations); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandPoseImpl_GetHandAngles( void* Instance, void* OutAngles); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandPoseImpl_SetHandAngles( - void* Instance, - void* HandAngles); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGHandPoseImpl_Equals( void* Instance, void* HandPoseImpl); @@ -1157,26 +1089,14 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandProfileImpl_ctor_copy_assig SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGHandProfileImpl_IsRight( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandProfileImpl_SetIsRight( - void* Instance, - bool bRightHanded); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandProfileImpl_GetSenseGloveHandProfile( void* Instance, void* OutProfile); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandProfileImpl_SetSenseGloveHandProfile( - void* Instance, - void* SenseGloveHandProfile); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandProfileImpl_GetNovaGloveHandProfile( void* Instance, void* OutProfile); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHandProfileImpl_SetNovaGloveHandProfile( - void* Instance, - void* NovaGloveHandProfile); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGHandProfileImpl_Equals( void* Instance, void* HandProfileImpl); @@ -1386,14 +1306,6 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCalibrationCheckImpl void* OutHapticGloveCalibrationCheckImpl, void* Rhs); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_GetLastSensorRange( - void* Instance, - void* OutLastSensorRange); - -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_SetLastSensorRange( - void* Instance, - void* LastSensorRange); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_GetCalibrationStage( void* Instance, void* OutStage); @@ -1554,26 +1466,14 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCommandBufferImpl_Ge void* Instance, void* OutForceFeedbackCommandsQueue); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCommandBufferImpl_SetForceFeedbackCommandsQueue( - void* Instance, - void* ForceFeedbackCommandsQueue); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetBuzzCommandsQueue( void* Instance, void* OutBuzzCommandsQueue); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCommandBufferImpl_SetBuzzCommandsQueue( - void* Instance, - void* BuzzCommandsQueue); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCommandBufferImpl_GetThumperCommandsQueue( void* Instance, void* OutThumperCommandsQueue); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCommandBufferImpl_SetThumperCommandsQueue( - void* Instance, - void* ThumperCommandsQueue); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveCommandBufferImpl_ClearForceFeedbackCommandsQueue( void* Instance); @@ -1721,10 +1621,6 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveQuickCalibrationImpl SENSEGLOVECOREIMPL_PUBLIC_API float SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_GetAutoEndTimeout( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_SetAutoEndTimeout( - void* Instance, - float AutoEndTimeout); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGHapticGloveQuickCalibrationImpl_GetSmoothingSamples( void* Instance); @@ -2150,18 +2046,10 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveHandProfileImpl_ctor_c SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGNovaGloveHandProfileImpl_IsRight( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveHandProfileImpl_SetIsRight( - void* Instance, - bool bRightHanded); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveHandProfileImpl_GetInterpolationSet( void* Instance, void* OutSet); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveHandProfileImpl_SetInterpolationSet( - void* Instance, - void* InterpolationSet); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGNovaGloveHandProfileImpl_Equals( void* Instance, void* NovaGloveHandProfileImpl); @@ -2211,54 +2099,26 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_GetDeviceId( void* Instance, void* OutId); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_SetDeviceId( - void* Instance, - void* DeviceId); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_GetHardwareVersion( void* Instance, void* OutVersion); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_SetHardwareVersion( - void* Instance, - void* HardwareVersion); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGNovaGloveInfoImpl_GetFirmwareVersion( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_SetFirmwareVersion( - void* Instance, - int32 FirmwareVersion); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGNovaGloveInfoImpl_GetSubFirmwareVersion( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_SetSubFirmwareVersion( - void* Instance, - int32 SubFirmwareVersion); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGNovaGloveInfoImpl_IsRight( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_SetIsRight( - void* Instance, - bool bRightHanded); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_GetImuCorrection( void* Instance, void* OutCorrection); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_SetImuCorrection( - void* Instance, - void* ImuCorrection); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGNovaGloveInfoImpl_GetNumberOfSensors( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveInfoImpl_SetNumberOfSensors( - void* Instance, - int32 NumberOfSensors); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGNovaGloveInfoImpl_Equals( void* Instance, void* NovaGloveInfoImpl); @@ -2312,46 +2172,22 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveSensorDataImpl_GetSens void* Instance, void* OutValues); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetSensorValues( - void* Instance, - void* SensorValues); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveSensorDataImpl_GetImuRotation( void* Instance, void* OutRotation); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetImuRotation( - void* Instance, - void* ImuRotation); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGNovaGloveSensorDataImpl_GetParsedValues( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetParsedValues( - void* Instance, - int32 ParsedValues); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGNovaGloveSensorDataImpl_IsImuParsed( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetImuParsed( - void* Instance, - bool bImuParsed); - SENSEGLOVECOREIMPL_PUBLIC_API float SGCoreImpl_FSGNovaGloveSensorDataImpl_GetBatteryLevel( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetBatteryLevel( - void* Instance, - float BatteryLevel); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGNovaGloveSensorDataImpl_IsCharging( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGNovaGloveSensorDataImpl_SetIsCharging( - void* Instance, - bool bCharging); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGNovaGloveSensorDataImpl_Equals( void* Instance, void* NovaGloveSensorDataImpl); @@ -2658,42 +2494,22 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_ctor_ SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGSenseGloveHandProfileImpl_IsRight( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetIsRight( - void* Instance, - bool bRightHanded); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetInterpolationSet( void* Instance, void* OutSet); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetInterpolationSet( - void* Instance, - void* InterpolationSet); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetThumbSolver( void* Instance, void* OutSolver); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetThumbSolver( - void* Instance, - void* ThumbSolver); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetFingerSolver( void* Instance, void* OutSolver); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetFingerSolver( - void* Instance, - void* FingerSolver); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_GetFingerThimbleOffset( void* Instance, void* OutOffset); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveHandProfileImpl_SetFingerThimbleOffset( - void* Instance, - void* FingerThimbleOffset); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGSenseGloveHandProfileImpl_Equals( void* Instance, void* SenseGloveHandProfileImpl); @@ -2748,86 +2564,42 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_GetDeviceId( void* Instance, void* OutId); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetDeviceId( - void* Instance, - void* DeviceId); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_GetHardwareVersion( void* Instance, void* OutVersion); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetHardwareVersion( - void* Instance, - void* HardwareVersion); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGSenseGloveInfoImpl_GetFirmwareVersion( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetFirmwareVersion( - void* Instance, - int32 FirmwareVersion); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGSenseGloveInfoImpl_GetSubFirmwareVersion( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetSubFirmwareVersion( - void* Instance, - int32 SubFirmwareVersion); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGSenseGloveInfoImpl_IsRight( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetIsRight( - void* Instance, - bool bRightHanded); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGSenseGloveInfoImpl_GetNumberOfSensors( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetNumberOfSensors( - void* Instance, - int32 NumberOfSensors); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_GetImuCorrection( void* Instance, void* OutCorrection); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetImuCorrection( - void* Instance, - void* ImuCorrection); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_GetStartPositions( void* Instance, void* OutPositions); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetStartPositions( - void* Instance, - void* StartPositions); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_GetStartRotations( void* Instance, void* OutRotations); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetStartRotations( - void* Instance, - void* StartRotations); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_GetGloveLengths( void* Instance, void* OutLengths); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetGloveLengths( - void* Instance, - void* GloveLengths); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_GetFunctions( void* Instance, void* OutFunctions); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_SetFunctions( - void* Instance, - void* Functions); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveInfoImpl_GetStartPosition( void* Instance, void* OutPosition, @@ -2899,34 +2671,18 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGlovePoseImpl_ctor_copy_as SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGSenseGlovePoseImpl_IsRight( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGlovePoseImpl_SetIsRight( - void* Instance, - bool bRightGloveed); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGlovePoseImpl_GetJointPositions( void* Instance, void* OutPositions); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGlovePoseImpl_SetJointPositions( - void* Instance, - void* JointPositions); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGlovePoseImpl_GetJointRotations( void* Instance, void* OutRotations); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGlovePoseImpl_SetJointRotations( - void* Instance, - void* JointRotations); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGlovePoseImpl_GetGloveAngles( void* Instance, void* OutAngles); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGlovePoseImpl_SetGloveAngles( - void* Instance, - void* GloveAngles); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGlovePoseImpl_GetThimblePositions( void* Instance, void* OutPositions); @@ -3001,10 +2757,6 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveSensorDataImpl_GetSen void* Instance, void* OutAngles); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveSensorDataImpl_SetSensorAngles( - void* Instance, - void* SensorAngles); - SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveSensorDataImpl_GetSensorAngles_Finger( void* Instance, void* OutAngles, @@ -3018,24 +2770,12 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveSensorDataImpl_GetImu void* Instance, void* OutRotation); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveSensorDataImpl_SetImuRotation( - void* Instance, - void* ImuRotation); - SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGSenseGloveSensorDataImpl_GetParsedValues( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveSensorDataImpl_SetParsedValues( - void* Instance, - int32 ParsedValues); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGSenseGloveSensorDataImpl_IsImuParsed( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGSenseGloveSensorDataImpl_SetImuParsed( - void* Instance, - bool bImuParsed); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGSenseGloveSensorDataImpl_Equals( void* Instance, void* SenseGloveSensorDataImpl); @@ -3293,31 +3033,12 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGTimedBuzzCommandImpl_GetBaseCom void* Instance, void* OutCommand); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGTimedBuzzCommandImpl_SetBaseCommand( - void* Instance, - void* BaseCommand); - -SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGTimedBuzzCommandImpl_GetMagnitude( - void* Instance); - -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGTimedBuzzCommandImpl_SetMagnitude( - void* Instance, - int32 Magnitude); - SENSEGLOVECOREIMPL_PUBLIC_API float SGCoreImpl_FSGTimedBuzzCommandImpl_GetDuration( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGTimedBuzzCommandImpl_SetDuration( - void* Instance, - float Duration); - SENSEGLOVECOREIMPL_PUBLIC_API float SGCoreImpl_FSGTimedBuzzCommandImpl_GetElapsedTime( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGTimedBuzzCommandImpl_SetElapsedTime( - void* Instance, - float ElapsedTime); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGTimedBuzzCommandImpl_HasTimeElapsed( void* Instance); @@ -3368,24 +3089,12 @@ SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGTimedThumpCommandImpl_ctor_copy SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_FSGTimedThumpCommandImpl_GetMagnitude( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGTimedThumpCommandImpl_SetMagnitude( - void* Instance, - int32 Magnitude); - SENSEGLOVECOREIMPL_PUBLIC_API float SGCoreImpl_FSGTimedThumpCommandImpl_GetDuration( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGTimedThumpCommandImpl_SetDuration( - void* Instance, - float Duration); - SENSEGLOVECOREIMPL_PUBLIC_API float SGCoreImpl_FSGTimedThumpCommandImpl_GetElapsedTime( void* Instance); -SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGTimedThumpCommandImpl_SetElapsedTime( - void* Instance, - float ElapsedTime); - SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGTimedThumpCommandImpl_HasTimeElapsed( void* Instance); diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h index 10c6d6fb..bad328ff 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h @@ -168,7 +168,6 @@ public: public: virtual TArray GetLevels() const; - void SetLevels(const TArray& Levels); virtual int32 GetLevel(int32 Finger) const; virtual void SetLevel(int32 Finger, int32 Value); @@ -176,4 +175,4 @@ public: virtual bool Equals(const FSGFingerCommandImpl& FingerCommandImpl) const; virtual FString ToString() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h index e88aa3b2..b3a9773b 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h @@ -143,4 +143,4 @@ public: virtual FSGForceFeedbackCommandImpl Copy() const; virtual FSGForceFeedbackCommandImpl Merge(const FSGForceFeedbackCommandImpl& Command) const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h index c8ad22e4..98f9d85f 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h @@ -144,12 +144,8 @@ public: public: TArray> GetJointInterpolations() const; - void SetJointInterpolations(const TArray>& JointInterpolations); - FQuat GetCmcStartRotation() const; - void SetCmcStartRotation(const FQuat& CmcStartRotation); - public: float CalculateAngle(ESGFinger Finger, int32 Movement, float Value) const; @@ -172,4 +168,4 @@ public: public: FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h index 7d121034..d0345520 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h @@ -148,16 +148,12 @@ public: public: bool IsRight() const; - void SetIsRight(bool bRightHanded) const; TArray> GetJointPositions() const; - void SetJointPositions(const TArray>& JointPositions) const; TArray> GetJointRotations() const; - void SetJointRotations(const TArray>& JointRotations) const; TArray> GetHandAngles() const; - void SetHandAngles(const TArray>& HandAngles) const; public: bool Equals(const FSGHandPoseImpl& HandPoseImpl) const; @@ -170,4 +166,4 @@ public: FString ToString(bool bShortFormat = false) const; FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h index 1d08201d..26b59e2e 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h @@ -147,16 +147,10 @@ public: public: bool IsRight() const; - void SetIsRight(bool bRightHanded) const; - FSGSenseGloveHandProfileImpl GetSenseGloveHandProfile() const; - void SetSenseGloveHandProfile(const FSGSenseGloveHandProfileImpl& SenseGloveHandProfile); - FSGNovaGloveHandProfileImpl GetNovaGloveHandProfile() const; - void SetNovaGloveHandProfile(const FSGNovaGloveHandProfileImpl& NovaGloveHandProfile); - public: bool Equals(const FSGHandProfileImpl& HandProfileImpl) const; @@ -164,4 +158,4 @@ public: public: FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h index 8655d2aa..33cf5ec4 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h @@ -147,10 +147,6 @@ public: */ const FHapticGloveCalibrationCheckType& ToHapticGloveCalibrationCheck() const; -public: - FSGSensorRangeImpl GetLastSensorRange() const; - void SetLastSensorRange(const FSGSensorRangeImpl& LastSensorRange); - public: ESGCalibrationStage GetCalibrationStage() const; @@ -160,4 +156,4 @@ public: virtual void Reset(); void CheckRange(const TArray& CurrentValues, float DeltaSeconds, ESGDeviceType DeviceType); -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h index ab9395e4..e1468180 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h @@ -198,4 +198,4 @@ public: virtual bool GetHandPose(bool bRightHanded, FSGHandPoseImpl& OutCurrentHandPose) const; virtual FString GetCurrentInstruction(const FString& NextStepKey = FString{""}) const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h index 6c6efaa6..4afe1db7 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h @@ -133,13 +133,10 @@ public: public: TArray GetForceFeedbackCommandsQueue() const; - void SetForceFeedbackCommandsQueue(const TArray& ForceFeedbackCommandsQueue); TArray GetBuzzCommandsQueue() const; - void SetBuzzCommandsQueue(const TArray& TimedBuzzCommandsQueue); TArray GetThumperCommandsQueue() const; - void SetThumperCommandsQueue(const TArray& TimedThumpCommandsQueue); public: void ClearForceFeedbackCommandsQueue(); @@ -175,4 +172,4 @@ public: void FlushHaptics(float DeltaSeconds, const FSGForceFeedbackCommandImpl& LastBrakeLevel, FSGForceFeedbackCommandImpl& OutForceFeedbackCommand, FSGBuzzCommandImpl& OutBuzzCommand, FSGThumperCommandImpl& OutThumperCommand); -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveHandProfilesImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveHandProfilesImpl.h index 8af14566..ecfae0e0 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveHandProfilesImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveHandProfilesImpl.h @@ -84,4 +84,4 @@ public: public: FSGHapticGloveHandProfilesImpl() = delete; virtual ~FSGHapticGloveHandProfilesImpl() = delete; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h index d10b2789..933862b1 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h @@ -137,8 +137,6 @@ public: public: float GetAutoEndTimeout() const; - void SetAutoEndTimeout(float AutoEndTimeout); - int32 GetSmoothingSamples() const; FSGSensorRangeImpl GetSensorRange() const; @@ -164,4 +162,4 @@ public: virtual bool GetHandPose(bool bRightHanded, FSGHandPoseImpl& OutCurrentHandPose) const override; virtual FString GetCurrentInstruction(const FString& NextStepKey = FString{""}) const override; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h index 3ab7480d..53d00c73 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h @@ -160,4 +160,4 @@ public: FString ToString(bool bLimits) const; FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h index 9c1e5b17..ead79a88 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h @@ -128,12 +128,8 @@ public: public: bool IsRight() const; - void SetIsRight(bool bRightHanded); - FSGHandInterpolatorImpl GetInterpolationSet() const; - void SetInterpolationSet(const FSGHandInterpolatorImpl& InterpolationSet); - public: bool Equals(const FSGNovaGloveHandProfileImpl& NovaGloveHandProfileImpl) const; @@ -141,4 +137,4 @@ public: public: FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h index fdbcee79..4f26f81f 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h @@ -128,25 +128,18 @@ public: public: FString GetDeviceId() const; - void SetDeviceId(const FString& DeviceId); FString GetHardwareVersion() const; - void SetHardwareVersion(const FString& HardwareVersion); int32 GetFirmwareVersion() const; - void SetFirmwareVersion(int32 FirmwareVersion); int32 GetSubFirmwareVersion() const; - void SetSubFirmwareVersion(int32 SubFirmwareVersion); bool IsRight() const; - void SetIsRight(bool bRightHanded); FQuat GetImuCorrection() const; - void SetImuCorrection(const FQuat& ImuCorrection); int32 GetNumberOfSensors() const; - void SetNumberOfSensors(int32 NumberOfSensors); public: bool Equals(const FSGNovaGloveInfoImpl& SGNovaGloveInfo) const; @@ -155,4 +148,4 @@ public: FString ToString() const; FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h index 9de1383d..fc94ed83 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h @@ -131,23 +131,17 @@ public: public: TArray GetSensorValues() const; - void SetSensorValues(const TArray& SensorValues) const; FQuat GetImuRotation() const; - void SetImuRotation(const FQuat& ImuRotation); int32 GetParsedValues() const; - void SetParsedValues(int32 ParsedValues); bool IsImuParsed() const; - void SetImuParsed(bool bImuParsed); public: float GetBatteryLevel() const; - void SetBatteryLevel(float BatteryLevel); bool IsCharging() const; - void SetIsCharging(bool bCharging); public: bool Equals(const FSGNovaGloveSensorDataImpl& NovaGloveSensorDataImpl) const; @@ -156,4 +150,4 @@ public: FString ToString() const; FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h index 6249f5a9..0bc94881 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h @@ -135,24 +135,14 @@ public: public: bool IsRight() const; - void SetIsRight(bool bRightHanded); - FSGHandInterpolatorImpl GetInterpolationSet() const; - void SetInterpolationSet(const FSGHandInterpolatorImpl& InterpolationSet); - ESGThumbSolver GetThumbSolver() const; - void SetThumbSolver(ESGThumbSolver ThumbSolver); - ESGFingerSolver GetFingerSolver() const; - void SetFingerSolver(ESGFingerSolver FingerSolver); - TArray GetFingerThimbleOffset() const; - void SetFingerThimbleOffset(const TArray& FingerThimbleOffset); - public: bool Equals(const FSGSenseGloveHandProfileImpl& SenseGloveHandProfileImpl) const; @@ -160,4 +150,4 @@ public: public: FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h index 0a4fd124..35a3985e 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h @@ -135,37 +135,26 @@ public: public: FString GetDeviceId() const; - void SetDeviceId(const FString& DeviceId); FString GetHardwareVersion() const; - void SetHardwareVersion(const FString& HardwareVersion); int32 GetFirmwareVersion() const; - void SetFirmwareVersion(int32 FirmwareVersion); int32 GetSubFirmwareVersion() const; - void SetSubFirmwareVersion(int32 SubFirmwareVersion); bool IsRight() const; - void SetIsRight(bool bRightHanded); int32 GetNumberOfSensors() const; - void SetNumberOfSensors(int32 NumberOfSensors); FQuat GetImuCorrection() const; - void SetImuCorrection(const FQuat& ImuCorrection); TArray GetStartPositions() const; - void SetStartPositions(const TArray& StartPositions); TArray GetStartRotations() const; - void SetStartRotations(const TArray& StartRotations); TArray> GetGloveLengths() const; - void SetGloveLengths(const TArray>& GloveLengths) const; TArray GetFunctions() const; - void SetFunctions(const TArray& Functions) const; public: FVector GetStartPosition(ESGFinger Finger) const; @@ -185,4 +174,4 @@ public: FString ToString() const; FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h index 9f79cb64..4ddc6763 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h @@ -132,16 +132,12 @@ public: public: bool IsRight() const; - void SetIsRight(bool bRightHanded) const; TArray> GetJointPositions() const; - void SetJointPositions(const TArray>& JointPositions) const; TArray> GetJointRotations() const; - void SetJointRotations(const TArray>& JointRotations) const; TArray> GetGloveAngles() const; - void SetGloveAngles(const TArray>& GloveAngles) const; public: TArray GetThimblePositions() const; @@ -160,4 +156,4 @@ public: FString ToString(bool bShortFormat = true) const; FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h index 6633cb96..ae021a15 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h @@ -131,21 +131,17 @@ public: public: TArray> GetSensorAngles() const; - void SetSensorAngles(const TArray>& SensorAngles); TArray GetSensorAngles(ESGFinger Finger) const; TArray GetAngleSequence() const; FQuat GetImuRotation() const; - void SetImuRotation(const FQuat& ImuRotation); int32 GetParsedValues() const; - void SetParsedValues(int32 ParsedValues); public: bool IsImuParsed() const; - void SetImuParsed(bool bImuParsed); public: bool Equals(const FSGSenseGloveSensorDataImpl& SenseGloveSensorDataImpl) const; @@ -154,4 +150,4 @@ public: FString ToString() const; FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveVarsImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveVarsImpl.h index e43c40d8..45315abb 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveVarsImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveVarsImpl.h @@ -82,4 +82,4 @@ public: public: FSGSenseGloveVarsImpl() = delete; virtual ~FSGSenseGloveVarsImpl() = delete; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h index 662eb2b2..19df1bc4 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h @@ -150,4 +150,4 @@ public: FString ToString(bool bYOnly = true) const; FString Serialize() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h index cdde210b..799ae446 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h @@ -129,4 +129,4 @@ public: FSGThumperCommandImpl Merge(const FSGThumperCommandImpl& ThumperCommandImpl) const; virtual bool Equals(const FSGThumperCommandImpl& ThumperCommandImpl) const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h index 204b1bcc..8d183f7d 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h @@ -154,16 +154,10 @@ public: public: virtual FSGBuzzCommandImpl GetBaseCommand() const; - void SetBaseCommand(const FSGBuzzCommandImpl& BaseCommand); - - int32 GetMagnitude() const; - void SetMagnitude(int32 Magnitude); float GetDuration() const; - void SetDuration(float Duration); float GetElapsedTime() const; - void SetElapsedTime(float ElapsedTime); virtual bool HasTimeElapsed() const; @@ -175,4 +169,4 @@ public: public: virtual FString ToString() const override; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h index 1be5538a..faf25b21 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h @@ -127,13 +127,10 @@ public: public: int32 GetMagnitude() const; - void SetMagnitude(int32 Magnitude); float GetDuration() const; - void SetDuration(float Duration); float GetElapsedTime() const; - void SetElapsedTime(float ElapsedTime); bool HasTimeElapsed() const; @@ -146,4 +143,4 @@ public: public: virtual FString ToString() const; -}; +}; \ No newline at end of file diff --git a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGHapticGloveCalibrationCheckKismetLibrary.cpp b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGHapticGloveCalibrationCheckKismetLibrary.cpp index 9393b1f0..a6be4ed1 100644 --- a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGHapticGloveCalibrationCheckKismetLibrary.cpp +++ b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGHapticGloveCalibrationCheckKismetLibrary.cpp @@ -103,13 +103,6 @@ bool USGHapticGloveCalibrationCheckKismetLibrary::MatchesLast( return USGHapticGloveCalibrationCheck::MatchesLast(CurrentRange, LastRange, DeviceType); } -USGSensorRange* USGHapticGloveCalibrationCheckKismetLibrary::GetLastSensorRange( - UObject* WorldContextObject, - const USGHapticGloveCalibrationCheck* HapticGloveCalibrationCheck) -{ - return HapticGloveCalibrationCheck->GetLastSensorRange(WorldContextObject); -} - ESGCalibrationStage USGHapticGloveCalibrationCheckKismetLibrary::GetCalibrationStage( const USGHapticGloveCalibrationCheck* HapticGloveCalibrationCheck) { diff --git a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGTimedBuzzCommandKismetLibrary.cpp b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGTimedBuzzCommandKismetLibrary.cpp index 698be634..c06da927 100644 --- a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGTimedBuzzCommandKismetLibrary.cpp +++ b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGTimedBuzzCommandKismetLibrary.cpp @@ -76,11 +76,6 @@ USGBuzzCommand* USGTimedBuzzCommandKismetLibrary::GetBaseCommand(UObject* WorldC return TimedBuzzCommand->GetBaseCommand(WorldContextObject); } -int32 USGTimedBuzzCommandKismetLibrary::GetMagnitude(const USGTimedBuzzCommand* TimedBuzzCommand) -{ - return TimedBuzzCommand->GetMagnitude(); -} - float USGTimedBuzzCommandKismetLibrary::GetDuration(const USGTimedBuzzCommand* TimedBuzzCommand) { return TimedBuzzCommand->GetDuration(); diff --git a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGTimedThumpCommandKismetLibrary.cpp b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGTimedThumpCommandKismetLibrary.cpp index 2f4ead4a..286e0b7d 100644 --- a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGTimedThumpCommandKismetLibrary.cpp +++ b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGTimedThumpCommandKismetLibrary.cpp @@ -63,31 +63,16 @@ int32 USGTimedThumpCommandKismetLibrary::GetMagnitude(const USGTimedThumpCommand return TimedThumpCommand->GetMagnitude(); } -void USGTimedThumpCommandKismetLibrary::SetMagnitude(USGTimedThumpCommand* TimedThumpCommand, const int32 Magnitude) -{ - TimedThumpCommand->SetMagnitude(Magnitude); -} - float USGTimedThumpCommandKismetLibrary::GetDuration(const USGTimedThumpCommand* TimedThumpCommand) { return TimedThumpCommand->GetDuration(); } -void USGTimedThumpCommandKismetLibrary::SetDuration(USGTimedThumpCommand* TimedThumpCommand, const float Duration) -{ - TimedThumpCommand->SetDuration(Duration); -} - float USGTimedThumpCommandKismetLibrary::GetElapsedTime(const USGTimedThumpCommand* TimedThumpCommand) { return TimedThumpCommand->GetElapsedTime(); } -void USGTimedThumpCommandKismetLibrary::SetElapsedTime(USGTimedThumpCommand* TimedThumpCommand, const float ElapsedTime) -{ - TimedThumpCommand->SetElapsedTime(ElapsedTime); -} - bool USGTimedThumpCommandKismetLibrary::HasTimeElapsed(const USGTimedThumpCommand* TimedThumpCommand) { return TimedThumpCommand->HasTimeElapsed(); diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHapticGloveCalibrationCheckKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHapticGloveCalibrationCheckKismetLibrary.h index 272006e6..0166cc9c 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHapticGloveCalibrationCheckKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHapticGloveCalibrationCheckKismetLibrary.h @@ -131,14 +131,6 @@ public: static bool MatchesLast(const TArray& CurrentRange, const TArray& LastRange, ESGDeviceType DeviceType); - /** - * - */ - UFUNCTION(BlueprintPure, Category="SenseGlove | Core | Calibration | Haptic Glove Calibration Check", - meta=(WorldContext="WorldContextObject")) - static USGSensorRange* GetLastSensorRange(UObject* WorldContextObject, - const USGHapticGloveCalibrationCheck* HapticGloveCalibrationCheck); - /** * */ diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGTimedBuzzCommandKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGTimedBuzzCommandKismetLibrary.h index bad1f4bd..8b6591fe 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGTimedBuzzCommandKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGTimedBuzzCommandKismetLibrary.h @@ -101,12 +101,6 @@ public: static USGBuzzCommand* GetBaseCommand(UObject* WorldContextObject, const USGTimedBuzzCommand* TimedBuzzCommand); - /** - * - */ - UFUNCTION(BlueprintPure, Category="SenseGlove | Core | Haptics | Timed Buzz Command") - static int32 GetMagnitude(const USGTimedBuzzCommand* TimedBuzzCommand); - /** * The total time [milliseconds] each buzz motor should be vibrating for. */ diff --git a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGTimedThumpCommandKismetLibrary.h b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGTimedThumpCommandKismetLibrary.h index 2f82c6f3..fbb18c47 100644 --- a/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGTimedThumpCommandKismetLibrary.h +++ b/Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGTimedThumpCommandKismetLibrary.h @@ -81,36 +81,18 @@ public: UFUNCTION(BlueprintPure, Category="SenseGlove | Core | Haptics | Timed Thump Command") static int32 GetMagnitude(const USGTimedThumpCommand* TimedThumpCommand); - /** - * - */ - UFUNCTION(BlueprintCallable, Category="SenseGlove | Core | Haptics | Timed Thump Command") - static void SetMagnitude(UPARAM(ref) USGTimedThumpCommand* TimedThumpCommand, int32 Magnitude); - /** * Duration in seconds. */ UFUNCTION(BlueprintPure, Category="SenseGlove | Core | Haptics | Timed Thump Command") static float GetDuration(const USGTimedThumpCommand* TimedThumpCommand); - /** - * - */ - UFUNCTION(BlueprintCallable, Category="SenseGlove | Core | Haptics | Timed Thump Command") - static void SetDuration(UPARAM(ref) USGTimedThumpCommand* TimedThumpCommand, float Duration); - /** * The elapsed time so far. */ UFUNCTION(BlueprintPure, Category="SenseGlove | Core | Haptics | Timed Thump Command") static float GetElapsedTime(const USGTimedThumpCommand* TimedThumpCommand); - /** - * - */ - UFUNCTION(BlueprintCallable, Category="SenseGlove | Core | Haptics | Timed Thump Command") - static void SetElapsedTime(UPARAM(ref) USGTimedThumpCommand* TimedThumpCommand, float ElapsedTime); - /** * Returns true if the timed command has elapsed. */