Skip to content

Commit e4e34b0

Browse files
authored
Draco v1.5.4 release. (#934)
1 parent 18ccdc7 commit e4e34b0

File tree

177 files changed

+11665
-3360
lines changed

Some content is hidden

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

177 files changed

+11665
-3360
lines changed

.cmake-format.py

Lines changed: 96 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,107 @@
1-
# Generated with cmake-format 0.5.1
2-
# How wide to allow formatted cmake files
3-
line_width = 80
4-
5-
# How many spaces to tab for indent
6-
tab_size = 2
7-
8-
# If arglists are longer than this, break them always
9-
max_subargs_per_line = 10
10-
11-
# If true, separate flow control names from their parentheses with a space
12-
separate_ctrl_name_with_space = False
13-
14-
# If true, separate function names from parentheses with a space
15-
separate_fn_name_with_space = False
16-
17-
# If a statement is wrapped to more than one line, than dangle the closing
18-
# parenthesis on its own line
19-
dangle_parens = False
20-
21-
# What character to use for bulleted lists
22-
bullet_char = '*'
23-
24-
# What character to use as punctuation after numerals in an enumerated list
25-
enum_char = '.'
26-
27-
# What style line endings to use in the output.
28-
line_ending = u'unix'
29-
30-
# Format command names consistently as 'lower' or 'upper' case
31-
command_case = u'lower'
32-
33-
# Format keywords consistently as 'lower' or 'upper' case
34-
keyword_case = u'unchanged'
35-
36-
# Specify structure for custom cmake functions
37-
additional_commands = {
38-
"foo": {
39-
"flags": [
40-
"BAR",
41-
"BAZ"
42-
],
43-
"kwargs": {
44-
"HEADERS": "*",
45-
"DEPENDS": "*",
46-
"SOURCES": "*"
47-
}
1+
with section('parse'):
2+
# Specify structure for custom cmake functions
3+
additional_commands = {
4+
'draco_add_emscripten_executable': {
5+
'kwargs': {
6+
'NAME': '*',
7+
'SOURCES': '*',
8+
'OUTPUT_NAME': '*',
9+
'DEFINES': '*',
10+
'INCLUDES': '*',
11+
'COMPILE_FLAGS': '*',
12+
'LINK_FLAGS': '*',
13+
'OBJLIB_DEPS': '*',
14+
'LIB_DEPS': '*',
15+
'GLUE_PATH': '*',
16+
'PRE_LINK_JS_SOURCES': '*',
17+
'POST_LINK_JS_SOURCES': '*',
18+
'FEATURES': '*',
19+
},
20+
'pargs': 0
21+
},
22+
'draco_add_executable': {
23+
'kwargs': {
24+
'NAME': '*',
25+
'SOURCES': '*',
26+
'OUTPUT_NAME': '*',
27+
'TEST': 0,
28+
'DEFINES': '*',
29+
'INCLUDES': '*',
30+
'COMPILE_FLAGS': '*',
31+
'LINK_FLAGS': '*',
32+
'OBJLIB_DEPS': '*',
33+
'LIB_DEPS': '*',
34+
},
35+
'pargs': 0
36+
},
37+
'draco_add_library': {
38+
'kwargs': {
39+
'NAME': '*',
40+
'TYPE': '*',
41+
'SOURCES': '*',
42+
'TEST': 0,
43+
'OUTPUT_NAME': '*',
44+
'DEFINES': '*',
45+
'INCLUDES': '*',
46+
'COMPILE_FLAGS': '*',
47+
'LINK_FLAGS': '*',
48+
'OBJLIB_DEPS': '*',
49+
'LIB_DEPS': '*',
50+
'PUBLIC_INCLUDES': '*',
51+
},
52+
'pargs': 0
53+
},
54+
'draco_generate_emscripten_glue': {
55+
'kwargs': {
56+
'INPUT_IDL': '*',
57+
'OUTPUT_PATH': '*',
58+
},
59+
'pargs': 0
60+
},
61+
'draco_get_required_emscripten_flags': {
62+
'kwargs': {
63+
'FLAG_LIST_VAR_COMPILER': '*',
64+
'FLAG_LIST_VAR_LINKER': '*',
65+
},
66+
'pargs': 0
67+
},
68+
'draco_option': {
69+
'kwargs': {
70+
'NAME': '*',
71+
'HELPSTRING': '*',
72+
'VALUE': '*',
73+
},
74+
'pargs': 0
75+
},
4876
}
49-
}
50-
51-
# A list of command names which should always be wrapped
52-
always_wrap = []
53-
54-
# Specify the order of wrapping algorithms during successive reflow attempts
55-
algorithm_order = [0, 1, 2, 3, 4]
56-
57-
# If true, the argument lists which are known to be sortable will be sorted
58-
# lexicographicall
59-
autosort = False
60-
61-
# enable comment markup parsing and reflow
62-
enable_markup = True
6377

64-
# If comment markup is enabled, don't reflow the first comment block in
65-
# eachlistfile. Use this to preserve formatting of your
66-
# copyright/licensestatements.
67-
first_comment_is_literal = True
78+
with section('format'):
79+
# Formatting options.
6880

69-
# If comment markup is enabled, don't reflow any comment block which matchesthis
70-
# (regex) pattern. Default is `None` (disabled).
71-
literal_comment_pattern = None
81+
# How wide to allow formatted cmake files
82+
line_width = 80
7283

73-
# Regular expression to match preformat fences in comments
74-
# default=r'^\s*([`~]{3}[`~]*)(.*)$'
75-
fence_pattern = u'^\\s*([`~]{3}[`~]*)(.*)$'
84+
# How many spaces to tab for indent
85+
tab_size = 2
7686

77-
# Regular expression to match rulers in comments
78-
# default=r'^\s*[^\w\s]{3}.*[^\w\s]{3}$'
79-
ruler_pattern = u'^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$'
87+
# If true, separate flow control names from their parentheses with a space
88+
separate_ctrl_name_with_space = False
8089

81-
# If true, emit the unicode byte-order mark (BOM) at the start of the file
82-
emit_byteorder_mark = False
90+
# If true, separate function names from parentheses with a space
91+
separate_fn_name_with_space = False
8392

84-
# If a comment line starts with at least this many consecutive hash characters,
85-
# then don't lstrip() them off. This allows for lazy hash rulers where the first
86-
# hash char is not separated by space
87-
hashruler_min_length = 10
93+
# If a statement is wrapped to more than one line, than dangle the closing
94+
# parenthesis on its own line.
95+
dangle_parens = False
8896

89-
# If true, then insert a space between the first hash char and remaining hash
90-
# chars in a hash ruler, and normalize its length to fill the column
91-
canonicalize_hashrulers = True
97+
# Do not sort argument lists.
98+
enable_sort = False
9299

93-
# Specify the encoding of the input file. Defaults to utf-8.
94-
input_encoding = u'utf-8'
100+
# What style line endings to use in the output.
101+
line_ending = 'unix'
95102

96-
# Specify the encoding of the output file. Defaults to utf-8. Note that cmake
97-
# only claims to support utf-8 so be careful when using anything else
98-
output_encoding = u'utf-8'
103+
# Format command names consistently as 'lower' or 'upper' case
104+
command_case = 'canonical'
99105

100-
# A dictionary containing any per-command configuration overrides. Currently
101-
# only `command_case` is supported.
102-
per_command = {}
106+
# Format keywords consistently as 'lower' or 'upper' case
107+
keyword_case = 'upper'

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
*.obj eol=lf
1+
*.obj eol=lf

BUILDING.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,15 @@ CMake Build Configuration
7777
Transcoder
7878
----------
7979

80+
Before attempting to build Draco with transcoding support you must run an
81+
additional Git command to obtain the submodules:
82+
83+
~~~~~ bash
84+
# Run this command from within your Draco clone.
85+
$ git submodule update --init
86+
# See below if you prefer to use existing versions of Draco dependencies.
87+
~~~~~
88+
8089
In order to build the `draco_transcoder` target, the transcoding support needs
8190
to be explicitly enabled when you run `cmake`, for example:
8291

@@ -90,7 +99,7 @@ built with the transcoder support may result in increased binary sizes of the
9099
produced libraries and executables compared to the default CMake settings.
91100

92101
The following CMake variables can be used to configure Draco to use local
93-
copies of third party dependencies.
102+
copies of third party dependencies instead of git submodules.
94103

95104
- `DRACO_EIGEN_PATH`: this path must contain an Eigen directory that includes
96105
the Eigen sources.
@@ -99,7 +108,7 @@ copies of third party dependencies.
99108
- `DRACO_TINYGLTF_PATH`: this path must contain tiny_gltf.h and its
100109
dependencies.
101110

102-
If not specified the Draco build requires the presence of the submodules that
111+
When not specified the Draco build requires the presence of the submodules that
103112
are stored within `draco/third_party`.
104113

105114
Debugging and Optimization

0 commit comments

Comments
 (0)