gg.easy.airship 0.1.2165 → 0.1.2167

package/Editor/CreateAssetBundles.cs

@@ -294,6 +294,9 @@ public static class CreateAssetBundles {
 		Debug.Log($"[Editor]: Building {platform} asset bundles...");
 		Debug.Log("[Editor]: Build path: " + buildPath);
 
+		// Act as if we are building all asset bundles (including CoreMaterials).
+		// This is so our current build target will have references to those asset bundles.
+		// This is paired with changes to Scriptable Build Pipeline that prevent these bundles from actually being built.
 		List<AssetBundleBuild> builds = GetPackageAssetBundleBuilds();
 
 		// Make a fake asset bundle with all package content. This makes the build have the correct dependency data.

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -396,8 +396,8 @@ namespace Editor.Packages {
             // Uncomment to just build iOS
             if (isCoreMaterials) {
                 platforms.Clear();
-                // platforms.Add(AirshipPlatform.iOS);
-                platforms.Add(AirshipPlatform.Android);
+                platforms.Add(AirshipPlatform.iOS);
+                // platforms.Add(AirshipPlatform.Android);
                 // platforms.Add(AirshipPlatform.Windows);
                 // platforms.Add(AirshipPlatform.Mac);
             }
@@ -413,6 +413,9 @@ namespace Editor.Packages {
                 Repaint();
                 yield return null; // give time to repaint
 
+                // Act as if we are building all asset bundles (including CoreMaterials).
+                // This is so our current build target will have references to those asset bundles.
+                // This is paired with changes to Scriptable Build Pipeline that prevent these bundles from actually being built.
                 List<AssetBundleBuild> builds = CreateAssetBundles.GetPackageAssetBundleBuilds();
 
                 foreach (var platform in platforms) {

package/Runtime/Code/Bootstrap/AirshipEntryPoint.cs

@@ -8,6 +8,8 @@ using UnityEngine;
 /// </summary>
 public class AirshipEntryPoint : Singleton<AirshipEntryPoint> {
     private void Start() {
+#if AIRSHIP_PLAYER
         Debug.unityLogger.logHandler = new AirshipLogHandler();
+#endif
     }
 }

package/Runtime/Code/Bundles/SystemRoot.cs

@@ -200,6 +200,9 @@ public class SystemRoot : Singleton<SystemRoot> {
 			enums.Add(this.UnloadBundleAsync(loadedBundle, keepCodeZip));
 		}
 		yield return this.WaitAll(enums.ToArray());
+		var unloadSW = Stopwatch.StartNew();
+		yield return Resources.UnloadUnusedAssets();
+		print("Unloaded unused assets in " + unloadSW.ElapsedMilliseconds + " ms.");
 
 		// code.zip
 		bool openCodeZips = RunCore.IsServer() || compileLuaOnClient;

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

@@ -14,29 +14,23 @@ namespace Code.Network.Simulation
      * This component is used to allow lag compensation, prediction, and other networked state systems to
      * work with a networked object controlled by the server.
      *
-     * When this component is placed on a object being networked with Mirror, the server can include it
+     * When this component is placed on a object, the server can include it
      * in lag compensation and clients can resimulate their predictions more accurately.
      */
-    public class AirshipNetworkedObject : NetworkBehaviour
-    {
+    public class AirshipNetworkedObject : MonoBehaviour {
+        
+        [Tooltip("Adjusts the lag compensation timing by this amount in seconds. Useful to add or remove additional delay on the lag compensation request. Ex. Removing observer buffer delay for non-buffered entities.")]
+        [Range(-1, 1)]
+        public float bufferAdjustment = 0;
+        
         private History<TransformSnapshot> history;
 
         private void Start()
         {
-            if (isServer && authority)
-            {
-                history = new History<TransformSnapshot>(NetworkServer.sendRate);
-                AirshipSimulationManager.Instance.OnCaptureSnapshot += this.CaptureSnapshot;
-                AirshipSimulationManager.Instance.OnSetSnapshot += this.SetSnapshot;
-                AirshipSimulationManager.Instance.OnLagCompensationCheck += this.LagCompensationCheck;
-            }
-
-            if (isClient && !authority)
-            {
-                history = new History<TransformSnapshot>(NetworkClient.sendRate);
-                AirshipSimulationManager.Instance.OnCaptureSnapshot += this.CaptureSnapshot;
-                AirshipSimulationManager.Instance.OnSetSnapshot += this.SetSnapshot;
-            }
+            history = new History<TransformSnapshot>(1);
+            AirshipSimulationManager.Instance.OnCaptureSnapshot += this.CaptureSnapshot;
+            AirshipSimulationManager.Instance.OnSetSnapshot += this.SetSnapshot;
+            AirshipSimulationManager.Instance.OnLagCompensationCheck += this.LagCompensationCheck;
         }
 
         private void OnDestroy() {
@@ -74,10 +68,14 @@ namespace Code.Network.Simulation
             }
         }
 
-        private void LagCompensationCheck(int clientId, int tick, double time, double latency, double buffer)
+        private void LagCompensationCheck(int clientId, int tick, double time, double latency, double bufferTime)
         {
-            var bufferedTicks = Math.Round((latency - NetworkClient.bufferTime - Time.fixedDeltaTime) / Time.fixedDeltaTime);
-            this.SetSnapshot(tick - bufferedTicks);
+            var commandBufferTime = (NetworkServer.sendInterval * (NetworkClient.bufferTimeMultiplier / 2f));
+            
+            var totalBuffer = (latency * 2) + bufferTime + commandBufferTime;
+            var lagCompensatedTime = time - (totalBuffer + bufferAdjustment);
+            var lagCompensatedTick = AirshipSimulationManager.Instance.GetNearestTickForUnscaledTime(lagCompensatedTime);
+            this.SetSnapshot(lagCompensatedTick);
         }
     }
 }

package/Runtime/DevConsole/Runtime/DevConsoleMono.cs

@@ -2053,133 +2053,8 @@ namespace Airship.DevConsole
 
             #endregion
 
-            #region Camera commands
-
-            AddCommand(Command.Create<bool?>(
-                "cam_ortho",
-                "",
-                "Query or set whether the main camera is orthographic",
-                Parameter.Create("enabled", "Whether the main camera is orthographic (use \"NULL\" to toggle)"),
-                b =>
-                {
-                    if (Camera.main == null)
-                    {
-                        LogError("Could not find the main camera.");
-                        return;
-                    }
-
-                    if (!b.HasValue)
-                    {
-                        b = !Camera.main.orthographic;
-                    }
-
-                    Camera.main.orthographic = b.Value;
-                    LogSuccess($"{(b.Value ? "Enabled" : "Disabled")} orthographic mode on the main camera.");
-                },
-                () =>
-                {
-                    if (Camera.main == null)
-                    {
-                        LogError("Could not find the main camera.");
-                        return;
-                    }
-
-                    LogVariable("Orthographic", Camera.main.orthographic);
-                }
-            ));
-
-            AddCommand(Command.Create<int>(
-                "cam_fov",
-                "",
-                "Query or set the main camera field of view",
-                Parameter.Create("fieldOfView", "Field of view"),
-                f =>
-                {
-                    if (Camera.main == null)
-                    {
-                        LogError("Could not find the main camera.");
-                        return;
-                    }
-
-                    Camera.main.fieldOfView = f;
-                    LogSuccess($"Main camera's field of view set to {f}.");
-                },
-                () =>
-                {
-                    if (Camera.main == null)
-                    {
-                        LogError("Could not find the main camera.");
-                        return;
-                    }
-
-                    LogVariable("Field of view", Camera.main.fieldOfView);
-                }
-            ));
-
-            #endregion
-
             #region Scene commands
 
-            AddCommand(Command.Create<int>(
-                "scene_load",
-                "",
-                "Load the scene at the specified build index",
-                Parameter.Create(
-                    "buildIndex",
-                    "Build index of the scene to load, specified in the Unity build settings"
-                    ),
-                i =>
-                {
-                    if (i >= SceneManager.sceneCountInBuildSettings)
-                    {
-                        LogError($"Invalid build index specified: \"{i}\". Check the Unity build settings.");
-                        return;
-                    }
-
-                    SceneManager.LoadScene(i);
-                    LogSuccess($"Loaded scene at build index {i}.");
-                }
-            ), true);
-
-            AddCommand(Command.Create<int>(
-                "scene_info",
-                "",
-                "Display information about the current scene",
-                Parameter.Create("sceneIndex", "Index of the scene in the currently loaded scenes"),
-                i =>
-                {
-                    if (i >= SceneManager.sceneCount)
-                    {
-                        LogError($"Could not find active scene at index: {i}.");
-                        return;
-                    }
-
-                    Scene scene = SceneManager.GetSceneAt(i);
-                    LogSeperator(scene.name);
-                    Log($"Scene index: {i}.");
-                    Log($"Build index: {scene.buildIndex}.");
-                    Log($"Path: {scene.path}.");
-                    LogSeperator();
-                },
-                () =>
-                {
-                    if (SceneManager.sceneCount == 0)
-                    {
-                        Log("Could not find any active scenes.");
-                        return;
-                    }
-
-                    LogSeperator("Active scenes");
-                    for (int i = 0; i < SceneManager.sceneCount; i++)
-                    {
-                        Scene scene = SceneManager.GetSceneAt(i);
-                        Log($" {i}) {scene.name}, build index: {scene.buildIndex}.");
-                    }
-                    LogCommand();
-                    LogSeperator();
-                }
-            ));
-
             AddCommand(Command.Create<string>(
                 "obj_info",
                 "",
@@ -2379,216 +2254,6 @@ namespace Airship.DevConsole
 
             #endregion
 
-            #region Reflection commands
-
-            AddCommand(Command.Create<string>(
-                "cs_evaluate",
-                "cs_eval,evaluate,eval",
-                "Evaluate a C# expression or statement and display the result",
-                Parameter.Create("expression", "The expression to evaluate"),
-                input =>
-                {
-                    if (_monoEvaluator == null)
-                    {
-                        DevConsole.LogError(MonoNotSupportedText);
-                        return;
-                    }
-
-                    try
-                    {
-                        if (!input.EndsWith(";"))
-                        {
-                            input += ";";
-                        }
-
-                        object result = _monoEvaluator.Evaluate(input);
-
-                        if (result == null)
-                        {
-                            Log($"Null.");
-                            return;
-                        }
-
-                        if (result.GetType() != typeof(string) && typeof(IEnumerable).IsAssignableFrom(result.GetType()))
-                        {
-                            Log($"{{ {string.Join(", ", ((IEnumerable)result).Cast<object>())} }}");
-                            return;
-                        }
-
-                        Log($"{result}.");
-                    }
-                    catch (Exception e)
-                    {
-                        LogError($"An exception was thrown whilst evaluating the C# expression or statement: {e.Message}.");
-                    }
-                }
-            ));
-
-            AddCommand(Command.Create<string>(
-                "cs_run",
-                "run",
-                "Execute a C# expression or statement",
-                Parameter.Create("statement", "The statement to execute"),
-                input =>
-                {
-                    if (_monoEvaluator == null)
-                    {
-                        DevConsole.LogError(MonoNotSupportedText);
-                        return;
-                    }
-
-                    try
-                    {
-                        if (!input.EndsWith(";"))
-                        {
-                            input += ";";
-                        }
-
-                        if (_monoEvaluator.Run(input))
-                        {
-                            LogSuccess("Successfully executed the C# expression or statement.");
-                        }
-                        else
-                        {
-                            LogError("Failed to parse the C# expression or statement.");
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        LogError($"An exception was thrown whilst executing the C# expression or statement: {e.Message}.");
-                    }
-                }
-            ));
-
-            AddCommand(Command.Create(
-                "cs_usings",
-                "",
-                "Display a list of all active using statements",
-                () =>
-                {
-                    if (_monoEvaluator == null)
-                    {
-                        DevConsole.LogError(MonoNotSupportedText);
-                        return;
-                    }
-
-                    string usings = _monoEvaluator.GetUsing();
-
-                    if (string.IsNullOrEmpty(usings))
-                    {
-                        Log("There are no active using statements.");
-                        return;
-                    }
-
-                    LogSeperator("Usings");
-                    Log(usings.TrimEnd('\n'));
-                    LogSeperator();
-                }
-            ));
-
-            AddCommand(Command.Create(
-                "cs_variables",
-                "cs_vars",
-                "Display a list of all local variables defined",
-                () =>
-                {
-                    if (_monoEvaluator == null)
-                    {
-                        DevConsole.LogError(MonoNotSupportedText);
-                        return;
-                    }
-
-                    string vars = _monoEvaluator.GetVars();
-
-                    if (string.IsNullOrEmpty(vars))
-                    {
-                        Log("There are no local variables defined.");
-                        return;
-                    }
-
-                    LogSeperator("Local variables");
-                    Log(vars.TrimEnd('\n'));
-                    LogSeperator();
-                }
-            ));
-
-            AddCommand(Command.Create<string, bool>(
-                "cs_setusing",
-                "",
-                "Set whether a using statement is included automatically when starting the developer console",
-                Parameter.Create("namespace", "Namespace to use as the using statement (e.g. \"System.Collections\""),
-                Parameter.Create("enabled", "Whether the using statement is automatically included upon starting the developer console"),
-                (usingName, enabled) =>
-                {
-                    if (enabled)
-                    {
-                        if (_includedUsings.Contains(usingName))
-                        {
-                            LogError($"The specifed using statement is already enabled: \"{usingName}\".");
-                            return;
-                        }
-
-                        _includedUsings.Add(usingName);
-                        LogSuccess($"Enabled \"{usingName}\" as an automatically included using statement.");
-                    }
-                    else
-                    {
-                        if (!_includedUsings.Contains(usingName))
-                        {
-                            LogError($"The specified using statement is already disabled: \"{usingName}\".");
-                            return;
-                        }
-
-                        _includedUsings.Remove(usingName);
-                        LogSuccess($"Disabled \"{usingName}\" as an automatically included using statement.");
-                    }
-                }
-            ));
-
-            AddCommand(Command.Create(
-                "cs_autousings",
-                "",
-                "Display a list of all user-defined using statements that are included automatically when starting the developer console",
-                () =>
-                {
-                    if (_includedUsings.Count == 0)
-                    {
-                        Log("There are no user-defined using statements.");
-                        return;
-                    }
-
-                    LogSeperator("User-defined usings");
-                    LogCollection(_includedUsings);
-                    LogSeperator();
-                }
-            ));
-
-            AddCommand(Command.Create(
-                "cs_help",
-                "",
-                "Display information about the reflection commands",
-                () =>
-                {
-                    Command evaluateCmd = GetCommand("cs_evaluate");
-                    Command runCmd = GetCommand("cs_run");
-                    Command usingsCmd = GetCommand("cs_usings");
-                    Command varsCmd = GetCommand("cs_vars");
-                    Command setUsingCmd = GetCommand("cs_setusing");
-                    Command autoUsingsCmd = GetCommand("cs_autousings");
-
-                    LogSeperator("Reflection commands help");
-                    LogVariable(evaluateCmd.ToFormattedString(), evaluateCmd.HelpText);
-                    LogVariable(runCmd.ToFormattedString(), runCmd.HelpText);
-                    LogVariable(usingsCmd.ToFormattedString(), usingsCmd.HelpText);
-                    LogVariable(varsCmd.ToFormattedString(), varsCmd.HelpText);
-                    LogVariable(setUsingCmd.ToFormattedString(), setUsingCmd.HelpText);
-                    LogVariable(autoUsingsCmd.ToFormattedString(), autoUsingsCmd.HelpText);
-                    LogSeperator();
-                }
-            ));
-
-            #endregion
-
             #region Stat display commands
 
             AddCommand(Command.Create(

package/package.json

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