forked from godotengine/godot
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'remotes/v-sekai-godot/vsk-lbfgs-4.2' in…
…to groups-staging-4.2
- Loading branch information
Showing
45 changed files
with
8,165 additions
and
1 deletion.
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 |
---|---|---|
|
@@ -364,3 +364,5 @@ $RECYCLE.BIN/ | |
*.msm | ||
*.msp | ||
*.lnk | ||
|
||
!modules/*/thirdparty/* |
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
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,128 @@ | ||
# 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 6.0.1). | ||
--- | ||
### General config, applies to all languages ### | ||
BasedOnStyle: LLVM | ||
AccessModifierOffset: -4 | ||
AlignAfterOpenBracket: DontAlign | ||
# AlignConsecutiveAssignments: false | ||
# AlignConsecutiveDeclarations: false | ||
# AlignEscapedNewlines: Right | ||
# AlignOperands: true | ||
AlignTrailingComments: false | ||
AllowAllParametersOfDeclarationOnNextLine: false | ||
# AllowShortBlocksOnASingleLine: false | ||
# AllowShortCaseLabelsOnASingleLine: false | ||
AllowShortFunctionsOnASingleLine: Inline | ||
# AllowShortIfStatementsOnASingleLine: false | ||
# AllowShortLoopsOnASingleLine: false | ||
# AlwaysBreakAfterDefinitionReturnType: None | ||
# AlwaysBreakAfterReturnType: None | ||
# AlwaysBreakBeforeMultilineStrings: false | ||
# AlwaysBreakTemplateDeclarations: false | ||
# BinPackArguments: true | ||
# BinPackParameters: true | ||
# BraceWrapping: | ||
# AfterClass: false | ||
# AfterControlStatement: false | ||
# AfterEnum: false | ||
# AfterFunction: false | ||
# AfterNamespace: false | ||
# AfterObjCDeclaration: false | ||
# AfterStruct: false | ||
# AfterUnion: false | ||
# AfterExternBlock: false | ||
# BeforeCatch: false | ||
# BeforeElse: false | ||
# IndentBraces: false | ||
# SplitEmptyFunction: true | ||
# SplitEmptyRecord: true | ||
# SplitEmptyNamespace: true | ||
# BreakBeforeBinaryOperators: None | ||
# BreakBeforeBraces: Attach | ||
# BreakBeforeInheritanceComma: false | ||
BreakBeforeTernaryOperators: false | ||
# BreakConstructorInitializersBeforeComma: false | ||
BreakConstructorInitializers: AfterColon | ||
# BreakStringLiterals: true | ||
ColumnLimit: 0 | ||
# CommentPragmas: '^ IWYU pragma:' | ||
# CompactNamespaces: false | ||
ConstructorInitializerAllOnOneLineOrOnePerLine: true | ||
ConstructorInitializerIndentWidth: 8 | ||
ContinuationIndentWidth: 8 | ||
Cpp11BracedListStyle: false | ||
# DerivePointerAlignment: false | ||
# DisableFormat: false | ||
# ExperimentalAutoDetectBinPacking: false | ||
# FixNamespaceComments: true | ||
# ForEachMacros: | ||
# - foreach | ||
# - Q_FOREACH | ||
# - BOOST_FOREACH | ||
# IncludeBlocks: Preserve | ||
IncludeCategories: | ||
- Regex: '".*"' | ||
Priority: 1 | ||
- Regex: '^<.*\.h>' | ||
Priority: 2 | ||
- Regex: '^<.*' | ||
Priority: 3 | ||
# IncludeIsMainRegex: '(Test)?$' | ||
IndentCaseLabels: true | ||
# IndentPPDirectives: None | ||
IndentWidth: 4 | ||
# IndentWrappedFunctionNames: false | ||
# JavaScriptQuotes: Leave | ||
# JavaScriptWrapImports: true | ||
KeepEmptyLinesAtTheStartOfBlocks: false | ||
# MacroBlockBegin: '' | ||
# MacroBlockEnd: '' | ||
# MaxEmptyLinesToKeep: 1 | ||
# NamespaceIndentation: None | ||
# PenaltyBreakAssignment: 2 | ||
# PenaltyBreakBeforeFirstCallParameter: 19 | ||
# PenaltyBreakComment: 300 | ||
# PenaltyBreakFirstLessLess: 120 | ||
# PenaltyBreakString: 1000 | ||
# PenaltyExcessCharacter: 1000000 | ||
# PenaltyReturnTypeOnItsOwnLine: 60 | ||
# PointerAlignment: Right | ||
# RawStringFormats: | ||
# - Delimiter: pb | ||
# Language: TextProto | ||
# BasedOnStyle: google | ||
# ReflowComments: true | ||
# SortIncludes: true | ||
# SortUsingDeclarations: true | ||
# SpaceAfterCStyleCast: false | ||
# SpaceAfterTemplateKeyword: true | ||
# SpaceBeforeAssignmentOperators: true | ||
# SpaceBeforeParens: ControlStatements | ||
# SpaceInEmptyParentheses: false | ||
# SpacesBeforeTrailingComments: 1 | ||
# SpacesInAngles: false | ||
# SpacesInContainerLiterals: true | ||
# SpacesInCStyleCastParentheses: false | ||
# SpacesInParentheses: false | ||
# SpacesInSquareBrackets: false | ||
TabWidth: 4 | ||
UseTab: Always | ||
--- | ||
### C++ specific config ### | ||
Language: Cpp | ||
Standard: Cpp11 | ||
--- | ||
### ObjC specific config ### | ||
Language: ObjC | ||
Standard: Cpp11 | ||
ObjCBlockIndentWidth: 4 | ||
# 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,40 @@ | ||
--- | ||
name: Bug report | ||
about: Create a report to help us improve | ||
title: "" | ||
labels: "" | ||
assignees: "" | ||
--- | ||
|
||
**Describe the bug** | ||
A clear and concise description of what the bug is. | ||
|
||
**To Reproduce** | ||
Steps to reproduce the behavior: | ||
|
||
1. Go to '...' | ||
2. Click on '....' | ||
3. Scroll down to '....' | ||
4. See error | ||
|
||
**Expected behavior** | ||
A clear and concise description of what you expected to happen. | ||
|
||
**Screenshots** | ||
If applicable, add screenshots to help explain your problem. | ||
|
||
**Desktop (please complete the following information):** | ||
|
||
- OS: [e.g. iOS] | ||
- Browser [e.g. chrome, safari] | ||
- Version [e.g. 22] | ||
|
||
**Smartphone (please complete the following information):** | ||
|
||
- Device: [e.g. iPhone6] | ||
- OS: [e.g. iOS8.1] | ||
- Browser [e.g. stock browser, safari] | ||
- Version [e.g. 22] | ||
|
||
**Additional context** | ||
Add any other context about the problem here. |
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,19 @@ | ||
--- | ||
name: Feature request | ||
about: Suggest an idea for this project | ||
title: "" | ||
labels: "" | ||
assignees: "" | ||
--- | ||
|
||
**Is your feature request related to a problem? Please describe.** | ||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] | ||
|
||
**Describe the solution you'd like** | ||
A clear and concise description of what you want to happen. | ||
|
||
**Describe alternatives you've considered** | ||
A clear and concise description of any alternative solutions or features you've considered. | ||
|
||
**Additional context** | ||
Add any other context or screenshots about the feature request here. |
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,55 @@ | ||
#!/usr/bin/env bash | ||
|
||
# This script ensures proper POSIX text file formatting and a few other things. | ||
|
||
set -uo pipefail | ||
IFS=$'\n\t' | ||
|
||
# Loops through all text files tracked by Git. | ||
git grep -zIl '' | | ||
while IFS= read -rd '' f; do | ||
# Exclude some types of files. | ||
if [[ "$f" == *"csproj" ]]; then | ||
continue | ||
elif [[ "$f" == *"hdr" ]]; then | ||
continue | ||
fi | ||
# Ensure that files are UTF-8 formatted. | ||
recode UTF-8 "$f" 2> /dev/null | ||
# Ensure that files have LF line endings and do not contain a BOM. | ||
dos2unix "$f" 2> /dev/null | ||
# Remove trailing space characters and ensures that files end | ||
# with newline characters. -l option handles newlines conveniently. | ||
perl -i -ple 's/\s*$//g' "$f" | ||
# Remove the character sequence "== true" if it has a leading space. | ||
perl -i -pe 's/\x20== true//g' "$f" | ||
# We don't want to change lines around braces in godot/tscn files. | ||
if [[ "$f" == *"godot" ]]; then | ||
continue | ||
elif [[ "$f" == *"tscn" ]]; then | ||
continue | ||
fi | ||
# Disallow empty lines after the opening brace. | ||
sed -z -i 's/\x7B\x0A\x0A/\x7B\x0A/g' "$f" | ||
# Disallow some empty lines before the closing brace. | ||
sed -z -i 's/\x0A\x0A\x7D/\x0A\x7D/g' "$f" | ||
done | ||
|
||
git diff > patch.patch | ||
FILESIZE="$(stat -c%s patch.patch)" | ||
MAXSIZE=5 | ||
|
||
# If no patch has been generated all is OK, clean up, and exit. | ||
if (( FILESIZE < MAXSIZE )); then | ||
printf "Files in this commit comply with the formatting rules.\n" | ||
rm -f patch.patch | ||
exit 0 | ||
fi | ||
|
||
# A patch has been created, notify the user, clean up, and exit. | ||
printf "\n*** The following differences were found between the code " | ||
printf "and the formatting rules:\n\n" | ||
cat patch.patch | ||
printf "\n*** Aborting, please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n" | ||
rm -f patch.patch | ||
exit 1 |
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,60 @@ | ||
# MIT License | ||
|
||
# Copyright (c) 2022 K. S. Ernest (iFire) Lee | ||
|
||
# Permission is hereby granted, free of charge, to any person obtaining a copy | ||
# of this software and associated documentation files (the "Software"), to deal | ||
# in the Software without restriction, including without limitation the rights | ||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
# copies of the Software, and to permit persons to whom the Software is | ||
# furnished to do so, subject to the following conditions: | ||
|
||
# The above copyright notice and this permission notice shall be included in all | ||
# copies or substantial portions of the Software. | ||
|
||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
# SOFTWARE. | ||
|
||
name: "Dagger Export" | ||
|
||
on: | ||
push: | ||
branches: [main, dagger] | ||
|
||
env: | ||
REPO_NAME: ${{ github.event.repository.name }} | ||
|
||
concurrency: | ||
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}} | ||
cancel-in-progress: true | ||
|
||
jobs: | ||
build: | ||
name: "Build" | ||
runs-on: ubuntu-latest | ||
# Set cache export environment | ||
env: | ||
DAGGER_CACHE_FROM: type=gha,scope=${{github.job}}-${{github.ref}}-${{github.sha}} | ||
DAGGER_CACHE_TO: type=gha,mode=max,scope=${{github.job}}-${{github.ref}}-${{github.sha}} | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
|
||
- name: "Run Dagger" | ||
uses: dagger/dagger-for-github@v3 | ||
with: | ||
workdir: demo | ||
cmds: | | ||
do build | ||
- name: Upload Artifact | ||
uses: actions/upload-artifact@v2 | ||
with: | ||
name: "Godot Build" | ||
path: demo/build | ||
retention-days: 14 |
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,53 @@ | ||
#!/usr/bin/env bash | ||
|
||
# This script runs clang-format and fixes copyright headers on all relevant files in the repo. | ||
# This is the primary script responsible for fixing style violations. | ||
|
||
set -uo pipefail | ||
IFS=$'\n\t' | ||
|
||
CLANG_FORMAT_FILE_EXTS=(".c" ".h" ".cpp" ".hpp" ".cc" ".hh" ".cxx" ".m" ".mm" ".inc" ".java" ".glsl") | ||
|
||
# Loops through all text files tracked by Git. | ||
git grep -zIl '' | | ||
while IFS= read -rd '' f; do | ||
# Exclude 3rd party files. | ||
if [[ "$f" == "glad"* ]]; then | ||
continue | ||
elif [[ "$f" == "godot-cpp"* ]]; then | ||
continue | ||
elif [[ "$f" == "thirdparty"* ]]; then | ||
continue | ||
elif [[ "$f" == "gradle"* ]]; then | ||
continue | ||
elif [[ "$f" == "build"* ]]; then | ||
continue | ||
elif [[ "$f" == "android"* ]]; then | ||
continue | ||
elif [[ "$f" == ".github"* ]]; then | ||
continue | ||
fi | ||
for extension in ${CLANG_FORMAT_FILE_EXTS[@]}; do | ||
if [[ "$f" == *"$extension" ]]; then | ||
# Run clang-format. | ||
clang-format -i "$f" | ||
fi | ||
done | ||
done | ||
|
||
git diff > patch.patch | ||
|
||
# If no patch has been generated all is OK, clean up, and exit. | ||
if [ ! -s patch.patch ] ; then | ||
printf "Files in this commit comply with the clang-format style rules.\n" | ||
rm -f patch.patch | ||
exit 0 | ||
fi | ||
|
||
# A patch has been created, notify the user, clean up, and exit. | ||
printf "\n*** The following differences were found between the code " | ||
printf "and the formatting rules:\n\n" | ||
cat patch.patch | ||
printf "\n*** Aborting, please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n" | ||
rm -f patch.patch | ||
exit 1 |
Oops, something went wrong.