Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Stretch robot default posrot fix #1061

Merged
merged 4 commits into from
Aug 18, 2022
Merged

Stretch robot default posrot fix #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2749d2
Moved stretch-agent's default-arm 0.1m up and 180 degrees left
elimvb Aug 9, 2022
f2fde6c
Disabled stretch-arm at initialization
elimvb Aug 16, 2022
b815aa6
Tiny change to trigger build.
Lucaweihs Aug 17, 2022
6836cc4
Merge branch 'stretch_robot_default_posrot_take_two' of github.com:al…
Lucaweihs Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion unity/Assets/Scripts/BaseFPSAgentController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
78 changes: 54 additions & 24 deletions unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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,
Expand All @@ -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}
Expand All @@ -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
Expand Down