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

Revert "move force-feedback properties from the touch component to the grab component"

Browse Source 
This reverts commit 9faa9d2ca4.
This commit is contained in:
Mamadou Babaei
2023-05-19 18:11:51 +02:00
parent 1e0501966f
commit 90b5a886df
8 changed files with 156 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/SenseGlove/Private/SenseGlove/Components/SGGrabComponent.cpp
-6
View File
@@ -93,12 +93,6 @@ USGGrabComponent::USGGrabComponent(const FObjectInitializer& ObjectInitializer)
bAttachmentWeldSimulatedBodies = false;
AttachmentSocketName = NAME_None;
ThumbForceFeedbackLevel = 100;
IndexForceFeedbackLevel = 100;
MiddleForceFeedbackLevel = 100;
RingForceFeedbackLevel = 100;
PinkyForceFeedbackLevel = 100;
}
USGGrabComponent::FImpl::FImpl(USGGrabComponent* InOwner)
Source/SenseGlove/Private/SenseGlove/Components/SGTouchComponent.cpp
+6
View File
@@ -92,6 +92,12 @@ USGTouchComponent::USGTouchComponent(const FObjectInitializer& ObjectInitializer
MiddleBuzzLevel = 0;
RingBuzzLevel = 0;
PinkyBuzzLevel = 0;
ThumbForceFeedbackLevel = 100;
IndexForceFeedbackLevel = 100;
MiddleForceFeedbackLevel = 100;
RingForceFeedbackLevel = 100;
PinkyForceFeedbackLevel = 100;
}
USGTouchComponent::FImpl::FImpl(USGTouchComponent* InOwner)
Source/SenseGlove/Public/SenseGlove/Components/SGGrabComponent.h
-70
View File
@@ -68,26 +68,6 @@ private:
UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false"))
FName AttachmentSocketName;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 ThumbForceFeedbackLevel;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 IndexForceFeedbackLevel;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 MiddleForceFeedbackLevel;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 RingForceFeedbackLevel;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 PinkyForceFeedbackLevel;
private:
struct FImpl;
@@ -149,54 +129,4 @@ public:
{
AttachmentSocketName = InAttachmentSocketName;
}
FORCEINLINE int32 GetThumbForceFeedbackLevel() const
{
return ThumbForceFeedbackLevel;
}
FORCEINLINE void SetThumbForceFeedbackLevel(const int32 Level)
{
ThumbForceFeedbackLevel = Level;
}
FORCEINLINE int32 GetIndexForceFeedbackLevel() const
{
return IndexForceFeedbackLevel;
}
FORCEINLINE void SetIndexForceFeedbackLevel(const int32 Level)
{
IndexForceFeedbackLevel = Level;
}
FORCEINLINE int32 GetMiddleForceFeedbackLevel() const
{
return MiddleForceFeedbackLevel;
}
FORCEINLINE void SetMiddleForceFeedbackLevel(const int32 Level)
{
MiddleForceFeedbackLevel = Level;
}
FORCEINLINE int32 GetRingForceFeedbackLevel() const
{
return RingForceFeedbackLevel;
}
FORCEINLINE void SetRingForceFeedbackLevel(const int32 Level)
{
RingForceFeedbackLevel = Level;
}
FORCEINLINE int32 GetPinkyForceFeedbackLevel() const
{
return PinkyForceFeedbackLevel;
}
FORCEINLINE void SetPinkyForceFeedbackLevel(const int32 Level)
{
PinkyForceFeedbackLevel = Level;
}
};
Source/SenseGlove/Public/SenseGlove/Components/SGTouchComponent.h
+70
View File
@@ -71,6 +71,26 @@ private:
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 PinkyBuzzLevel;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 ThumbForceFeedbackLevel;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 IndexForceFeedbackLevel;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 MiddleForceFeedbackLevel;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 RingForceFeedbackLevel;
UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level",
meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
int32 PinkyForceFeedbackLevel;
private:
struct FImpl;
@@ -132,4 +152,54 @@ public:
{
PinkyBuzzLevel = Level;
}
FORCEINLINE int32 GetThumbForceFeedbackLevel() const
{
return ThumbForceFeedbackLevel;
}
FORCEINLINE void SetThumbForceFeedbackLevel(const int32 Level)
{
ThumbForceFeedbackLevel = Level;
}
FORCEINLINE int32 GetIndexForceFeedbackLevel() const
{
return IndexForceFeedbackLevel;
}
FORCEINLINE void SetIndexForceFeedbackLevel(const int32 Level)
{
IndexForceFeedbackLevel = Level;
}
FORCEINLINE int32 GetMiddleForceFeedbackLevel() const
{
return MiddleForceFeedbackLevel;
}
FORCEINLINE void SetMiddleForceFeedbackLevel(const int32 Level)
{
MiddleForceFeedbackLevel = Level;
}
FORCEINLINE int32 GetRingForceFeedbackLevel() const
{
return RingForceFeedbackLevel;
}
FORCEINLINE void SetRingForceFeedbackLevel(const int32 Level)
{
RingForceFeedbackLevel = Level;
}
FORCEINLINE int32 GetPinkyForceFeedbackLevel() const
{
return PinkyForceFeedbackLevel;
}
FORCEINLINE void SetPinkyForceFeedbackLevel(const int32 Level)
{
PinkyForceFeedbackLevel = Level;
}
};
Source/SenseGloveKismet/Private/SGKismet/SGGrabComponentKismetLibrary.cpp
-50
View File
@@ -97,54 +97,4 @@ void UGrabComponentKismetLibrary::SetAttachmentSocketName(USGGrabComponent* Grab
const FName& InAttachmentSocketName)
{
GrabComponent->SetAttachmentSocketName(InAttachmentSocketName);
}
int32 UGrabComponentKismetLibrary::GetThumbForceFeedbackLevel(const USGGrabComponent* GrabComponent)
{
return GrabComponent->GetThumbForceFeedbackLevel();
}
void UGrabComponentKismetLibrary::SetThumbForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level)
{
GrabComponent->SetThumbForceFeedbackLevel(Level);
}
int32 UGrabComponentKismetLibrary::GetIndexForceFeedbackLevel(const USGGrabComponent* GrabComponent)
{
return GrabComponent->GetIndexForceFeedbackLevel();
}
void UGrabComponentKismetLibrary::SetIndexForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level)
{
GrabComponent->SetIndexForceFeedbackLevel(Level);
}
int32 UGrabComponentKismetLibrary::GetMiddleForceFeedbackLevel(const USGGrabComponent* GrabComponent)
{
return GrabComponent->GetMiddleForceFeedbackLevel();
}
void UGrabComponentKismetLibrary::SetMiddleForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level)
{
GrabComponent->SetMiddleForceFeedbackLevel(Level);
}
int32 UGrabComponentKismetLibrary::GetRingForceFeedbackLevel(const USGGrabComponent* GrabComponent)
{
return GrabComponent->GetRingForceFeedbackLevel();
}
void UGrabComponentKismetLibrary::SetRingForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level)
{
GrabComponent->SetRingForceFeedbackLevel(Level);
}
int32 UGrabComponentKismetLibrary::GetPinkyForceFeedbackLevel(const USGGrabComponent* GrabComponent)
{
return GrabComponent->GetPinkyForceFeedbackLevel();
}
void UGrabComponentKismetLibrary::SetPinkyForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level)
{
GrabComponent->SetPinkyForceFeedbackLevel(Level);
}
Source/SenseGloveKismet/Private/SGKismet/SGTouchComponentKismetLibrary.cpp
+50
View File
@@ -93,4 +93,54 @@ int32 UTouchComponentKismetLibrary::GetPinkyBuzzLevel(const USGTouchComponent* T
void UTouchComponentKismetLibrary::SetPinkyBuzzLevel(USGTouchComponent* TouchComponent, const int32 Level)
{
TouchComponent->SetPinkyBuzzLevel(Level);
}
int32 UTouchComponentKismetLibrary::GetThumbForceFeedbackLevel(const USGTouchComponent* TouchComponent)
{
return TouchComponent->GetThumbForceFeedbackLevel();
}
void UTouchComponentKismetLibrary::SetThumbForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level)
{
TouchComponent->SetThumbForceFeedbackLevel(Level);
}
int32 UTouchComponentKismetLibrary::GetIndexForceFeedbackLevel(const USGTouchComponent* TouchComponent)
{
return TouchComponent->GetIndexForceFeedbackLevel();
}
void UTouchComponentKismetLibrary::SetIndexForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level)
{
TouchComponent->SetIndexForceFeedbackLevel(Level);
}
int32 UTouchComponentKismetLibrary::GetMiddleForceFeedbackLevel(const USGTouchComponent* TouchComponent)
{
return TouchComponent->GetMiddleForceFeedbackLevel();
}
void UTouchComponentKismetLibrary::SetMiddleForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level)
{
TouchComponent->SetMiddleForceFeedbackLevel(Level);
}
int32 UTouchComponentKismetLibrary::GetRingForceFeedbackLevel(const USGTouchComponent* TouchComponent)
{
return TouchComponent->GetRingForceFeedbackLevel();
}
void UTouchComponentKismetLibrary::SetRingForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level)
{
TouchComponent->SetRingForceFeedbackLevel(Level);
}
int32 UTouchComponentKismetLibrary::GetPinkyForceFeedbackLevel(const USGTouchComponent* TouchComponent)
{
return TouchComponent->GetPinkyForceFeedbackLevel();
}
void UTouchComponentKismetLibrary::SetPinkyForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level)
{
TouchComponent->SetPinkyForceFeedbackLevel(Level);
}
Source/SenseGloveKismet/Public/SGKismet/SGGrabComponentKismetLibrary.h
-30
View File
@@ -87,34 +87,4 @@ public:
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component")
static void SetAttachmentSocketName(UPARAM(ref) USGGrabComponent* GrabComponent,
const FName& InAttachmentSocketName);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component")
static int32 GetThumbForceFeedbackLevel(const USGGrabComponent* GrabComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component")
static void SetThumbForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component")
static int32 GetIndexForceFeedbackLevel(const USGGrabComponent* GrabComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component")
static void SetIndexForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component")
static int32 GetMiddleForceFeedbackLevel(const USGGrabComponent* GrabComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component")
static void SetMiddleForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component")
static int32 GetRingForceFeedbackLevel(const USGGrabComponent* GrabComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component")
static void SetRingForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component")
static int32 GetPinkyForceFeedbackLevel(const USGGrabComponent* GrabComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component")
static void SetPinkyForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level);
};
Source/SenseGloveKismet/Public/SGKismet/SGTouchComponentKismetLibrary.h
+30
View File
@@ -82,4 +82,34 @@ public:
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component")
static void SetPinkyBuzzLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component")
static int32 GetThumbForceFeedbackLevel(const USGTouchComponent* TouchComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component")
static void SetThumbForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component")
static int32 GetIndexForceFeedbackLevel(const USGTouchComponent* TouchComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component")
static void SetIndexForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component")
static int32 GetMiddleForceFeedbackLevel(const USGTouchComponent* TouchComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component")
static void SetMiddleForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component")
static int32 GetRingForceFeedbackLevel(const USGTouchComponent* TouchComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component")
static void SetRingForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level);
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component")
static int32 GetPinkyForceFeedbackLevel(const USGTouchComponent* TouchComponent);
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component")
static void SetPinkyForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level);
};