Skip to content

Commit

Permalink
Merge branch 'main' into remove-collider-vis-scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
winthos committed Aug 20, 2024
2 parents 5bbb41c + 5a75cd2 commit b21ad9e
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions unity/Assets/Scripts/FpinAgentController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -883,8 +883,11 @@ public ActionFinished InitializeBody(
fpinMovable = new FpinMovableContinuous(this.GetComponentInParent<CollisionListener>());

// we had a body asset used, so actionFinished returns info related to that
if (bodyAsset != null) {
return new ActionFinished(spawnAssetActionFinished) {
if (bodyAsset != null)
{
return new ActionFinished(spawnAssetActionFinished)
{
success = true,
// TODO: change to a proper class once metadata return is defined
actionReturn = new Dictionary<string, object>()
{
Expand All @@ -898,16 +901,19 @@ spawnAssetActionFinished.actionReturn as ObjectSphereBounds
{ "cameraFarPlane", m_Camera.farClipPlane }
}
};
} else {
return new ActionFinished() {
}
else
{
return new ActionFinished(
success: true,
// TODO: change to a proper class once metadata return is defined
actionReturn = new Dictionary<string, object>()
actionReturn: new Dictionary<string, object>()
{
{ "BoxBounds", this.BoxBounds },
{ "cameraNearPlane", m_Camera.nearClipPlane },
{ "cameraFarPlane", m_Camera.farClipPlane }
}
};
);
}
}

Expand Down

0 comments on commit b21ad9e

Please sign in to comment.