From f2749d28c6cfa7380bf984bdb8b17b126e2d5890 Mon Sep 17 00:00:00 2001 From: Eli VanderBilt <40370237+elimvb@users.noreply.github.com> Date: Tue, 9 Aug 2022 14:42:01 -0700 Subject: [PATCH 1/3] Moved stretch-agent's default-arm 0.1m up and 180 degrees left --- .../Prefabs/FPSController.prefab | 80 +++++++++++++------ 1 file changed, 55 insertions(+), 25 deletions(-) diff --git a/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab b/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab index 7acff41d63..bd8f2df461 100644 --- a/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab +++ b/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab @@ -6743,6 +6743,36 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 4688288424284159259, guid: 90f8e05439e435c408ec2fe2048c8492, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4688288424284159259, guid: 90f8e05439e435c408ec2fe2048c8492, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4688288424284159259, guid: 90f8e05439e435c408ec2fe2048c8492, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4688288424284159259, guid: 90f8e05439e435c408ec2fe2048c8492, + type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4688288424284159259, guid: 90f8e05439e435c408ec2fe2048c8492, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4688288424284159259, guid: 90f8e05439e435c408ec2fe2048c8492, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} - target: {fileID: 5606275403011028521, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} propertyPath: FourthJoint @@ -6791,7 +6821,7 @@ PrefabInstance: - target: {fileID: 7207280906714838609, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7359940282124862951, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} @@ -6835,15 +6865,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} +--- !u!1 &4091808238110504036 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7207280906714838609, guid: 90f8e05439e435c408ec2fe2048c8492, + type: 3} + m_PrefabInstance: {fileID: 6686827459010527797} + m_PrefabAsset: {fileID: 0} --- !u!1 &2986994670441414570 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8484656314935655839, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} ---- !u!1 &4091808238110504036 stripped +--- !u!1 &5905402249939106863 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7207280906714838609, guid: 90f8e05439e435c408ec2fe2048c8492, + m_CorrespondingSourceObject: {fileID: 952606066754928154, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} @@ -6853,9 +6889,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} ---- !u!1 &6943963101039952706 stripped +--- !u!1 &6538673571612156706 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4364422909097050487, guid: 90f8e05439e435c408ec2fe2048c8492, + m_CorrespondingSourceObject: {fileID: 464551209438273815, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} @@ -6877,9 +6913,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} ---- !u!1 &6538673571612156706 stripped +--- !u!1 &6943963101039952706 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 464551209438273815, guid: 90f8e05439e435c408ec2fe2048c8492, + m_CorrespondingSourceObject: {fileID: 4364422909097050487, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} @@ -6889,9 +6925,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} ---- !u!4 &6736801866581176760 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 122036717755888525, guid: 90f8e05439e435c408ec2fe2048c8492, +--- !u!1 &3436107029992345560 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8314738952976993773, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} @@ -6901,12 +6937,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} ---- !u!1 &5905402249939106863 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 952606066754928154, guid: 90f8e05439e435c408ec2fe2048c8492, - type: 3} - m_PrefabInstance: {fileID: 6686827459010527797} - m_PrefabAsset: {fileID: 0} --- !u!1 &6299647482959421952 stripped GameObject: m_CorrespondingSourceObject: {fileID: 837874209359945781, guid: 90f8e05439e435c408ec2fe2048c8492, @@ -6919,15 +6949,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} ---- !u!1 &3436107029992345560 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8314738952976993773, guid: 90f8e05439e435c408ec2fe2048c8492, - type: 3} - m_PrefabInstance: {fileID: 6686827459010527797} - m_PrefabAsset: {fileID: 0} ---- !u!1 &983767856714463903 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5866898946652059818, guid: 90f8e05439e435c408ec2fe2048c8492, +--- !u!4 &6736801866581176760 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 122036717755888525, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} @@ -6943,6 +6967,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6686827459010527797} m_PrefabAsset: {fileID: 0} +--- !u!1 &983767856714463903 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5866898946652059818, guid: 90f8e05439e435c408ec2fe2048c8492, + type: 3} + m_PrefabInstance: {fileID: 6686827459010527797} + m_PrefabAsset: {fileID: 0} --- !u!54 &6566831570947703045 Rigidbody: m_ObjectHideFlags: 0 From f2fde6c716af4cd4ef9e67b0987d87c07c7104df Mon Sep 17 00:00:00 2001 From: Eli VanderBilt Date: Tue, 16 Aug 2022 16:49:06 -0700 Subject: [PATCH 2/3] Disabled stretch-arm at initialization --- .../FirstPersonCharacter/Prefabs/FPSController.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab b/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab index bd8f2df461..082f5fe5e3 100644 --- a/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab +++ b/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab @@ -6821,7 +6821,7 @@ PrefabInstance: - target: {fileID: 7207280906714838609, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7359940282124862951, guid: 90f8e05439e435c408ec2fe2048c8492, type: 3} From b815aa6607bbdcf6eea807a322c75b0b0f3d0030 Mon Sep 17 00:00:00 2001 From: lucaw Date: Wed, 17 Aug 2022 09:20:20 -0700 Subject: [PATCH 3/3] Tiny change to trigger build. --- unity/Assets/Scripts/BaseFPSAgentController.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/unity/Assets/Scripts/BaseFPSAgentController.cs b/unity/Assets/Scripts/BaseFPSAgentController.cs index 56e0cb02e6..ef0bcecdfe 100644 --- a/unity/Assets/Scripts/BaseFPSAgentController.cs +++ b/unity/Assets/Scripts/BaseFPSAgentController.cs @@ -1423,7 +1423,6 @@ protected virtual void RotateView() { // freeze y-axis transform.rotation = Quaternion.Euler(eulerX, eulerY, 0); - } // Check if agent is collided with other objects