gg.easy.airship 0.1.1721 → 0.1.1723

package/Runtime/Code/Player/Character/API/CharacterMovementData.cs

@@ -18,12 +18,17 @@ namespace Code.Player.Character.API {
 		[Tooltip("Should movement be applied over time as a force? Or a constant speed.")]
 		public bool useAccelerationMovement = false;
 
-		[Tooltip("Default movement speed (units per second)")] [Min(0f)]
+		[Tooltip("Default movement speed (units per second) when not using accesleration movement")] [Min(0f)]
 		public float speed = 4.666667f;
 
-		[Tooltip("Sprint movement speed (units per second)")] [Min(0f)]
+		[Tooltip("Sprint movement speed (units per second) when not using accesleration movement")] [Min(0f)]
 		public float sprintSpeed = 6.666667f;
 
+		[Tooltip("How much to accelerate (units per second) when using acceleration movement or when going faster than the target speed")] [Min(0f)]
+		public float accelerationForce = 1;
+		[Tooltip("How much to accelerate sprinting (units per second) when using acceleration movement or when going faster than the target speed")] [Min(0f)]
+		public float sprintAccelerationForce = 1.4f;
+
 		[Tooltip("Only allow sprinting forward.")]
 		public bool onlySprintForward = false;
 

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

@@ -206,9 +206,19 @@ namespace Code.Player.Character {
 			return this.replicatedLookVector;
 		}
 
-		private void FixedUpdate() {
-			//Update the movement state of the character		
-			StartMove(BuildMoveData());
+		private void FixedUpdate() {	
+			// Observers don't calculate moves
+			if (!isOwned){
+				return;
+			}
+
+			//Update the movement state of the character	
+			MoveInputData md = BuildMoveData();
+
+			this.currentMoveInputData = md;
+			OnBeginMove?.Invoke(md);
+			Move(md);
+			OnEndMove?.Invoke(md);
 		}
 
 		private void Update(){
@@ -225,18 +235,6 @@ namespace Code.Player.Character {
 			}
 		}
 
-		private void StartMove(MoveInputData md) {
-			// Observers don't calculate moves
-			if (!isOwned){
-				return;
-			}
-
-			this.currentMoveInputData = md;
-			OnBeginMove?.Invoke(md);
-			Move(md);
-			OnEndMove?.Invoke(md);
-		}
-
 		[ClientRpc]
 		private void ObserverOnImpactWithGround(Vector3 velocity) {
 			this.OnImpactWithGround?.Invoke(velocity);
@@ -256,7 +254,7 @@ namespace Code.Player.Character {
 			var currentVelocity = this.rigidbody.velocity;// trackedVelocity;
 			var newVelocity = currentVelocity;
 			var isIntersecting = IsIntersectingWithBlock();
-			var deltaTime = Time.deltaTime;
+			var deltaTime = Time.fixedDeltaTime;
 
 #region GROUNDED
 			//Ground checks
@@ -656,12 +654,13 @@ namespace Code.Player.Character {
 				//Instantly move at the desired speed
 				var moveMagnitude = characterMoveVelocity.magnitude;
 				var velMagnitude = flatVelocity.magnitude;
-				var clampedIncrease = characterMoveVelocity.normalized * Mathf.Min(moveMagnitude, Mathf.Max(0, currentSpeed - velMagnitude));
+				var clampedIncrease = normalizedMoveDir * Mathf.Min(moveMagnitude, Mathf.Max(0, currentSpeed - velMagnitude));
 
 				
 				//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.
-				var rawDot = Vector3.Dot(flatVelocity/ currentSpeed, characterMoveVelocity/ currentSpeed);
+				//var rawDot = Vector3.Dot(flatVelocity/ currentSpeed, characterMoveVelocity/ currentSpeed);
+				var rawDot = Vector3.Dot(flatVelocity.normalized, normalizedMoveDir);
 				var dirDot = Mathf.Clamp01(1-rawDot);
 				
 				if(useExtraLogging){
@@ -672,7 +671,7 @@ namespace Code.Player.Character {
 					clampedIncrease *= moveData.airSpeedMultiplier;
 				}
 
-				if(_flying || (velMagnitude < currentSpeed && !airborneFromImpulse)){
+				if(_flying || (velMagnitude < currentSpeed+1 && !isImpulsing)){
 					// if(clampedIncrease.x < 0){
 					// 	clampedIncrease.x = Mathf.Max(clampedIncrease.x, newVelocity.x + clampedIncrease.x);
 					// }else{
@@ -688,7 +687,8 @@ namespace Code.Player.Character {
 				}else{
 					//dirDot = dirDot - 1 / 2;
 					//clampedIncrease *= -Mathf.Min(0, dirDot-1);
-					newVelocity += characterMoveVelocity * dirDot * deltaTime * 2;
+					newVelocity += normalizedMoveDir * dirDot * 
+						(groundedState == CharacterState.Sprinting ? this.moveData.sprintAccelerationForce : moveData.accelerationForce);
 				}
 				//characterMoveVelocity = clampedIncrease;
 				// if(Mathf.Abs(newVelocity.x) < Mathf.Abs(characterMoveVelocity.x)){

package/Runtime/Code/VoxelWorld/VoxelBlocks.cs

@@ -213,8 +213,7 @@ public class VoxelBlocks : MonoBehaviour {
         public bool detail = false;
         public bool doOcclusion = true;
 
-        public VoxelMeshCopy mesh = null;
-        public VoxelMeshCopy meshLod = null;
+        public LodSet mesh = null;
 
         public Dictionary<int, LodSet> meshTiles = new();
 
@@ -368,22 +367,28 @@ public class VoxelBlocks : MonoBehaviour {
         if (block.definition.contextStyle != ContextStyle.StaticMesh) {
             return;
         }
-
-        var meshSrc = block.definition.staticMeshLOD0;
-        if (meshSrc == null) {
+        
+        if (block.definition.staticMeshLOD0 == null) {
             return;
         }
-        VoxelMeshCopy meshCopy = new VoxelMeshCopy(meshSrc);
-        block.mesh = meshCopy;
 
+        block.mesh = new();
+        
+        block.mesh.lod0 = new VoxelMeshCopy(block.definition.staticMeshLOD0);
+        
+        if (block.definition.staticMeshLOD1 != null){
+            block.mesh.lod1 = new VoxelMeshCopy(block.definition.staticMeshLOD1);
+        }
+        
+        if (block.definition.staticMeshLOD2 != null){
+            block.mesh.lod2 = new VoxelMeshCopy(block.definition.staticMeshLOD2);
+        }
+        
         //Apply the material to this
         if (block.meshMaterial != null) {
-            if (block.mesh.surfaces != null) {
-                foreach (VoxelMeshCopy.Surface surf in block.mesh.surfaces) {
-                    surf.meshMaterial = block.meshMaterial;
-                    surf.meshMaterialName = block.meshMaterial.name;
-                }
-            }
+            block.mesh.lod0.ApplyMaterial(block.meshMaterial);
+            block.mesh.lod1.ApplyMaterial(block.meshMaterial);
+            block.mesh.lod2.ApplyMaterial(block.meshMaterial);
         }
                 
     }

package/Runtime/Code/VoxelWorld/VoxelMeshCopy.cs

@@ -371,5 +371,16 @@ namespace Assets.Airship.VoxelRenderer
                 rotation.Add((int)rot.Key, new PrecalculatedRotation(srcVertices, srcNormals, rot.Key, rot.Value));
             }
         }
+
+        public void ApplyMaterial(Material meshMaterial) {
+            if (surfaces == null) {
+                return;
+            }
+
+            foreach (Surface surf in surfaces) {
+                surf.meshMaterial = meshMaterial;
+                surf.meshMaterialName = meshMaterial.name;
+            }
+        }
     }
 }

package/Runtime/Code/VoxelWorld/VoxelMeshProcessor.cs

@@ -990,16 +990,21 @@ namespace VoxelWorldStuff {
                                 //Init the detail meshes now
                                 InitDetailMeshes();
 
-                                if (block.mesh != null) {
-                                    EmitMesh(block, block.mesh, detailMeshData[0], world, origin, true, rotation);
-                                }
-                                if (block.meshLod != null) {
-                                    EmitMesh(block, block.mesh, detailMeshData[1], world, origin, true, rotation);
+                                if (block.mesh != null && block.mesh.lod0 != null) {
+                                    EmitMesh(block, block.mesh.lod0, detailMeshData[0], world, origin, true, rotation);
+
+                                    if (block.mesh.lod1 != null) {
+                                        EmitMesh(block, block.mesh.lod1, detailMeshData[1], world, origin, true, rotation);
+                                    }
+                                    if (block.mesh.lod2 != null) {
+                                        EmitMesh(block, block.mesh.lod2, detailMeshData[2], world, origin, true, rotation);
+                                    }
                                 }
+                                
                             }
                             else {
                                 //same mesh that the voxels use (think stairs etc)
-                                EmitMesh(block, block.mesh, temporaryMeshData, world, origin, true, rotation);
+                                EmitMesh(block, block.mesh.lod0, temporaryMeshData, world, origin, true, rotation);
                             }
                             //No code past here
                             continue;
@@ -1285,8 +1290,8 @@ namespace VoxelWorldStuff {
             //Center around 0,0,0
             Vector3 origin = new Vector3(-0.5f, -0.5f, -0.5f);
 
-            if (block.mesh != null) {
-                EmitMesh(block, block.mesh, meshData, world, origin, false);
+            if (block.mesh != null && block.mesh.lod0 != null) {
+                EmitMesh(block, block.mesh.lod0, meshData, world, origin, false);
             }
             else {
                 //Add regular cube Faces

package/Runtime/Code/VoxelWorld/VoxelWorld.cs

@@ -708,8 +708,7 @@ public partial class VoxelWorld : MonoBehaviour {
         }
 
         RegenerateAllMeshes();
-
-        UpdatePropertiesForAllChunksForRendering();
+         
 
         Debug.Log("Finished loading voxel save file. Took " + (Time.realtimeSinceStartup - startTime) + " seconds.");
         Profiler.EndSample();
@@ -731,8 +730,7 @@ public partial class VoxelWorld : MonoBehaviour {
  
         DeleteChildGameObjects(gameObject);
         RegenerateAllMeshes();
-
-        UpdatePropertiesForAllChunksForRendering();
+ 
     }
 
 
@@ -824,15 +822,9 @@ public partial class VoxelWorld : MonoBehaviour {
         this.voxelBlocks.Reload();
 
         RegenerateAllMeshes();
-
-        UpdatePropertiesForAllChunksForRendering();
+ 
     }
-
-    public void UpdatePropertiesForAllChunksForRendering() {
-        foreach (var chunkRec in chunks) {
-            chunkRec.Value.UpdateMaterialPropertiesForChunk();
-        }
-    } 
+ 
 
     private void Awake() {
         this.finishedLoading = false;
@@ -1017,11 +1009,6 @@ public partial class VoxelWorld : MonoBehaviour {
         Profiler.BeginSample("RegenerateMissingChunkGeometry");
         RegenerateMissingChunkGeometry();
         Profiler.EndSample();
-
-        Profiler.BeginSample("UpdatePropertiesForAllChunksForRendering");
-        UpdatePropertiesForAllChunksForRendering();
-        Profiler.EndSample();
- 
     }
 
     public void OnRenderObject() {

package/Runtime/Code/VoxelWorld/VoxelWorldChunk.cs

@@ -93,11 +93,7 @@ namespace VoxelWorldStuff {
         private Mesh[] detailMeshes;
         private MeshFilter[] detailFilters;
         private MeshRenderer[] detailRenderers;
-
-        private float[] detailMeshAlpha = new float[3];
-        private bool[] wantsToBeVisible = new bool[3];
-        private float[] detailMeshPrevAlpha = new float[3];
-        private bool skipLodAnimation = true;
+        
 
         private GameObject parent;
         public List<BoxCollider> colliders = new();
@@ -451,9 +447,7 @@ namespace VoxelWorldStuff {
 
                         //See if this mesh has detail meshes
                         if (meshProcessor.GetHasDetailMeshes() == true) {
-                            //Debug.Log("Got a mesh");
-                            skipLodAnimation = true;
-
+                            
                             if (detailGameObjects == null) {
                                 detailGameObjects = new GameObject[3];
 
@@ -474,7 +468,7 @@ namespace VoxelWorldStuff {
                                 if (i == 2) {
                                     detailGameObjects[i].name = "DetailMeshVeryFar";
                                 }
-                                detailGameObjects[i].layer = 6;
+                                
                                 detailFilters[i] = detailGameObjects[i].AddComponent<MeshFilter>();
                                 detailRenderers[i] = detailGameObjects[i].AddComponent<MeshRenderer>();
 
@@ -483,6 +477,23 @@ namespace VoxelWorldStuff {
 
                                 detailFilters[i].mesh = detailMeshes[i];
                             }
+
+                            LODGroup lodSystem = detailGameObjects[0].AddComponent<LODGroup>();
+
+                            // Enable crossfade
+                            lodSystem.fadeMode = LODFadeMode.CrossFade;
+                            lodSystem.animateCrossFading = true;
+
+                            // Configure LODs with the last LOD2 as the lowest and no "culled" LOD
+                            LOD[] lods = new LOD[3] {
+                                new LOD(0.07f, new Renderer[] { detailRenderers[0] }), //The distance is actually for the next group eg: this one sets LOD1 to 10%
+                                new LOD(0.03f, new Renderer[] { detailRenderers[1] }),
+                                new LOD(0.0f, new Renderer[] { detailRenderers[2] })  
+                            };
+                       
+                            lodSystem.SetLODs(lods);
+
+
                         }
                     }
                     
@@ -522,7 +533,7 @@ namespace VoxelWorldStuff {
 
                 Profiler.BeginSample("UpdatePropertiesForChunk");
                 materialPropertiesDirty = true;
-                UpdateMaterialPropertiesForChunk();
+         
                 Profiler.EndSample();
 
                 //Print out the total time taken
@@ -564,215 +575,7 @@ namespace VoxelWorldStuff {
             Array.Clear(lightColors, 0, lightColors.Length);
             Array.Clear(lightRadius, 0, lightRadius.Length);
         }
-        public void UpdateMaterialPropertiesForChunk() {
-            if (renderer == null) return;
-            if (mesh == null) return;
-
-            //Update the detail meshes if they're there
-            if (detailRenderers != null && currentCamera != null) {
-                Vector3 pos = currentCamera.transform.position;
-                Vector3 chunkPos = (chunkKey * chunkSize) + new Vector3(chunkSize / 2, chunkSize / 2, chunkSize / 2);
-                float distance = Vector3.Distance(pos, chunkPos);
-                wantsToBeVisible[0] = false;
-                wantsToBeVisible[1] = false;
-                wantsToBeVisible[2] = false;
-                bool somethingChanged = false;
-                float speed = world.lodTransitionSpeed * Time.deltaTime;
-
-
-                //mark what we saw
-                for (int i = 0; i < 3; i++) {
-                    detailMeshPrevAlpha[i] = detailMeshAlpha[i];
-                }
-
-                //If the near one should be visible
-                if (distance < world.lodNearDistance) {
-                    //Blend it in
-                    if (detailMeshAlpha[0] < 1.0f) {
-                        detailMeshAlpha[0] += speed;
-                    }
-                    else {
-                        //Once the near one is fully visible, we can fade 1 and 2 out
-                        detailMeshAlpha[1] -= speed;
-                        detailMeshAlpha[2] -= speed;
-                    }
-                }
-                else
-                if (distance < world.lodFarDistance) {
-                    //If the far one should be visible
-                    //Blend it in
-                    if (detailMeshAlpha[1] < 1.0f) {
-                        detailMeshAlpha[1] += speed;
-                    }
-                    else {
-                        //Once the far one is fully visible, we can fade 0+2 out
-                        detailMeshAlpha[0] -= speed;
-                        detailMeshAlpha[2] -= speed;
-                    }
-                }
-                else {
-                    if (detailMeshAlpha[2] < 1.0f) {
-                        detailMeshAlpha[2] += speed;
-                    }
-                    else {
-                        detailMeshAlpha[0] -= speed;
-                        detailMeshAlpha[1] -= speed;
-                    }
-                }
-
-                /*
-                for (int i = 0; i < 2; i++)
-                {
-                    //Becoming more visible?
-                    if (wantsToBeVisible[i] == true)
-                    {
-                        detailRenderers[i].enabled = true;
-                        
-                        if (detailMeshAlpha[i] < 1)
-                        {
-                            detailMeshAlpha[i] += speed;
-                            somethingChanged = true;
-                            if (detailMeshAlpha[i] >= 1)
-                            {
-                                detailMeshAlpha[i] = 1;
-                            }
-                        }
-                    }
-                    //And backwards
-                    if (wantsToBeVisible[i] == false && detailMeshAlpha[i] > 0)
-                    {
-                        detailMeshAlpha[i] -= speed;
-                        somethingChanged = true;
-                        if (detailMeshAlpha[i] <= 0)
-                        {
-                            detailMeshAlpha[i] = 0;
-                            detailRenderers[i].enabled = false;
-                        }
-                    }
-                }*/
-
-                for (int i = 0; i < 3; i++) {
-                    //Did we hit zero from a higher value?
-                    if (detailMeshPrevAlpha[i] > 0 && detailMeshAlpha[i] <= 0) {
-                        detailRenderers[i].enabled = false;
-
-                    }
-                    //Did we move away from zero?
-                    if (detailMeshPrevAlpha[i] <= 0 && detailMeshAlpha[i] > 0) {
-                        detailRenderers[i].enabled = true;
-                    }
-                    //clamp it to 0, 1
-                    detailMeshAlpha[i] = Mathf.Clamp01(detailMeshAlpha[i]);
-
-                    //mark the change
-                    if (detailMeshPrevAlpha[i] - detailMeshAlpha[i] != 0) {
-                        somethingChanged = true;
-                    }
-                }
-                
-                //On initial creation we want lod stuff to be in its correct state, so this skips the animation and just sets things directly
-                //Note this block of code doesn't run every frame!
-                if (skipLodAnimation == true) {
-                    //Hot start! This isnt the moment to moment logic
-                    skipLodAnimation = false;
-                    somethingChanged = true;
-                    if (distance < world.lodNearDistance) {
-                        detailRenderers[0].enabled = true;
-                        detailMeshAlpha[0] = 1;
-                        detailRenderers[1].enabled = false;
-                        detailMeshAlpha[1] = 0;
-                        detailRenderers[2].enabled = false;
-                        detailMeshAlpha[2] = 0;
-                    }
-                    else
-                    if (distance < world.lodFarDistance) {
-                        detailRenderers[0].enabled = false;
-                        detailMeshAlpha[0] = 0;
-                        detailRenderers[1].enabled = true;
-                        detailMeshAlpha[1] = 1;
-                        detailRenderers[2].enabled = false;
-                        detailMeshAlpha[2] = 0;
-                    }
-                    else {
-                        detailRenderers[0].enabled = false;
-                        detailMeshAlpha[0] = 0;
-                        detailRenderers[1].enabled = false;
-                        detailMeshAlpha[1] = 0;
-                        detailRenderers[2].enabled = true;
-                        detailMeshAlpha[2] = 1;
-                    }
-                }
-
-
-                //Set the alpha of the detail meshes
-                if (somethingChanged == true) {
-
-                    //Create the material property blocks and store them 
-                    /*if (detailPropertyBlocks == null)
-                    {
-                        detailPropertyBlocks = new List<MaterialPropertyBlock>[3];
-                        for (int i = 0; i < 3; i++)
-                        {
-                            detailPropertyBlocks[i] = new List<MaterialPropertyBlock>();
-                            for (int materialIndex = 0; materialIndex < detailRenderers[i].sharedMaterials.Length; materialIndex++)
-                            {
-                                detailPropertyBlocks[i].Add(new MaterialPropertyBlock());
-                            }
-                        }
-                    }*/
-
-                    //Adjust the alpha in the property block
-                    for (int i = 0; i < 3; i++) {
-                        for (int materialIndex = 0; materialIndex < detailRenderers[i].sharedMaterials.Length; materialIndex++) {
-                            Material mat = detailRenderers[i].sharedMaterials[materialIndex];
-                            if (mat == null) {
-                                continue;
-                            }
-
-                            /*
-                            var rendererRef = AirshipRendererManager.Instance.GetRendererReference(detailRenderers[i]);
-
-                            if (rendererRef != null) {
-                                MaterialPropertyBlock propertyBlock = rendererRef.GetPropertyBlock(mat, materialIndex);
-                                propertyBlock.SetFloat("_Alpha", detailMeshAlpha[i]);
-                            }
-                            */
-
-                        }
-                    }
-                }
-            }
-
-            if (materialPropertiesDirty == true) {
-                //get all the point lights in the scene
-                /*
-                int numHighQualityLights = 0;
-                
-                foreach (var lightRec in lights)
-                {
-                    lightRec.Value.lightRef.TryGetTarget(out AirshipPointLight light);
-                    if (light == null)
-                    {
-                        continue;
-                    }
-
-                    lightsPositions[numHighQualityLights] = light.transform.position;
-                    lightColors[numHighQualityLights] = light.color * light.intensity;
-                    lightRadius[numHighQualityLights] = light.range;
-                    numHighQualityLights++;
-                    if (numHighQualityLights == 2)
-                    {
-                        break;
-                    }
-                }
-                if (numHighQualityLights > 0)
-                {
-                    usingLocallyClonedMaterials = true;
-                }*/
-
-
-            }
-        }
+      
 
         public GameObject GetGameObject() {
             return obj;

package/package.json

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