gg.easy.airship 0.1.2003 → 0.1.2005

package/Runtime/Code/Health/AirshipProfileExporter.cs

@@ -13,6 +13,8 @@ using UnityEngine.Profiling;
 struct SignedUrlRequest {
     public string type;
     public string name;
+    [CanBeNull]
+    public string note;
     public string contentType;
     public long contentLength;
 }
@@ -37,6 +39,7 @@ namespace Code.Health
     public struct ClientProfileUploadRequest : NetworkMessage
     {
         public string logLocation;
+        public string fileName;
         public float duration;
         public long contentSize;
     }
@@ -46,7 +49,6 @@ namespace Code.Health
         public string logLocation;
         public string id;
         public string url;
-        public float duration;
     }
     
     public struct StartServerProfileMessage : NetworkMessage {
@@ -113,11 +115,10 @@ namespace Code.Health
 
         public async void OnClientUploadRequest(NetworkConnectionToClient sender, ClientProfileUploadRequest msg)
         {
-            var urlData = await this.GetSignedUrl(msg.duration, msg.contentSize);
+            var urlData = await this.GetSignedUrl(msg.fileName, msg.duration, msg.contentSize);
             sender.Send(new ClientProfileUploadResponse
             {
                 logLocation = msg.logLocation,
-                duration = msg.duration,
                 url = urlData.url,
                 id = urlData.id
             });
@@ -129,7 +130,7 @@ namespace Code.Health
             {
                 id = msg.id,
                 url = msg.url
-            }, msg.logLocation, msg.duration, null);
+            }, msg.logLocation, null);
         }
 
         public void OnStartProfilingMessage(NetworkConnectionToClient sender, StartServerProfileMessage msg) {
@@ -144,13 +145,13 @@ namespace Code.Health
                     $"{AirshipPlatformUrl.contentService}/artifacts/artifact-id/{msg.artifactId}");
             if (!downloadUrl.success)
             {
-                Debug.Log($"Profile Uploaded: <a href=\"https://create.airship.gg/dashboard/organization/game/artifacts?activeGame={msg.gameId}\">View it on the Create site.</a> (copied to your clipboard)");
+                Debug.Log($"Profile Uploaded:\n<a href=\"https://create.airship.gg/dashboard/organization/game/artifacts?activeGame={msg.gameId}\">https://create.airship.gg/dashboard/organization/game/artifacts?activeGame={msg.gameId}</a>\n(copied to your clipboard)");
                 return;
             }
 
             var data = JsonUtility.FromJson<ArtifactDownloadResponse>(downloadUrl.data);
             
-            Debug.Log($"Profile uploaded: <a href=\"{data.url}\">Download here.</a> (copied to your clipboard)");
+            Debug.Log($"Profile uploaded:\n<a href=\"{data.url}\">{data.url}</a>\n(copied to your clipboard)");
             GUIUtility.systemCopyBuffer = data.url;
         }
 
@@ -162,7 +163,8 @@ namespace Code.Health
             }
 
             var date = DateTime.Now.ToString("MM-dd-yyyy h.mm.ss");
-            var logPath = Path.Combine(Application.persistentDataPath, $"Profile-{date}.raw");
+            var fileName = RunCore.IsClient() ?  $"Client-Profile-{date}.raw" :  $"Server-Profile-{date}.raw";
+            var logPath = Path.Combine(Application.persistentDataPath, fileName);
             if (File.Exists(logPath)) File.WriteAllText(logPath, "");
 
             Profiler.logFile = logPath;
@@ -170,10 +172,10 @@ namespace Code.Health
             
             Debug.Log($"Starting profiler for {durationSecs} seconds.");
             Profiler.enabled = true;
-            StopProfilingAfterDelay(logPath, durationSecs, profileInitiator);
+            StopProfilingAfterDelay(logPath, fileName, durationSecs, profileInitiator);
         }
 
-        private async void StopProfilingAfterDelay(string logPath, float durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator) {
+        private async void StopProfilingAfterDelay(string logPath, string fileName, float durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator) {
             await Task.Delay((int)(durationSecs * 1000));
             Profiler.enabled = false;
             var info = new FileInfo(logPath);
@@ -184,22 +186,23 @@ namespace Code.Health
                 NetworkClient.Send(new ClientProfileUploadRequest
                 {
                     contentSize = info.Length,
-                    logLocation = logPath
+                    logLocation = logPath,
+                    fileName = fileName
                 });
             }
             else
             {
-                var urlData = await this.GetSignedUrl(durationSecs, info.Length);
-                Upload(urlData, logPath, durationSecs, profileInitiator);
+                var urlData = await this.GetSignedUrl(fileName, durationSecs, info.Length);
+                Upload(urlData, logPath, profileInitiator);
             }
         }
 
-        private async Task<SignedUrlResponse> GetSignedUrl(float duration, long length)
+        private async Task<SignedUrlResponse> GetSignedUrl(string fileName, float duration, long length)
         {
             var body = new SignedUrlRequest()
             {
                 type = "MICRO_PROFILE",
-                name = RunCore.IsClient() ? $"Client Profile ({duration}s)" : $"Server Profile ({duration}s)",
+                name = fileName,
                 contentType = "application/octet-stream",
                 contentLength = length
             };
@@ -208,30 +211,30 @@ namespace Code.Health
             {
                 throw new Exception("Unable to get upload URL for profile.");
             }
-            
-           return JsonUtility.FromJson<SignedUrlResponse>(response.data);
+            return JsonUtility.FromJson<SignedUrlResponse>(response.data);
         }
 
