Path tracer colors #599

nkoenig · 2020-09-09T20:05:21Z

Add support for a YAML configuration file, which has the form:

rtf: 4.0
incorrect_report_color:
  ambient:
    r: 1.0
    g: 0.0
    b: 0.0
    a: 0.5
  diffuse:
    r: 1.0
    g: 0.0
    b: 0.0
    a: 0.5
  emissive:
    r: 0.2
    g: 0.0
    b: 0.0
    a: 0.1
correct_report_color:
  ambient:
    r: 0.0
    g: 1.0
    b: 0.0
    a: 1.0
  diffuse:
    r: 0.0
    g: 1.0
    b: 0.0
    a: 1.0
  emissive:
    r: 0.0
    g: 1.0
    b: 0.0
    a: 1.0
artifact_location_color:
  ambient:
    r: 0.0
    g: 1.0
    b: 1.0
    a: 0.5
  diffuse:
    r: 0.0
    g: 1.0
    b: 1.0
    a: 0.5
  emissive:
    r: 0.0
    g: 0.2
    b: 0.2
    a: 0.5
robot_colors:
  - color:
    ambient:
      r: 0.6
      g: 0.0
      b: 1.0
      a: 1.0
    diffuse:
      r: 0.6
      g: 0.0
      b: 1.0
      a: 1.0
    emissive:
      r: 0.6
      g: 0.0
      b: 1.0
      a: 1.0
  - color:
    ambient:
      r: 0.678
      g: 0.2
      b: 1.0
      a: 1.0
    diffuse:
      r: 0.678
      g: 0.2
      b: 1.0
      a: 1.0
    emissive:
      r: 0.678
      g: 0.2
      b: 1.0
      a: 1.0
  - color:
    ambient:
      r: 0.761
      g: 0.4
      b: 1.0
      a: 1.0
    diffuse:
      r: 0.761
      g: 0.4
      b: 1.0
      a: 1.0
    emissive:
      r: 0.761
      g: 0.4
      b: 1.0
      a: 1.0

Signed-off-by: Nate Koenig <[email protected]>

mjcarroll · 2020-09-17T14:57:38Z

Small enhancement: path_tracer_colors...path_tracer_colors_dry

Signed-off-by: Nate Koenig <[email protected]>

…racer_colors

nkoenig · 2020-09-21T16:33:24Z

Small enhancement: path_tracer_colors...path_tracer_colors_dry

I think your branch may have disappeared, but I recreated the change in 46a6489

mjcarroll · 2020-09-21T17:09:31Z

I think your branch may have disappeared, but I recreated the change in 46a6489

Whoops, for some reason I thought it was already merged, and cleaned it up.

subt_ign/src/path_tracer.cc

mjcarroll

Just one additional suggestion to help debug yaml issues, otherwise LGTM

Co-authored-by: Michael Carroll <[email protected]>

