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

fix grab/release bug for the right hand

Browse Source
This commit is contained in:
Mamadou Babaei
2023-07-13 17:27:28 +02:00
parent b4e547f755
commit b2f89c4694
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/SenseGlove/Private/SenseGlove/GameFramework/SGPawn.cpp
+25 -4
View File
@@ -435,7 +435,7 @@ ASGPawn::ASGPawn(const FObjectInitializer& ObjectInitializer)
LeftHandGrabState = FSGGrabState(HandLeft, nullptr, nullptr, nullptr, nullptr); LeftHandGrabState = FSGGrabState(HandLeft, nullptr, nullptr, nullptr, nullptr);
LeftHandTouchState = FSGTouchState(HandLeft, nullptr, nullptr, nullptr, nullptr, nullptr); LeftHandTouchState = FSGTouchState(HandLeft, nullptr, nullptr, nullptr, nullptr, nullptr);
RightHandGrabState = FSGGrabState(HandLeft, nullptr, nullptr, nullptr, nullptr); RightHandGrabState = FSGGrabState(HandRight, nullptr, nullptr, nullptr, nullptr);
RightHandTouchState = FSGTouchState(HandRight, nullptr, nullptr, nullptr, nullptr, nullptr); RightHandTouchState = FSGTouchState(HandRight, nullptr, nullptr, nullptr, nullptr, nullptr);
} }
@@ -1145,15 +1145,36 @@ void ASGPawn::Grab(USGVirtualHandComponent* Hand, AActor* Actor)
const bool bAttached = Actor->AttachToComponent(Hand, MoveTemp(AttachmentRules), SocketName); const bool bAttached = Actor->AttachToComponent(Hand, MoveTemp(AttachmentRules), SocketName);
if (bAttached) if (bAttached)
{ {
LeftHandGrabState.GrabbedActor = Actor; if (Hand->IsRight())
{
RightHandGrabState.GrabbedActor = Actor;
}
else
{
LeftHandGrabState.GrabbedActor = Actor;
}
} }
else else
{ {
SGLOG_ERROR("Failed to grab the actor with the left hand!", Actor, SocketName); if (Hand->IsRight())
{
SGLOG_ERROR("Failed to grab the actor with the right hand!", Actor, SocketName);
}
else
{
SGLOG_ERROR("Failed to grab the actor with the left hand!", Actor, SocketName);
}
} }
#else #else
Actor->AttachToComponent(Hand, MoveTemp(AttachmentRules), SocketName); Actor->AttachToComponent(Hand, MoveTemp(AttachmentRules), SocketName);
LeftHandGrabState.GrabbedActor = Actor; if (Hand->IsRight())
{
RightHandGrabState.GrabbedActor = Actor;
}
else
{
LeftHandGrabState.GrabbedActor = Actor;
}
#endif /* ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 2 */ #endif /* ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 2 */
} }