gg.easy.airship 0.1.2129 → 0.1.2131

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -395,7 +395,7 @@ namespace Editor.Packages {
 
             // Uncomment to just build iOS
             if (isCoreMaterials) {
-            //     platforms.Clear();
+                platforms.Clear();
             //     platforms.Add(AirshipPlatform.iOS);
             //     platforms.Add(AirshipPlatform.Android);
                 platforms.Add(AirshipPlatform.Windows);

package/Runtime/Code/Bundles/SystemRoot.cs

@@ -36,6 +36,7 @@ public class SystemRoot : Singleton<SystemRoot> {
 	public static bool startedLoadingExtraBundle = false;
 	public static bool preWarmedCoreShaders = false;
 	public AssetBundle coreMaterialsAssetBundle;
+	private bool loadInProgress = false;
 
 	private void Awake() {
 		DontDestroyOnLoad(this);
@@ -142,12 +143,21 @@ public class SystemRoot : Singleton<SystemRoot> {
 	/// <param name="forceUnloadAll">If false, we attempt to keep packages that are already loaded in place (instead of unloading and re-loading them)</param>
 	/// <returns></returns>
 	public IEnumerator LoadPackages(List<AirshipPackage> packages, bool useUnityAssetBundles, bool forceUnloadAll = true, bool compileLuaOnClient = false, Action<string> onLoadingScreenStep = null) {
+		if (this.loadInProgress) {
+			Debug.LogWarning("Tried to load packages when load was already in progress. Waiting...");
+			while (this.loadInProgress) {
+				yield return null;
+			}
+		}
+		this.loadInProgress = true;
+		
 #if AIRSHIP_PLAYER
 		print("Packages to load:");
 		for (int i = 0; i < packages.Count; i++) {
 			print($"  {i}. {packages[i].id} (Assets v{packages[i].assetVersion}) (Code v{packages[i].codeVersion})");
 		}
 #endif
+		
 		//
 		// print("Already loaded asset bundles:");
 		// {
@@ -201,6 +211,7 @@ public class SystemRoot : Singleton<SystemRoot> {
 					}
 					if (zip == null) {
 						Debug.LogError("Zip was null. This is bad.");
+						this.loadInProgress = false;
 						yield break;
 					}
 
@@ -396,6 +407,7 @@ public class SystemRoot : Singleton<SystemRoot> {
 			}
 		}
 
+		this.loadInProgress = false;
 #if AIRSHIP_PLAYER
 		Debug.Log("[Airship]: Finished loading asset bundles in " + sw.ElapsedMilliseconds + " ms.");
 #endif

package/Runtime/Code/Luau/LuauCoreCallbacks.cs

@@ -780,6 +780,8 @@ public partial class LuauCore : MonoBehaviour {
             return LuauError(thread, "ERROR - " + propName + " get property not found on class " + staticClassName);
         }
         else {
+            // Not a static class object:
+            
             // Profiler.BeginSample("GetRef");
             System.Object objectReference = ThreadDataManager.GetObjectReference(thread, instanceId);
             // Profiler.EndSample();

package/Runtime/Code/Luau/ReflectionList.cs

@@ -148,6 +148,7 @@ namespace Luau {
             [typeof(ScrollRect)] = LuauContextAll,
             [typeof(Text)] = LuauContextAll,
             [typeof(RectMask2D)] = LuauContextAll,
+            [typeof(WheelFrictionCurve)] = LuauContextAll,
 
             // Particles
             [typeof(ParticleSystem)] = LuauContextAll,

package/Runtime/Code/LuauAPI/WheelFrictionCurveAPI.cs

@@ -0,0 +1,9 @@
+using System;
+using UnityEngine;
+
+[LuauAPI]
+public class WheelFrictionCurveAPI : BaseLuaAPIClass {
+    public override Type GetAPIType() {
+        return typeof(WheelFrictionCurve);
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c28f2fd5c31d42279623c6877ebbd9cb
+timeCreated: 1746810245

package/Runtime/Code/MainMenu/MainMenuSceneManager.cs

@@ -244,7 +244,11 @@ public class MainMenuSceneManager : MonoBehaviour {
             // Delete core packages
             var path = Path.Combine(Application.persistentDataPath, "Packages", "@Easy");
             if (Directory.Exists(path)) {
-                Directory.Delete(path, true);
+                try {
+                    Directory.Delete(path, true);
+                } catch (Exception e) {
+                    Debug.LogError(e);
+                }
             }
 
             // yield return SceneManager.UnloadSceneAsync("MainMenu");

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

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Mirror;
+using Tayx.Graphy.Resim;
 using UnityEngine;
 using UnityEngine.Serialization;
 
@@ -144,6 +145,10 @@ namespace Code.Network.Simulation
             // and capturing snapshots of the interpolated state on its own timeline.
             var time = NetworkServer.active ? NetworkTime.time : Time.unscaledTimeAsDouble;
             
+            // Update debug overlay
+            var buffer = NetworkClient.bufferTime / Math.Min(Time.timeScale, 1);
+            G_ResimMonitor.FrameObserverBuffer = buffer;
+            
             if (!isActive) return;
             if (Physics.simulationMode != SimulationMode.Script) return;
             
@@ -268,6 +273,7 @@ namespace Code.Network.Simulation
         private void PerformResimulation(double baseTime)
         {
             Debug.Log($"T:{Time.unscaledTimeAsDouble} Resimulating from {baseTime}");
+            G_ResimMonitor.FrameResimValue = 100;
             
             if (replaying)
             {

package/Runtime/Code/Network/StateSystem/AirshipNetworkedStateManager.cs

@@ -179,7 +179,7 @@ namespace Code.Network.StateSystem
             // in poor network conditions.
             this.serverCommandBufferTargetSize =
                 Math.Min(this.serverCommandBufferMaxSize,
-                    ((int)Math.Ceiling(NetworkClient.sendInterval / Time.fixedDeltaTime)) * 3);
+                    ((int)Math.Ceiling(NetworkClient.sendInterval / Time.fixedDeltaTime)) * 2);
             print("Command buffer max size is " + this.serverCommandBufferMaxSize + ". Target size: " + this.serverCommandBufferTargetSize);
 
             this.inputHistory = new((int)Math.Ceiling(1f / Time.fixedDeltaTime));

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

@@ -158,6 +158,8 @@ namespace Code.Player.Character.MovementSystems.Character
         private Vector3 lookVector;
         private BinaryBlob customInputData;
 
+        [SyncVar] public Vector3 startingLookVector;
+
         // State information
         public CharacterSnapshotData currentMoveSnapshot = new CharacterSnapshotData() {};
         public CharacterAnimationSyncData currentAnimState = new CharacterAnimationSyncData() {};
@@ -186,6 +188,16 @@ namespace Code.Player.Character.MovementSystems.Character
             _cameraTransform = Camera.main.transform;
         }
 
+        public override void OnStartClient() {
+            base.OnStartClient();
+            this.lookVector = this.startingLookVector;
+        }
+
+        public override void OnStartServer() {
+            base.OnStartServer();
+            this.lookVector = this.startingLookVector;
+        }
+
         public override void SetMode(NetworkedStateSystemMode mode)
         {
             Debug.Log("Running movement in " + mode + " mode for " + this.name + ".");
@@ -845,7 +857,7 @@ namespace Code.Player.Character.MovementSystems.Character
 
             //Instantly move at the desired speed
             var moveMagnitude = characterMoveVelocity.magnitude;
-            var velMagnitude = flatVelocity.magnitude;
+            var flatVelMagnitude = flatVelocity.magnitude;
 
             //Don't move character in direction its already moveing
             //Positive dot means we are already moving in this direction. Negative dot means we are moving opposite of velocity.
@@ -863,13 +875,13 @@ namespace Code.Player.Character.MovementSystems.Character
                 newVelocity.z = command.moveDir.z * currentMoveSnapshot.currentSpeed;
             }
             else if (!isImpulsing && !currentMoveSnapshot.airborneFromImpulse && //Not impulsing AND under our max speed
-                     (velMagnitude < (movementSettings.useAccelerationMovement
+                     (flatVelMagnitude < (movementSettings.useAccelerationMovement
                          ? currentMoveSnapshot.currentSpeed
                          : Mathf.Max(movementSettings.sprintSpeed, currentMoveSnapshot.currentSpeed) + 1)))
             {
                 if (movementSettings.useAccelerationMovement)
                 {
-                    newVelocity += Vector3.ClampMagnitude(characterMoveVelocity, currentMoveSnapshot.currentSpeed - velMagnitude);
+                    newVelocity += Vector3.ClampMagnitude(characterMoveVelocity, currentMoveSnapshot.currentSpeed - flatVelMagnitude);
                 }
                 else
                 {
@@ -879,7 +891,7 @@ namespace Code.Player.Character.MovementSystems.Character
                     // if(Mathf.Abs(characterMoveVelocity.z) > Mathf.Abs(newVelocity.z)){
                     // 	newVelocity.z = characterMoveVelocity.z;
                     // }
-                    if (moveMagnitude + .5f >= velMagnitude)
+                    if (moveMagnitude + .5f >= flatVelMagnitude)
                     {
                         newVelocity.x = characterMoveVelocity.x;
                         newVelocity.z = characterMoveVelocity.z;
@@ -888,11 +900,30 @@ namespace Code.Player.Character.MovementSystems.Character
             }
             else
             {
-                //Moving faster than max speed or using acceleration mode
-                newVelocity += normalizedMoveDir * (dirDot * dirDot / 2) *
-                               (groundedState == CharacterState.Sprinting
-                                   ? this.movementSettings.sprintAccelerationForce
-                                   : movementSettings.accelerationForce);
+                if(this.movementSettings.useAccelerationMovement){
+                    //Using acceleration movement
+                    newVelocity += normalizedMoveDir * (dirDot * dirDot / 2) *
+                                   (groundedState == CharacterState.Sprinting
+                                       ? this.movementSettings.sprintAccelerationForce
+                                       : movementSettings.accelerationForce);
+                }else{
+                    //Impulsing
+                    var forwardMod = Mathf.Max(0, dirDot);
+                    var addedForce = groundedState == CharacterState.Sprinting
+                                    ? this.movementSettings.sprintAccelerationForce
+                                    : movementSettings.accelerationForce;
+                    if(flatVelMagnitude+addedForce < currentMoveSnapshot.currentSpeed){
+                        forwardMod = 1;
+                    }
+
+                    //Apply the force
+                    newVelocity += normalizedMoveDir * forwardMod * addedForce;
+
+                    //Never get faster than you've been impulsed
+                    var flatVel = Vector3.ClampMagnitude(new Vector3(newVelocity.x, 0, newVelocity.z), Mathf.Max(addedForce, flatVelMagnitude));
+                    newVelocity.x = flatVel.x;
+                    newVelocity.z = flatVel.z;
+                }
             }
 
             //print("isreplay: " + replaying + " didHitForward: " + didHitForward + " moveVec: " + characterMoveVector + " colliderDot: " + colliderDot  + " for: " + forwardHit.collider?.gameObject.name + " point: " + forwardHit.point);
@@ -1166,6 +1197,7 @@ namespace Code.Player.Character.MovementSystems.Character
         }
         
         public void SetMoveInput(Vector3 moveDir, bool jump, bool sprinting, bool crouch, int moveDirModeInt) {
+            moveDir = moveDir.normalized;
             var moveDirMode = (MoveDirectionMode)moveDirModeInt;
             switch (moveDirMode) {
                 case MoveDirectionMode.World:

package/Runtime/Code/TSCodeGen/TypeGenerator.cs

@@ -221,6 +221,7 @@ public class TypeGenerator : MonoBehaviour
             typeof(QualitySettings),
             typeof(GraphicsSettings),
             typeof(UniversalRenderPipelineAsset),
+            typeof(WheelFrictionCurve),
 
             // Mirror
             typeof(NetworkServer),

package/Runtime/Code/VoxelWorld/Editor/VoxelBuilderEditorWindow.cs

@@ -131,15 +131,17 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
                 //Select this
                 selection.gameObject.SetActive(true);
                 Selection.activeGameObject = selection.gameObject;
+                Debug.Log("select.1");
             }
 
-            if (VoxelWorldEditorToolBase.buttonActive == true) {
+            if (VoxelWorldEditorToolBase.buttonActive) {
                 //If we're not in selection mode, disable the selection zone
                 selection = world.GetComponentInChildren<SelectionZone>();
 
                 if (selection) {
                     //Select the world
                     Selection.activeGameObject = world.gameObject;
+                    Debug.Log("select.2");
                     //disable it
                     selection.gameObject.SetActive(false);
 
@@ -150,7 +152,7 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
 
             //Show a foldable help box
             EditorGUILayout.HelpBox(
-                "Left click to add\nShift+click to delete\nCtrl+click for repeat placement\nA to rotate highlighted block",
+                "Left click to add\nShift+click to delete\nCtrl+click for repeat placement\nG to rotate highlighted block",
                 MessageType.Info);
 
             //active = EditorGUILayout.Toggle("Active", active);

package/Runtime/Code/VoxelWorld/Editor/VoxelWorldEditor.cs

@@ -233,9 +233,6 @@ public class VoxelWorldEditor : UnityEditor.Editor {
         //Add selection handler
         Selection.selectionChanged += OnSelectionChanged;
 
-        //Add a handler for the gizmo refresh event
-        SceneView.duringSceneGui += GizmoRefreshEvent;
-
         EditorApplication.update += OnEditorUpdate;
 
         //Save handler
@@ -428,6 +425,9 @@ public class VoxelWorldEditor : UnityEditor.Editor {
         }
 
         AirshipEditorGUI.HorizontalLine();
+        
+        EditorGUILayout.LabelField("Quality", EditorStyles.boldLabel);
+        world.useSimplifiedVoxels = GUILayout.Toggle(world.useSimplifiedVoxels, new GUIContent("Simplified Voxels", "If enabled quarter blocks will be rendered as default cube voxels."));
 
         EditorGUILayout.LabelField("Editing", EditorStyles.boldLabel);
 
@@ -509,8 +509,14 @@ public class VoxelWorldEditor : UnityEditor.Editor {
             world.FullWorldUpdate();
         }
     }
+    
+    private void OnEnable() {
+        SceneView.duringSceneGui += GizmoRefreshEvent;
+    }
 
     private void OnDisable() {
+        SceneView.duringSceneGui -= GizmoRefreshEvent;
+        
         CleanupHandles();
     }
 
@@ -830,7 +836,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
                 leftShiftDown = false;
             }
 
-            if (currentEvent.keyCode == KeyCode.A) {
+            if (currentEvent.keyCode == KeyCode.G) {
                 //Cycle the bits on the selected block
                 if (world.selectedBlockIndex > 0) {
                     var oldVoxel = world.GetVoxelAt(lastPos); // Assuming you have a method to get the voxel value
@@ -847,6 +853,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
                     //newValue = (ushort)VoxelWorld.SetVoxelFlippedBits(newValue, 0x04  );
                     VoxelEditManager.AddEdit(world, lastPos, oldVoxel, newVoxel, "Flip Voxel " + def.definition.name);
 
+                    //Need to use a Key that Unity doesn't use so we don't consume it
                     currentEvent.Use();
                 }
 
@@ -983,6 +990,10 @@ public class VoxelWorldEditorToolBase : EditorTool {
         buttonActive = true;
     }
 
+    private void OnDisable() {
+        buttonActive = false;
+    }
+
     public override void OnWillBeDeactivated() {
         buttonActive = false;
     }
@@ -1011,6 +1022,10 @@ public class VoxelWorldSelectionToolBase : EditorTool {
         buttonActive = true;
     }
 
+    private void OnDisable() {
+        buttonActive = false;
+    }
+
     public override void OnWillBeDeactivated() {
         buttonActive = false;
     }
@@ -1038,6 +1053,10 @@ public class VoxelWorldPaintBucketToolBase : EditorTool {
         buttonActive = true;
     }
 
+    private void OnDisable() {
+        buttonActive = false;
+    }
+
     public override void OnWillBeDeactivated() {
         buttonActive = false;
     }
@@ -1065,6 +1084,10 @@ public class VoxelWorldBrushToolBase : EditorTool {
         buttonActive = true;
     }
 
+    private void OnDisable() {
+        buttonActive = false;
+    }
+
     public override void OnWillBeDeactivated() {
         buttonActive = false;
     }