Skip to content

Commit a9f2b67

Browse files
Andrew Kimfacebook-github-bot
authored andcommitted
Update CCDIK processor and hip pinning scene targets
Summary: Update the CCDIK processor to not stretch for its target position - it will only solve rotation. In addition, update the hip pinning scene so that the CCDIK targets are the tracked anchors, rather than the hand directly to handle the case of invalid hands. Reviewed By: sohailshafiiWk Differential Revision: D74085068 fbshipit-source-id: 5891ca672093dc3f2c18486dd2165f830bd4eed6
1 parent 6bb4b7c commit a9f2b67

File tree

2 files changed

+5
-42
lines changed

2 files changed

+5
-42
lines changed

Runtime/Native/Scripts/Retargeting/TargetProcessors/CCDSkeletalProcessor.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ private void RunCCDOnSkeletalData(
177177
// Push end effector to target. We need to know what the local position of the target
178178
// is based on the last recomputed world positions of the IK chain after CCD has
179179
// modified them.
180-
var targetLocalPosition = GetTargetRelativeToEffectorParent(endEffectorParentIndex, targetPose,
181-
targetPositionLerped, rootScale);
180+
var targetLocalPosition = targetPoseLocal[endEffectorTargetIndex].Position;
182181
var localEndEffectorRotation =
183182
Quaternion.Inverse(targetPose[endEffectorParentIndex].Orientation) * endEffectorRotation;
184183
targetPoseLocal[endEffectorTargetIndex] =

Samples/AdvancedSamples/Scenes/MovementHipPinning.unity

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -23653,15 +23653,7 @@ MonoBehaviour:
2365323653
resetHmdPoseOnRelease: 1
2365423654
resetHmdPoseByMiddleMouseButton: 1
2365523655
activateKeys: 3201000031010000
23656-
activateKeyBindings:
23657-
- <Keyboard>/leftCtrl
23658-
- <Keyboard>/rightCtrl
23659-
- <Keyboard>/f1
2366023656
pitchKeys: 3401000033010000
23661-
pitchKeyBindings:
23662-
- <Keyboard>/leftAlt
23663-
- <Keyboard>/rightAlt
23664-
- <Keyboard>/f2
2366523657
--- !u!114 &2062269061
2366623658
MonoBehaviour:
2366723659
m_ObjectHideFlags: 0
@@ -23723,32 +23715,6 @@ MonoBehaviour:
2372323715
launchSimultaneousHandsControllersOnStartup: 0
2372423716
isInsightPassthroughEnabled: 0
2372523717
shouldBoundaryVisibilityBeSuppressed: 0
23726-
isImmersiveDebuggerEnabled: 0
23727-
expandFeatureFidelitySystemPropertySheet: 0
23728-
featureFidelitySystemActivated: 0
23729-
handTrackingFeatureFidelityGroup:
23730-
targetFeatureEnabled: -1
23731-
targetFeatureFidelity: -1
23732-
keyboardTrackingFeatureFidelityGroup:
23733-
targetFeatureEnabled: -1
23734-
targetFeatureFidelity: -1
23735-
eyeTrackingFeatureFidelityGroup:
23736-
targetFeatureEnabled: -1
23737-
targetFeatureFidelity: -1
23738-
faceTrackingFeatureFidelityGroup:
23739-
targetFeatureEnabled: -1
23740-
targetFeatureFidelity: -1
23741-
bodyTrackingFeatureFidelityGroup:
23742-
targetFeatureEnabled: -1
23743-
targetFeatureFidelity: -1
23744-
passthroughFeatureFidelityGroup:
23745-
targetFeatureEnabled: -1
23746-
targetFeatureFidelity: -1
23747-
gaseBasedFoveatedRenderingFeatureFidelityGroup:
23748-
targetFeatureEnabled: -1
23749-
targetFeatureFidelity: -1
23750-
handTrackingFeatureEnabled: 0
23751-
handTrackingFeatureFidelity: 0
2375223718
requestBodyTrackingPermissionOnStartup: 1
2375323719
requestFaceTrackingPermissionOnStartup: 0
2375423720
requestEyeTrackingPermissionOnStartup: 0
@@ -23767,8 +23733,6 @@ MonoBehaviour:
2376723733
SimultaneousHandsAndControllersEnabled: 0
2376823734
_readOnlyWideMotionModeHandPosesEnabled: 0
2376923735
wideMotionModeHandPosesEnabled: 0
23770-
_readOnlyBodyFusionHandPosesEnabled: 0
23771-
bodyFusionHandPosesEnabled: 0
2377223736
dynamicResolutionVersion: 1
2377323737
--- !u!114 &2062269062
2377423738
MonoBehaviour:
@@ -25483,11 +25447,11 @@ PrefabInstance:
2548325447
- target: {fileID: 4963305197896889744, guid: f26be2a7dbd67dc42b7191b7a75047a6, type: 3}
2548425448
propertyPath: _targetProcessorContainers.Array.data[3]._ccdProcessor._ccdData.Array.data[0].Target
2548525449
value:
25486-
objectReference: {fileID: 205652339}
25450+
objectReference: {fileID: 1467336568}
2548725451
- target: {fileID: 4963305197896889744, guid: f26be2a7dbd67dc42b7191b7a75047a6, type: 3}
2548825452
propertyPath: _targetProcessorContainers.Array.data[4]._ccdProcessor._ccdData.Array.data[0].Target
2548925453
value:
25490-
objectReference: {fileID: 676065713}
25454+
objectReference: {fileID: 1419136270}
2549125455
- target: {fileID: 4963305197896889744, guid: f26be2a7dbd67dc42b7191b7a75047a6, type: 3}
2549225456
propertyPath: _targetProcessorContainers.Array.data[2]._hipPinningProcessor._hipPinningTargetParent
2549325457
value:
@@ -26007,11 +25971,11 @@ PrefabInstance:
2600725971
- target: {fileID: 4028155944758615682, guid: 1620c7a13bf63d74aa04e90ed9488f6e, type: 3}
2600825972
propertyPath: _bonePairs.Array.data[14].ParentJoint
2600925973
value:
26010-
objectReference: {fileID: 0}
25974+
objectReference: {fileID: 324755899}
2601125975
- target: {fileID: 4028155944758615682, guid: 1620c7a13bf63d74aa04e90ed9488f6e, type: 3}
2601225976
propertyPath: _bonePairs.Array.data[15].ParentJoint
2601325977
value:
26014-
objectReference: {fileID: 0}
25978+
objectReference: {fileID: 1009674806}
2601525979
- target: {fileID: 5558038247458039740, guid: 1620c7a13bf63d74aa04e90ed9488f6e, type: 3}
2601625980
propertyPath: m_LocalPosition.x
2601725981
value: 0

0 commit comments

Comments
 (0)