Skip to content

Commit 7b97de0

Browse files
committed
Merge branch 'master' into Android_fixes_thierry
* master: (244 commits) ofxAssimpModelLoader addon_config.mk osx exclusions Downloader 3.2.3 - fixes for install detection and single url for curl (openframeworks#8009) Downloader 3.2.3 - fixes for install detection and single url for curl Download libs script update (adds openframeworks#7907 wget2) - params and fixes deploy logs (openframeworks#8002) .mk removing repeated configs COREVIDEO_SILENCE_GL_DEPRECATION (openframeworks#8005) ios template update update addons folder in xcode template (openframeworks#8003) VS download latest x64 only (openframeworks#7999) Android 2024 template (openframeworks#7991) XCode macOS template update up (openframeworks#7996) msys2 improvements (openframeworks#7976) commented out .h files removed (openframeworks#7990) VS2022 FreeType Fix (openframeworks#7992) Update ofPixels.cpp (openframeworks#7989) ofAppNoWindow..h: #include ofEvents to complete the ofCoreEvents type (openframeworks#7943) ofFile::doesFileExist simplified (openframeworks#7970) fix unneeded reference for `add` of `bool`, `char` (openframeworks#7973) ofxOscReceiver: win32 implementation: shadow posix changes (openframeworks#7979) ... # Conflicts: # .gitignore # libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp # libs/openFrameworks/gl/ofShader.cpp # libs/openFrameworks/gl/ofTexture.h # libs/openFrameworks/graphics/ofGraphicsBaseTypes.cpp # libs/openFrameworks/graphics/ofTrueTypeFont.cpp # libs/openFrameworks/graphics/ofTrueTypeFont.h # libs/openFrameworks/sound/ofAVEngineSoundPlayer.h # libs/openFrameworks/sound/ofSoundBaseTypes.h # libs/openFrameworks/utils/ofConstants.h # libs/openFrameworks/utils/ofThread.h # libs/openFrameworks/utils/ofURLFileLoader.cpp # libs/openFrameworks/utils/ofUtils.h # libs/openFrameworks/utils/ofXml.h
2 parents b4a7346 + c194512 commit 7b97de0

File tree

1,081 files changed

+40527
-139571
lines changed

Some content is hidden

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

1,081 files changed

+40527
-139571
lines changed

.clang-format

+217
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,217 @@
1+
---
2+
Language: Cpp
3+
# BasedOnStyle: WebKit
4+
AccessModifierOffset: -4
5+
AlignAfterOpenBracket: DontAlign
6+
AlignArrayOfStructures: None
7+
AlignConsecutiveAssignments:
8+
Enabled: false
9+
AcrossEmptyLines: false
10+
AcrossComments: false
11+
AlignCompound: false
12+
PadOperators: true
13+
AlignConsecutiveBitFields:
14+
Enabled: false
15+
AcrossEmptyLines: false
16+
AcrossComments: false
17+
AlignCompound: false
18+
PadOperators: false
19+
AlignConsecutiveDeclarations:
20+
Enabled: false
21+
AcrossEmptyLines: false
22+
AcrossComments: false
23+
AlignCompound: false
24+
PadOperators: false
25+
AlignConsecutiveMacros:
26+
Enabled: false
27+
AcrossEmptyLines: false
28+
AcrossComments: false
29+
AlignCompound: false
30+
PadOperators: false
31+
AlignEscapedNewlines: Right
32+
AlignOperands: DontAlign
33+
AlignTrailingComments: false
34+
AllowAllArgumentsOnNextLine: true
35+
AllowAllParametersOfDeclarationOnNextLine: true
36+
AllowShortEnumsOnASingleLine: true
37+
AllowShortBlocksOnASingleLine: Empty
38+
AllowShortCaseLabelsOnASingleLine: false
39+
AllowShortFunctionsOnASingleLine: All
40+
AllowShortLambdasOnASingleLine: All
41+
AllowShortIfStatementsOnASingleLine: WithoutElse
42+
AllowShortLoopsOnASingleLine: false
43+
AlwaysBreakAfterDefinitionReturnType: None
44+
AlwaysBreakAfterReturnType: None
45+
AlwaysBreakBeforeMultilineStrings: false
46+
AlwaysBreakTemplateDeclarations: MultiLine
47+
AttributeMacros:
48+
- __capability
49+
BinPackArguments: true
50+
BinPackParameters: true
51+
BraceWrapping:
52+
AfterCaseLabel: false
53+
AfterClass: false
54+
AfterControlStatement: Never
55+
AfterEnum: false
56+
AfterFunction: false
57+
AfterNamespace: false
58+
AfterObjCDeclaration: false
59+
AfterStruct: false
60+
AfterUnion: false
61+
AfterExternBlock: false
62+
BeforeCatch: false
63+
BeforeElse: false
64+
BeforeLambdaBody: false
65+
BeforeWhile: false
66+
IndentBraces: false
67+
SplitEmptyFunction: true
68+
SplitEmptyRecord: true
69+
SplitEmptyNamespace: true
70+
BreakBeforeBinaryOperators: All
71+
BreakBeforeConceptDeclarations: Always
72+
BreakBeforeBraces: Custom
73+
BreakBeforeInheritanceComma: false
74+
BreakInheritanceList: BeforeColon
75+
BreakBeforeTernaryOperators: true
76+
BreakConstructorInitializersBeforeComma: false
77+
BreakConstructorInitializers: BeforeComma
78+
BreakAfterJavaFieldAnnotations: false
79+
BreakStringLiterals: true
80+
ColumnLimit: 0
81+
CommentPragmas: '^ IWYU pragma:'
82+
QualifierAlignment: Leave
83+
CompactNamespaces: false
84+
ConstructorInitializerIndentWidth: 4
85+
ContinuationIndentWidth: 4
86+
Cpp11BracedListStyle: false
87+
DeriveLineEnding: true
88+
DerivePointerAlignment: false
89+
DisableFormat: false
90+
EmptyLineAfterAccessModifier: Never
91+
EmptyLineBeforeAccessModifier: LogicalBlock
92+
ExperimentalAutoDetectBinPacking: false
93+
PackConstructorInitializers: BinPack
94+
BasedOnStyle: ''
95+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
96+
AllowAllConstructorInitializersOnNextLine: true
97+
FixNamespaceComments: false
98+
ForEachMacros:
99+
- foreach
100+
- Q_FOREACH
101+
- BOOST_FOREACH
102+
IfMacros:
103+
- KJ_IF_MAYBE
104+
IncludeBlocks: Preserve
105+
IncludeCategories:
106+
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
107+
Priority: 2
108+
SortPriority: 0
109+
CaseSensitive: false
110+
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
111+
Priority: 3
112+
SortPriority: 0
113+
CaseSensitive: false
114+
- Regex: '.*'
115+
Priority: 1
116+
SortPriority: 0
117+
CaseSensitive: false
118+
IncludeIsMainRegex: '(Test)?$'
119+
IncludeIsMainSourceRegex: ''
120+
IndentAccessModifiers: false
121+
IndentCaseLabels: false
122+
IndentCaseBlocks: false
123+
IndentGotoLabels: true
124+
IndentPPDirectives: BeforeHash
125+
IndentExternBlock: AfterExternBlock
126+
IndentRequiresClause: true
127+
IndentWidth: 4
128+
IndentWrappedFunctionNames: false
129+
InsertBraces: false
130+
InsertTrailingCommas: None
131+
JavaScriptQuotes: Leave
132+
JavaScriptWrapImports: true
133+
KeepEmptyLinesAtTheStartOfBlocks: true
134+
LambdaBodyIndentation: Signature
135+
MacroBlockBegin: ''
136+
MacroBlockEnd: ''
137+
MaxEmptyLinesToKeep: 1
138+
NamespaceIndentation: None
139+
ObjCBinPackProtocolList: Auto
140+
ObjCBlockIndentWidth: 4
141+
ObjCBreakBeforeNestedBlockParam: true
142+
ObjCSpaceAfterProperty: true
143+
ObjCSpaceBeforeProtocolList: true
144+
PenaltyBreakAssignment: 2
145+
PenaltyBreakBeforeFirstCallParameter: 19
146+
PenaltyBreakComment: 300
147+
PenaltyBreakFirstLessLess: 120
148+
PenaltyBreakOpenParenthesis: 0
149+
PenaltyBreakString: 1000
150+
PenaltyBreakTemplateDeclaration: 10
151+
PenaltyExcessCharacter: 1000000
152+
PenaltyReturnTypeOnItsOwnLine: 60
153+
PenaltyIndentedWhitespace: 0
154+
PointerAlignment: Middle
155+
PPIndentWidth: -1
156+
ReferenceAlignment: Pointer
157+
ReflowComments: false
158+
RemoveBracesLLVM: false
159+
RequiresClausePosition: OwnLine
160+
SeparateDefinitionBlocks: Leave
161+
ShortNamespaceLines: 1
162+
SortIncludes: CaseSensitive
163+
SortJavaStaticImport: Before
164+
SortUsingDeclarations: true
165+
SpaceAfterCStyleCast: false
166+
SpaceAfterLogicalNot: false
167+
SpaceAfterTemplateKeyword: true
168+
SpaceBeforeAssignmentOperators: true
169+
SpaceBeforeCaseColon: false
170+
SpaceBeforeCpp11BracedList: true
171+
SpaceBeforeCtorInitializerColon: true
172+
SpaceBeforeInheritanceColon: true
173+
SpaceBeforeParens: ControlStatements
174+
SpaceBeforeParensOptions:
175+
AfterControlStatements: true
176+
AfterForeachMacros: true
177+
AfterFunctionDefinitionName: false
178+
AfterFunctionDeclarationName: false
179+
AfterIfMacros: true
180+
AfterOverloadedOperator: false
181+
AfterRequiresInClause: false
182+
AfterRequiresInExpression: false
183+
BeforeNonEmptyParentheses: false
184+
SpaceAroundPointerQualifiers: Default
185+
SpaceBeforeRangeBasedForLoopColon: true
186+
SpaceInEmptyBlock: true
187+
SpaceInEmptyParentheses: false
188+
SpacesBeforeTrailingComments: 1
189+
SpacesInAngles: Never
190+
SpacesInConditionalStatement: false
191+
SpacesInContainerLiterals: true
192+
SpacesInCStyleCastParentheses: false
193+
SpacesInLineCommentPrefix:
194+
Minimum: 1
195+
Maximum: -1
196+
SpacesInParentheses: false
197+
SpacesInSquareBrackets: false
198+
SpaceBeforeSquareBrackets: false
199+
BitFieldColonSpacing: Both
200+
Standard: Latest
201+
StatementAttributeLikeMacros:
202+
- Q_EMIT
203+
StatementMacros:
204+
- Q_UNUSED
205+
- QT_REQUIRE_VERSION
206+
TabWidth: 4
207+
UseCRLF: false
208+
UseTab: Always
209+
WhitespaceSensitiveMacros:
210+
- STRINGIZE
211+
- STRINGIFY
212+
- PP_STRINGIZE
213+
- BOOST_PP_STRINGIZE
214+
- NS_SWIFT_NAME
215+
- CF_SWIFT_NAME
216+
...
217+

.github/build-android.yml renamed to .github/disabled/build-android.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
build-android:
19-
runs-on: ubuntu-18.04
19+
runs-on: ubuntu-20.04
2020
strategy:
2121
matrix:
2222
cfg:
@@ -47,7 +47,5 @@ jobs:
4747
run: ./scripts/$TARGET/download_libs.sh
4848
- name: Build
4949
run: ./scripts/ci/$TARGET/build.sh
50-
- name: Upload Libs
51-
run: scripts/ci/upload_of_lib.sh;
5250
env:
5351
GA_CI_SECRET: ${{ secrets.CI_SECRET }}

.github/disabled/build-linux-arm.yml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: build-linux-arm
2+
3+
# make the action not run on the local repo if the branch is also in a pull request to OF/OF
4+
on:
5+
push:
6+
if: github.event_name == 'push' && github.event.pull_request == null
7+
paths-ignore:
8+
- '**/*.md'
9+
- 'examples/**'
10+
pull_request:
11+
if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
12+
paths-ignore:
13+
- '**/*.md'
14+
- 'examples/**'
15+
16+
env:
17+
ccache: ccache
18+
19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: true
22+
23+
jobs:
24+
build-linux-arm-platforms:
25+
runs-on: ubuntu-latest
26+
strategy:
27+
matrix:
28+
cfg:
29+
- {target: linuxarmv6l, libs: armv6l}
30+
- {target: linuxaarch64, libs: aarch64}
31+
env:
32+
TARGET: ${{matrix.cfg.target}}
33+
steps:
34+
- name: Cache Packages
35+
uses: awalsh128/cache-apt-pkgs-action@latest
36+
with:
37+
packages: make curl libunwind-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good
38+
version: 1.0
39+
40+
- uses: actions/checkout@v4
41+
- name: ccache
42+
uses: hendrikmuhs/ccache-action@v1.2.12
43+
with:
44+
# key: ${{ matrix.os }}-${{ matrix.type }}
45+
key: ${{ matrix.cfg.target }}
46+
- name: Download libs
47+
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
48+
- name: Install dependencies
49+
run: ./scripts/ci/$TARGET/install.sh;
50+
- name: Build
51+
run: ./scripts/ci/$TARGET/build.sh;

.github/workflows/build-vs.yml renamed to .github/disabled/build-vs2019.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16+
env:
17+
ccache: ccache
18+
1619
concurrency:
1720
group: ${{ github.workflow }}-${{ github.ref }}
1821
cancel-in-progress: true
@@ -29,7 +32,7 @@ jobs:
2932
BITS: ${{ matrix.bits }}
3033
steps:
3134
- name: Clone repository
32-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3336
- uses: msys2/setup-msys2@v2
3437
with:
3538
update: true

.github/workflows/build-emscripten.yml renamed to .github/workflows/actions/build-emscripten.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,26 @@ concurrency:
1717
group: ${{ github.workflow }}-${{ github.ref }}
1818
cancel-in-progress: true
1919

20+
env:
21+
ccache: ccache
22+
2023
jobs:
2124
build-emscripten:
22-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-24.04
2326
strategy:
2427
matrix:
2528
cfg:
2629
- {target: emscripten}
27-
env:
28-
TARGET: ${{matrix.cfg.target}}
2930
steps:
30-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3132
- name: Docker Step
3233
run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash"
3334
- name: Download libs
34-
run: ./scripts/$TARGET/download_libs.sh
35+
run: ./scripts/${{matrix.cfg.target}}/download_libs.sh
3536
- name: Install dependencies
36-
run: ./scripts/ci/$TARGET/install.sh
37+
run: ./scripts/ci/${{matrix.cfg.target}}/install.sh
3738
- name: Build
38-
run: docker exec -i emscripten sh -c "scripts/ci/$TARGET/build.sh";
39+
run: docker exec -i emscripten sh -c "scripts/ci/${{matrix.cfg.target}}/build.sh";
3940
- name: Upload Libs
4041
run: scripts/ci/upload_of_lib.sh;
4142
env:

.github/workflows/build-ios-tvos.yml renamed to .github/workflows/actions/build-ios-tvos.yml

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: build-ios-tvos
22

3-
43
# make the action not run on the local repo if the branch is also in a pull request to OF/OF
54
on:
65
push:
@@ -14,14 +13,16 @@ on:
1413
- '**/*.md'
1514
- 'examples/**'
1615

17-
1816
concurrency:
1917
group: ${{ github.workflow }}-${{ github.ref }}
2018
cancel-in-progress: true
2119

20+
env:
21+
ccache: ccache
22+
2223
jobs:
23-
build-osx:
24-
runs-on: macos-12
24+
build-ios-tvos:
25+
runs-on: macos-13
2526
strategy:
2627
matrix:
2728
cfg:
@@ -30,7 +31,12 @@ jobs:
3031
env:
3132
TARGET: ${{matrix.cfg.target}}
3233
steps:
33-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
35+
- name: ccache
36+
uses: hendrikmuhs/ccache-action@v1.2.13
37+
with:
38+
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
39+
3440
- name: Download libs
3541
run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
3642
- name: install
@@ -39,4 +45,4 @@ jobs:
3945
run: ./scripts/ci/$TARGET/build.sh;
4046

4147
env:
42-
DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer"
48+
DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer"

0 commit comments

Comments
 (0)