diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index 5658ef7755844613ff586e5f9077d3f53de3e83a..11c58c01c8225121b746ae806a92d4db65492222 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -500,13 +500,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
control: {fileID: 437356320}
- speed: 15
+ speed: 5
lookPower: 0.1
lowerLookBound: -60
upperLookBound: 60
currentMovement: {x: 0, y: 0, z: 0}
currentLook: {x: 0, y: 0, z: 0}
- gravity: {x: 0, y: 0, z: 0}
+ gravity: {x: 0, y: -9.81, z: 0}
gravityVelocity: {x: 0, y: 0, z: 0}
--- !u!114 &437356322
MonoBehaviour:
@@ -630,6 +630,254 @@ MonoBehaviour:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
+--- !u!1 &556969462
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 556969468}
+ - component: {fileID: 556969467}
+ - component: {fileID: 556969466}
+ - component: {fileID: 556969465}
+ - component: {fileID: 556969464}
+ - component: {fileID: 556969463}
+ m_Layer: 0
+ m_Name: FastBoi
+ m_TagString: Player
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!114 &556969463
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 556969462}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Actions: {fileID: -944628639613478452, guid: 0b783231be8e2a84b988e2fbe9cab91d, type: 3}
+ m_NotificationBehavior: 2
+ m_UIInputModule: {fileID: 0}
+ m_DeviceLostEvent:
+ m_PersistentCalls:
+ m_Calls: []
+ m_DeviceRegainedEvent:
+ m_PersistentCalls:
+ m_Calls: []
+ m_ControlsChangedEvent:
+ m_PersistentCalls:
+ m_Calls: []
+ m_ActionEvents:
+ - m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 556969464}
+ m_TargetAssemblyTypeName: PlayerControl, Assembly-CSharp
+ m_MethodName: OnMove
+ m_Mode: 0
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_ActionId: c86b1a4e-7070-45b6-ba73-b33ddb63fe90
+ m_ActionName: Player/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]
+ - m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 556969464}
+ m_TargetAssemblyTypeName: PlayerControl, Assembly-CSharp
+ m_MethodName: OnLook
+ m_Mode: 0
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_ActionId: 0711f46b-0fc3-4947-a028-b7c3b7357385
+ m_ActionName: Player/Look[/Mouse/delta]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: a17600ee-bb8a-464e-9798-6368d9b8e665
+ m_ActionName: Player/Fire[/Mouse/leftButton]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 0469a8b5-a429-4326-9e70-815a7669e7d0
+ m_ActionName: UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 93e13849-fb73-4e47-b24c-a28241cea91e
+ m_ActionName: UI/Submit[/Keyboard/enter]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 7e1d7e30-9a79-4ba0-984e-83b886b7eb37
+ m_ActionName: UI/Cancel[/Keyboard/escape]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 737f5fb8-0634-46e4-ae78-f4470b470030
+ m_ActionName: UI/Point[/Mouse/position]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: c2f2122c-6223-49a5-9016-6ce3cb38a1be
+ m_ActionName: UI/Click[/Mouse/leftButton]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 8484666b-b569-42a7-8998-a611a1b72cc5
+ m_ActionName: UI/ScrollWheel[/Mouse/scroll]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: a0c450b7-f1df-4df1-8709-70565627d3f0
+ m_ActionName: UI/MiddleClick[/Mouse/middleButton]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 7a4219e3-cf6b-4109-a83d-cc789d3ddedd
+ m_ActionName: UI/RightClick[/Mouse/rightButton]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: b0ba3ecf-5609-4ea9-bd24-bb7549b0d8ab
+ m_ActionName: UI/TrackedDevicePosition
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: a133780b-2f15-48a1-9a49-923cc5185661
+ m_ActionName: UI/TrackedDeviceOrientation
+ - m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 556969464}
+ m_TargetAssemblyTypeName: PlayerControl, Assembly-CSharp
+ m_MethodName: OnLookHold
+ m_Mode: 0
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_ActionId: 55d09b9e-9d1d-470d-b0ee-136f6d428778
+ m_ActionName: Player/HoldMouse[/Mouse/press]
+ m_NeverAutoSwitchControlSchemes: 0
+ m_DefaultControlScheme:
+ m_DefaultActionMap: Player
+ m_SplitScreenIndex: -1
+ m_Camera: {fileID: 0}
+--- !u!114 &556969464
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 556969462}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1e5849cee77b15342b2286d9639ee94f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ control: {fileID: 556969465}
+ speed: 15
+ lookPower: 0.1
+ lowerLookBound: -60
+ upperLookBound: 60
+ currentMovement: {x: 0, y: 0, z: 0}
+ currentLook: {x: 0, y: 0, z: 0}
+ gravity: {x: 0, y: 0, z: 0}
+ gravityVelocity: {x: 0, y: 0, z: 0}
+--- !u!143 &556969465
+CharacterController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 556969462}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Height: 2
+ m_Radius: 0.5
+ m_SlopeLimit: 90
+ m_StepOffset: 0.3
+ m_SkinWidth: 0.08
+ m_MinMoveDistance: 0.001
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &556969466
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 556969462}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &556969467
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 556969462}
+ m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &556969468
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 556969462}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 925, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 818677184}
+ m_Father: {fileID: 0}
+ m_RootOrder: 12
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &705168852
GameObject:
m_ObjectHideFlags: 0
@@ -913,8 +1161,104 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 13
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &818677183
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 818677184}
+ - component: {fileID: 818677187}
+ - component: {fileID: 818677186}
+ - component: {fileID: 818677185}
+ m_Layer: 0
+ m_Name: LagDetector
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &818677184
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 818677183}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 556969468}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &818677185
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 818677183}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c3b119b3e4570d940aee042ad39c5067, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!23 &818677186
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 818677183}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &818677187
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 818677183}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &963194225
GameObject:
m_ObjectHideFlags: 0
@@ -1548,7 +1892,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 12
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1796874583
GameObject:
@@ -1605,7 +1949,7 @@ MonoBehaviour:
- amplitude: 0.1
frequency: 0.05
type: 3
- - amplitude: 0.01
+ - amplitude: 0.03
frequency: 0.1
type: 1
crawlStartPosition: {x: 0, y: 0}
diff --git a/Assets/Scripts/TerrainGeneration/TerrainGenerator.cs b/Assets/Scripts/TerrainGeneration/TerrainGenerator.cs
index efc5269b1b8f2523be56718e43338eddac40781e..9d058defea5c204b610a646f6174f5ba062637a2 100644
--- a/Assets/Scripts/TerrainGeneration/TerrainGenerator.cs
+++ b/Assets/Scripts/TerrainGeneration/TerrainGenerator.cs
@@ -58,7 +58,7 @@ public class TerrainGenerator : MonoBehaviour
[Tooltip("Dictionary of previously loaded terrains.")]
public Dictionary<Vector2Int, TerrainData> previouslyLoaded = new();
- public Queue<TerrainGenThread> queuedThreads = new();
+ public ConcurrentQueue<TerrainGenThread> queuedThreads = new();
public ConcurrentBag<TerrainGenThread> completedGenerators = new();