-        private async void Upload(SignedUrlResponse urlData, string logPath, float durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator)
+        private async void Upload(SignedUrlResponse urlData, string logPath, [CanBeNull] NetworkConnectionToClient profileInitiator)
         {
             Debug.Log("Uploading profile to backend...");
             var uploadFilePath = logPath;
             var fileData = await File.ReadAllBytesAsync(uploadFilePath);
             File.Delete(uploadFilePath);
             
-            var form = new WWWForm();
-            form.AddBinaryData("file",  fileData, Path.GetFileName(uploadFilePath));
-            using var www = UnityWebRequest.Post(urlData.url, form);
+            using var www = UnityWebRequest.Put(urlData.url, fileData);
             MonitorUploadProgress(www);
             await UnityWebRequestProxyHelper.ApplyProxySettings(www).SendWebRequest();
             
+            Debug.Log($"Upload response: {www.downloadHandler.text}");
+            
             if (profileInitiator != null && profileInitiator.isReady) {
                 profileInitiator.Send(new ServerProfileCompleteMessage { artifactId = urlData.id });
             }
             Debug.Log($"Profile uploaded.");
         }
 
-        private async void MonitorUploadProgress(UnityWebRequest req) {
+        private async Task MonitorUploadProgress(UnityWebRequest req) {
+            Debug.Log("Starting upload...");
             var elapsed = 0.0d;
             var timeSinceLastLog = 0.0d;
             try {

package/Runtime/Code/LuauAPI/Bridge.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -15,26 +14,59 @@ using UnityEngine.UI;
 using SceneManager = UnityEngine.SceneManagement.SceneManager;
 
 [LuauAPI][Preserve]
-public static class Bridge
-{
-    public static Vector2 MakeVector2(float x, float y)
-    {
-        return new Vector2(x, y);
+public static class Bridge {
+
+#region CREATION
+    //RENDER TEXTURES
+    public static RenderTexture MakeDefaultRenderTexture(int width, int height){
+        RenderTextureDescriptor descriptor = new RenderTextureDescriptor(width, height, RenderTextureFormat.ARGB32, 8, 0) {
+            sRGB = false,
+            autoGenerateMips = false,
+            useMipMap = false
+        };
+        return new RenderTexture(descriptor);
     }
 
-    public static Sprite MakeSprite(Texture2D texture2D)
-    {
-        return Sprite.Create(texture2D, new Rect(0.0f, 0.0f, texture2D.width, texture2D.height),
+    //TEXTURES
+    public static Texture2D MakeDefaultTexture2D(int width, int height){
+        return new Texture2D(width, height);
+    }
+
+    public static Texture2D MakeTexture2D(int width, int height, TextureFormat format, bool mipChain, bool linear){
+        return new Texture2D(width, height, format, mipChain, linear);
+    }
+
+    //SPRITES
+    public static Sprite MakeDefaultSprite(Texture2D texture){
+        return Sprite.Create(texture, new Rect(0.0f, 0.0f, texture.width, texture.height),
             new Vector2(0.5f, 0.5f), 100.0f);
     }
 
+    public static Sprite MakeSprite(Texture2D texture, Rect rect, Vector2 pivot, float pixelsPerUnit){
+        return Sprite.Create(texture, rect, pivot, pixelsPerUnit);
+    }
+
+    //RENDERERS
+    public static void ClearMaterial(Renderer ren, int materialI){
+        ren.materials[materialI] = null;
+    }
+    
+    public static void ClearAllMaterials(Renderer ren){
+        for(int i=0; i<ren.materials.Length; i++){
+            ren.materials[i] = null;
+        }
+    }
+
+    // MATERIAL PROPERTY BLOCK
     public static MaterialPropertyBlock MakeMaterialPropertyBlock() {
         return new MaterialPropertyBlock();
     }
 
+    //MESH
     public static Mesh MakeMesh() {
         return new Mesh();
     }
+#endregion
     
     public static float GetAverageFPS()
     {
@@ -46,14 +78,6 @@ public static class Bridge
         return GraphyManager.Instance.CurrentFPS;
     }
 
-    public static Vector3 Lerp(Vector3 start, Vector3 goal, float alpha) {
-        return Vector3.Lerp(start, goal, alpha);
-    }
-
-    public static Vector3 Slerp(Vector3 start, Vector3 goal, float alpha) {
-        return Vector3.Slerp(start, goal, alpha);
-    }
-
     public static float GetMonoRam() {
         return GraphyManager.Instance.MonoRam;
     }

package/Runtime/Code/TSCodeGen/TypeGenerator.cs

@@ -162,7 +162,6 @@ public class TypeGenerator : MonoBehaviour
             typeof(LayoutElement),
             typeof(Screen),
             typeof(Gizmos),
-            typeof(RenderUtils),
             typeof(DeviceBridge),
             typeof(Mask),
             typeof(ImageWithRoundedCorners),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.2003",
+  "version": "0.1.2005",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",

package/Runtime/Code/LuauAPI/RenderUtils.cs

@@ -1,21 +0,0 @@
-using UnityEngine;
-
-[LuauAPI]
-public static class RenderUtils{
-    public static RenderTexture CreateDefaultRenderTexture(int width, int height){
-        RenderTextureDescriptor descriptor = new RenderTextureDescriptor(width, height, RenderTextureFormat.ARGB32, 8, 0) {
-            sRGB = false,
-            autoGenerateMips = false,
-            useMipMap = false
-        };
-        return new RenderTexture(descriptor);
-    }
-
-    public static Texture2D CreateDefaultTexture2D(int width, int height){
-        return new Texture2D(width, height);
-    }
-
-    public static Texture2D CreateTexture2D(int width, int height, TextureFormat format, bool mipChain, bool linear){
-        return new Texture2D(width, height, format, mipChain, linear);
-    }
-}

package/Runtime/Code/LuauAPI/RenderUtils.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 1825e5f62ce62bf4f92491144b8ed5f4