Skip to content

Commit

Permalink
Apply pre-commit fixes
Browse files Browse the repository at this point in the history
- trailing whitespace
- end of file
- yaml: single doc
  • Loading branch information
rhaschke committed Apr 10, 2021
1 parent 4054a60 commit 697ed3f
Show file tree
Hide file tree
Showing 45 changed files with 322 additions and 372 deletions.
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -73,4 +73,3 @@ yet been invented or conceived.
```

Source: http://creativecommons.org/licenses/publicdomain/

151 changes: 83 additions & 68 deletions doc/conf.py
Expand Up @@ -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
Expand All @@ -100,126 +101,134 @@
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
# "<project> v<release> 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 <link> 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 --------------------------------------------

# 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 ------------------------------------------------
Expand All @@ -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"
2 changes: 1 addition & 1 deletion ogre_media/fonts/liberation-sans/SIL Open Font License.txt
Expand Up @@ -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.
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.
2 changes: 1 addition & 1 deletion 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( );
Expand Down
1 change: 0 additions & 1 deletion ogre_media/materials/glsl120/glsl120.program
Expand Up @@ -163,4 +163,3 @@ fragment_program rviz/glsl120/smooth_square.frag glsl
param_named_auto alpha custom 1
}
}

7 changes: 3 additions & 4 deletions 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.

Expand All @@ -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 ));
}

2 changes: 1 addition & 1 deletion ogre_media/materials/glsl120/include/pass_depth.vert
Expand Up @@ -3,7 +3,7 @@
uniform mat4 worldview_matrix;

varying float depth;

void passDepth( vec4 pos )
{
vec4 pos_rel_view = worldview_matrix * pos;
Expand Down
4 changes: 2 additions & 2 deletions ogre_media/materials/glsl120/nogp/billboard.vert
Expand Up @@ -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;
Expand Down

0 comments on commit 697ed3f

Please sign in to comment.