Merge branch 'release/4.1.0-pre.3'

.github/workflows/package_generation.yml

@@ -269,14 +269,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        BuildArch: [armv7, arm64, x86_64]
+        BuildArch: [arm64, x86_64]
     steps:
+      - uses: actions/checkout@v3
+        with:
+          path: assimp-unity
+
       - name: Download Assimp sources
         run: curl -L https://github.com/assimp/assimp/archive/v${{ inputs.AssimpVersion }}.zip -o assimp.zip
 
       - name: Extract Assimp sources
         run: unzip assimp.zip
 
+      - name: Apply patches
+        run: patch -Np1 < ${{ github.workspace }}/assimp-unity/patches/4.1.0/iOS/0001-enable-bitcode.patch
+        working-directory: assimp-${{ inputs.AssimpVersion }}
+
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
@@ -288,7 +296,10 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: Assimp-iOS-${{ matrix.BuildArch }}
-          path: assimp-${{ inputs.AssimpVersion }}/lib/iOS
+          path: |
+            assimp-${{ inputs.AssimpVersion }}/lib/iOS/${{ matrix.BuildArch }}/libassimp.a
+            assimp-${{ inputs.AssimpVersion }}/lib/libIrrXML.a
+            assimp-${{ inputs.AssimpVersion }}/lib/libzlibstatic.a
 
       - uses: actions/upload-artifact@v3
         with:
@@ -507,27 +518,34 @@ jobs:
           name: Assimp-iOS-arm64
           path: ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64
 
-      - uses: actions/download-artifact@v3
-        with:
-          name:  Assimp-iOS-armv7
-          path: ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-armv7
-
       - uses: actions/download-artifact@v3
         with:
           name: Assimp-iOS-x86_64
           path: ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64
 
-      - name: Install Assimp for iOS armv7
+      - name: Install Assimp for iOS arm64
+        if: inputs.buildiOS
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/iOS/arm64/libassimp.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libassimp.a
+
+      - name: Install Assimp for iOS arm64
         if: inputs.buildiOS
-        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-armv7/armv7/libassimp.a packages/${{ env.PackageName }}/Plugins/ios/armv7/libassimp.a
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/libIrrXML.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libIrrXML.a
 
       - name: Install Assimp for iOS arm64
         if: inputs.buildiOS
-        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/arm64/libassimp.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libassimp.a
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/libzlibstatic.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libzlibstatic.a
+
+      - name: Install Assimp for iOS x86_64
+        if: inputs.buildiOS
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/iOS/x86_64/libassimp.a packages/${{ env.PackageName }}/Plugins/ios/x64/libassimp.a
+
+      - name: Install Assimp for iOS x86_64
+        if: inputs.buildiOS
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/libIrrXML.a packages/${{ env.PackageName }}/Plugins/ios/x64/libIrrXML.a
 
       - name: Install Assimp for iOS x86_64
         if: inputs.buildiOS
-        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/x86_64/libassimp.a packages/${{ env.PackageName }}/Plugins/ios/x64/libassimp.a
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/libzlibstatic.a packages/${{ env.PackageName }}/Plugins/ios/x64/libzlibstatic.a
 
       - name: Copy Assimp License
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/LICENSE packages/${{ env.PackageName }}/AssimpLicense.txt

.gitignore

@@ -4,8 +4,6 @@
 [Ll]ibrary/
 [Oo]bj/
 [Tt]emp/
-[Ss]treaming[Aa]ssets/
-[Ss]treaming[Aa]ssets.meta
 [Aa]ctual[Ii]mages/
 [Aa]ctual[Ii]mages.meta
 [Ll]og/
@@ -37,3 +35,4 @@ packages/**/*.dll
 packages/**/*.so
 packages/**/*.a
 packages/**/*.dylib
+diffs/

TestProjects/Assimp_URP_Tests/Packages/packages-lock.json

@@ -11,39 +11,39 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.2"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
       }
     },
     "com.frozenstorminteractive.assimp.ios": {
       "version": "file:../../../packages/com.frozenstorminteractive.assimp.ios",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.2"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
       }
     },
     "com.frozenstorminteractive.assimp.linux": {
       "version": "file:../../../packages/com.frozenstorminteractive.assimp.linux",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.2"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
       }
     },
     "com.frozenstorminteractive.assimp.macos": {
       "version": "file:../../../packages/com.frozenstorminteractive.assimp.macos",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.2"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
       }
     },
     "com.frozenstorminteractive.assimp.windows": {
       "version": "file:../../../packages/com.frozenstorminteractive.assimp.windows",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.2"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
       }
     },
     "com.unity.burst": {

docs/index.md

@@ -14,7 +14,7 @@ This project currently supports:
 - Android
 - iOS (untested)
 
-See [Installation](installation.md)
+See [Installation](installation/index.md)
 
 {: .warning }
 Assimp for Unity is based on [AssimpNet](https://bitbucket.org/Starnick/assimpnet/). This project does not offer full support for AssimpNet and we will never offer it. This page is therefore incomplete and serves as a starting point for using AssimpNet. We encourage you to read official [AssimpNet](https://bitbucket.org/Starnick/assimpnet/) Documentation.

packages/com.frozenstorminteractive.assimp.android/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.frozenstorminteractive.assimp.android",
-  "version": "4.1.0-pre.2",
+  "version": "4.1.0-pre.3",
   "displayName": "Assimp - Android",
   "unity": "2018.1",
   "description": "Assimp binaries for Android",
@@ -23,6 +23,6 @@
     "url" : "https://www.frozenstorminteractive.com"
   },
   "dependencies": {
-    "com.frozenstorminteractive.assimp": "4.1.0-pre.2"
+    "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
   }
 }