Skip to content

Commit

Permalink
Merge pull request #212 from NextCenturyCorporation/fix-api
Browse files Browse the repository at this point in the history
Fixed stale documentation in StepMetadata.
  • Loading branch information
ThomasSchellenbergNextCentury authored Nov 18, 2020
2 parents fe552d3 + 00bd045 commit 2e71220
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 34 deletions.
27 changes: 10 additions & 17 deletions machine_common_sense/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,9 @@ Defines output metadata from an action step in the MCS 3D environment.


* **depth_map_list** (*list of 2D numpy arrays*) – The list of 2-dimensional numpy arrays of depth float data from the
scene after the last action and physics simulation were run.
scene after the last action and physics simulation were run. This is
usually a list with 1 array, except for the output from start_scene
for a scene with a scripted Preview Phase.
Each depth float in a 2-dimensional numpy array is a value between 0
and the camera’s far clipping plane (default 15) correspondings to the
depth in simulation units at that pixel in the image.
Expand All @@ -355,13 +357,8 @@ Defines output metadata from an action step in the MCS 3D environment.


* **image_list** (*list of Pillow.Image objects*) – The list of images from the scene after the last action and physics
simulation were run. This is normally a list with five images, where
the physics simulation has unpaused and paused again for a little
bit between each image, and the final image is the state of the
environment before your next action. The StepMetadata object
returned from a call to controller.start_scene will normally have a
listwith only one image, except for a scene with a scripted Preview
Phase.
simulation were run. This is usually a list with 1 image, except for
the output from start_scene for a scene with a scripted Preview Phase.


* **object_list** (*list of ObjectMetadata objects*) – The list of metadata for all the visible interactive objects in the
Expand All @@ -370,15 +367,11 @@ Defines output metadata from an action step in the MCS 3D environment.


* **object_mask_list** (*list of Pillow.Image objects*) – The list of object mask (instance segmentation) images from the scene
after the last action and physics simulation were run. This is
normally a list with five images, where the physics simulation
has unpaused and paused again for a little bit between each image,
and the final image is the state of the environment before your next
action. The StepMetadata object returned from a call to
controller.start_scene will normally have a list with only one image,
except for a scene with a scripted Preview Phase. The color of each
object in the mask corresponds to the “color” property in its
ObjectMetadata object.
after the last action and physics simulation were run. This is usually
a list with 1 image, except for the output from start_scene for a
scene with a scripted Previous Phase.
The color of each object in the mask corresponds to the “color”
property in its ObjectMetadata object.


* **pose** (*string*) – Your current pose. Either “STANDING”, “CRAWLING”, or “LYING”.
Expand Down
27 changes: 10 additions & 17 deletions machine_common_sense/step_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ class StepMetadata:
actions like "LieDown", "Stand", or "Crawl".
depth_map_list : list of 2D numpy arrays
The list of 2-dimensional numpy arrays of depth float data from the
scene after the last action and physics simulation were run.
scene after the last action and physics simulation were run. This is
usually a list with 1 array, except for the output from start_scene
for a scene with a scripted Preview Phase.
Each depth float in a 2-dimensional numpy array is a value between 0
and the camera's far clipping plane (default 15) correspondings to the
depth in simulation units at that pixel in the image.
Expand All @@ -42,28 +44,19 @@ class StepMetadata:
Changed by setting the "horizon" parameter in a "RotateLook" action.
image_list : list of Pillow.Image objects
The list of images from the scene after the last action and physics
simulation were run. This is normally a list with five images, where
the physics simulation has unpaused and paused again for a little
bit between each image, and the final image is the state of the
environment before your next action. The StepMetadata object
returned from a call to controller.start_scene will normally have a
listwith only one image, except for a scene with a scripted Preview
Phase.
simulation were run. This is usually a list with 1 image, except for
the output from start_scene for a scene with a scripted Preview Phase.
object_list : list of ObjectMetadata objects
The list of metadata for all the visible interactive objects in the
scene. For metadata on structural objects like walls, please see
structural_object_list
object_mask_list : list of Pillow.Image objects
The list of object mask (instance segmentation) images from the scene
after the last action and physics simulation were run. This is
normally a list with five images, where the physics simulation
has unpaused and paused again for a little bit between each image,
and the final image is the state of the environment before your next
action. The StepMetadata object returned from a call to
controller.start_scene will normally have a list with only one image,
except for a scene with a scripted Preview Phase. The color of each
object in the mask corresponds to the "color" property in its
ObjectMetadata object.
after the last action and physics simulation were run. This is usually
a list with 1 image, except for the output from start_scene for a
scene with a scripted Previous Phase.
The color of each object in the mask corresponds to the "color"
property in its ObjectMetadata object.
pose : string
Your current pose. Either "STANDING", "CRAWLING", or "LYING".
position : dict
Expand Down

0 comments on commit 2e71220

Please sign in to comment.