* bump to citadel, update comms visualization * Adding breadcrumbs to x1 config 7 & 8 * Added additional breadcrumbs * Update to citadel * Prevent breadcrumb topics * Added breadcrumb handling to more launch files * Apply patch * Adjust spawn location of the breadcrumbs * Update cave_circuit.ign to call the corect spawner method (#409) Signed-off-by: Addisu Z. Taddese <[email protected]> * Add disable_physics_time param to breadcrumb plugin to auto disable them Signed-off-by: Ian Chen <[email protected]> * Adding team base * One team base only * Cleanup after move from bitbucket * Cleanup * Remove extra whitespace * Use https for git * Cave Qual release * Update Citadel and Urban Circuit * Update Citadel and Urban Circuit * bump to citadel, update comms visualization * Update to citadel * bump to citadel, update comms visualization * Cleanup after rebase * Updates based on review * Missed one pose publisher * one more RawPose Signed-off-by: Ian Chen <[email protected]> * Minor cmake tweaks Signed-off-by: Nate Koenig <[email protected]> * Change colors for comms visualization. Signed-off-by: Nate Koenig <[email protected]> * Fix docs Signed-off-by: Nate Koenig <[email protected]> * Azeey/marsupial (#424) * Add marsupial robots for cave_circuit * Update example command * Apply spawnWorldYaw to marsupial offsets * Add marsupial vehicle support to cloudsim Signed-off-by: Addisu Z. Taddese <[email protected]> * Update cloudsim_bridge and json2docker Signed-off-by: Addisu Z. Taddese <[email protected]> * Suppress DetachableJoint missing child warning Signed-off-by: Addisu Z. Taddese <[email protected]> * Added platform Signed-off-by: Nate Koenig <[email protected]> * Fix platform position Signed-off-by: Nate Koenig <[email protected]> * Combined spawn Signed-off-by: Nate Koenig <[email protected]> * Update submitted models Signed-off-by: Nate Koenig <[email protected]> * Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Add missing changes from PRs #402 and #403 Signed-off-by: Addisu Z. Taddese <[email protected]> * Adjust platform height Signed-off-by: Nate Koenig <[email protected]> * Fix deprecation Signed-off-by: Nate Koenig <[email protected]> * Fix build Signed-off-by: Nate Koenig <[email protected]> * Update to visibility RF model (#440) * Testing. * Remove debug code. * Update to visibility RF model to account for radio characteristics and message size. * Updated the static number of bytes in a message for communication visualization from 5 to 100. Co-authored-by: Carlos Aguero <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * citadel dockerfiles Signed-off-by: Nate Koenig <[email protected]> * Merged with master Signed-off-by: Nate Koenig <[email protected]> * Fix dependencies Signed-off-by: Nate Koenig <[email protected]> * Download models Signed-off-by: Nate Koenig <[email protected]> * Path tracer (#545) * Added a path tracer program that visualizes robot paths, artifacts, and artifact reports. Signed-off-by: Nate Koenig <[email protected]> * Added path tracer files Signed-off-by: Nate Koenig <[email protected]> * Cleanup build and address comments Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Break out model download into separate docker image. Signed-off-by: Nate Koenig <[email protected]> * Cleanup Signed-off-by: Nate Koenig <[email protected]> * Update docker image name Signed-off-by: Nate Koenig <[email protected]> * Updating docker Signed-off-by: Nate Koenig <[email protected]> * Fixed merge Signed-off-by: Nate Koenig <[email protected]> * Handle log files with no events.yml file, and also handle an error case in events.yml (#565) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Path tracer rtf (#596) * Modify path tracer to use an RTF value Signed-off-by: Nate Koenig <[email protected]> * Added more output Signed-off-by: Nate Koenig <[email protected]> * Account for time required to process the step Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Path tracer colors (#599) * Modify path tracer to use an RTF value Signed-off-by: Nate Koenig <[email protected]> * Start of path tracer color yaml configuration Signed-off-by: Nate Koenig <[email protected]> * Support yaml configuration for colors and rtf Signed-off-by: Nate Koenig <[email protected]> * Update to use DRY suggestion Signed-off-by: Nate Koenig <[email protected]> * Update subt_ign/src/path_tracer.cc Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Michael Carroll <[email protected]> * Merge from master (#621) Signed-off-by: Carlos Agüero <[email protected]> * Missing include Signed-off-by: Nate Koenig <[email protected]> * Merged with master Signed-off-by: Nate Koenig <[email protected]> * Disable truth_controller * Update to use Ignition Dome Signed-off-by: Nate Koenig <[email protected]> * Updating dockerfiles Signed-off-by: Nate Koenig <[email protected]> * Updating subt_sim_entry dockerfile Signed-off-by: Nate Koenig <[email protected]> * Updating model download Signed-off-by: Nate Koenig <[email protected]> * Update dockerfile Signed-off-by: Nate Koenig <[email protected]> * Update dockefile Signed-off-by: Nate Koenig <[email protected]> * Update subt_sim_entry Signed-off-by: Nate Koenig <[email protected]> * Update docker Signed-off-by: Nate Koenig <[email protected]> * Fixing docker Signed-off-by: Nate Koenig <[email protected]> * Improve git clone Signed-off-by: Nate Koenig <[email protected]> * Add back in ros_ign bridge to cloudsim_sim dockerfile Signed-off-by: Nate Koenig <[email protected]> * Update all urban .dat files. (#721) Signed-off-by: Carlos Agüero <[email protected]> * Update all tunnel .dat files. (#723) Signed-off-by: Carlos Agüero <[email protected]> * Update dockerfiles Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Ian Chen <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Taddese <[email protected]> Co-authored-by: acschang <[email protected]> Co-authored-by: Carlos Aguero <[email protected]> Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Carlos Agüero <[email protected]>

* bump to citadel, update comms visualization * Adding breadcrumbs to x1 config 7 & 8 * Added additional breadcrumbs * Update to citadel * Prevent breadcrumb topics * Added breadcrumb handling to more launch files * Apply patch * Adjust spawn location of the breadcrumbs * Update cave_circuit.ign to call the corect spawner method (#409) Signed-off-by: Addisu Z. Taddese <[email protected]> * Add disable_physics_time param to breadcrumb plugin to auto disable them Signed-off-by: Ian Chen <[email protected]> * Adding team base * One team base only * Cleanup after move from bitbucket * Cleanup * Remove extra whitespace * Use https for git * Cave Qual release * Update Citadel and Urban Circuit * Update Citadel and Urban Circuit * bump to citadel, update comms visualization * Update to citadel * bump to citadel, update comms visualization * Cleanup after rebase * Updates based on review * Missed one pose publisher * one more RawPose Signed-off-by: Ian Chen <[email protected]> * Minor cmake tweaks Signed-off-by: Nate Koenig <[email protected]> * Change colors for comms visualization. Signed-off-by: Nate Koenig <[email protected]> * Fix docs Signed-off-by: Nate Koenig <[email protected]> * Azeey/marsupial (#424) * Add marsupial robots for cave_circuit * Update example command * Apply spawnWorldYaw to marsupial offsets * Add marsupial vehicle support to cloudsim Signed-off-by: Addisu Z. Taddese <[email protected]> * Update cloudsim_bridge and json2docker Signed-off-by: Addisu Z. Taddese <[email protected]> * Suppress DetachableJoint missing child warning Signed-off-by: Addisu Z. Taddese <[email protected]> * Added platform Signed-off-by: Nate Koenig <[email protected]> * Fix platform position Signed-off-by: Nate Koenig <[email protected]> * Combined spawn Signed-off-by: Nate Koenig <[email protected]> * Update submitted models Signed-off-by: Nate Koenig <[email protected]> * Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Add missing changes from PRs #402 and #403 Signed-off-by: Addisu Z. Taddese <[email protected]> * Adjust platform height Signed-off-by: Nate Koenig <[email protected]> * Fix deprecation Signed-off-by: Nate Koenig <[email protected]> * Fix build Signed-off-by: Nate Koenig <[email protected]> * Update to visibility RF model (#440) * Testing. * Remove debug code. * Update to visibility RF model to account for radio characteristics and message size. * Updated the static number of bytes in a message for communication visualization from 5 to 100. Co-authored-by: Carlos Aguero <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * citadel dockerfiles Signed-off-by: Nate Koenig <[email protected]> * Merged with master Signed-off-by: Nate Koenig <[email protected]> * Fix dependencies Signed-off-by: Nate Koenig <[email protected]> * Download models Signed-off-by: Nate Koenig <[email protected]> * Path tracer (#545) * Added a path tracer program that visualizes robot paths, artifacts, and artifact reports. Signed-off-by: Nate Koenig <[email protected]> * Added path tracer files Signed-off-by: Nate Koenig <[email protected]> * Cleanup build and address comments Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Break out model download into separate docker image. Signed-off-by: Nate Koenig <[email protected]> * Cleanup Signed-off-by: Nate Koenig <[email protected]> * Update docker image name Signed-off-by: Nate Koenig <[email protected]> * Updating docker Signed-off-by: Nate Koenig <[email protected]> * Fixed merge Signed-off-by: Nate Koenig <[email protected]> * Handle log files with no events.yml file, and also handle an error case in events.yml (#565) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Path tracer rtf (#596) * Modify path tracer to use an RTF value Signed-off-by: Nate Koenig <[email protected]> * Added more output Signed-off-by: Nate Koenig <[email protected]> * Account for time required to process the step Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Path tracer colors (#599) * Modify path tracer to use an RTF value Signed-off-by: Nate Koenig <[email protected]> * Start of path tracer color yaml configuration Signed-off-by: Nate Koenig <[email protected]> * Support yaml configuration for colors and rtf Signed-off-by: Nate Koenig <[email protected]> * Update to use DRY suggestion Signed-off-by: Nate Koenig <[email protected]> * Update subt_ign/src/path_tracer.cc Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Michael Carroll <[email protected]> * Merge from master (#621) Signed-off-by: Carlos Agüero <[email protected]> * Missing include Signed-off-by: Nate Koenig <[email protected]> * Merged with master Signed-off-by: Nate Koenig <[email protected]> * Disable truth_controller * Update to use Ignition Dome Signed-off-by: Nate Koenig <[email protected]> * Updating dockerfiles Signed-off-by: Nate Koenig <[email protected]> * Updating subt_sim_entry dockerfile Signed-off-by: Nate Koenig <[email protected]> * Updating model download Signed-off-by: Nate Koenig <[email protected]> * Update dockerfile Signed-off-by: Nate Koenig <[email protected]> * Update dockefile Signed-off-by: Nate Koenig <[email protected]> * Update subt_sim_entry Signed-off-by: Nate Koenig <[email protected]> * Update docker Signed-off-by: Nate Koenig <[email protected]> * Fixing docker Signed-off-by: Nate Koenig <[email protected]> * Improve git clone Signed-off-by: Nate Koenig <[email protected]> * Add back in ros_ign bridge to cloudsim_sim dockerfile Signed-off-by: Nate Koenig <[email protected]> * Tunnel connection points Signed-off-by: Nate Koenig <[email protected]> * added subt_tunnel_staging_area Signed-off-by: Nate Koenig <[email protected]> * Fixed connection points Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Ian Chen <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Taddese <[email protected]> Co-authored-by: acschang <[email protected]> Co-authored-by: Carlos Aguero <[email protected]> Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Carlos Agüero <[email protected]>

Nate Koenig added 4 commits September 8, 2020 15:17

Modify path tracer to use an RTF value

41dc846

Signed-off-by: Nate Koenig <[email protected]>

Start of path tracer color yaml configuration

adb1f29

Signed-off-by: Nate Koenig <[email protected]>

Support yaml configuration for colors and rtf

b2804cd

Signed-off-by: Nate Koenig <[email protected]>

merged with citadel

d3af590

Signed-off-by: Nate Koenig <[email protected]>

nkoenig changed the base branch from path_tracer_rtf to citadel September 16, 2020 22:15

nkoenig requested a review from caguero September 16, 2020 22:16

nkoenig removed the request for review from caguero September 21, 2020 16:18

Nate Koenig added 2 commits September 21, 2020 09:31

Update to use DRY suggestion

46a6489

Signed-off-by: Nate Koenig <[email protected]>

Merge branch 'path_tracer_colors' of github.com:osrf/subt into path_t…

2811db9

…racer_colors

nkoenig requested a review from mjcarroll September 21, 2020 16:33

mjcarroll reviewed Sep 21, 2020

View reviewed changes

subt_ign/src/path_tracer.cc Outdated Show resolved Hide resolved

mjcarroll approved these changes Sep 21, 2020

View reviewed changes

Update subt_ign/src/path_tracer.cc

d79dccc

Co-authored-by: Michael Carroll <[email protected]>

nkoenig merged commit afa207d into citadel Sep 21, 2020

nkoenig deleted the path_tracer_colors branch December 10, 2020 22:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Path tracer colors #599

Path tracer colors #599

nkoenig commented Sep 9, 2020

mjcarroll commented Sep 17, 2020

nkoenig commented Sep 21, 2020

mjcarroll commented Sep 21, 2020

mjcarroll left a comment

Path tracer colors #599

Path tracer colors #599

Conversation

nkoenig commented Sep 9, 2020

mjcarroll commented Sep 17, 2020

nkoenig commented Sep 21, 2020

mjcarroll commented Sep 21, 2020

mjcarroll left a comment

Choose a reason for hiding this comment