gg.easy.airship 0.1.2137 → 0.1.2138

package/Editor/Artifacts/AirshipPrefabUtility.cs

@@ -6,30 +6,29 @@ namespace Airship.Editor {
     internal static class AirshipPrefabUtility {
         internal static bool FindReconcilablePrefabComponent(AirshipComponent component, out AirshipComponent prefabComponent) {
             var isPrefab = PrefabUtility.IsPartOfAnyPrefab(component);
-            prefabComponent = PrefabUtility.GetCorrespondingObjectFromOriginalSource(component);
-
             if (!isPrefab) {
                 prefabComponent = null;
                 return false;
             }
             
-            if (prefabComponent.script == null) {
-                prefabComponent = null;
-                return false;
-            }
-            
-            var networkIdentity = prefabComponent.gameObject.GetComponentInParent<NetworkIdentity>();
+            var networkIdentity = component.gameObject.GetComponentInParent<NetworkIdentity>();
             if (networkIdentity != null) {
                 prefabComponent = null;
                 return false;
             }
 
-            var meshFilter = prefabComponent.GetComponentsInChildren<MeshFilter>(); // because of 'SendMessage' we can't force reconcile these
+            var meshFilter = component.GetComponentsInChildren<MeshFilter>(); // because of 'SendMessage' we can't force reconcile these
             if (meshFilter.Length > 0) {
                 prefabComponent = null;
                 return false;
             }
-
+            
+            prefabComponent = PrefabUtility.GetCorrespondingObjectFromOriginalSource(component);
+            if (prefabComponent.script == null) {
+                prefabComponent = null;
+                return false;
+            }
+            
             return true;
         }
     }

package/Runtime/Code/Authentication/EasyAuthenticator.cs

@@ -174,14 +174,16 @@ namespace Code.Authentication {
                     tcs.SetResult(new UserData() {
                         uid = InternalHttpManager.editorUserId,
                         username = loginMessage.editorUsername,
-                        profileImageId = loginMessage.editorProfileImageId
+                        orgRoleName = "Dev",
+                        profileImageId = loginMessage.editorProfileImageId,
                     });
                     return await tcs.Task;
                 }
                 tcs.SetResult(new UserData() {
                     uid = this.connectionCounter + "",
                     username = "Player" + this.connectionCounter,
-                    profileImageId = "",
+                    orgRoleName = "Dev",
+                    profileImageId = string.Empty,
                     fullTransferPacket = "{}"
                 });
                 return await tcs.Task;
@@ -210,6 +212,7 @@ namespace Code.Authentication {
                     uid = transferData.user.uid,
                     username = transferData.user.username,
                     profileImageId = transferData.user.profileImageId,
+                    orgRoleName = transferData.user.orgRoleName,
                     fullTransferPacket = fullTransferPacket
                 });
             }).Catch((err) => {

package/Runtime/Code/Authentication/TransferData.cs

@@ -12,6 +12,7 @@ public class User {
     public string usernameLower;
     public string lastUsernameChangeTime;
     public string profileImageId;
+    public string orgRoleName;
 }
 
 

package/Runtime/Code/Luau/BinaryBlob.cs

@@ -16,270 +16,16 @@ namespace Assets.Luau {
         }
         
         public BinaryBlob(byte[] bytes) {
+            if (bytes.Length > uint.MaxValue) {
+                throw new Exception("Length of binary blob data exceeds " + int.MaxValue + " bytes.");
+            }
             dataSize = bytes.Length;
             data = bytes;
         }
         
-        public long dataSize;
+        public int dataSize;
         public byte[] data;
 
-        private Dictionary<object, object> m_cachedDictionary = null;
-
-        public Dictionary<object, object> GetDictionary() {
-            if (m_cachedDictionary != null) {
-                return m_cachedDictionary;
-            }
-
-            var readPos = 1; // skip the first byte, it's a magic key to let us know it's a blob
-            m_cachedDictionary = Decode(data, ref readPos);
-            
-            return m_cachedDictionary;
-        }
-        
-        enum keyTypes : byte {
-            KEY_TERMINATOR = 0,
-            KEY_TABLE = 1,
-            KEY_BYTENUMBER = 2,
-            KEY_SHORTNUMBER = 3,
-            KEY_INTNUMBER = 4,
-            KEY_FLOATNUMBER = 5,
-            KEY_DOUBLENUMBER = 6,
-            KEY_SHORTSTRING = 7,
-            KEY_LONGSTRING = 8,
-            KEY_VECTOR3 = 9,
-            KEY_BOOLEANTRUE = 10,
-            KEY_BOOLEANFALSE = 11,
-            KEY_PODTYPE = 12,
-        };
-
-        private static Dictionary<object, object> Decode(byte[] bufferRaw, ref int readPos) {
-            var isCompressed = bufferRaw.Length > 0 && bufferRaw[0] == 1;
-            
-            // Skip the first byte, which is the compressed/decompressed flag:
-            var bufferMaybeCompressed = new ArraySegment<byte>(bufferRaw).Slice(1, bufferRaw.Length - 1);
-            
-            // Decompress the buffer if needed:
-            var buffer = isCompressed ? Zstd.DecompressData(bufferMaybeCompressed.Array) : bufferMaybeCompressed.Array;
-            
-            Dictionary<object, object> dictionary = new();
-
-            while (true) {
-                byte keyType = readByte(buffer, ref readPos);
-
-                
-                if (keyType == (byte)keyTypes.KEY_TERMINATOR) {
-                    //All done
-                    return dictionary;
-                }
-
-                object key = null;
-                object value = null;
-
-                //All the supported key types ONLY
-                switch ((keyTypes)keyType) {
-                    case keyTypes.KEY_SHORTSTRING: {
-                        key = decodeShortStringToLua(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_LONGSTRING: {
-                        key = decodeLongStringToLua(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_BYTENUMBER: {
-                        key = readByte(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_SHORTNUMBER: {
-                        key = readShort(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_INTNUMBER: {
-                        key = readInt(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_FLOATNUMBER: {
-                        key = readFloat(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_DOUBLENUMBER: {
-                        key = readDouble(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_VECTOR3: {
-                        key = readVector3(buffer, ref readPos);
-                        break;
-                    }
-                    default: {
-                        Debug.LogError("[AirshipNet] Format problem decoding buffer - unknown key type. keyType=" + keyType);
-                        return null;
-                    }
-                }
-
-                byte valueType = readByte(buffer, ref readPos);
-                //All the value types
-                switch ((keyTypes)valueType) {
-                    case keyTypes.KEY_SHORTSTRING: {
-                        value = decodeShortStringToLua(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_LONGSTRING: {
-                        value = decodeLongStringToLua(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_BYTENUMBER: {
-                        value = readByte(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_SHORTNUMBER: {
-                        value = readShort(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_INTNUMBER: {
-                        value = readInt(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_FLOATNUMBER: {
-                        value = readFloat(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_DOUBLENUMBER: {
-                        value = readDouble(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_VECTOR3: {
-                        value = readVector3(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_BOOLEANTRUE: {
-                        value = true;
-                        break;
-                    }
-                    case keyTypes.KEY_BOOLEANFALSE: {
-                        value = false;
-                        break;
-                    }
-                    case keyTypes.KEY_TABLE: {
-                        value = Decode(buffer, ref readPos);
-                        break;
-                    }
-                    case keyTypes.KEY_PODTYPE: {
-                        value = readPodType(buffer, ref readPos);
-                        break;
-                    }
-                    default: {
-                        Debug.LogError("[AirshipNet] Format problem decoding buffer - unknown value type. valueType=" + valueType);
-                        return null;
-                    }
-                }
-
-                //store it
-                dictionary.Add(key, value);
-            }
-        }
-
-        //Read a byte
-        private static byte readByte(byte[] buffer, ref int readPos) {
-            byte value = buffer[readPos];
-            readPos += 1;
-            return value;
-        }
-
-        private static short readShort(byte[] buffer, ref int readPos) {
-            short value = BitConverter.ToInt16(buffer, readPos);
-            readPos += 2;
-            return value;
-        }
-
-        private static int readInt(byte[] buffer, ref int readPos) {
-            int value = BitConverter.ToInt32(buffer, readPos);
-            readPos += 4;
-            return value;
-        }
-
-        private static float readFloat(byte[] buffer, ref int readPos) {
-            float value = BitConverter.ToSingle(buffer, readPos);
-            readPos += 4;
-            return value;
-        }
-
-        private static double readDouble(byte[] buffer, ref int readPos) {
-            double value = BitConverter.ToDouble(buffer, readPos);
-            readPos += 8;
-            return value;
-        }
-
-        private static Vector3 readVector3(byte[] buffer, ref int readPos) {
-            Vector3 value = new();
-            value.x = readFloat(buffer, ref readPos);
-            value.y = readFloat(buffer, ref readPos);
-            value.z = readFloat(buffer, ref readPos);
-            return value;
-        }
-
-        private static object decodeShortStringToLua(byte[] buffer, ref int readPos) {
-            byte stringLength = readByte(buffer, ref readPos);
-            string value = Encoding.UTF8.GetString(buffer, readPos, stringLength);
-            readPos += stringLength;
-            return value;
-        }
-
-        private static object decodeLongStringToLua(byte[] buffer, ref int readPos) {
-            short stringLength = readShort(buffer, ref readPos);
-            string value = Encoding.UTF8.GetString(buffer, readPos, stringLength);
-            readPos += stringLength;
-            return value;
-        }
-
-        private static unsafe object readPodType(byte[] buffer, ref int readPos) {
-            int podType = readByte(buffer, ref readPos);
-            fixed (byte* pData = buffer) {
-                IntPtr data = (IntPtr)pData + readPos;
-
-                switch ((PODTYPE)podType) {
-                    default: {
-                        Debug.LogError("[AirshipNet] Unhandled pod type encountered during decode");
-                        return null;
-                    }
-
-                    case PODTYPE.POD_RAY: {
-                        readPos += LuauCore.RaySize();
-                        return LuauCore.NewRayFromPointer(data);
-                    }
-                    case PODTYPE.POD_PLANE: {
-                        readPos += LuauCore.PlaneSize();
-                        return LuauCore.NewPlaneFromPointer(data);
-                    }
-                    case PODTYPE.POD_MATRIX: {
-                        readPos += LuauCore.MatrixSize();
-                        return LuauCore.NewMatrixFromPointer(data);
-                    }
-                    case PODTYPE.POD_QUATERNION: {
-                        readPos += LuauCore.QuaternionSize();
-                        return LuauCore.NewQuaternionFromPointer(data);
-                    }
-                    case PODTYPE.POD_VECTOR2: {
-                        readPos = LuauCore.Vector2Size();
-                        return LuauCore.NewVector2FromPointer(data);
-                    }
-                    case PODTYPE.POD_VECTOR4: {
-                        readPos = LuauCore.Vector4Size();
-                        return LuauCore.NewVector4FromPointer(data);
-                    }
-                    case PODTYPE.POD_COLOR: {
-                        readPos += LuauCore.ColorSize();
-                        return LuauCore.NewColorFromPointer(data);
-                    }
-                    case PODTYPE.POD_BINARYBLOB: {
-                        int sizeOfBlob = readInt(buffer, ref readPos);
-                        byte[] blobBuffer = new byte[sizeOfBlob + 4];
-                        Marshal.Copy(data, blobBuffer, 0, sizeOfBlob + 4);
-
-                        return new BinaryBlob(blobBuffer);
-                    }
-                }
-            }
-        }
-
         public bool Equals(BinaryBlob other) {
             return this.dataSize == other?.dataSize;
         }

package/Runtime/Code/LuauAPI/Bridge.cs

@@ -448,6 +448,10 @@ public static class Bridge {
         return scenes.ToArray();
     }
 
+    public static void SetSkyboxMaterial(Material material) {
+        RenderSettings.skybox = material;
+    }
+
     public static float[] MakeFloatArray(int size) {
         return new float[size];
     }

package/Runtime/Code/LuauAPI/ResourcesAPI.cs

@@ -1,6 +1,6 @@
 using System;
 
-[LuauAPI]
+[LuauAPI(LuauContext.Protected)]
 public class ResourcesAPI : BaseLuaAPIClass
 {
     public override Type GetAPIType()

package/Runtime/Code/Network/AirshipNetworkManager.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Assets.Luau.Network;
 using Code.Bootstrap;