Skip to content

Commit 697ed3f

Browse files
committed
Apply pre-commit fixes
- trailing whitespace - end of file - yaml: single doc
1 parent 4054a60 commit 697ed3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+322
-372
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,3 @@ yet been invented or conceived.
7373
```
7474

7575
Source: http://creativecommons.org/licenses/publicdomain/
76-

doc/conf.py

Lines changed: 83 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -11,87 +11,88 @@
1111
# All configuration values have a default; values that are commented out
1212
# serve to show the default.
1313

14-
import sys, os
14+
import sys
15+
import os
1516

1617
# If extensions (or modules to document with autodoc) are in another directory,
1718
# add these directories to sys.path here. If the directory is relative to the
1819
# documentation root, use os.path.abspath to make it absolute, like shown here.
19-
#sys.path.insert(0, os.path.abspath('.'))
20+
# sys.path.insert(0, os.path.abspath("."))
2021

2122
# -- General configuration -----------------------------------------------------
2223

2324
# If your documentation needs a minimal Sphinx version, state it here.
24-
#needs_sphinx = '1.0'
25+
# needs_sphinx = "1.0"
2526

2627
# Add any Sphinx extension module names here, as strings. They can be extensions
27-
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
28+
# coming with Sphinx (named "sphinx.ext.*") or your custom ones.
2829
extensions = []
2930

3031
# Add any paths that contain templates here, relative to this directory.
31-
templates_path = ['_templates']
32+
templates_path = ["_templates"]
3233

3334
# The suffix of source filenames.
34-
source_suffix = '.rst'
35+
source_suffix = ".rst"
3536

3637
# The encoding of source files.
37-
#source_encoding = 'utf-8-sig'
38+
# source_encoding = "utf-8-sig"
3839

3940
# The master toctree document.
40-
master_doc = 'index'
41+
master_doc = "index"
4142

4243
# General information about the project.
43-
project = u'RViz'
44-
copyright = u'2012, Willow Garage, Inc'
44+
project = u"RViz"
45+
copyright = u"2012, Willow Garage, Inc"
4546

4647
# The version info for the project you're documenting, acts as replacement for
4748
# |version| and |release|, also used in various other places throughout the
4849
# built documents.
4950
#
5051
# The short X.Y version.
51-
version = '1.9'
52+
version = "1.9"
5253
# The full version, including alpha/beta/rc tags.
53-
release = '1.9.0'
54+
release = "1.9.0"
5455

5556
# The language for content autogenerated by Sphinx. Refer to documentation
5657
# for a list of supported languages.
57-
#language = None
58+
# language = None
5859

5960
# There are two options for replacing |today|: either, you set today to some
6061
# non-false value, then it is used:
61-
#today = ''
62+
# today = ""
6263
# Else, today_fmt is used as the format for a strftime call.
63-
#today_fmt = '%B %d, %Y'
64+
# today_fmt = "%B %d, %Y"
6465

6566
# List of patterns, relative to source directory, that match files and
6667
# directories to ignore when looking for source files.
6768
exclude_patterns = []
6869

6970
# The reST default role (used for this markup: `text`) to use for all documents.
70-
#default_role = None
71+
# default_role = None
7172

72-
# If true, '()' will be appended to :func: etc. cross-reference text.
73-
#add_function_parentheses = True
73+
# If true, "()" will be appended to :func: etc. cross-reference text.
74+
# add_function_parentheses = True
7475

7576
# If true, the current module name will be prepended to all description
7677
# unit titles (such as .. function::).
77-
#add_module_names = True
78+
# add_module_names = True
7879

7980
# If true, sectionauthor and moduleauthor directives will be shown in the
8081
# output. They are ignored by default.
81-
#show_authors = False
82+
# show_authors = False
8283

8384
# The name of the Pygments (syntax highlighting) style to use.
84-
pygments_style = 'sphinx'
85+
pygments_style = "sphinx"
8586

8687
# A list of ignored prefixes for module index sorting.
87-
#modindex_common_prefix = []
88+
# modindex_common_prefix = []
8889

8990

9091
# -- Options for HTML output ---------------------------------------------------
9192

9293
# The theme to use for HTML and HTML Help pages. See the documentation for
9394
# a list of builtin themes.
94-
html_theme = 'default'
95+
html_theme = "default"
9596

9697
# Theme options are theme-specific and customize the look and feel of a theme
9798
# further. For a list of options available for each theme, see the
@@ -100,126 +101,134 @@
100101
html_theme_options = {}
101102

102103
# Add any paths that contain custom themes here, relative to this directory.
103-
#html_theme_path = []
104+
# html_theme_path = []
104105

105106
# The name for this set of Sphinx documents. If None, it defaults to
106107
# "<project> v<release> documentation".
107-
#html_title = None
108+
# html_title = None
108109

109110
# A shorter title for the navigation bar. Default is the same as html_title.
110-
#html_short_title = None
111+
# html_short_title = None
111112

112113
# The name of an image file (relative to this directory) to place at the top
113114
# of the sidebar.
114-
#html_logo = None
115+
# html_logo = None
115116

116117
# The name of an image file (within the static path) to use as favicon of the
117118
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
118119
# pixels large.
119-
#html_favicon = None
120+
# html_favicon = None
120121

121122
# Add any paths that contain custom static files (such as style sheets) here,
122123
# relative to this directory. They are copied after the builtin static files,
123124
# so a file named "default.css" will overwrite the builtin "default.css".
124125
html_static_path = []
125126

126-
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
127+
# If not "", a "Last updated on:" timestamp is inserted at every page bottom,
127128
# using the given strftime format.
128-
#html_last_updated_fmt = '%b %d, %Y'
129+
# html_last_updated_fmt = "%b %d, %Y"
129130

130131
# If true, SmartyPants will be used to convert quotes and dashes to
131132
# typographically correct entities.
132-
#html_use_smartypants = True
133+
# html_use_smartypants = True
133134

134135
# Custom sidebar templates, maps document names to template names.
135-
#html_sidebars = {}
136+
# html_sidebars = {}
136137

137138
# Additional templates that should be rendered to pages, maps page names to
138139
# template names.
139-
#html_additional_pages = {}
140+
# html_additional_pages = {}
140141

141142
# If false, no module index is generated.
142-
#html_domain_indices = True
143+
# html_domain_indices = True
143144

144145
# If false, no index is generated.
145-
#html_use_index = True
146+
# html_use_index = True
146147

147148
# If true, the index is split into individual pages for each letter.
148-
#html_split_index = False
149+
# html_split_index = False
149150

150151
# If true, links to the reST sources are added to the pages.
151-
#html_show_sourcelink = True
152+
# html_show_sourcelink = True
152153

153154
# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
154-
#html_show_sphinx = True
155+
# html_show_sphinx = True
155156

156157
# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
157-
#html_show_copyright = True
158+
# html_show_copyright = True
158159

159160
# If true, an OpenSearch description file will be output, and all pages will
160161
# contain a <link> tag referring to it. The value of this option must be the
161162
# base URL from which the finished HTML is served.
162-
#html_use_opensearch = ''
163+
# html_use_opensearch = ""
163164

164165
# This is the file name suffix for HTML files (e.g. ".xhtml").
165-
#html_file_suffix = None
166+
# html_file_suffix = None
166167

167168
# Output file base name for HTML help builder.
168-
htmlhelp_basename = 'RVizdoc'
169+
htmlhelp_basename = "RVizdoc"
169170

170171

171172
# -- Options for LaTeX output --------------------------------------------------
172173

173174
latex_elements = {
174-
# The paper size ('letterpaper' or 'a4paper').
175-
#'papersize': 'letterpaper',
176-
177-
# The font size ('10pt', '11pt' or '12pt').
178-
#'pointsize': '10pt',
179-
180-
# Additional stuff for the LaTeX preamble.
181-
#'preamble': '',
175+
# The paper size ("letterpaper" or "a4paper").
176+
# "papersize": "letterpaper",
177+
# The font size ("10pt", "11pt" or "12pt").
178+
# "pointsize": "10pt",
179+
# Additional stuff for the LaTeX preamble.
180+
# "preamble": "",
182181
}
183182

184183
# Grouping the document tree into LaTeX files. List of tuples
185184
# (source start file, target name, title, author, documentclass [howto/manual]).
186185
latex_documents = [
187-
('index', 'RViz.tex', u'RViz Documentation',
188-
u'Josh Faust, Dave Hershberger, David Gossow, and others', 'manual'),
186+
(
187+
"index",
188+
"RViz.tex",
189+
u"RViz Documentation",
190+
u"Josh Faust, Dave Hershberger, David Gossow, and others",
191+
"manual",
192+
),
189193
]
190194

191195
# The name of an image file (relative to this directory) to place at the top of
192196
# the title page.
193-
#latex_logo = None
197+
# latex_logo = None
194198

195199
# For "manual" documents, if this is true, then toplevel headings are parts,
196200
# not chapters.
197-
#latex_use_parts = False
201+
# latex_use_parts = False
198202

199203
# If true, show page references after internal links.
200-
#latex_show_pagerefs = False
204+
# latex_show_pagerefs = False
201205

202206
# If true, show URL addresses after external links.
203-
#latex_show_urls = False
207+
# latex_show_urls = False
204208

205209
# Documents to append as an appendix to all manuals.
206-
#latex_appendices = []
210+
# latex_appendices = []
207211

208212
# If false, no module index is generated.
209-
#latex_domain_indices = True
213+
# latex_domain_indices = True
210214

211215

212216
# -- Options for manual page output --------------------------------------------
213217

214218
# One entry per manual page. List of tuples
215219
# (source start file, name, description, authors, manual section).
216220
man_pages = [
217-
('index', 'rviz', u'RViz Documentation',
218-
[u'Josh Faust, Dave Hershberger, David Gossow, and others'], 1)
221+
(
222+
"index",
223+
"rviz",
224+
u"RViz Documentation",
225+
[u"Josh Faust, Dave Hershberger, David Gossow, and others"],
226+
1,
227+
)
219228
]
220229

221230
# If true, show URL addresses after external links.
222-
#man_show_urls = False
231+
# man_show_urls = False
223232

224233

225234
# -- Options for Texinfo output ------------------------------------------------
@@ -228,16 +237,22 @@
228237
# (source start file, target name, title, author,
229238
# dir menu entry, description, category)
230239
texinfo_documents = [
231-
('index', 'RViz', u'RViz Documentation',
232-
u'Josh Faust, Dave Hershberger, David Gossow, and others', 'RViz', 'One line description of project.',
233-
'Miscellaneous'),
240+
(
241+
"index",
242+
"RViz",
243+
u"RViz Documentation",
244+
u"Josh Faust, Dave Hershberger, David Gossow, and others",
245+
"RViz",
246+
"One line description of project.",
247+
"Miscellaneous",
248+
),
234249
]
235250

236251
# Documents to append as an appendix to all manuals.
237-
#texinfo_appendices = []
252+
# texinfo_appendices = []
238253

239254
# If false, no module index is generated.
240-
#texinfo_domain_indices = True
255+
# texinfo_domain_indices = True
241256

242-
# How to display URL addresses: 'footnote', 'no', or 'inline'.
243-
#texinfo_show_urls = 'footnote'
257+
# How to display URL addresses: "footnote", "no", or "inline".
258+
# texinfo_show_urls = "footnote"

ogre_media/fonts/liberation-sans/SIL Open Font License.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ TERMINATION
4343
This license becomes null and void if any of the above conditions are not met.
4444

4545
DISCLAIMER
46-
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.
46+
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.

ogre_media/materials/glsl120/depth_circle.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#version 120
22

3-
// Draws a circle with the packed depth value
3+
// Draws a circle with the packed depth value
44

55
// includes
66
vec4 packDepth( );

ogre_media/materials/glsl120/glsl120.program

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,3 @@ fragment_program rviz/glsl120/smooth_square.frag glsl
163163
param_named_auto alpha custom 1
164164
}
165165
}
166-

ogre_media/materials/glsl120/include/pack_depth.frag

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#version 120
22

3-
// Splits up a normalized depth value in the range (0..1)
3+
// Splits up a normalized depth value in the range (0..1)
44
// into the vertex RGB values.
55
// Alpha values below 1/255 are rendered transparent.
66

@@ -14,13 +14,12 @@ varying float depth;
1414
vec4 packDepth()
1515
{
1616
float normalized_depth = depth / far_clip_distance;
17-
17+
1818
// split up float into rgb components
1919
const vec3 shift = vec3(256.0 * 256.0, 256.0, 1.0);
2020
const vec3 mask = vec3(0.0, 1.0 / 256.0, 1.0 / 256.0);
2121
vec3 depth_packed = fract(normalized_depth * shift);
2222
depth_packed -= depth_packed.xxy * mask;
23-
23+
2424
return vec4( depth_packed.zyx, step( minimum_alpha, alpha ));
2525
}
26-

ogre_media/materials/glsl120/include/pass_depth.vert

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
uniform mat4 worldview_matrix;
44

55
varying float depth;
6-
6+
77
void passDepth( vec4 pos )
88
{
99
vec4 pos_rel_view = worldview_matrix * pos;

ogre_media/materials/glsl120/nogp/billboard.vert

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ void main()
3131
vec4 s = gl_MultiTexCoord0 * (size_factor);
3232
vec3 r = s.xxx * right;
3333
vec3 u = s.yyy * up;
34-
34+
3535
vec4 pos = gl_Vertex + vec4( r + u, 0.0 );
36-
36+
3737
gl_Position = worldviewproj_matrix * pos;
3838
gl_TexCoord[0] = gl_MultiTexCoord0 + vec4(0.5,0.5,0.0,0.0);
3939
gl_FrontColor = gl_Color;

0 commit comments

Comments
 (0)