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
danoli3 · Jun 12, 2024 · 7b97de0 · 7b97de0
2 parents b4a7346 + c194512
commit 7b97de0
Show file tree

Hide file tree

Showing 1,081 changed files with 40,527 additions and 139,571 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,217 @@
+---
+Language:        Cpp
+# BasedOnStyle:  WebKit
+AccessModifierOffset: -4
+AlignAfterOpenBracket: DontAlign
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignEscapedNewlines: Right
+AlignOperands:   DontAlign
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+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: All
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     0
+CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: BinPack
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+AllowAllConstructorInitializersOnNextLine: true
+FixNamespaceComments: false
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: true
+IndentPPDirectives: BeforeHash
+IndentExternBlock: AfterExternBlock
+IndentRequiresClause: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 4
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Middle
+PPIndentWidth:   -1
+ReferenceAlignment: Pointer
+ReflowComments:  false
+RemoveBracesLLVM: false
+RequiresClausePosition: OwnLine
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   true
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: Both
+Standard:        Latest
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        4
+UseCRLF:         false
+UseTab:          Always
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - STRINGIFY
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+...
+
diff --git a/.github/build-android.yml → .github/disabled/build-android.yml b/.github/build-android.yml → .github/disabled/build-android.yml
@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   build-android:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         cfg:
@@ -47,7 +47,5 @@ jobs:
       run: ./scripts/$TARGET/download_libs.sh
     - name: Build
       run: ./scripts/ci/$TARGET/build.sh
-    - name: Upload Libs
-      run: scripts/ci/upload_of_lib.sh;
       env:
         GA_CI_SECRET: ${{ secrets.CI_SECRET }}
diff --git a/.github/disabled/build-linux-arm.yml b/.github/disabled/build-linux-arm.yml
@@ -0,0 +1,51 @@
+name: build-linux-arm
+
+# make the action not run on the local repo if the branch is also in a pull request to OF/OF
+on:
+  push:
+    if: github.event_name == 'push' && github.event.pull_request == null
+    paths-ignore:
+    - '**/*.md'
+    - 'examples/**'
+  pull_request:
+    if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
+    paths-ignore:
+      - '**/*.md'
+      - 'examples/**'
+
+env:
+  ccache: ccache
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-linux-arm-platforms:
+    runs-on: ubuntu-latest
+    strategy:
+        matrix:
+          cfg:
+          - {target: linuxarmv6l, libs: armv6l}
+          - {target: linuxaarch64, libs: aarch64}
+    env:
+     TARGET: ${{matrix.cfg.target}}
+    steps:
+    - name: Cache Packages
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        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
+        version: 1.0
+
+    - uses: actions/checkout@v4
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.12
+      with:
+        # key: ${{ matrix.os }}-${{ matrix.type }}
+        key: ${{ matrix.cfg.target }}
+    - name: Download libs
+      run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
+    - name: Install dependencies
+      run: ./scripts/ci/$TARGET/install.sh;
+    - name: Build
+      run: ./scripts/ci/$TARGET/build.sh;
diff --git a/.github/workflows/build-vs.yml → .github/disabled/build-vs2019.yml b/.github/workflows/build-vs.yml → .github/disabled/build-vs2019.yml
@@ -13,6 +13,9 @@ on:
       - '**/*.md'
       - 'examples/**'
 
+env:
+  ccache: ccache
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -29,7 +32,7 @@ jobs:
       BITS: ${{ matrix.bits }}
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
         with:
           update: true

diff --git a/.github/workflows/build-emscripten.yml → ...ub/workflows/actions/build-emscripten.yml b/.github/workflows/build-emscripten.yml → ...ub/workflows/actions/build-emscripten.yml
@@ -17,25 +17,26 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache
+
 jobs:
   build-emscripten:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
         matrix:
           cfg:
           - {target: emscripten}
-    env:
-     TARGET: ${{matrix.cfg.target}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Docker Step
       run:  "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash"
     - name: Download libs
-      run: ./scripts/$TARGET/download_libs.sh
+      run: ./scripts/${{matrix.cfg.target}}/download_libs.sh
     - name: Install dependencies
-      run: ./scripts/ci/$TARGET/install.sh
+      run: ./scripts/ci/${{matrix.cfg.target}}/install.sh
     - name: Build
-      run: docker exec -i emscripten sh -c "scripts/ci/$TARGET/build.sh";
+      run: docker exec -i emscripten sh -c "scripts/ci/${{matrix.cfg.target}}/build.sh";
     - name: Upload Libs
       run: scripts/ci/upload_of_lib.sh;
       env:

diff --git a/.github/workflows/build-ios-tvos.yml → .github/workflows/actions/build-ios-tvos.yml b/.github/workflows/build-ios-tvos.yml → .github/workflows/actions/build-ios-tvos.yml
@@ -1,6 +1,5 @@
 name: build-ios-tvos
 
-
 # make the action not run on the local repo if the branch is also in a pull request to OF/OF
 on:
   push:
@@ -14,14 +13,16 @@ on:
       - '**/*.md'
       - 'examples/**'
 
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  ccache: ccache
+
 jobs:
-  build-osx:
-    runs-on: macos-12
+  build-ios-tvos:
+    runs-on: macos-13
     strategy:
         matrix:
           cfg:
@@ -30,7 +31,12 @@ jobs:
     env:
      TARGET: ${{matrix.cfg.target}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.13
+      with:
+        key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
+
     - name: Download libs
       run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
     - name: install
@@ -39,4 +45,4 @@ jobs:
       run: ./scripts/ci/$TARGET/build.sh;
 
       env:
-        DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer"
+        DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer"