- full rewrite of how the world generates

- server now generates the chunks and sends them to the client
tddebart · Apr 24, 2022 · 02f1581 · 02f1581
1 parent f474457
commit 02f1581
Show file tree

Hide file tree

Showing 19 changed files with 401 additions and 310 deletions.
diff --git a/.idea/.idea.Minecraft/.idea/misc.xml b/.idea/.idea.Minecraft/.idea/misc.xml
diff --git a/Assets/Resources/Prefabs/Player.prefab b/Assets/Resources/Prefabs/Player.prefab
@@ -698,7 +698,7 @@ MonoBehaviour:
   isFlying: 0
   drawBounds: 0
   sensitivity: 5
-  checkIncrement: 0.05
+  checkIncrement: 0.1
   reach: 4.5
   cam: {fileID: 3114816152506633376}
   inventory: {fileID: 0}

diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
@@ -1852,7 +1852,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -152.5, y: 215544.27}
+  m_AnchoredPosition: {x: -152.5, y: 248223.02}
   m_SizeDelta: {x: 305, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &845042230
@@ -3799,7 +3799,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 236816974}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.4168831
+  m_Size: 0.40985915
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -5757,7 +5757,7 @@ PrefabInstance:
         type: 3}
       propertyPath: transport
       value: 
-      objectReference: {fileID: 2330286423484457791}
+      objectReference: {fileID: 2330286423484457793}
     - target: {fileID: 2330286422166840741, guid: ed098faebcb7c0a46a1b8cbc9753bb43,
         type: 3}
       propertyPath: m_Enabled
@@ -5771,16 +5771,16 @@ PrefabInstance:
     m_RemovedComponents:
     - {fileID: 2330286422166840739, guid: ed098faebcb7c0a46a1b8cbc9753bb43, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: ed098faebcb7c0a46a1b8cbc9753bb43, type: 3}
---- !u!114 &2330286423484457791 stripped
+--- !u!114 &2330286423484457793 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 2330286422166840743, guid: ed098faebcb7c0a46a1b8cbc9753bb43,
+  m_CorrespondingSourceObject: {fileID: 2330286422166840742, guid: ed098faebcb7c0a46a1b8cbc9753bb43,
     type: 3}
   m_PrefabInstance: {fileID: 2330286423484457790}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
+  m_Script: {fileID: 11500000, guid: 61b93ff779f4ef84da855aef42076949, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!224 &4834870413912905276

diff --git a/Assets/Scenes/World.unity b/Assets/Scenes/World.unity
@@ -3875,7 +3875,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e113280f9ab044168541f6fef84d3095, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  renderDistance: 2
+  renderDistance: 3
   chunkSize: 16
   chunkHeight: 16
   worldHeight: 96
@@ -3884,7 +3884,7 @@ MonoBehaviour:
   worldRenderer: {fileID: 1269315924}
   terrainGenerator: {fileID: 1658937128}
   mapSeedOffset: {x: -251, y: 150, z: 0}
-  GenerateMoreChunks: 1
+  GenerateMoreChunks: 0
   gamma: 0
   skyLightMultiplier: 0.9
   blockLightMultiplier: 1.18

diff --git a/Assets/TODO.md b/Assets/TODO.md
@@ -12,4 +12,6 @@ made by me
 - fix noise never going above 0.67
 
 - also change the inventory on the server instead of only on the client (so that the server can save the inventory)
+
+- broke generating more chunks than the initial ones
 
diff --git a/Assets/ZeroFormatter.meta b/Assets/ZeroFormatter.meta
diff --git a/Assets/_Scripts/F3MenuManger.cs b/Assets/_Scripts/F3MenuManger.cs
@@ -15,6 +15,8 @@ public class F3MenuManger : MonoBehaviour
 
     public void Update()
     {
+        if(WorldServer.IsDedicated) return;
+
         if (Input.GetKeyUp(KeyCode.F3))
         {
             if (!GameManager.Instance.localPlayer.f3KeyComboUsed)

diff --git a/Assets/_Scripts/Networking/MinecraftNetworkManager.cs b/Assets/_Scripts/Networking/MinecraftNetworkManager.cs
@@ -19,7 +19,7 @@ public override void OnClientConnect()
         base.OnClientConnect();
         NetworkClient.Send(new WorldServer.StartPlayerMessage(SteamClient.SteamId));
 
-        // NetworkClient.Send(new WorldServer.SpawnPlayerMessage(SteamClient.SteamId));
+        NetworkClient.Send(new WorldServer.ChunkRequestMessage(Vector3Int.zero, World.Instance.renderDistance));
     }
 
     public override void OnStartServer()
@@ -55,4 +55,10 @@ public override void OnServerDisconnect(NetworkConnectionToClient conn)
 
         base.OnServerDisconnect(conn);
     }
+
+    public override void OnStopServer()
+    {
+        World.Instance.SaveWorld();
+        base.OnStopServer();
+    }
 }
diff --git a/Assets/_Scripts/World/ChunkData.cs b/Assets/_Scripts/World/ChunkData.cs
@@ -17,7 +17,7 @@ public class ChunkData
     public bool modifiedAfterSave = true;
 
     public TreeData treeData = new TreeData();
-    [CanBeNull] public ChunkRenderer renderer => WorldDataHelper.GetChunk(worldRef, worldPos);
+    [CanBeNull] public ChunkRenderer renderer => WorldDataHelper.GetChunk(worldPos);
 
     public readonly Queue<BlockLightNode> blockLightUpdateQueue = new(); 
     public readonly Queue<BlockLightNode> blockLightRemoveQueue = new(); 
@@ -51,6 +51,7 @@ public static ChunkData Deserialize(ChunkSaveData saveData)
         }
         chunkData.sections = sections;
         chunkData.modifiedAfterSave = false;
+        chunkData.isGenerated = true;
 
         return chunkData;
     } 

diff --git a/Assets/_Scripts/World/World.cs b/Assets/_Scripts/World/World.cs
@@ -7,12 +7,13 @@
 using Mirror;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityEngine.SceneManagement;
 using Debug = UnityEngine.Debug;
 #if UNITY_EDITOR
 using UnityEditor;
 using UnityEditor.SceneManagement;
+[InitializeOnLoad]
 #endif
