Merge pull request #17 from Kariaro/develop

Develop

.github/workflows/main.yml

@@ -1,19 +1,25 @@
-name: Build VRigUnity 🎮
-
-on: workflow_dispatch
+name: Build VRigUnity
 
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        type: string
+        default: v0.10.1-macos11
 env:
   UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-
 jobs:
   buildWindows:
-    name: Build for Windows 🖥️
+    name: Build for Windows
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+
+      - name: Download libs
+        run: bash download_libs.sh "${{ inputs.tag }}"
 
       - uses: actions/cache@v2
         with:
@@ -25,6 +31,7 @@ jobs:
       
       - uses: game-ci/unity-builder@v2
         with:
+          buildName: VRigUnity
           targetPlatform: StandaloneWindows64
 
       - uses: actions/upload-artifact@v2
@@ -33,13 +40,16 @@ jobs:
           path: build/StandaloneWindows64
 
   buildLinux:
-    name: Build for Linux 📱
+    name: Build for Linux
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+
+      - name: Download libs
+        run: bash download_libs.sh "${{ inputs.tag }}"
 
       - uses: actions/cache@v2
         with:
@@ -51,9 +61,40 @@ jobs:
 
       - uses: game-ci/unity-builder@v2
         with:
+          buildName: VRigUnity
           targetPlatform: StandaloneLinux64
 
       - uses: actions/upload-artifact@v2
         with:
           name: build-StandaloneLinux64
           path: build/StandaloneLinux64
+
+  buildOSX:
+    name: Build for OSX
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Download libs
+        run: bash download_libs.sh "${{ inputs.tag }}"
+
+      - uses: actions/cache@v2
+        with:
+          path: Library
+          key: Library-VRigUnity-OSX
+          restore-keys: |
+            Library-VRigUnity-
+            Library-
+
+      - uses: game-ci/unity-builder@v2
+        with:
+          buildName: VRigUnity
+          targetPlatform: StandaloneOSX
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: build-StandaloneOSX
+          path: build/StandaloneOSX

.gitignore

@@ -76,6 +76,10 @@ crashlytics-build.properties
 
 # Remove mediapipe resources
 /Packages/com.github.homuler.mediapipe/Runtime/Resources/
+/Packages/com.github.homuler.mediapipe/Samples~/
 Build/
 Temp/
-TempFolder/
+TempFolder/
+
+# Temp
+.curl/

Assets/Plugins/SimpleFileBrowser/Android/FBCallbackHelper.cs

@@ -0,0 +1,31 @@
+#if UNITY_EDITOR || UNITY_ANDROID
+using UnityEngine;
+
+namespace SimpleFileBrowser
+{
+	public class FBCallbackHelper : MonoBehaviour
+	{
+		private System.Action mainThreadAction = null;
+
+		private void Awake()
+		{
+			DontDestroyOnLoad( gameObject );
+		}
+
+		private void Update()
+		{
+			if( mainThreadAction != null )
+			{
+				System.Action temp = mainThreadAction;
+				mainThreadAction = null;
+				temp();
+			}
+		}
+
+		public void CallOnMainThread( System.Action function )
+		{
+			mainThreadAction = function;
+		}
+	}
+}
+#endif

Assets/Plugins/SimpleFileBrowser/Android/FBDirectoryReceiveCallbackAndroid.cs

@@ -0,0 +1,36 @@
+#if UNITY_EDITOR || UNITY_ANDROID
+using UnityEngine;
+
+namespace SimpleFileBrowser
+{
+	public class FBDirectoryReceiveCallbackAndroid : AndroidJavaProxy
+	{
+		private readonly FileBrowser.AndroidSAFDirectoryPickCallback callback;
+		private readonly FBCallbackHelper callbackHelper;
+
+		public FBDirectoryReceiveCallbackAndroid( FileBrowser.AndroidSAFDirectoryPickCallback callback ) : base( "com.yasirkula.unity.FileBrowserDirectoryReceiver" )
+		{
+			this.callback = callback;
+			callbackHelper = new GameObject( "FBCallbackHelper" ).AddComponent<FBCallbackHelper>();
+		}
+
+		public void OnDirectoryPicked( string rawUri, string name )
+		{
+			callbackHelper.CallOnMainThread( () => DirectoryPickedCallback( rawUri, name ) );
+		}
+
+		private void DirectoryPickedCallback( string rawUri, string name )
+		{
+			try
+			{
+				if( callback != null )
+					callback( rawUri, name );
+			}
+			finally
+			{
+				Object.Destroy( callbackHelper.gameObject );
+			}
+		}
+	}
+}
+#endif

Assets/Plugins/SimpleFileBrowser/Android/FBPermissionCallbackAndroid.cs

@@ -0,0 +1,29 @@
+#if UNITY_EDITOR || UNITY_ANDROID
+using System.Threading;
+using UnityEngine;
+
+namespace SimpleFileBrowser
+{
+	public class FBPermissionCallbackAndroid : AndroidJavaProxy
+	{
+		private object threadLock;
+		public int Result { get; private set; }
+
+		public FBPermissionCallbackAndroid( object threadLock ) : base( "com.yasirkula.unity.FileBrowserPermissionReceiver" )
+		{
+			Result = -1;
+			this.threadLock = threadLock;
+		}
+
+		public void OnPermissionResult( int result )
+		{
+			Result = result;
+
+			lock( threadLock )
+			{
+				Monitor.Pulse( threadLock );
+			}
+		}
+	}
+}
+#endif