Merge branch 'wip'

Author: gkngkc

Assets/StandaloneFileBrowser.meta

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>16G29</string>
+	<string>18A391</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -31,16 +31,16 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>9A235</string>
+	<string>10A255</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>17A360</string>
+	<string>18A384</string>
 	<key>DTSDKName</key>
-	<string>macosx10.13</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0900</string>
+	<string>1000</string>
 	<key>DTXcodeBuild</key>
-	<string>9A235</string>
+	<string>10A255</string>
 </dict>
 </plist>

Assets/StandaloneFileBrowser/Plugins.meta

@@ -1,14 +1,17 @@
 var StandaloneFileBrowserWebGLPlugin = {
     // Open file.
-    // gameObjectNamePtr: GameObject name required for calling back unity side with SendMessage. And it should be unique
-    // filter(disabled): Filter files. Example filters:
+    // gameObjectNamePtr: Unique GameObject name. Required for calling back unity with SendMessage.
+    // methodNamePtr: Callback method name on given GameObject.
+    // filter: Filter files. Example filters:
     //     Match all image files: "image/*"
     //     Match all video files: "video/*"
     //     Match all audio files: "audio/*"
-    //     Custom: ".plist,.xml,.yaml"
-    // multiselect(disabled): Allows multiple file selection
-    UploadFile: function(gameObjectNamePtr/*, filter, multiselect*/) {
+    //     Custom: ".plist, .xml, .yaml"
+    // multiselect: Allows multiple file selection
+    UploadFile: function(gameObjectNamePtr, methodNamePtr, filterPtr, multiselect) {
         gameObjectName = Pointer_stringify(gameObjectNamePtr);
+        methodName = Pointer_stringify(methodNamePtr);
+        filter = Pointer_stringify(filterPtr);
 
         // Delete if element exist
         var fileInput = document.getElementById(gameObjectName)
@@ -21,23 +24,24 @@ var StandaloneFileBrowserWebGLPlugin = {
         fileInput.setAttribute('type', 'file');
         fileInput.setAttribute('style','display:none;');
         fileInput.setAttribute('style','visibility:hidden;');
-        // if (multiselect) {
-        //     fileInput.setAttribute('multiple', multiselect);
-        // }
-        // if (filter) {
-        //     fileInput.setAttribute('accept', filter);
-        // }
+        if (multiselect) {
+            fileInput.setAttribute('multiple', '');
+        }
+        if (filter) {
+            fileInput.setAttribute('accept', filter);
+        }
         fileInput.onclick = function (event) {
             // File dialog opened
             this.value = null;
         };
         fileInput.onchange = function (event) {
             // multiselect works
-            // for (var i = 0; i < event.target.files.length; i++) {
-            //     console.log(URL.createObjectURL(event.target.files[i]));
-            // }
+            var urls = [];
+            for (var i = 0; i < event.target.files.length; i++) {
+                urls.push(URL.createObjectURL(event.target.files[i]));
+            }
             // File selected
-            SendMessage(gameObjectName, 'OnFileUploaded', URL.createObjectURL(event.target.files[0]));
+            SendMessage(gameObjectName, methodName, urls.join());
 
             // Remove after file selected
             document.body.removeChild(fileInput);
@@ -50,21 +54,16 @@ var StandaloneFileBrowserWebGLPlugin = {
         }
     },
 
-    // Open folder. - NOT IMPLEMENTED
-    UploadFolder: function(gameObjectNamePtr) {
-        gameObjectName = Pointer_stringify(gameObjectNamePtr);
-        SendMessage(gameObjectName, 'OnFolderUploaded', '');
-    },
-
     // Save file
     // DownloadFile method does not open SaveFileDialog like standalone builds, its just allows user to download file
-    // gameObjectNamePtr: GameObject name required for calling back unity side with SendMessage. And it should be unique
-    //     DownloadFile does not return any info, just calls 'OnFileDownloaded' without any parameter
+    // gameObjectNamePtr: Unique GameObject name. Required for calling back unity with SendMessage.
+    // methodNamePtr: Callback method name on given GameObject.
     // filenamePtr: Filename with extension
     // byteArray: byte[]
     // byteArraySize: byte[].Length
-    DownloadFile: function(gameObjectNamePtr, filenamePtr, byteArray, byteArraySize) {
+    DownloadFile: function(gameObjectNamePtr, methodNamePtr, filenamePtr, byteArray, byteArraySize) {
         gameObjectName = Pointer_stringify(gameObjectNamePtr);
+        methodName = Pointer_stringify(methodNamePtr);
         filename = Pointer_stringify(filenamePtr);
 
         var bytes = new Uint8Array(byteArraySize);
@@ -83,7 +82,7 @@ var StandaloneFileBrowserWebGLPlugin = {
             document.body.removeChild(downloader);
         	document.onmouseup = null;
 
-            SendMessage(gameObjectName, 'OnFileDownloaded');
+            SendMessage(gameObjectName, methodName);
         }
     }
 };