-
 public partial class World : MonoBehaviour
 {
     public static World Instance;
@@ -55,12 +56,16 @@ public partial class World : MonoBehaviour
     public bool IsWorldCreated { get; private set; }
 
     private Stopwatch fullStopwatch = new Stopwatch();
-
-    public Dictionary<Vector3Int, BlockType> blocksToPlaceAfterGeneration = new Dictionary<Vector3Int, BlockType>();
 
     public bool validateDone;
     [HideInInspector] public bool isInPlayMode;
 
+    #if UNITY_EDITOR
+    static World()
+    {
+        EditorApplication.update += EditorUpdate;
+    }
+    #endif
 
     private void Awake()
     {
@@ -78,19 +83,25 @@ private void Start()
         NetworkClient.RegisterHandler<StartWorldMessage>(message =>
         {
             StartWorld();
-            GenerateWorld(message.position);
+            // GenerateWorld(message.position);
+        });
+
+        NetworkClient.RegisterHandler<WorldServer.ChunkDataMessage>(message =>
+        {
+            Debug.Log("Received chunk");
+
+            var chunkData = ChunkData.Deserialize(message.chunkSaveData);
+
+            if (worldData.chunkDataDict.ContainsKey(chunkData.worldPos) && NetworkServer.active)
+            {
+                worldData.chunkDataDict[chunkData.worldPos] = chunkData;
+            }
+            else
+            {
+                worldData.chunkDataDict.TryAdd(chunkData.worldPos, chunkData);
+            }
+            dataToMeshQueue.Enqueue(chunkData);
         });
-
-        // NetworkClient.RegisterHandler<WorldServer.ChunkReceiveMessage>(message =>
-        // {
-        //     Debug.Log("Received chunk");
-        //     
-        //     var chunkData = ChunkData.Deserialize(message.chunkSaveData);
-        //
-        //     worldData.chunkDataDict[chunkData.worldPos] = chunkData;
-        //
-        //     GenerateOnlyMesh();
-        // });
     }
 
     private void OnValidate()
@@ -100,7 +111,7 @@ private void OnValidate()
         {
             worldData = new WorldData
             {
-                chunkDataDict = new Dictionary<Vector3Int, ChunkData>(),
+                chunkDataDict = new ConcurrentDictionary<Vector3Int, ChunkData>(),
                 chunkDict = new Dictionary<Vector3Int, ChunkRenderer>(),
                 worldName = worldName,
             };
@@ -116,7 +127,7 @@ private void OnValidate()
         Shader.SetGlobalVectorArray("lightColors", LightTextureCreator.lightColors);
     }
 
-    private WorldGenerationData GetPositionsInRenderDistance(Vector3Int playerPos)
+    public WorldGenerationData GetPositionsInRenderDistance(Vector3Int playerPos)
     {
         var allChunkPositionsNeeded = WorldDataHelper.GetChunkPositionsInRenderDistance(this, playerPos);
         var allChunkDataPositionsNeeded = WorldDataHelper.GetDataPositionsInRenderDistance(this, playerPos);
@@ -196,7 +207,7 @@ public void SetBlock(Vector3 pos, BlockType blockType)
     public void SetBlock(Vector3Int blockPos, BlockType blockType)
     {
         var chunkPos = WorldDataHelper.GetChunkPosition(this, blockPos);
-        var chunk = WorldDataHelper.GetChunk(this, chunkPos);
+        var chunk = WorldDataHelper.GetChunk(chunkPos);
         if (chunk == null) return;
         chunk.ModifiedByPlayer = true;
         chunk.ChunkData.modifiedAfterSave = true;
@@ -206,7 +217,7 @@ public void SetBlock(Vector3Int blockPos, BlockType blockType)
     public void SetBlocks(IEnumerable<Vector3Int> blockPoss, BlockType blockType)
     {
         var chunkPos = WorldDataHelper.GetChunkPosition(this, blockPoss.First());
-        var chunk = WorldDataHelper.GetChunk(this, chunkPos);
+        var chunk = WorldDataHelper.GetChunk(chunkPos);
         SetBlocks(chunk, blockPoss, blockType);
     }
 
@@ -232,7 +243,7 @@ public async void SetBlocks(ChunkRenderer chunk, IEnumerable<Vector3Int> blockPo
                 {
                     if(neighChunkData == null) continue;
 
-                    ChunkRenderer neighbourChunk = WorldDataHelper.GetChunk(neighChunkData.worldRef, neighChunkData.worldPos);
+                    ChunkRenderer neighbourChunk = WorldDataHelper.GetChunk(neighChunkData.worldPos);
                     if(neighbourChunk != null)
                     {
                         neightBourUpdates.Add(neighbourChunk);
@@ -301,17 +312,15 @@ public void LoadAdditionalChunks(GameObject localPlayer)
         if (!GenerateMoreChunks) return;
 
         // Debug.Log("Loading additional chunks");
-        GenerateWorld(Vector3Int.RoundToInt(localPlayer.transform.position), () =>
-        {
-            OnNewChunksGenerated?.Invoke();
-        });
+        GenerateWorld(Vector3Int.RoundToInt(localPlayer.transform.position));
+        OnNewChunksGenerated?.Invoke();
     }
 
     private void Clear()
     {
         worldData = new WorldData
         {
-            chunkDataDict = new Dictionary<Vector3Int, ChunkData>(),
+            chunkDataDict = new ConcurrentDictionary<Vector3Int, ChunkData>(),
             chunkDict = new Dictionary<Vector3Int, ChunkRenderer>(),
             worldName = worldName
         };
@@ -320,8 +329,17 @@ private void Clear()
         worldRenderer.chunkPool?.Clear();
         isSaving = false;
 
+        // Clear queues
+        doneDataQueue.Clear();
+        dataToMeshQueue.Clear();
+        meshToRenderQueue.Clear();
+
+        actionOnChunkDone.Clear();
+
         chunksToUpdate?.Clear();
 
+        disabled = false;
+
         MyNoise.noiseStopwatch.Reset();
         MyNoise.noise3DStopwatch.Reset();
 
@@ -394,6 +412,6 @@ public StartWorldMessage(Vector3Int position)
 public struct WorldData
 {
     public string worldName;
-    public Dictionary<Vector3Int, ChunkData> chunkDataDict;
+    public ConcurrentDictionary<Vector3Int, ChunkData> chunkDataDict;
     public Dictionary<Vector3Int, ChunkRenderer> chunkDict;
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,6 @@ made by me
		- fix noise never going above 0.67

		- also change the inventory on the server instead of only on the client (so that the server can save the inventory)

		- broke generating more chunks than the initial ones