gg.easy.airship 0.1.2131 → 0.1.2133

package/Editor/CreateAssetBundles.cs

@@ -386,7 +386,7 @@ public static class CreateAssetBundles {
 			PlayerSettings.SetUseDefaultGraphicsAPIs(buildTarget, false);
 			PlayerSettings.SetGraphicsAPIs(buildTarget, new GraphicsDeviceType[]
 			{
-				GraphicsDeviceType.OpenGLES3
+				GraphicsDeviceType.Vulkan
 			});
 		} else {
 			PlayerSettings.SetUseDefaultGraphicsAPIs(buildTarget, true);

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -396,10 +396,10 @@ namespace Editor.Packages {
             // Uncomment to just build iOS
             if (isCoreMaterials) {
                 platforms.Clear();
-            //     platforms.Add(AirshipPlatform.iOS);
-            //     platforms.Add(AirshipPlatform.Android);
-                platforms.Add(AirshipPlatform.Windows);
-                platforms.Add(AirshipPlatform.Mac);
+                // platforms.Add(AirshipPlatform.iOS);
+                platforms.Add(AirshipPlatform.Android);
+                // platforms.Add(AirshipPlatform.Windows);
+                // platforms.Add(AirshipPlatform.Mac);
             }
 
             if (!CreateAssetBundles.PrePublishChecks()) {
@@ -437,7 +437,7 @@ namespace Editor.Packages {
                         PlayerSettings.SetUseDefaultGraphicsAPIs(buildTarget, false);
                         PlayerSettings.SetGraphicsAPIs(buildTarget, new GraphicsDeviceType[]
                         {
-                            GraphicsDeviceType.OpenGLES3
+                            GraphicsDeviceType.Vulkan
                         });
                     }
 

package/Runtime/Code/CoreUI/Login/LoginApp.cs

@@ -28,6 +28,7 @@ public class LoginApp : MonoBehaviour {
     [SerializeField] public TMP_Text errorMessageText;
     [SerializeField] public LoginButton steamLoginButton;
     [SerializeField] public GameObject quitButton;
+    [SerializeField] public GameObject backButton;
 
     [Header("Mobile")]
     [SerializeField] public Canvas mobileCanvas;
@@ -99,6 +100,10 @@ public class LoginApp : MonoBehaviour {
         this.quitButton.SetActive(Screen.fullScreen);
     }
 
+    public void BackToFirstPage() {
+        this.RouteToPage(this.loginPage, false, false);
+    }
+
     private void CalcLayout() {
         this.screenWidth = Screen.width;
         this.screenHeight = Screen.height;
@@ -146,6 +151,12 @@ public class LoginApp : MonoBehaviour {
         loginPage.SetActive(false);
         pickUsernamePage.SetActive(false);
         pageGameObject.SetActive(true);
+
+        if (this.mobileMode) {
+            this.backButton.SetActive(false);
+        } else {
+            this.backButton.SetActive(pageGameObject != this.loginPage);
+        }
     }   
 
     public async void PressContinueWithGoogle() {

package/Runtime/Code/Luau/ReflectionList.cs

@@ -19,7 +19,6 @@ using UnityEngine.UIElements;
 using LightType = UnityEngine.LightType;
 using UnityEngine.Tilemaps;
 using UnityEngine.VFX;
-using Toggle = UnityEngine.UI.Toggle;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -132,6 +131,7 @@ namespace Luau {
             [typeof(GridLayoutGroup)] = LuauContextAll,
             [typeof(LayoutRebuilder)] = LuauContextAll,
             [typeof(UnityEngine.UI.Button)] = LuauContextAll,
+            [typeof(ToggleGroup)] = LuauContextAll,
             [typeof(Dropdown)] = LuauContextAll,
             [typeof(TMP_Dropdown)] = LuauContextAll,
             [typeof(TMP_InputField)] = LuauContextAll,
@@ -139,7 +139,7 @@ namespace Luau {
             [typeof(TextMeshProUGUI)] = LuauContextAll,
             [typeof(UnityEngine.UI.Slider)] = LuauContextAll,
             [typeof(CanvasScaler)] = LuauContextAll,
-            [typeof(Toggle)] = LuauContextAll,
+            [typeof(UnityEngine.UI.Toggle)] = LuauContextAll,
             [typeof(Mask)] = LuauContextAll,
             [typeof(ContentSizeFitter)] = LuauContextAll,
             [typeof(AspectRatioFitter)] = LuauContextAll,
@@ -221,6 +221,7 @@ namespace Luau {
             ["TubeRendererCS"] = LuauContextAll,
             ["AudioMixerSnapshotController"] = LuauContextAll,
             ["AudioMixerController"] = LuauContextAll,
+            ["Toggle"] = LuauContextAll, // "no idea why this needs to be a string...
         };
 
         public static Dictionary<Type, LuauContext> allowedTypesInternal;

package/Runtime/Code/Luau/TypeReflection.cs

@@ -11,6 +11,8 @@ public class TypeReflection {
         { "RectTransform", typeof(RectTransform) },
         { "Button", typeof(Button) },
         { "Color", typeof(Color) },
+        { "Toggle", typeof(Toggle) },
+        // { "ToggleGroup", typeof(ToggleGroup) }
     };
     private static readonly Dictionary<string, HashSet<string>> _assemblyNamespaceCache = new();
 

package/Runtime/Code/LuauAPI/WheelColliderAPI.cs

@@ -0,0 +1,33 @@
+using System;
+using UnityEngine;
+
+[LuauAPI]
+public class WheelColliderAPI : BaseLuaAPIClass {
+    public override Type GetAPIType() {
+        return typeof(WheelCollider);
+    }
+
+    public override int OverrideMemberMethod(LuauContext context, IntPtr thread, object targetObject, string methodName, int numParameters,
+        ArraySegment<int> parameterDataPODTypes, ArraySegment<IntPtr> parameterDataPtrs, ArraySegment<int> parameterDataSizes) {
+        
+        if (methodName == "GetGroundHit") {
+            var target = (WheelCollider)targetObject;
+            if (target.GetGroundHit(out var hit)) {
+                LuauCore.WritePropertyToThread(thread, hit, hit.GetType());
+                return 1;
+            }
+
+            return 0;
+        }
+        
+        if (methodName == "GetWorldPose") {
+            var target = (WheelCollider)targetObject;
+            target.GetWorldPose(out var pos, out var quat);
+            LuauCore.WritePropertyToThread(thread, pos, pos.GetType());
+            LuauCore.WritePropertyToThread(thread, quat, quat.GetType());
+            return 2;
+        }
+        
+        return -1;
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 87b4195a19a149fc8224151e3d0acf0f
+timeCreated: 1746811250

package/Runtime/Code/Network/Simulation/AirshipSimulationManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Code.Player;
 using Mirror;
 using Tayx.Graphy.Resim;
 using UnityEngine;
@@ -49,7 +50,6 @@ namespace Code.Network.Simulation
     {
         public CheckWorld check;
         public RollbackComplete complete;
-        public NetworkConnectionToClient client;
     }
 
     struct ResimulationRequest
@@ -122,12 +122,21 @@ namespace Code.Network.Simulation
          * event to clean up any data that is no longer required.
          */
         public event Action<object> OnHistoryLifetimeReached;
+        
+        /**
+        * Fired when lag compensated checks should occur. ID of check is passed as the event parameter.
+        */
+        public event Action<object> OnLagCompensationRequestCheck;
+        /**
+         * Fired when lag compensated check is over and physics can be modified. ID of check is passed as the event parameter.
+         */
+        public event Action<object> OnLagCompensationRequestComplete;
 
         [NonSerialized] public bool replaying = false;
         
         private bool isActive = false;
         private List<double> tickTimes = new List<double>();
-        private List<LagCompensationRequest> lagCompensationRequests = new();
+        private Dictionary<NetworkConnectionToClient, List<LagCompensationRequest>> lagCompensationRequests = new();
         private Queue<ResimulationRequest> resimulationRequests = new();
 
         public void ActivateSimulationManager()
@@ -185,15 +194,17 @@ namespace Code.Network.Simulation
             // Note: This process is placed after snapshot processing so that changes made to physics (like an impulse)
             // are processed on the _next_ tick. This is safe because the server never resimulates.
             var processedLagCompensation = false;
-            foreach (var request in this.lagCompensationRequests)
+            foreach (var entry in this.lagCompensationRequests)
             {
-                processedLagCompensation = true;
                 try
                 {
-                   // Debug.LogWarning("Server lag compensation rolling back for client " + request.client.connectionId);
-                    OnLagCompensationCheck?.Invoke(request.client.connectionId, time,
-                        request.client.rtt);
-                    request.check();
+                    processedLagCompensation = true;
+                    // Debug.LogWarning("Server lag compensation rolling back for client " + entry.Key.connectionId);
+                    OnLagCompensationCheck?.Invoke(entry.Key.connectionId, time, entry.Key.rtt);
+                    foreach (var request in entry.Value)
+                    {
+                        request.check();
+                    }
                 }
                 catch (Exception e)
                 {
@@ -208,11 +219,21 @@ namespace Code.Network.Simulation
                 // Reset back to the server view of the world at the current time.
                 OnSetSnapshot?.Invoke(time);
                 // Invoke all of the callbacks for modifying physics that should be applied in the next tick.
-                while (this.lagCompensationRequests.Count > 0)
+                foreach (var entry in this.lagCompensationRequests)
                 {
-                    this.lagCompensationRequests[0].complete();
-                    this.lagCompensationRequests.RemoveAt(0);
+                    foreach (var request in entry.Value)
+                    {
+                        try
+                        {
+                            request.complete();
+                        }
+                        catch (Exception e)
+                        {
+                            Debug.LogError(e);
+                        }
+                    }
                 }
+                this.lagCompensationRequests.Clear();
             }
 
             // Add our completed tick time into our history
@@ -237,14 +258,40 @@ namespace Code.Network.Simulation
         public void ScheduleLagCompensation(NetworkConnectionToClient client, CheckWorld checkCallback,
             RollbackComplete completeCallback)
         {
-            this.lagCompensationRequests.Add(new LagCompensationRequest()
+            List<LagCompensationRequest> list;
+            if (!this.lagCompensationRequests.TryGetValue(client, out list))
+            {
+                list = new();
+                this.lagCompensationRequests.Add(client, list);
+            }
+
+            list.Add(new LagCompensationRequest()
             {
                 check = checkCallback,
                 complete = completeCallback,
-                client = client,
             });
         }
 
+        /**
+         * Schedules lag compensation for the provided ID. Used by TS to call ScheduleLagCompensation for a player in the Player.ts file.
+         */
+        public string RequestLagCompensationCheck(int connectionId)
+        {
+            if (NetworkServer.connections.TryGetValue(connectionId, out var connection))
+            {
+                string uniqueId = Guid.NewGuid().ToString();
+                this.ScheduleLagCompensation(connection, () => {
+                    this.OnLagCompensationRequestCheck?.Invoke(uniqueId);
+                }, () =>
+                {
+                    this.OnLagCompensationRequestComplete?.Invoke(uniqueId);
+                });
+                return uniqueId;
+            }
+
+            return "";
+        }
+
         /**
          * Schedules a resimulation to occur on the next tick. This allows correcting predicted history on a non authoritative client.
          * The callback provided will be called when the resimulation should occur. The callback will be passed a resimulate

package/Runtime/Code/Player/Character/MovementSystems/Character/CharacterMovement.cs

@@ -45,6 +45,15 @@ namespace Code.Player.Character.MovementSystems.Character
         public bool drawDebugGizmos_STEPUP = false;
         public bool drawDebugGizmos_STATES= false;
         public bool useExtraLogging = false;
+        
+        [Header("Prediction Correction Interpolation (server auth only)")]
+        [Tooltip("Controls the speed of correction when non-authoritative clients mis-predict their location. Unit is seconds.")]
+        [Range(0, 1)]
+        public float correctionInterpTime = 0.1f;
+
+        [Tooltip(
+            "Controls the maximum magnitude of the correction interp. Mis-predictions larger that this magnitude will instantly teleport the character to the correct location.")]
+        public float correctionMaxMagnitude = 10;
 
         [Header("Visual Variables")]
         public bool autoCalibrateSkiddingSpeed = true;
@@ -61,6 +70,21 @@ namespace Code.Player.Character.MovementSystems.Character
         private Transform _cameraTransform;
         private bool _smoothLookVector = false;
 
+        /**
+         * Used for calculating interp for non-authoritative clients. Set to the previous airshipTransform location
+         * OnPause (before resim). Used to calculate difference in simulated and actual position which is then
+         * applied to the airshipTransform.
+         */
+        private Vector3 correctionLastSimulatedPosition = Vector3.zero;
+        /**
+         * The offset applied to the airshipTransform due to correction.
+         */
+        private Vector3 correctionOffset = Vector3.zero;
+        /**
+         * How long since the last correction
+         */
+        private float correctionTime = 0;
+
         #endregion
 
         #region EVENTS
@@ -117,15 +141,6 @@ namespace Code.Player.Character.MovementSystems.Character
 
         public event Action<object, object> OnCompareSnapshots;
         
-        /**
-         * Fired when lag compensated checks should occur. ID of check is passed as the event parameter.
-         */
-        public event Action<object> OnLagCompensationCheck;
-        /**
-         * Fired when lag compensated check is over and physics can be modified. ID of check is passed as the event parameter.
-         */
-        public event Action<object> OnLagCompensationComplete;
-        
         public event Action<object> OnMoveDirectionChanged;
 
         /// <summary>
@@ -213,10 +228,40 @@ namespace Code.Player.Character.MovementSystems.Character
                 rigidbody.isKinematic = false;
                 rigidbody.interpolation = RigidbodyInterpolation.Interpolate;
                 rigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic;
+
+                // non-authoritative client functions for interpolating mispredicts
+                if (isClient && mode == NetworkedStateSystemMode.Input)
+                {
+                    AirshipSimulationManager.Instance.OnSetPaused += OnPaused;
+                }
             }
             
             OnSetMode?.Invoke(mode);
         }
+        
+        public void OnDestroy()
+        {
+            // non-authoritative client
+            if (isClient && mode == NetworkedStateSystemMode.Input)
+            {
+                AirshipSimulationManager.Instance.OnSetPaused -= OnPaused;
+            }
+        }
+        
+        private void OnPaused(bool paused)
+        {
+            if (paused)
+            {
+                this.correctionLastSimulatedPosition = this.airshipTransform.position; // save the last transform position so that we calculate the difference from where the player sees themselves
+            }
+            else
+            {
+                this.correctionTime = 0;
+                var goalPosition = this.rigidbody.position;
+                var difference = this.correctionLastSimulatedPosition - goalPosition; // inverted so that when we apply the difference, we move the airshipTransform back to the original pos
+                this.correctionOffset = (difference.magnitude > correctionMaxMagnitude) ?  Vector3.zero : difference;
+            }
+        }
 
         public override void SetCurrentState(CharacterSnapshotData snapshot)
         {
@@ -1124,6 +1169,16 @@ namespace Code.Player.Character.MovementSystems.Character
             }
         }
 
+        public void Update()
+        {
+            if (this.correctionTime < 1)
+            {
+                this.correctionTime += correctionInterpTime == 0 ? 1 : Time.deltaTime / this.correctionInterpTime;
+                this.airshipTransform.localPosition = Vector3.Lerp(this.correctionOffset, Vector3.zero,
+                    this.correctionTime);
+            }
+        }
+
         #region Helpers
 
         private void SnapToY(float newY){
@@ -1182,19 +1237,6 @@ namespace Code.Player.Character.MovementSystems.Character
 
             return true;
         }
-
-        public string RequestLagCompensationCheck()
-        {
-            string uniqueId = Guid.NewGuid().ToString();
-            AirshipSimulationManager.Instance.ScheduleLagCompensation(netIdentity.connectionToClient, () =>
-            {
-                this.OnLagCompensationCheck?.Invoke(uniqueId);
-            }, () =>
-            {
-                this.OnLagCompensationComplete?.Invoke(uniqueId);
-            });
-            return uniqueId;
-        }
         
         public void SetMoveInput(Vector3 moveDir, bool jump, bool sprinting, bool crouch, int moveDirModeInt) {
             moveDir = moveDir.normalized;
@@ -1466,7 +1508,7 @@ namespace Code.Player.Character.MovementSystems.Character
         {
             // Only used in the client authoritative networking mode.
             if (mode != NetworkedStateSystemMode.Observer) return;
-            OnImpactWithGround(velocity, hitInfo);
+            OnImpactWithGround?.Invoke(velocity, hitInfo);
             SAuthImpactEvent(velocity, hitInfo);
         }
 

package/Runtime/Code/TSCodeGen/TypeGenerator.cs

@@ -222,6 +222,7 @@ public class TypeGenerator : MonoBehaviour
             typeof(GraphicsSettings),
             typeof(UniversalRenderPipelineAsset),
             typeof(WheelFrictionCurve),
+            typeof(WheelHit),
 
             // Mirror
             typeof(NetworkServer),
@@ -335,7 +336,7 @@ public class TypeGenerator : MonoBehaviour
             "\\.OcclusionCam$",
             "\\.AirshipUniVoiceNetwork$"
         };
-
+        
         var options = new TypeScriptOptions
         {
             ShouldGenerateMethod = (info, definition) => true,

package/Runtime/Code/VoxelWorld/TexturePacker.cs

@@ -1,9 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
 using UnityEngine.Profiling;
 
-public class TexturePacker
+public class TexturePacker : IDisposable
 {
 
     static int anisoLevel = 1;
@@ -14,12 +15,6 @@ public class TexturePacker
     public RenderTexture diffuse;
     public RenderTexture normals;
 
-    //destructor
-    ~TexturePacker()
-    {
-        Dispose();
-    }
-
     public void Dispose()
     {
         if (diffuse != null)

package/Runtime/Code/VoxelWorld/VoxelBlocks.cs

@@ -398,11 +398,6 @@ public class VoxelBlocks : MonoBehaviour {
         }
     }
 
-    //Destructor
-    ~VoxelBlocks() {
-        atlas?.Dispose();
-    }
-
     private void Clear() {
         blockIdCounter = 0;
         atlasMaterial = null;
@@ -600,6 +595,11 @@ public class VoxelBlocks : MonoBehaviour {
             meshList[i] = meshToAdd;
         }
     }
+
+    private void OnDestroy() {
+        atlas?.Dispose();
+    }
+
     public void Load(bool loadTexturesDirectlyFromDisk = false) {
         //clear everything
         Clear();

package/Runtime/Resources/Img/arrow-exit.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -67,7 +67,7 @@ TextureImporter:
   swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -80,7 +80,7 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -93,7 +93,7 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Server
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -106,7 +106,7 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -119,8 +119,8 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
+  - serializedVersion: 4
+    buildTarget: iOS
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
@@ -136,15 +136,18 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0