
Submitter:	Ansariel Hiller	Reviewers
Branch:		Groups:	viewer
Bugs:	STORM-1899	People:
Change Number:	None	Repository:	viewer-release

Description:

A proposed solution for STORM-1899 and the issue, where the handpose of avatars randomly get stuck in the spread hand position.

In the current implementation, this case might happen under the following circumstances:
* Avatar uses an animation with hand pose A
* A request is issued to change hand pose to B
* Before the viewer has blended pose A over to pose B, the original pose A is requested again
* In this case, the hand pose will not be properly (re)set and because mNewPose == mCurrentPose, there will be no further blending, leaving the hand in it's current pose

The patch will properly reset the hand pose in this case and update the visual parameters of the avatar.

Testing Done:

Diff revision 1

This is not the most recent revision of the diff. The latest diff is revision 2. See what's changed.

Jump to revision:	1 2
Changes between r1 and:	1 2

Files Changed:

indra/llcharacter/llhandmotion.cpp:

--- Revision 4d9106153407
+++ New Change
     	F32 timeDelta = time - mLastTime;
     	mLastTime = time;
     	requestedHandPose = (eHandPose *)mCharacter->getAnimationData("Hand Pose");
     	// check to see if requested pose has changed
     	if (!requestedHandPose)
+    	{
     		if (mNewPose != HAND_POSE_RELAXED && mNewPose != mCurrentPose)
+    		{
     			// Only set param weight for poses other than
     			// default (HAND_POSE_SPREAD); HAND_POSE_SPREAD
     			// is not an animatable morph!
     			if (mNewPose != HAND_POSE_SPREAD)
+    			{
-    			mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+    				mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+    			}
     			// Reset morph weight for current pose back to its
     			// full extend or it might be stuck somewhere in the middle if a
     			// pose is requested and the old pose is requested again shortly
     			// after while still blending to the other pose!
     			if (mCurrentPose != HAND_POSE_SPREAD)
+    			{
     				mCharacter->setVisualParamWeight(gHandPoseNames[mCurrentPose], 1.f);
+    			}
     			// Update visual params now if we won't blend
     			if (mCurrentPose == HAND_POSE_RELAXED)
+    			{
     				mCharacter->updateVisualParams();
+    			}
+    		}
     		mNewPose = HAND_POSE_RELAXED;
+    	}
     	else
+    	{
-		// this is a new morph we didn't know about before
+		// Sometimes we seem to get garbage here, with poses that are out of bounds.
-		if (*requestedHandPose != mNewPose && mNewPose != mCurrentPose && mNewPose != HAND_POSE_SPREAD)
+		// Clamp requested pose before setting the new pose and request
     		// relaxed hand pose instead as default.
     		if (*requestedHandPose < 0 || *requestedHandPose >= NUM_HAND_POSES)
+    		{
     			llwarns << "Requested hand pose out of range. Using HAND_POSE_RELAXED." << llendl;
     			*requestedHandPose = HAND_POSE_RELAXED;
+    		}
     		// This is a new morph we didn't know about before:
     		// Reset morph weight for both current and new pose
     		// back their starting values while still blending.
     		if (*requestedHandPose != mNewPose && mNewPose != mCurrentPose)
+    		{
     			if (mNewPose != HAND_POSE_SPREAD)
+    			{
-    			mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+    				mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+    			}
     			// Reset morph weight for current pose back to its full extend
     			// or it might be stuck somewhere in the middle if a pose is
     			// requested and the old pose is requested again shortly after
     			// while still blending to the other pose!
     			if (mCurrentPose != HAND_POSE_SPREAD)
+    			{
     				mCharacter->setVisualParamWeight(gHandPoseNames[mCurrentPose], 1.f);
+    			}
     			// Update visual params now if we won't blend
     			if (mCurrentPose == *requestedHandPose)
+    			{
     				mCharacter->updateVisualParams();
+    			}
+    		}
     		mNewPose = *requestedHandPose;
+    	}
     	mCharacter->removeAnimationData("Hand Pose");
     	mCharacter->removeAnimationData("Hand Pose Priority");
     //	if (requestedHandPose)
     //		llinfos << "Hand Pose " << *requestedHandPose << llendl;
     	// if we are still blending...

indra/llcharacter/llhandmotion.cpp:

You have a pending review.

Other reviews

Your comment

Review Board 1.6.11

This change has been marked as submitted.

STORM-1899: Avatar hand poses randomly get stuck in spread position

Diff revision 1