From 697ed3ff0496b79b1bb4270aabf457ee2f2ae736 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Thu, 8 Apr 2021 21:58:28 +0200 Subject: [PATCH] Apply pre-commit fixes - trailing whitespace - end of file - yaml: single doc --- README.md | 1 - doc/conf.py | 151 ++++++++++-------- .../liberation-sans/SIL Open Font License.txt | 2 +- .../materials/glsl120/depth_circle.frag | 2 +- ogre_media/materials/glsl120/glsl120.program | 1 - .../materials/glsl120/include/pack_depth.frag | 7 +- .../materials/glsl120/include/pass_depth.vert | 2 +- .../materials/glsl120/nogp/billboard.vert | 4 +- .../glsl120/nogp/billboard_tile.vert | 6 +- ogre_media/materials/glsl120/nogp/box.frag | 12 +- .../materials/glsl120/nogp/nogp.program | 2 +- ogre_media/materials/glsl120/pass_color.frag | 2 +- ogre_media/materials/glsl120/pickcolor.frag | 2 +- .../materials/glsl120/pickcolor_circle.frag | 2 +- .../materials/glsl120/shaded_circle.frag | 2 +- .../materials/glsl120/smooth_square.frag | 6 +- ogre_media/materials/glsl120/test_glsl.sh | 1 - ogre_media/materials/glsl150/billboard.geom | 4 +- ogre_media/materials/glsl150/box.geom | 13 +- ogre_media/materials/glsl150/glsl150.program | 1 - .../materials/glsl150/pass_pos_color.vert | 2 +- .../scripts/default_pick_and_depth.material | 4 +- .../scripts/point_cloud_point.material | 6 +- .../scripts/point_cloud_tile.material | 10 +- .../scripts120/point_cloud_box.material | 14 +- .../point_cloud_flat_square.material | 19 ++- .../scripts120/point_cloud_sphere.material | 20 +-- .../scripts120/point_cloud_square.material | 19 ++- .../scripts150/point_cloud_box.material | 14 +- .../point_cloud_flat_square.material | 33 ++-- .../scripts150/point_cloud_sphere.material | 33 ++-- .../scripts150/point_cloud_square.material | 33 ++-- ogre_media/plugins.cfg | 2 +- src/python_bindings/sip/config.sip | 2 +- .../sip/visualization_manager.sip | 2 +- src/rviz/helpers/color.i | 2 +- src/test/cube-and-cube-list-marker.yaml | 121 ++++++-------- src/test/cycling_frame.py | 2 +- src/test/embedded_materials_with_stl.yaml | 29 ++-- src/test/kitchen-mesh-marker.yaml | 2 +- src/test/meshes/README | 1 - src/test/meshes/pr2-base.dae | 2 +- src/test/send_covariance_msgs.py | 1 - src/test/triangle_list_marker.yaml | 48 +++--- src/test/turtlebot-arm-mesh-marker-array.yaml | 50 +++--- 45 files changed, 322 insertions(+), 372 deletions(-) diff --git a/README.md b/README.md index 80389418fd..943cc36004 100644 --- a/README.md +++ b/README.md @@ -73,4 +73,3 @@ yet been invented or conceived. ``` Source: http://creativecommons.org/licenses/publicdomain/ - diff --git a/doc/conf.py b/doc/conf.py index 533245123a..20018a85ef 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -11,87 +11,88 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os +import sys +import os # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) +# sys.path.insert(0, os.path.abspath(".")) # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' +# needs_sphinx = "1.0" # Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +# coming with Sphinx (named "sphinx.ext.*") or your custom ones. extensions = [] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The suffix of source filenames. -source_suffix = '.rst' +source_suffix = ".rst" # The encoding of source files. -#source_encoding = 'utf-8-sig' +# source_encoding = "utf-8-sig" # The master toctree document. -master_doc = 'index' +master_doc = "index" # General information about the project. -project = u'RViz' -copyright = u'2012, Willow Garage, Inc' +project = u"RViz" +copyright = u"2012, Willow Garage, Inc" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '1.9' +version = "1.9" # The full version, including alpha/beta/rc tags. -release = '1.9.0' +release = "1.9.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -#language = None +# language = None # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: -#today = '' +# today = "" # Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' +# today_fmt = "%B %d, %Y" # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. exclude_patterns = [] # The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None +# default_role = None -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True +# If true, "()" will be appended to :func: etc. cross-reference text. +# add_function_parentheses = True # If true, the current module name will be prepended to all description # unit titles (such as .. function::). -#add_module_names = True +# add_module_names = True # If true, sectionauthor and moduleauthor directives will be shown in the # output. They are ignored by default. -#show_authors = False +# show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = "sphinx" # A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] +# modindex_common_prefix = [] # -- Options for HTML output --------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +html_theme = "default" # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -100,113 +101,116 @@ html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] +# html_theme_path = [] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -#html_title = None +# html_title = None # A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None +# html_short_title = None # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None +# html_logo = None # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -#html_favicon = None +# html_favicon = None # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = [] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# If not "", a "Last updated on:" timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +# html_last_updated_fmt = "%b %d, %Y" # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. -#html_use_smartypants = True +# html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -#html_sidebars = {} +# html_sidebars = {} # Additional templates that should be rendered to pages, maps page names to # template names. -#html_additional_pages = {} +# html_additional_pages = {} # If false, no module index is generated. -#html_domain_indices = True +# html_domain_indices = True # If false, no index is generated. -#html_use_index = True +# html_use_index = True # If true, the index is split into individual pages for each letter. -#html_split_index = False +# html_split_index = False # If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True +# html_show_sourcelink = True # If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True +# html_show_sphinx = True # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True +# html_show_copyright = True # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. -#html_use_opensearch = '' +# html_use_opensearch = "" # This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None +# html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'RVizdoc' +htmlhelp_basename = "RVizdoc" # -- Options for LaTeX output -------------------------------------------------- latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', + # The paper size ("letterpaper" or "a4paper"). + # "papersize": "letterpaper", + # The font size ("10pt", "11pt" or "12pt"). + # "pointsize": "10pt", + # Additional stuff for the LaTeX preamble. + # "preamble": "", } # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'RViz.tex', u'RViz Documentation', - u'Josh Faust, Dave Hershberger, David Gossow, and others', 'manual'), + ( + "index", + "RViz.tex", + u"RViz Documentation", + u"Josh Faust, Dave Hershberger, David Gossow, and others", + "manual", + ), ] # The name of an image file (relative to this directory) to place at the top of # the title page. -#latex_logo = None +# latex_logo = None # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. -#latex_use_parts = False +# latex_use_parts = False # If true, show page references after internal links. -#latex_show_pagerefs = False +# latex_show_pagerefs = False # If true, show URL addresses after external links. -#latex_show_urls = False +# latex_show_urls = False # Documents to append as an appendix to all manuals. -#latex_appendices = [] +# latex_appendices = [] # If false, no module index is generated. -#latex_domain_indices = True +# latex_domain_indices = True # -- Options for manual page output -------------------------------------------- @@ -214,12 +218,17 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'rviz', u'RViz Documentation', - [u'Josh Faust, Dave Hershberger, David Gossow, and others'], 1) + ( + "index", + "rviz", + u"RViz Documentation", + [u"Josh Faust, Dave Hershberger, David Gossow, and others"], + 1, + ) ] # If true, show URL addresses after external links. -#man_show_urls = False +# man_show_urls = False # -- Options for Texinfo output ------------------------------------------------ @@ -228,16 +237,22 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'RViz', u'RViz Documentation', - u'Josh Faust, Dave Hershberger, David Gossow, and others', 'RViz', 'One line description of project.', - 'Miscellaneous'), + ( + "index", + "RViz", + u"RViz Documentation", + u"Josh Faust, Dave Hershberger, David Gossow, and others", + "RViz", + "One line description of project.", + "Miscellaneous", + ), ] # Documents to append as an appendix to all manuals. -#texinfo_appendices = [] +# texinfo_appendices = [] # If false, no module index is generated. -#texinfo_domain_indices = True +# texinfo_domain_indices = True -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' +# How to display URL addresses: "footnote", "no", or "inline". +# texinfo_show_urls = "footnote" diff --git a/ogre_media/fonts/liberation-sans/SIL Open Font License.txt b/ogre_media/fonts/liberation-sans/SIL Open Font License.txt index f2473f9cce..c02de88fa2 100644 --- a/ogre_media/fonts/liberation-sans/SIL Open Font License.txt +++ b/ogre_media/fonts/liberation-sans/SIL Open Font License.txt @@ -43,4 +43,4 @@ TERMINATION This license becomes null and void if any of the above conditions are not met. DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/ogre_media/materials/glsl120/depth_circle.frag b/ogre_media/materials/glsl120/depth_circle.frag index 607ec81622..598e1cd34e 100644 --- a/ogre_media/materials/glsl120/depth_circle.frag +++ b/ogre_media/materials/glsl120/depth_circle.frag @@ -1,6 +1,6 @@ #version 120 -// Draws a circle with the packed depth value +// Draws a circle with the packed depth value // includes vec4 packDepth( ); diff --git a/ogre_media/materials/glsl120/glsl120.program b/ogre_media/materials/glsl120/glsl120.program index 138f37f05f..1b84684c3e 100644 --- a/ogre_media/materials/glsl120/glsl120.program +++ b/ogre_media/materials/glsl120/glsl120.program @@ -163,4 +163,3 @@ fragment_program rviz/glsl120/smooth_square.frag glsl param_named_auto alpha custom 1 } } - diff --git a/ogre_media/materials/glsl120/include/pack_depth.frag b/ogre_media/materials/glsl120/include/pack_depth.frag index 2bc8e48737..e7b83d3404 100644 --- a/ogre_media/materials/glsl120/include/pack_depth.frag +++ b/ogre_media/materials/glsl120/include/pack_depth.frag @@ -1,6 +1,6 @@ #version 120 -// Splits up a normalized depth value in the range (0..1) +// Splits up a normalized depth value in the range (0..1) // into the vertex RGB values. // Alpha values below 1/255 are rendered transparent. @@ -14,13 +14,12 @@ varying float depth; vec4 packDepth() { float normalized_depth = depth / far_clip_distance; - + // split up float into rgb components const vec3 shift = vec3(256.0 * 256.0, 256.0, 1.0); const vec3 mask = vec3(0.0, 1.0 / 256.0, 1.0 / 256.0); vec3 depth_packed = fract(normalized_depth * shift); depth_packed -= depth_packed.xxy * mask; - + return vec4( depth_packed.zyx, step( minimum_alpha, alpha )); } - diff --git a/ogre_media/materials/glsl120/include/pass_depth.vert b/ogre_media/materials/glsl120/include/pass_depth.vert index 4115f940ee..7d987418cc 100644 --- a/ogre_media/materials/glsl120/include/pass_depth.vert +++ b/ogre_media/materials/glsl120/include/pass_depth.vert @@ -3,7 +3,7 @@ uniform mat4 worldview_matrix; varying float depth; - + void passDepth( vec4 pos ) { vec4 pos_rel_view = worldview_matrix * pos; diff --git a/ogre_media/materials/glsl120/nogp/billboard.vert b/ogre_media/materials/glsl120/nogp/billboard.vert index 70249a1697..4685d7342a 100644 --- a/ogre_media/materials/glsl120/nogp/billboard.vert +++ b/ogre_media/materials/glsl120/nogp/billboard.vert @@ -31,9 +31,9 @@ void main() vec4 s = gl_MultiTexCoord0 * (size_factor); vec3 r = s.xxx * right; vec3 u = s.yyy * up; - + vec4 pos = gl_Vertex + vec4( r + u, 0.0 ); - + gl_Position = worldviewproj_matrix * pos; gl_TexCoord[0] = gl_MultiTexCoord0 + vec4(0.5,0.5,0.0,0.0); gl_FrontColor = gl_Color; diff --git a/ogre_media/materials/glsl120/nogp/billboard_tile.vert b/ogre_media/materials/glsl120/nogp/billboard_tile.vert index f9d929b21b..f7143b3a43 100644 --- a/ogre_media/materials/glsl120/nogp/billboard_tile.vert +++ b/ogre_media/materials/glsl120/nogp/billboard_tile.vert @@ -18,13 +18,13 @@ void passDepth( vec4 pos ); void main() { vec3 right = cross(up.xyz, normal.xyz); - + vec4 s = gl_MultiTexCoord0 * size; vec3 r = s.xxx * right; vec3 u = s.yyy * up.xyz; - + vec4 pos = gl_Vertex + vec4( r + u, 0.0 ); - + gl_Position = worldviewproj_matrix * pos; gl_TexCoord[0] = gl_MultiTexCoord0 + vec4(0.5,0.5,0.0,0.0); gl_FrontColor = gl_Color; diff --git a/ogre_media/materials/glsl120/nogp/box.frag b/ogre_media/materials/glsl120/nogp/box.frag index 7953df2a85..2b628c55a8 100644 --- a/ogre_media/materials/glsl120/nogp/box.frag +++ b/ogre_media/materials/glsl120/nogp/box.frag @@ -15,7 +15,7 @@ void main() float ax; float ay; float l; - + if ( gl_TexCoord[0].z < -0.4999 ) { ax = gl_TexCoord[0].x; @@ -55,16 +55,16 @@ void main() float blend = smoothstep(-0.48, -0.45, ay) * (1.0 - smoothstep(0.45, 0.48, ay)) * smoothstep(-0.48, -0.45, ax) * (1.0 - smoothstep(0.45, 0.48, ax)); - + float inv_blend = 1.0 - blend; - + //vec3 col = blend * gl_Color.xyz + (sign(0.5 - length(vec3(gl_Color.xyz))) * vec3(0.2, 0.2, 0.2) + gl_Color.xyz) * inv_blend; - + //alternative version: make color at edge darker vec3 col = (0.5 + 0.5*blend) * gl_Color.xyz; - + col = col * l; - + col = col + col * highlight.xyz; diff --git a/ogre_media/materials/glsl120/nogp/nogp.program b/ogre_media/materials/glsl120/nogp/nogp.program index e25e27ba48..a68a87eea4 100644 --- a/ogre_media/materials/glsl120/nogp/nogp.program +++ b/ogre_media/materials/glsl120/nogp/nogp.program @@ -1,6 +1,6 @@ // These shaders are work-arounds in case geometry shaders // are not supported, so vertices can't be created on the graphics card. -// Multiple vertices are passed in for each primitive, +// Multiple vertices are passed in for each primitive, // and each one is offset according to its texture coords. //includes: diff --git a/ogre_media/materials/glsl120/pass_color.frag b/ogre_media/materials/glsl120/pass_color.frag index f72d4c8789..d18827f9fa 100644 --- a/ogre_media/materials/glsl120/pass_color.frag +++ b/ogre_media/materials/glsl120/pass_color.frag @@ -1,6 +1,6 @@ #version 120 -// Passes the fragment color unchanged +// Passes the fragment color unchanged void main() { diff --git a/ogre_media/materials/glsl120/pickcolor.frag b/ogre_media/materials/glsl120/pickcolor.frag index 281de19665..52d8c1387d 100644 --- a/ogre_media/materials/glsl120/pickcolor.frag +++ b/ogre_media/materials/glsl120/pickcolor.frag @@ -1,6 +1,6 @@ #version 120 -// Passes the vertex pick color +// Passes the vertex pick color uniform vec4 pick_color; diff --git a/ogre_media/materials/glsl120/pickcolor_circle.frag b/ogre_media/materials/glsl120/pickcolor_circle.frag index fdc1d2ee06..c0166a771f 100644 --- a/ogre_media/materials/glsl120/pickcolor_circle.frag +++ b/ogre_media/materials/glsl120/pickcolor_circle.frag @@ -1,6 +1,6 @@ #version 120 -// Draws a circle in the pick color +// Draws a circle in the pick color //includes: void circleImpl( vec4 color, float ax, float ay ); diff --git a/ogre_media/materials/glsl120/shaded_circle.frag b/ogre_media/materials/glsl120/shaded_circle.frag index a0836a8827..b558af1e33 100644 --- a/ogre_media/materials/glsl120/shaded_circle.frag +++ b/ogre_media/materials/glsl120/shaded_circle.frag @@ -17,6 +17,6 @@ void main() vec3 col = mix(vec3(0.8, 0.8, 0.8) * gl_Color.xyz, gl_Color.xyz, a); col = col + col * highlight.xyz; - + gl_FragColor = vec4(col, alpha * ceil(a) * gl_Color.a); } diff --git a/ogre_media/materials/glsl120/smooth_square.frag b/ogre_media/materials/glsl120/smooth_square.frag index e5aa62a99c..97ff6e7625 100644 --- a/ogre_media/materials/glsl120/smooth_square.frag +++ b/ogre_media/materials/glsl120/smooth_square.frag @@ -12,13 +12,13 @@ void main() float blend = smoothstep(-0.48, -0.45, ay) * (1.0 - smoothstep(0.45, 0.48, ay)) * smoothstep(-0.48, -0.45, ax) * (1.0 - smoothstep(0.45, 0.48, ax)); - + float inv_blend = 1.0 - blend; vec3 col = blend * gl_Color.xyz + (sign(0.5 - length(vec3(gl_Color.xyz))) * vec3(0.2, 0.2, 0.2) + gl_Color.xyz) * inv_blend; - + //alternative version: make color at edge darker //vec3 col = (0.5 + 0.5*blend) * gl_Color.xyz; - + col = col + col * highlight.xyz; gl_FragColor = vec4(col.r, col.g, col.b, alpha * gl_Color.a ); diff --git a/ogre_media/materials/glsl120/test_glsl.sh b/ogre_media/materials/glsl120/test_glsl.sh index 43e02a8612..bafeedc093 100755 --- a/ogre_media/materials/glsl120/test_glsl.sh +++ b/ogre_media/materials/glsl120/test_glsl.sh @@ -8,4 +8,3 @@ else echo "Unknown shader type!" exit 1 fi - diff --git a/ogre_media/materials/glsl150/billboard.geom b/ogre_media/materials/glsl150/billboard.geom index bcd6a758e6..08e53670a6 100644 --- a/ogre_media/materials/glsl150/billboard.geom +++ b/ogre_media/materials/glsl150/billboard.geom @@ -39,7 +39,7 @@ void emitVertex( vec3 pos_rel, vec3 tex ) EmitVertex(); } -void main() +void main() { // if auto_size == 1, then size_factor == size.x*gl_Vertex.z // if auto_size == 0, then size_factor == size.x @@ -54,6 +54,6 @@ void main() emitVertex( vec3( size_factor,-size_factor, 0.0), vec3(1.0, 0.0, 0.0) ); emitVertex( vec3(-size_factor, size_factor, 0.0), vec3(0.0, 1.0, 0.0) ); emitVertex( vec3( size_factor, size_factor, 0.0), vec3(1.0, 1.0, 0.0) ); - + EndPrimitive(); } diff --git a/ogre_media/materials/glsl150/box.geom b/ogre_media/materials/glsl150/box.geom index ff97e0dec8..d7c655a44e 100644 --- a/ogre_media/materials/glsl150/box.geom +++ b/ogre_media/materials/glsl150/box.geom @@ -31,9 +31,9 @@ layout(points) in; layout(triangle_strip, max_vertices=24) out; -const vec4 axes[3] = vec4[] ( - vec4(1.0,0.0,0.0,0.0), - vec4(0.0,1.0,0.0,0.0), +const vec4 axes[3] = vec4[] ( + vec4(1.0,0.0,0.0,0.0), + vec4(0.0,1.0,0.0,0.0), vec4(0.0,0.0,1.0,0.0) ); const float lightness[6] = float[] ( @@ -50,7 +50,7 @@ void emitVertex( int side, vec4 x, vec4 y, vec4 z, vec3 tex ) vec4 pos = gl_in[0].gl_Position + vec4( pos_rel * size_factor * 0.5 ); gl_Position = worldviewproj_matrix * pos; gl_TexCoord[0] = vec4( tex.x*0.5+0.5, tex.y*0.5+0.5, 0.0, 0.0 ); - + #ifdef WITH_LIGHTING gl_FrontColor = vec4( gl_in[0].gl_FrontColor.xyz * lightness[side], gl_in[0].gl_FrontColor.a ); #else @@ -65,7 +65,7 @@ void emitVertex( int side, vec4 x, vec4 y, vec4 z, vec3 tex ) } -void main() +void main() { for( int side=0; side<3; side++ ) { @@ -74,7 +74,7 @@ void main() vec4 x=axes[ side ]; vec4 y=axes[ side2 ]; vec4 z=axes[ side3 ]; - + // face for +z emitVertex( side, x, y, z, vec3(-1, -1, +1) ); emitVertex( side, x, y, z, vec3(+1, -1, +1) ); @@ -90,4 +90,3 @@ void main() EndPrimitive(); } } - diff --git a/ogre_media/materials/glsl150/glsl150.program b/ogre_media/materials/glsl150/glsl150.program index ebcdf1ea30..14c4fba115 100644 --- a/ogre_media/materials/glsl150/glsl150.program +++ b/ogre_media/materials/glsl150/glsl150.program @@ -78,4 +78,3 @@ vertex_program rviz/glsl150/pass_pos_color.vert glsl { source pass_pos_color.vert } - diff --git a/ogre_media/materials/glsl150/pass_pos_color.vert b/ogre_media/materials/glsl150/pass_pos_color.vert index 8f0853f6d2..9ee147ca5d 100644 --- a/ogre_media/materials/glsl150/pass_pos_color.vert +++ b/ogre_media/materials/glsl150/pass_pos_color.vert @@ -1,6 +1,6 @@ #version 150 compatibility -// this merely passes over position and color, +// this merely passes over position and color, // as needed by box.geom out gl_PerVertex { diff --git a/ogre_media/materials/scripts/default_pick_and_depth.material b/ogre_media/materials/scripts/default_pick_and_depth.material index bc9a8e6603..a2a5c28e68 100644 --- a/ogre_media/materials/scripts/default_pick_and_depth.material +++ b/ogre_media/materials/scripts/default_pick_and_depth.material @@ -10,7 +10,7 @@ material rviz/DefaultPickAndDepth fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - + technique BlackCull { pass @@ -43,7 +43,7 @@ material rviz/DefaultPickAndDepth fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - + technique Black { pass diff --git a/ogre_media/materials/scripts/point_cloud_point.material b/ogre_media/materials/scripts/point_cloud_point.material index 9357a20ddf..28e26a1ab6 100644 --- a/ogre_media/materials/scripts/point_cloud_point.material +++ b/ogre_media/materials/scripts/point_cloud_point.material @@ -11,7 +11,7 @@ material rviz/PointCloudPoint fragment_program_ref rviz/glsl120/flat_color_circle.frag {} } } - + technique depth { scheme Depth @@ -22,7 +22,7 @@ material rviz/PointCloudPoint fragment_program_ref rviz/glsl120/depth_circle.frag {} } } - + technique selection_first_pass { scheme Pick @@ -33,7 +33,7 @@ material rviz/PointCloudPoint fragment_program_ref rviz/glsl120/pickcolor_circle.frag {} } } - + technique selection_second_pass { scheme Pick1 diff --git a/ogre_media/materials/scripts/point_cloud_tile.material b/ogre_media/materials/scripts/point_cloud_tile.material index afa6188f11..e87caa18a0 100644 --- a/ogre_media/materials/scripts/point_cloud_tile.material +++ b/ogre_media/materials/scripts/point_cloud_tile.material @@ -1,4 +1,4 @@ -material rviz/PointCloudTile +material rviz/PointCloudTile { technique nogp { pass { @@ -9,7 +9,7 @@ material rviz/PointCloudTile fragment_program_ref rviz/glsl120/smooth_square.frag {} } } - + technique nogp_depth { scheme Depth pass { @@ -20,7 +20,7 @@ material rviz/PointCloudTile fragment_program_ref rviz/glsl120/depth.frag {} } } - + technique nogp_selection_first_pass { scheme Pick pass { @@ -31,7 +31,7 @@ material rviz/PointCloudTile fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - + technique nogp_selection_second_pass { scheme Pick1 pass { @@ -42,4 +42,4 @@ material rviz/PointCloudTile fragment_program_ref rviz/glsl120/pass_color.frag {} } } -} \ No newline at end of file +} diff --git a/ogre_media/materials/scripts120/point_cloud_box.material b/ogre_media/materials/scripts120/point_cloud_box.material index 20ae9a7677..4f759eed63 100644 --- a/ogre_media/materials/scripts120/point_cloud_box.material +++ b/ogre_media/materials/scripts120/point_cloud_box.material @@ -1,9 +1,9 @@ material rviz/PointCloudBox -{ +{ /* This material should only be used with glsl < 1.50 */ /* the 'nogp' techniques require the full box geometry as input */ - + technique nogp { pass @@ -11,8 +11,8 @@ material rviz/PointCloudBox vertex_program_ref rviz/glsl120/nogp/box.vert {} fragment_program_ref rviz/glsl120/nogp/box.frag {} } - } - + } + technique nogp_depth { scheme Depth @@ -21,8 +21,8 @@ material rviz/PointCloudBox vertex_program_ref rviz/glsl120/nogp/box.vert(with_depth) {} fragment_program_ref rviz/glsl120/depth.frag {} } - } - + } + technique nogp_selection_first_pass { scheme Pick @@ -32,7 +32,7 @@ material rviz/PointCloudBox fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - + technique nogp_selection_second_pass { scheme Pick1 diff --git a/ogre_media/materials/scripts120/point_cloud_flat_square.material b/ogre_media/materials/scripts120/point_cloud_flat_square.material index dc37af2fff..a8c4e722bf 100644 --- a/ogre_media/materials/scripts120/point_cloud_flat_square.material +++ b/ogre_media/materials/scripts120/point_cloud_flat_square.material @@ -1,37 +1,36 @@ material rviz/PointCloudFlatSquare { technique nogp { - pass { + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl120/nogp/billboard.vert {} fragment_program_ref rviz/glsl120/flat_color.frag {} } } - - technique nogp_depth { + + technique nogp_depth { scheme Depth - pass { + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl120/nogp/billboard.vert(with_depth) {} fragment_program_ref rviz/glsl120/depth.frag {} } } - - technique nogp_selection_first_pass { + + technique nogp_selection_first_pass { scheme Pick - pass { + pass { vertex_program_ref rviz/glsl120/nogp/billboard.vert {} fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - + technique nogp_selection_second_pass { scheme Pick1 - pass { + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl120/nogp/billboard.vert {} fragment_program_ref rviz/glsl120/pass_color.frag {} } } } - diff --git a/ogre_media/materials/scripts120/point_cloud_sphere.material b/ogre_media/materials/scripts120/point_cloud_sphere.material index 1e6a122746..997d956237 100644 --- a/ogre_media/materials/scripts120/point_cloud_sphere.material +++ b/ogre_media/materials/scripts120/point_cloud_sphere.material @@ -1,23 +1,23 @@ material rviz/PointCloudSphere { - + technique nogp { - pass { + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl120/nogp/billboard.vert {} fragment_program_ref rviz/glsl120/shaded_circle.frag {} } } - - technique nogp_depth { + + technique nogp_depth { scheme Depth - pass { + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl120/nogp/billboard.vert(with_depth) {} fragment_program_ref rviz/glsl120/depth_circle.frag {} } } - - technique nogp_selection_first_pass { + + technique nogp_selection_first_pass { scheme Pick pass { alpha_rejection greater_equal 1 @@ -25,14 +25,14 @@ material rviz/PointCloudSphere { fragment_program_ref rviz/glsl120/pickcolor_circle.frag {} } } - + technique nogp_selection_second_pass { scheme Pick1 - pass { + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl120/nogp/billboard.vert {} fragment_program_ref rviz/glsl120/pass_color_circle.frag {} } } - + } diff --git a/ogre_media/materials/scripts120/point_cloud_square.material b/ogre_media/materials/scripts120/point_cloud_square.material index a47db4aad9..bf991fbdee 100644 --- a/ogre_media/materials/scripts120/point_cloud_square.material +++ b/ogre_media/materials/scripts120/point_cloud_square.material @@ -1,37 +1,36 @@ material rviz/PointCloudSquare { technique nogp { - pass { + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl120/nogp/billboard.vert {} fragment_program_ref rviz/glsl120/smooth_square.frag {} } } - - technique nogp_depth { + + technique nogp_depth { scheme Depth - pass { + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl120/nogp/billboard.vert(with_depth) {} fragment_program_ref rviz/glsl120/depth.frag {} } } - - technique nogp_selection_first_pass { + + technique nogp_selection_first_pass { scheme Pick - pass { + pass { vertex_program_ref rviz/glsl120/nogp/billboard.vert {} fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - + technique nogp_selection_second_pass { scheme Pick1 - pass { + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl120/nogp/billboard.vert {} fragment_program_ref rviz/glsl120/pass_color.frag {} } } } - diff --git a/ogre_media/materials/scripts150/point_cloud_box.material b/ogre_media/materials/scripts150/point_cloud_box.material index c466c6ee1f..8c76c163b1 100644 --- a/ogre_media/materials/scripts150/point_cloud_box.material +++ b/ogre_media/materials/scripts150/point_cloud_box.material @@ -1,10 +1,10 @@ material rviz/PointCloudBox -{ +{ /* This material should only be used with glsl < 1.50 */ - - // the 'gp' techniques need one input vertex per box + + // the 'gp' techniques need one input vertex per box // and use geometry shaders to create the geometry - + technique gp { pass @@ -14,7 +14,7 @@ material rviz/PointCloudBox fragment_program_ref rviz/glsl120/smooth_square.frag {} } } - + technique gp_depth { scheme Depth @@ -25,7 +25,7 @@ material rviz/PointCloudBox fragment_program_ref rviz/glsl120/depth.frag {} } } - + technique gp_selection_first_pass { scheme Pick @@ -36,7 +36,7 @@ material rviz/PointCloudBox fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - + technique gp_selection_second_pass { scheme Pick1 diff --git a/ogre_media/materials/scripts150/point_cloud_flat_square.material b/ogre_media/materials/scripts150/point_cloud_flat_square.material index 75dd8448bd..cafb2e8852 100644 --- a/ogre_media/materials/scripts150/point_cloud_flat_square.material +++ b/ogre_media/materials/scripts150/point_cloud_flat_square.material @@ -1,8 +1,8 @@ material rviz/PointCloudFlatSquare { - technique gp + technique gp { - pass + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl150/pass_pos_color.vert {} @@ -10,35 +10,35 @@ material rviz/PointCloudFlatSquare { fragment_program_ref rviz/glsl120/flat_color.frag {} } } - - technique gp_depth - { + + technique gp_depth + { scheme Depth - pass - { + pass + { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl150/pass_pos_color.vert {} geometry_program_ref rviz/glsl150/billboard.geom(with_depth) {} fragment_program_ref rviz/glsl120/depth.frag {} } } - - technique gp_selection_first_pass - { + + technique gp_selection_first_pass + { scheme Pick - pass - { + pass + { vertex_program_ref rviz/glsl150/pass_pos_color.vert {} geometry_program_ref rviz/glsl150/billboard.geom {} fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - - technique gp_selection_second_pass + + technique gp_selection_second_pass { scheme Pick1 - pass - { + pass + { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl150/pass_pos_color.vert {} geometry_program_ref rviz/glsl150/billboard.geom {} @@ -46,4 +46,3 @@ material rviz/PointCloudFlatSquare { } } } - diff --git a/ogre_media/materials/scripts150/point_cloud_sphere.material b/ogre_media/materials/scripts150/point_cloud_sphere.material index 7f159cf521..bd6289347d 100644 --- a/ogre_media/materials/scripts150/point_cloud_sphere.material +++ b/ogre_media/materials/scripts150/point_cloud_sphere.material @@ -1,8 +1,8 @@ material rviz/PointCloudSphere { - technique gp + technique gp { - pass + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl150/pass_pos_color.vert {} @@ -10,35 +10,35 @@ material rviz/PointCloudSphere { fragment_program_ref rviz/glsl120/shaded_circle.frag {} } } - - technique gp_depth - { + + technique gp_depth + { scheme Depth - pass - { + pass + { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl150/pass_pos_color.vert {} geometry_program_ref rviz/glsl150/billboard.geom(with_depth) {} fragment_program_ref rviz/glsl120/depth.frag {} } } - - technique gp_selection_first_pass - { + + technique gp_selection_first_pass + { scheme Pick - pass - { + pass + { vertex_program_ref rviz/glsl150/pass_pos_color.vert {} geometry_program_ref rviz/glsl150/billboard.geom {} fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - - technique gp_selection_second_pass + + technique gp_selection_second_pass { scheme Pick1 - pass - { + pass + { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl150/pass_pos_color.vert {} geometry_program_ref rviz/glsl150/billboard.geom {} @@ -46,4 +46,3 @@ material rviz/PointCloudSphere { } } } - diff --git a/ogre_media/materials/scripts150/point_cloud_square.material b/ogre_media/materials/scripts150/point_cloud_square.material index 7953d10545..276ec62c40 100644 --- a/ogre_media/materials/scripts150/point_cloud_square.material +++ b/ogre_media/materials/scripts150/point_cloud_square.material @@ -1,8 +1,8 @@ material rviz/PointCloudSquare { - technique gp + technique gp { - pass + pass { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl150/pass_pos_color.vert {} @@ -10,35 +10,35 @@ material rviz/PointCloudSquare { fragment_program_ref rviz/glsl120/smooth_square.frag {} } } - - technique gp_depth - { + + technique gp_depth + { scheme Depth - pass - { + pass + { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl150/pass_pos_color.vert {} geometry_program_ref rviz/glsl150/billboard.geom(with_depth) {} fragment_program_ref rviz/glsl120/depth.frag {} } } - - technique gp_selection_first_pass - { + + technique gp_selection_first_pass + { scheme Pick - pass - { + pass + { vertex_program_ref rviz/glsl150/pass_pos_color.vert {} geometry_program_ref rviz/glsl150/billboard.geom {} fragment_program_ref rviz/glsl120/pickcolor.frag {} } } - - technique gp_selection_second_pass + + technique gp_selection_second_pass { scheme Pick1 - pass - { + pass + { alpha_rejection greater_equal 1 vertex_program_ref rviz/glsl150/pass_pos_color.vert {} geometry_program_ref rviz/glsl150/billboard.geom {} @@ -46,4 +46,3 @@ material rviz/PointCloudSquare { } } } - diff --git a/ogre_media/plugins.cfg b/ogre_media/plugins.cfg index 330240314f..6411699cb3 100644 --- a/ogre_media/plugins.cfg +++ b/ogre_media/plugins.cfg @@ -1 +1 @@ -# dummy plugins.cfg, needed so Ogre does not throw an exception \ No newline at end of file +# dummy plugins.cfg, needed so Ogre does not throw an exception diff --git a/src/python_bindings/sip/config.sip b/src/python_bindings/sip/config.sip index 8a1e41fb58..c37fc2166a 100644 --- a/src/python_bindings/sip/config.sip +++ b/src/python_bindings/sip/config.sip @@ -51,7 +51,7 @@ public: /** @brief Return true if there is a next entry, false if not. */ bool isValid(); - + /** @brief Resets the iterator to the start of the map. */ void start(); diff --git a/src/python_bindings/sip/visualization_manager.sip b/src/python_bindings/sip/visualization_manager.sip index eb8c671d29..ccb69658e7 100644 --- a/src/python_bindings/sip/visualization_manager.sip +++ b/src/python_bindings/sip/visualization_manager.sip @@ -74,7 +74,7 @@ public: * @param frame The name of the frame -- must match the frame name broadcast to libTF * @sa getFixedFrame() */ void setFixedFrame( const QString& frame ); - + /** * @brief Convenience function: returns getFrameManager()->getTFClient(). */ diff --git a/src/rviz/helpers/color.i b/src/rviz/helpers/color.i index 6dcf8c09d8..871d0dc4fd 100644 --- a/src/rviz/helpers/color.i +++ b/src/rviz/helpers/color.i @@ -6,4 +6,4 @@ %init %{ -%} \ No newline at end of file +%} diff --git a/src/test/cube-and-cube-list-marker.yaml b/src/test/cube-and-cube-list-marker.yaml index 419617f292..b695922ffc 100644 --- a/src/test/cube-and-cube-list-marker.yaml +++ b/src/test/cube-and-cube-list-marker.yaml @@ -1,8 +1,7 @@ markers: - - - header: + - header: seq: 1 - stamp: + stamp: secs: 0 nsecs: 0 frame_id: base_link @@ -10,36 +9,35 @@ markers: id: 0 type: 1 action: 0 - pose: - position: + pose: + position: x: 0.0 y: 0.0 z: 0.0 - orientation: + orientation: x: 0.0 y: 0.0 z: 0.0 w: 1.0 - scale: + scale: x: 1.0 y: 1.0 z: 1.0 - color: + color: r: .5 g: .5 b: .5 a: 1 - lifetime: + lifetime: secs: 0 nsecs: 0 frame_locked: False - text: '' - mesh_resource: '' + text: "" + mesh_resource: "" mesh_use_embedded_materials: False - - - header: + - header: seq: 1 - stamp: + stamp: secs: 0 nsecs: 0 frame_id: base_link @@ -47,135 +45,108 @@ markers: id: 1 type: 6 action: 0 - pose: - position: + pose: + position: x: 0.0 y: 0.0 z: 0.0 - orientation: + orientation: x: 0.0 y: 0.0 z: 0.0 w: 1.0 - scale: + scale: x: 1.0 y: 1.0 z: 1.0 - color: + color: r: .5 g: .5 b: .5 a: 1 - lifetime: + lifetime: secs: 0 nsecs: 0 frame_locked: False - text: '' + text: "" points: - - - x: 2 + - x: 2 y: 0 z: 0 - - - x: 2 + - x: 2 y: 5 z: 0 - - - x: 1 + - x: 1 y: 5 z: 0 - - - x: 0 + - x: 0 y: 5 z: 0 - - - x: 2 + - x: 2 y: 6 z: 0 - - - x: 1 + - x: 1 y: 6 z: 0 - - - x: 0 + - x: 0 y: 6 z: 0 - - - x: 2 + - x: 2 y: 7 z: 0 - - - x: 1 + - x: 1 y: 7 z: 0 - - - x: 0 + - x: 0 y: 7 z: 0 - - - x: 2 + - x: 2 y: 8 z: 0 - - - x: 1 + - x: 1 y: 8 z: 0 - - - x: 0 + - x: 0 y: 8 z: 0 - - - x: 2 + - x: 2 y: 8 z: 1 - - - x: 1 + - x: 1 y: 8 z: 1 - - - x: 0 + - x: 0 y: 8 z: 1 - - - x: 2 + - x: 2 y: 8 z: 2 - - - x: 1 + - x: 1 y: 8 z: 2 - - - x: 0 + - x: 0 y: 8 z: 2 - - - x: -1 + - x: -1 y: 8 z: 2 - - - x: -1 + - x: -1 y: 8 z: 1 - - - x: -1 + - x: -1 y: 8 z: 0 - - - x: -1 + - x: -1 y: 7 z: 0 - - - x: -1 + - x: -1 y: 6 z: 0 - - - x: -1 + - x: -1 y: 5 z: 0 - - - x: 1 + - x: 1 y: 7 z: 1 - mesh_resource: '' + mesh_resource: "" mesh_use_embedded_materials: False ---- diff --git a/src/test/cycling_frame.py b/src/test/cycling_frame.py index 7542aef13f..739fc33713 100755 --- a/src/test/cycling_frame.py +++ b/src/test/cycling_frame.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python # Test script to publish a "cycling_frame" that rotates about the origin import math diff --git a/src/test/embedded_materials_with_stl.yaml b/src/test/embedded_materials_with_stl.yaml index 97cc2efb19..f2194ab603 100644 --- a/src/test/embedded_materials_with_stl.yaml +++ b/src/test/embedded_materials_with_stl.yaml @@ -1,58 +1,53 @@ markers: - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 0 type: 10 action: 0 - pose: + pose: position: { x: 0, y: 0, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: .01, y: .01, z: .01 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/ax12_box.stl' + mesh_resource: "package://rviz/src/test/meshes/ax12_box.stl" mesh_use_embedded_materials: True - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 1 type: 10 action: 0 - pose: + pose: position: { x: 1, y: 0, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: .01, y: .01, z: .01 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/ax12_box.stl' + mesh_resource: "package://rviz/src/test/meshes/ax12_box.stl" mesh_use_embedded_materials: False - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 2 type: 10 action: 0 - pose: + pose: position: { x: 0, y: 1, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: 1, y: 1, z: 1 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/pr2-base.dae' + mesh_resource: "package://rviz/src/test/meshes/pr2-base.dae" mesh_use_embedded_materials: True - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 3 type: 10 action: 0 - pose: + pose: position: { x: 1, y: 1, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: 1, y: 1, z: 1 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/pr2-base.dae' + mesh_resource: "package://rviz/src/test/meshes/pr2-base.dae" mesh_use_embedded_materials: False ---- diff --git a/src/test/kitchen-mesh-marker.yaml b/src/test/kitchen-mesh-marker.yaml index 0b4984dda3..a92a55f69d 100644 --- a/src/test/kitchen-mesh-marker.yaml +++ b/src/test/kitchen-mesh-marker.yaml @@ -3,7 +3,7 @@ ns: chunk id: 0 type: 10 action: 0 -pose: +pose: position: { x: 0, y: 0, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 1 } color: { r: 1, g: 1, b: 1, a: 1 } diff --git a/src/test/meshes/README b/src/test/meshes/README index 424710882f..3fc337e5cc 100644 --- a/src/test/meshes/README +++ b/src/test/meshes/README @@ -1,3 +1,2 @@ The meshes for these parts were created by I-Bioloid and obtain from: http://www.thingiverse.com/thing:5192 - diff --git a/src/test/meshes/pr2-base.dae b/src/test/meshes/pr2-base.dae index 8219d112e6..e56bffda6c 100644 --- a/src/test/meshes/pr2-base.dae +++ b/src/test/meshes/pr2-base.dae @@ -5,7 +5,7 @@ WakiMudi OpenCOLLADA2009 x64 - ColladaMaya export options: + ColladaMaya export options: bakeTransforms=0;relativePaths=0;copyTextures=0;exportTriangles=0;exportCgfxFileReferences=1; isSampling=0;curveConstrainSampling=0;removeStaticCurves=1;exportPolygonMeshes=1;exportLights=1; exportCameras=1;exportJointsAndSkin=1;exportAnimations=1;exportInvisibleNodes=0;exportDefaultCameras=0; diff --git a/src/test/send_covariance_msgs.py b/src/test/send_covariance_msgs.py index aeedd943cf..f7f731a108 100755 --- a/src/test/send_covariance_msgs.py +++ b/src/test/send_covariance_msgs.py @@ -108,4 +108,3 @@ # p = angle # y = angle rate.sleep() - diff --git a/src/test/triangle_list_marker.yaml b/src/test/triangle_list_marker.yaml index 05f8291aec..b5318e72da 100644 --- a/src/test/triangle_list_marker.yaml +++ b/src/test/triangle_list_marker.yaml @@ -1,6 +1,6 @@ -header: +header: seq: 1 - stamp: + stamp: secs: 0 nsecs: 0 frame_id: base_link @@ -8,67 +8,57 @@ ns: cube id: 1 type: 11 action: 0 -pose: - position: +pose: + position: x: 0.0 y: 0.0 z: 0.0 - orientation: + orientation: x: 0.0 y: 0.0 z: 0.0 w: 1.0 -scale: +scale: x: 1.0 y: 1.0 z: 1.0 -color: +color: r: .5 g: .5 b: 1 a: 1 -lifetime: +lifetime: secs: 0 nsecs: 0 frame_locked: False -text: '' +text: "" points: - - - x: 0 + - x: 0 y: 0 z: 0 - - - x: 1 + - x: 1 y: 0 z: 0 - - - x: 1 + - x: 1 y: 1 z: 0 - - - x: 0 + - x: 0 y: 0 z: 0 - - - x: 1 + - x: 1 y: 0 z: 0 - - - x: 1 + - x: 1 y: 0 z: 1 - - - x: 0 + - x: 0 y: 0 z: 0 - - - x: 0 + - x: 0 y: 0 z: 0 - - - x: 0 + - x: 0 y: 0 z: 0 -mesh_resource: '' +mesh_resource: "" mesh_use_embedded_materials: False ---- diff --git a/src/test/turtlebot-arm-mesh-marker-array.yaml b/src/test/turtlebot-arm-mesh-marker-array.yaml index 07ec7af941..8145e37731 100644 --- a/src/test/turtlebot-arm-mesh-marker-array.yaml +++ b/src/test/turtlebot-arm-mesh-marker-array.yaml @@ -1,100 +1,92 @@ markers: - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 0 type: 10 action: 0 - pose: + pose: position: { x: 0, y: 0, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: .01, y: .01, z: .01 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/ax12_box.stl' + mesh_resource: "package://rviz/src/test/meshes/ax12_box.stl" mesh_use_embedded_materials: False - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 1 type: 10 action: 0 - pose: + pose: position: { x: 1, y: 0, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: .01, y: .01, z: .01 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/F10.stl' + mesh_resource: "package://rviz/src/test/meshes/F10.stl" mesh_use_embedded_materials: False - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 2 type: 10 action: 0 - pose: + pose: position: { x: 2, y: 0, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: .01, y: .01, z: .01 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/F2.stl' + mesh_resource: "package://rviz/src/test/meshes/F2.stl" mesh_use_embedded_materials: False - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 3 type: 10 action: 0 - pose: + pose: position: { x: 0, y: 1, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: .01, y: .01, z: .01 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/F3.stl' + mesh_resource: "package://rviz/src/test/meshes/F3.stl" mesh_use_embedded_materials: False - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 4 type: 10 action: 0 - pose: + pose: position: { x: 1, y: 1, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: .01, y: .01, z: .01 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/F4.stl' + mesh_resource: "package://rviz/src/test/meshes/F4.stl" mesh_use_embedded_materials: False - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 5 type: 10 action: 0 - pose: + pose: position: { x: 2, y: 1, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: 1, g: 1, b: 0, a: 1 } scale: { x: .01, y: .01, z: .01 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/finger.stl' + mesh_resource: "package://rviz/src/test/meshes/finger.stl" mesh_use_embedded_materials: False - - - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } + - header: { seq: 0, stamp: { secs: 0, nsecs: 0 }, frame_id: base_link } ns: chunk id: 6 type: 10 action: 0 - pose: + pose: position: { x: 0, y: 2, z: 0 } orientation: { x: 0, y: 0, z: 0, w: 0 } color: { r: .5, g: 1, b: 0, a: 1 } scale: { x: 1, y: 1, z: 1 } frame_locked: False - mesh_resource: 'package://rviz/src/test/meshes/pr2-base.dae' + mesh_resource: "package://rviz/src/test/meshes/pr2-base.dae" mesh_use_embedded_materials: False ----