Skip to content

Commit 9926b8f

Browse files
authored
Merge pull request #1 from stevenewald/graphics
Add basic display for graphics
2 parents bafd65b + bf8fbdf commit 9926b8f

File tree

15 files changed

+352
-333
lines changed

15 files changed

+352
-333
lines changed

.clang-format

Lines changed: 110 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,189 @@
11
---
22
Language: Cpp
3-
# BasedOnStyle: Chromium
4-
AccessModifierOffset: -2
5-
AlignAfterOpenBracket: Align
6-
AlignConsecutiveMacros: false
7-
AlignConsecutiveAssignments: false
8-
AlignConsecutiveBitFields: false
9-
AlignConsecutiveDeclarations: false
10-
AlignEscapedNewlines: DontAlign
11-
AlignOperands: DontAlign
12-
AlignTrailingComments: false
3+
AccessModifierOffset: -4
4+
AlignAfterOpenBracket: BlockIndent
5+
AlignArrayOfStructures: Left
6+
AlignConsecutiveAssignments: None
7+
AlignConsecutiveBitFields: None
8+
AlignConsecutiveDeclarations: None
9+
AlignConsecutiveMacros: AcrossEmptyLines
10+
AlignEscapedNewlines: Right
11+
AlignOperands: Align
12+
AlignTrailingComments: true
1313
AllowAllArgumentsOnNextLine: true
14-
AllowAllConstructorInitializersOnNextLine: false
1514
AllowAllParametersOfDeclarationOnNextLine: true
16-
AllowShortEnumsOnASingleLine: false
1715
AllowShortBlocksOnASingleLine: Empty
1816
AllowShortCaseLabelsOnASingleLine: false
17+
AllowShortEnumsOnASingleLine: true
1918
AllowShortFunctionsOnASingleLine: Inline
20-
AllowShortLambdasOnASingleLine: All
2119
AllowShortIfStatementsOnASingleLine: Never
20+
AllowShortLambdasOnASingleLine: All
2221
AllowShortLoopsOnASingleLine: false
23-
AlwaysBreakAfterDefinitionReturnType: None
2422
AlwaysBreakAfterReturnType: None
25-
AlwaysBreakBeforeMultilineStrings: true
23+
AlwaysBreakBeforeMultilineStrings: false
2624
AlwaysBreakTemplateDeclarations: Yes
27-
BinPackArguments: false
28-
BinPackParameters: false
25+
AttributeMacros:
26+
- __capability
27+
BasedOnStyle: "LLVM"
28+
BinPackArguments: true
29+
BinPackParameters: true
30+
BitFieldColonSpacing: Both
2931
BraceWrapping:
3032
AfterCaseLabel: false
31-
AfterClass: true
32-
AfterControlStatement: MultiLine
33-
AfterEnum: true
33+
AfterClass: false
34+
AfterControlStatement: Never
35+
AfterEnum: false
3436
AfterFunction: true
35-
AfterNamespace: true
37+
AfterNamespace: false
3638
AfterObjCDeclaration: false
37-
AfterStruct: true
38-
AfterUnion: true
39-
AfterExternBlock: true
39+
AfterStruct: false
40+
AfterUnion: false
41+
AfterExternBlock: false
4042
BeforeCatch: false
41-
BeforeElse: false
42-
BeforeLambdaBody: true
43+
BeforeElse: true
44+
BeforeLambdaBody: false
4345
BeforeWhile: false
4446
IndentBraces: false
45-
SplitEmptyFunction: true
47+
SplitEmptyFunction: false
4648
SplitEmptyRecord: true
4749
SplitEmptyNamespace: true
50+
BreakAfterJavaFieldAnnotations: true
4851
BreakBeforeBinaryOperators: NonAssignment
4952
BreakBeforeBraces: Custom
50-
# BreakBeforeInheritanceComma: true
51-
BreakInheritanceList: BeforeComma
53+
BreakBeforeConceptDeclarations: true
5254
BreakBeforeTernaryOperators: true
53-
BreakConstructorInitializersBeforeComma: true
54-
BreakConstructorInitializers: BeforeComma
55-
BreakAfterJavaFieldAnnotations: true
55+
BreakConstructorInitializers: AfterColon
56+
BreakInheritanceList: AfterColon
5657
BreakStringLiterals: true
57-
ColumnLimit: 80
58-
CommentPragmas: '^ IWYU pragma:'
58+
ColumnLimit: 88
59+
CommentPragmas: "^( IWYU pragma:| NOLINT)"
5960
CompactNamespaces: false
60-
ConstructorInitializerAllOnOneLineOrOnePerLine: false
6161
ConstructorInitializerIndentWidth: 4
6262
ContinuationIndentWidth: 4
6363
Cpp11BracedListStyle: true
6464
DeriveLineEnding: false
6565
DerivePointerAlignment: false
6666
DisableFormat: false
67+
EmptyLineAfterAccessModifier: Never
68+
EmptyLineBeforeAccessModifier: LogicalBlock
6769
ExperimentalAutoDetectBinPacking: false
6870
FixNamespaceComments: true
6971
ForEachMacros:
7072
- foreach
7173
- Q_FOREACH
7274
- BOOST_FOREACH
75+
IfMacros:
76+
- KJ_IF_MAYBE
7377
IncludeBlocks: Regroup
7478
IncludeCategories:
75-
# Standard library headers come before anything else
76-
- Regex: '^<[a-z_]+>'
77-
Priority: -1
78-
- Regex: '^<.+\.h(pp)?>'
79+
# Headers in "" with extension.
80+
- Regex: '"([A-Za-z0-9.\Q/-_\E])+"'
7981
Priority: 1
80-
- Regex: '^<.*'
82+
CaseSensitive: false
83+
# Headers in <> from libraries.
84+
- Regex: "^(<(gsl|catch2))"
8185
Priority: 2
82-
- Regex: '.*'
86+
CaseSensitive: false
87+
# C headers
88+
- Regex: '<c([A-Za-z0-9\Q/-_\E])+>'
89+
Priority: 4
90+
CaseSensitive: false
91+
# Headers in <> without extension.
92+
- Regex: '<([A-Za-z0-9\Q/-_\E])+>'
93+
Priority: 5
94+
CaseSensitive: false
95+
# Headers in <> with extension.
96+
- Regex: '<([A-Za-z0-9.\Q/-_\E])+>'
8397
Priority: 3
84-
IncludeIsMainRegex: ''
85-
IncludeIsMainSourceRegex: ''
98+
CaseSensitive: false
99+
IncludeIsMainRegex: "(Test)?$"
100+
IncludeIsMainSourceRegex: ""
101+
IndentAccessModifiers: false
86102
IndentCaseLabels: true
87-
IndentCaseBlocks: false
88-
IndentGotoLabels: true
103+
IndentCaseBlocks: true
104+
IndentExternBlock: AfterExternBlock
105+
IndentGotoLabels: false
89106
IndentPPDirectives: AfterHash
90-
IndentExternBlock: NoIndent
91-
IndentWidth: 2
107+
IndentRequires: false
108+
IndentWidth: 4
92109
IndentWrappedFunctionNames: false
93-
InsertTrailingCommas: Wrapped
94-
JavaScriptQuotes: Double
95-
JavaScriptWrapImports: true
96110
KeepEmptyLinesAtTheStartOfBlocks: false
97-
MacroBlockBegin: ''
98-
MacroBlockEnd: ''
111+
LambdaBodyIndentation: Signature
112+
MacroBlockBegin: ""
113+
MacroBlockEnd: ""
99114
MaxEmptyLinesToKeep: 1
100115
NamespaceIndentation: None
101-
ObjCBinPackProtocolList: Never
102-
ObjCBlockIndentWidth: 2
103-
ObjCBreakBeforeNestedBlockParam: true
104-
ObjCSpaceAfterProperty: false
105-
ObjCSpaceBeforeProtocolList: true
116+
PackConstructorInitializers: BinPack
106117
PenaltyBreakAssignment: 2
107-
PenaltyBreakBeforeFirstCallParameter: 1
118+
PenaltyBreakBeforeFirstCallParameter: 19
108119
PenaltyBreakComment: 300
109120
PenaltyBreakFirstLessLess: 120
121+
PenaltyBreakOpenParenthesis: 0
110122
PenaltyBreakString: 1000
111123
PenaltyBreakTemplateDeclaration: 10
112124
PenaltyExcessCharacter: 1000000
113-
PenaltyReturnTypeOnItsOwnLine: 200
125+
PenaltyIndentedWhitespace: 0
126+
PenaltyReturnTypeOnItsOwnLine: 60
114127
PointerAlignment: Left
115-
RawStringFormats:
116-
- Language: Cpp
117-
Delimiters:
118-
- cc
119-
- CC
120-
- cpp
121-
- Cpp
122-
- CPP
123-
- 'c++'
124-
- 'C++'
125-
CanonicalDelimiter: ''
126-
BasedOnStyle: google
127-
- Language: TextProto
128-
Delimiters:
129-
- pb
130-
- PB
131-
- proto
132-
- PROTO
133-
EnclosingFunctions:
134-
- EqualsProto
135-
- EquivToProto
136-
- PARSE_PARTIAL_TEXT_PROTO
137-
- PARSE_TEST_PROTO
138-
- PARSE_TEXT_PROTO
139-
- ParseTextOrDie
140-
- ParseTextProtoOrDie
141-
- ParseTestProto
142-
- ParsePartialTestProto
143-
CanonicalDelimiter: ''
144-
BasedOnStyle: google
128+
PPIndentWidth: 2
129+
QualifierAlignment: Leave
130+
ReferenceAlignment: Pointer
145131
ReflowComments: true
146-
SortIncludes: true
132+
RemoveBracesLLVM: false
133+
SeparateDefinitionBlocks: Always
134+
ShortNamespaceLines: 1
135+
SortIncludes: CaseInsensitive
147136
SortUsingDeclarations: true
148137
SpaceAfterCStyleCast: false
149138
SpaceAfterLogicalNot: false
150-
SpaceAfterTemplateKeyword: false
139+
SpaceAfterTemplateKeyword: true
140+
SpaceAroundPointerQualifiers: Default
151141
SpaceBeforeAssignmentOperators: true
152-
SpaceBeforeCpp11BracedList: true
142+
SpaceBeforeCaseColon: false
143+
SpaceBeforeCpp11BracedList: false
153144
SpaceBeforeCtorInitializerColon: true
154145
SpaceBeforeInheritanceColon: true
155-
SpaceBeforeParens: ControlStatementsExceptForEachMacros
146+
SpaceBeforeParens: ControlStatementsExceptControlMacros
147+
# Ignored as SpaceBeforeParens != Custom
148+
SpaceBeforeParensOptions:
149+
AfterControlStatements: true
150+
AfterForeachMacros: true
151+
AfterFunctionDefinitionName: false
152+
AfterFunctionDeclarationName: false
153+
AfterIfMacros: true
154+
AfterOverloadedOperator: false
155+
BeforeNonEmptyParentheses: false
156156
SpaceBeforeRangeBasedForLoopColon: true
157+
SpaceBeforeSquareBrackets: false
157158
SpaceInEmptyBlock: false
158159
SpaceInEmptyParentheses: false
159-
SpacesBeforeTrailingComments: 2
160-
SpacesInAngles: false
160+
SpacesInAngles: Never
161+
SpacesBeforeTrailingComments: 1
161162
SpacesInConditionalStatement: false
162163
SpacesInContainerLiterals: false
163164
SpacesInCStyleCastParentheses: false
165+
SpacesInLineCommentPrefix:
166+
Minimum: 1
167+
Maximum: -1
164168
SpacesInParentheses: false
165169
SpacesInSquareBrackets: false
166-
SpaceBeforeSquareBrackets: false
167-
Standard: Auto
170+
Standard: Latest
171+
StatementAttributeLikeMacros:
172+
- Q_EMIT
168173
StatementMacros:
169174
- Q_UNUSED
170175
- QT_REQUIRE_VERSION
171-
TabWidth: 8
176+
- wxBEGIN_EVENT_TABLE
177+
- wxEND_EVENT_TABLE
178+
- EVT_MENU
179+
TabWidth: 4
172180
UseCRLF: false
173181
UseTab: Never
174182
WhitespaceSensitiveMacros:
175183
- STRINGIZE
176184
- PP_STRINGIZE
177185
- BOOST_PP_STRINGIZE
178-
...
186+
- NS_SWIFT_NAME
187+
- CF_SWIFT_NAME
188+
---
189+

0 commit comments

Comments
 (0)