Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Stretch Robot integration into main branch #1008

Merged
merged 75 commits into from
Apr 13, 2022
Merged

Stretch Robot integration into main branch #1008

merged 75 commits into from
Apr 13, 2022

Conversation

elimvb
Copy link
Collaborator

@elimvb elimvb commented Apr 1, 2022

Merging of final iteration of Stretch Robot into main branch

elimvb and others added 30 commits August 24, 2021 13:53
@elimvb
Added stretch robot mesh, materials, and initial arm functionality
6c700a7
Merge branch 'erick/refactor-agent' into stretch_robot
a92c80b
@elimvb
Removed unnecessary comments from FK_IK_Solver script
08b4c28
@elimvb
Renamed parameter names to be more universal
f83627e
@elimvb
Major additions to FPSController logic, to add new stretch_robot as f…
40d07c2 
…eature. Work-in-progress.
adding UNITY_EDITOR debugging for stretch robot
851b78a
@elimvb
Fixed ContinuousMovement script to be compatible with Stretch Arm
6e03767
@elimvb
Fixed ArmActive conditions to include SArm
5554393
@elimvb
Made more refined adjustments to stretch arm variation of logic in Ba…
181d3dc 
…seFPSAgentController
@elimvb
Adjusted Stretch Arm to have proper extension boundaries
f9b87b9
@elimvb
Fixed variable names in Stretch Arm Solver to be more appropriate
0926269
@elimvb
Restructured Stretch Arm hierarchy to make it more consistent with IK…
18dd12c 
… Arm
@elimvb
Fixed one more detail to stretch robot hierarchy restructuring
2e7a419
@elimvb
Added more Stretch Arm details
98d8beb
@elimvb
Made corrections to Stretch Arm restructuring
8a813a4
@elimvb
Made final physics-related adjustments to AgentManager
b5ea842
@elimvb
Fixed slight orientation problem with stretch robot mesh
171a2a1
@elimvb
Fixed offset issue with Stretch Arm Controller
56132bd
@elimvb
Fixed stretch arm gripper prefab orientation
5b5e109
@elimvb
Changed functionally-identical detail to IK_Robot_Arm_Controller, to …
ccc688e 
…keep logic consistent with Stretch Arm's
@elimvb
Removed redundant comments from arm scripts
d1dc106
@elimvb
Added more intermediate joints for stretch-arm, for organization's sake
3f706b2
@elimvb
Made additional changes to consolidate and simplify logic for both IK…
826a161 
…, and fixed Stretch Arm base's center-of-rotation
@winthos
NavMeshAgent moved to child of FPSController
153d871 
-moved NavMeshAgent to child object so we can offset it accordingly with Stretch bot's weird center of rotation
@elimvb
Fixed joint points for ideal metadata
17c95a0
@elimvb
Fixed parameter for stretch-arm's freedom of motion
4e56197
@elimvb
Adjusted logic for changed joint_5 transform
2baf593
@elimvb
Added custom shortcuts for debug actions
e103183
@elimvb
Re-activated capsules that I forgot to turn back on
7125292
@elimvb
Fixed rotation metadata
ffe5710
elimvb and others added 19 commits December 3, 2021 14:35
@elimvb
Added third-party camera ImageSynthesis to SecondaryCamera
6ccbd41
@elimvb
Added condition to enable SecondaryCamera's ImageSynthesis component …
31f60f0 
…only if necessary
@elimvb
Added enableImageSynthesis boolean change
b254dac
@elimvb
Temporary disabling of enableImageSynthesis
879ad7c
@elimvb
Changed Stretch Agent's secondary camera to update its imagesynthesis…
7675df8 
… without caching anything
@elimvb
More direct reference to main camera's image-synthesis activation
37bc4dc
@elimvb
Using override method instead
54353b9
@elimvb
Added context to updateThirdPartyCameraImageSynthesis, and made it pa…
03b26e9 
…rameter-dependent
@elimvb
Corrected visibility point conditions to include Stretch Arm edge case
7184aa4
Merge branch 'main' into erick/stretch_robot_restructured_arm_updated…
525a1e4 
…-merge
Merge branch 'main' into erick/stretch_robot_restructured_arm_updated…
f698c1c 
…-merge
@elimvb
Merge branch 'main' into stretch_robot_pre_merge
ea2060a
@elimvb
Fixed rooms whose agent's starting locations clip into walls in Stret…
bda5253 
…ch mode
@elimvb
Fixed 6_1 starting position
fe00552
@elimvb
Made secondary camera a non-child of primary camera, so camera rotati…
db38e37 
…ons down cascade from one to the other
@elimvb
Fixed initialization transform for secondary camera
04b4785
@elimvb
Changed Secondary Camera position to match real-life position
a4ca647
@elimvb
Tweaked Secondary Camera position again
546c50b
modifying retrieval of ImageSynthesis component off of agent to use t…
cf23e65 
…he camera instead of the agent gameobject to avoid finding the ImageSynthesis component for the SecondaryCamera on the stretchrobot
@lgtm-com
Copy link

lgtm-com bot commented Apr 1, 2022

This pull request introduces 26 alerts and fixes 2 when merging cf23e65 into fce692a - view on LGTM.com

new alerts:

  • 17 for Dereferenced variable may be null
  • 6 for Use of default ToString()
  • 3 for Useless assignment to local variable

fixed alerts:

  • 2 for Dereferenced variable may be null

@lgtm-com
Copy link

lgtm-com bot commented Apr 13, 2022

This pull request introduces 26 alerts and fixes 2 when merging 0db08ed into ea60106 - view on LGTM.com

new alerts:

  • 17 for Dereferenced variable may be null
  • 6 for Use of default ToString()
  • 3 for Useless assignment to local variable

fixed alerts:

  • 2 for Dereferenced variable may be null

@elimvb elimvb merged commit dc0f9ec into main Apr 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekolve ekolve Awaiting requested review from ekolve

@ehsanik ehsanik Awaiting requested review from ehsanik

@AlvaroHG AlvaroHG Awaiting requested review from AlvaroHG

@winthos winthos Awaiting requested review from winthos

@mattdeitke mattdeitke Awaiting requested review from mattdeitke

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@elimvb @winthos @AlvaroHG