-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #156 from Geequlim/gd4-rebase
Fix Godot 4.0 compile errors, update JavaScript integration, refactor code, and address minor issues
- Loading branch information
Showing
97 changed files
with
5,515 additions
and
3,656 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,199 @@ | ||
# Commented out parameters are those with the same value as base LLVM style. | ||
# We can uncomment them if we want to change their value, or enforce the | ||
# chosen value in case the base style changes (last sync: Clang 14.0). | ||
--- | ||
### General config, applies to all languages ### | ||
BasedOnStyle: LLVM | ||
AccessModifierOffset: -4 | ||
AlignAfterOpenBracket: DontAlign | ||
# AlignArrayOfStructures: None | ||
# AlignConsecutiveMacros: None | ||
# AlignConsecutiveAssignments: None | ||
# AlignConsecutiveBitFields: None | ||
# AlignConsecutiveDeclarations: None | ||
# AlignEscapedNewlines: Right | ||
AlignOperands: DontAlign | ||
AlignTrailingComments: false | ||
# AllowAllArgumentsOnNextLine: true | ||
AllowAllParametersOfDeclarationOnNextLine: false | ||
# AllowShortEnumsOnASingleLine: true | ||
# AllowShortBlocksOnASingleLine: Never | ||
# AllowShortCaseLabelsOnASingleLine: false | ||
# AllowShortFunctionsOnASingleLine: All | ||
# AllowShortLambdasOnASingleLine: All | ||
# AllowShortIfStatementsOnASingleLine: Never | ||
# AllowShortLoopsOnASingleLine: false | ||
# AlwaysBreakAfterDefinitionReturnType: None | ||
# AlwaysBreakAfterReturnType: None | ||
# AlwaysBreakBeforeMultilineStrings: false | ||
# AlwaysBreakTemplateDeclarations: MultiLine | ||
# AttributeMacros: | ||
# - __capability | ||
# BinPackArguments: true | ||
# BinPackParameters: true | ||
# BraceWrapping: | ||
# AfterCaseLabel: false | ||
# AfterClass: false | ||
# AfterControlStatement: Never | ||
# AfterEnum: false | ||
# AfterFunction: false | ||
# AfterNamespace: false | ||
# AfterObjCDeclaration: false | ||
# AfterStruct: false | ||
# AfterUnion: false | ||
# AfterExternBlock: false | ||
# BeforeCatch: false | ||
# BeforeElse: false | ||
# BeforeLambdaBody: false | ||
# BeforeWhile: false | ||
# IndentBraces: false | ||
# SplitEmptyFunction: true | ||
# SplitEmptyRecord: true | ||
# SplitEmptyNamespace: true | ||
# BreakBeforeBinaryOperators: None | ||
# BreakBeforeConceptDeclarations: true | ||
# BreakBeforeBraces: Attach | ||
# BreakBeforeInheritanceComma: false | ||
# BreakInheritanceList: BeforeColon | ||
# BreakBeforeTernaryOperators: true | ||
# BreakConstructorInitializersBeforeComma: false | ||
BreakConstructorInitializers: AfterColon | ||
# BreakStringLiterals: true | ||
ColumnLimit: 0 | ||
# CommentPragmas: '^ IWYU pragma:' | ||
# QualifierAlignment: Leave | ||
# CompactNamespaces: false | ||
ConstructorInitializerIndentWidth: 8 | ||
ContinuationIndentWidth: 8 | ||
Cpp11BracedListStyle: false | ||
# DeriveLineEnding: true | ||
# DerivePointerAlignment: false | ||
# DisableFormat: false | ||
# EmptyLineAfterAccessModifier: Never | ||
# EmptyLineBeforeAccessModifier: LogicalBlock | ||
# ExperimentalAutoDetectBinPacking: false | ||
# PackConstructorInitializers: BinPack | ||
ConstructorInitializerAllOnOneLineOrOnePerLine: true | ||
# AllowAllConstructorInitializersOnNextLine: true | ||
# FixNamespaceComments: true | ||
# ForEachMacros: | ||
# - foreach | ||
# - Q_FOREACH | ||
# - BOOST_FOREACH | ||
# IfMacros: | ||
# - KJ_IF_MAYBE | ||
# IncludeBlocks: Preserve | ||
IncludeCategories: | ||
- Regex: '".*"' | ||
Priority: 1 | ||
- Regex: '^<.*\.h>' | ||
Priority: 2 | ||
- Regex: '^<.*' | ||
Priority: 3 | ||
# IncludeIsMainRegex: '(Test)?$' | ||
# IncludeIsMainSourceRegex: '' | ||
# IndentAccessModifiers: false | ||
IndentCaseLabels: true | ||
# IndentCaseBlocks: false | ||
# IndentGotoLabels: true | ||
# IndentPPDirectives: None | ||
# IndentExternBlock: AfterExternBlock | ||
# IndentRequires: false | ||
IndentWidth: 4 | ||
# IndentWrappedFunctionNames: false | ||
# InsertTrailingCommas: None | ||
# JavaScriptQuotes: Leave | ||
# JavaScriptWrapImports: true | ||
KeepEmptyLinesAtTheStartOfBlocks: false | ||
# LambdaBodyIndentation: Signature | ||
# MacroBlockBegin: '' | ||
# MacroBlockEnd: '' | ||
# MaxEmptyLinesToKeep: 1 | ||
# NamespaceIndentation: None | ||
# PenaltyBreakAssignment: 2 | ||
# PenaltyBreakBeforeFirstCallParameter: 19 | ||
# PenaltyBreakComment: 300 | ||
# PenaltyBreakFirstLessLess: 120 | ||
# PenaltyBreakOpenParenthesis: 0 | ||
# PenaltyBreakString: 1000 | ||
# PenaltyBreakTemplateDeclaration: 10 | ||
# PenaltyExcessCharacter: 1000000 | ||
# PenaltyReturnTypeOnItsOwnLine: 60 | ||
# PenaltyIndentedWhitespace: 0 | ||
# PointerAlignment: Right | ||
# PPIndentWidth: -1 | ||
# ReferenceAlignment: Pointer | ||
# ReflowComments: true | ||
# RemoveBracesLLVM: false | ||
# SeparateDefinitionBlocks: Leave | ||
# ShortNamespaceLines: 1 | ||
# SortIncludes: CaseSensitive | ||
# SortJavaStaticImport: Before | ||
# SortUsingDeclarations: true | ||
# SpaceAfterCStyleCast: false | ||
# SpaceAfterLogicalNot: false | ||
# SpaceAfterTemplateKeyword: true | ||
# SpaceBeforeAssignmentOperators: true | ||
# SpaceBeforeCaseColon: false | ||
# SpaceBeforeCpp11BracedList: false | ||
# SpaceBeforeCtorInitializerColon: true | ||
# SpaceBeforeInheritanceColon: true | ||
# SpaceBeforeParens: ControlStatements | ||
# SpaceBeforeParensOptions: | ||
# AfterControlStatements: true | ||
# AfterForeachMacros: true | ||
# AfterFunctionDefinitionName: false | ||
# AfterFunctionDeclarationName: false | ||
# AfterIfMacros: true | ||
# AfterOverloadedOperator: false | ||
# BeforeNonEmptyParentheses: false | ||
# SpaceAroundPointerQualifiers: Default | ||
# SpaceBeforeRangeBasedForLoopColon: true | ||
# SpaceInEmptyBlock: false | ||
# SpaceInEmptyParentheses: false | ||
# SpacesBeforeTrailingComments: 1 | ||
# SpacesInAngles: Never | ||
# SpacesInConditionalStatement: false | ||
# SpacesInContainerLiterals: true | ||
# SpacesInCStyleCastParentheses: false | ||
## Godot TODO: We'll want to use a min of 1, but we need to see how to fix | ||
## our comment capitalization at the same time. | ||
SpacesInLineCommentPrefix: | ||
Minimum: 0 | ||
Maximum: -1 | ||
# SpacesInParentheses: false | ||
# SpacesInSquareBrackets: false | ||
# SpaceBeforeSquareBrackets: false | ||
# BitFieldColonSpacing: Both | ||
# StatementAttributeLikeMacros: | ||
# - Q_EMIT | ||
# StatementMacros: | ||
# - Q_UNUSED | ||
# - QT_REQUIRE_VERSION | ||
TabWidth: 4 | ||
# UseCRLF: false | ||
UseTab: Always | ||
# WhitespaceSensitiveMacros: | ||
# - STRINGIZE | ||
# - PP_STRINGIZE | ||
# - BOOST_PP_STRINGIZE | ||
# - NS_SWIFT_NAME | ||
# - CF_SWIFT_NAME | ||
--- | ||
### C++ specific config ### | ||
Language: Cpp | ||
Standard: c++17 | ||
--- | ||
### ObjC specific config ### | ||
Language: ObjC | ||
# ObjCBinPackProtocolList: Auto | ||
ObjCBlockIndentWidth: 4 | ||
# ObjCBreakBeforeNestedBlockParam: true | ||
# ObjCSpaceAfterProperty: false | ||
# ObjCSpaceBeforeProtocolList: true | ||
--- | ||
### Java specific config ### | ||
Language: Java | ||
# BreakAfterJavaFieldAnnotations: false | ||
JavaImportGroups: ['org.godotengine', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax'] | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
--- | ||
Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,cppcoreguidelines-pro-type-member-init,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-nullptr,readability-braces-around-statements,readability-redundant-member-init' | ||
WarningsAsErrors: '' | ||
HeaderFilterRegex: '' | ||
AnalyzeTemporaryDtors: false | ||
FormatStyle: none | ||
CheckOptions: | ||
- key: cert-dcl16-c.NewSuffixes | ||
value: 'L;LL;LU;LLU' | ||
- key: cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField | ||
value: '0' | ||
- key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors | ||
value: '1' | ||
- key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic | ||
value: '1' | ||
- key: cppcoreguidelines-pro-type-member-init.IgnoreArrays | ||
value: '1' | ||
- key: cppcoreguidelines-pro-type-member-init.UseAssignment | ||
value: '1' | ||
- key: google-readability-function-size.StatementThreshold | ||
value: '800' | ||
- key: google-readability-namespace-comments.ShortNamespaceLines | ||
value: '10' | ||
- key: google-readability-namespace-comments.SpacesBeforeComments | ||
value: '2' | ||
- key: modernize-loop-convert.MaxCopySize | ||
value: '16' | ||
- key: modernize-loop-convert.MinConfidence | ||
value: reasonable | ||
- key: modernize-loop-convert.NamingStyle | ||
value: CamelCase | ||
- key: modernize-pass-by-value.IncludeStyle | ||
value: llvm | ||
- key: modernize-replace-auto-ptr.IncludeStyle | ||
value: llvm | ||
- key: modernize-use-bool-literals.IgnoreMacros | ||
value: '0' | ||
- key: modernize-use-default-member-init.IgnoreMacros | ||
value: '0' | ||
- key: modernize-use-default-member-init.UseAssignment | ||
value: '1' | ||
- key: modernize-use-nullptr.NullMacros | ||
value: 'NULL' | ||
- key: readability-braces-around-statements.ShortStatementLines | ||
value: '0' | ||
... | ||
|
Oops, something went wrong.