Reverted Smooth Chunk Building

Jukitsu · Dec 20, 2023 · 659949e · 659949e
1 parent 9264c73
commit 659949e
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 25 deletions.
diff --git a/Jukcraft.sln b/Jukcraft.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
+# Visual Studio Version 16
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLFW", "vendor\glfw\GLFW.vcxproj", "{154B857C-0182-860D-AA6E-6C109684020F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glad", "vendor\glad\Glad.vcxproj", "{BDD6857C-A90D-870D-52FA-6C103E10030F}"

diff --git a/Jukcraft/Jukcraft.vcxproj b/Jukcraft/Jukcraft.vcxproj
@@ -80,13 +80,12 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>GLFW_INCLUDE_NONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>GLFW_INCLUDE_NONE;JUK_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>src;..\vendor\glad\include;..\vendor\glfw\include;..\vendor\glm;..\vendor\stb;..\vendor\spdlog\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <ExternalWarningLevel>Level3</ExternalWarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -100,7 +99,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <PreprocessorDefinitions>GLFW_INCLUDE_NONE;GLM_FORCE_INLINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>GLFW_INCLUDE_NONE;GLM_FORCE_INLINE;JUK_BETA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>src;..\vendor\glad\include;..\vendor\glfw\include;..\vendor\glm;..\vendor\stb;..\vendor\spdlog\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -111,7 +110,6 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <ExternalWarningLevel>Level3</ExternalWarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -140,7 +138,6 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <ExternalWarningLevel>Level3</ExternalWarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -166,8 +163,8 @@
     <ClInclude Include="src\models\Model.h" />
     <ClInclude Include="src\pch.h" />
     <ClInclude Include="src\physics\constants.h" />
-    <ClInclude Include="src\renderer\chunk\Mesh.h" />
     <ClInclude Include="src\renderer\Renderer.h" />
+    <ClInclude Include="src\renderer\chunk\Mesh.h" />
     <ClInclude Include="src\renderer\gfx\buffers\DynamicBuffer.h" />
     <ClInclude Include="src\renderer\gfx\buffers\StagingBuffer.h" />
     <ClInclude Include="src\renderer\gfx\objects\Buffer.h" />

diff --git a/Jukcraft/Jukcraft.vcxproj.filters b/Jukcraft/Jukcraft.vcxproj.filters
@@ -22,6 +22,9 @@
     <Filter Include="renderer">
       <UniqueIdentifier>{9C6AA017-8837-FB22-B150-E9CA9D7C30B1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="renderer\chunk">
+      <UniqueIdentifier>{C4E6214A-B0B4-1550-9948-867685B5F1B4}</UniqueIdentifier>
+    </Filter>
     <Filter Include="renderer\gfx">
       <UniqueIdentifier>{30E2E770-1C45-7715-C5CA-AFCBB10C4398}</UniqueIdentifier>
     </Filter>
@@ -97,6 +100,9 @@
     <ClInclude Include="src\renderer\Renderer.h">
       <Filter>renderer</Filter>
     </ClInclude>
+    <ClInclude Include="src\renderer\chunk\Mesh.h">
+      <Filter>renderer\chunk</Filter>
+    </ClInclude>
     <ClInclude Include="src\renderer\gfx\buffers\DynamicBuffer.h">
       <Filter>renderer\gfx\buffers</Filter>
     </ClInclude>
@@ -130,7 +136,6 @@
     <ClInclude Include="src\world\chunk\util.h">
       <Filter>world\chunk</Filter>
     </ClInclude>
-    <ClInclude Include="src\renderer\chunk\Mesh.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\core\App.cpp">
@@ -162,6 +167,9 @@
     </ClCompile>
     <ClCompile Include="src\main.cpp" />
     <ClCompile Include="src\pch.cpp" />
+    <ClCompile Include="src\renderer\chunk\Mesh.cpp">
+      <Filter>renderer\chunk</Filter>
+    </ClCompile>
     <ClCompile Include="src\renderer\gfx\buffers\DynamicBuffer.cpp">
       <Filter>renderer\gfx\buffers</Filter>
     </ClCompile>
@@ -180,6 +188,5 @@
     <ClCompile Include="src\world\chunk\ChunkManager.cpp">
       <Filter>world\chunk</Filter>
     </ClCompile>
-    <ClCompile Include="src\renderer\chunk\Mesh.cpp" />
   </ItemGroup>
 </Project>
diff --git a/Jukcraft/src/core/Window.cpp b/Jukcraft/src/core/Window.cpp
@@ -50,11 +50,13 @@ namespace Jukcraft {
 		glfwSetWindowUserPointer(handle, this);
 		if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress))
 			THROW_ERROR("Failed to load GL");
-#ifdef _DEBUG
+
+#ifdef JUK_DEBUG
 		glEnable(GL_DEBUG_OUTPUT);
 		glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
 		glDebugMessageCallback(GLDebugMsgCallback, nullptr);
 #endif
+
 		glfwSetWindowSizeCallback(handle, [](GLFWwindow* window, int width, int height) {
 			((Window*)glfwGetWindowUserPointer(window))->onResize(width, height);
 			});

diff --git a/Jukcraft/src/world/chunk/Chunk.cpp b/Jukcraft/src/world/chunk/Chunk.cpp
@@ -30,7 +30,7 @@ namespace Jukcraft {
 					else if (ly >= CHUNK_HEIGHT / 2 - 3 && ly < CHUNK_HEIGHT / 2 - 1)
 						setBlock(glm::uvec3(lx, ly, lz), 3);
 					else
-						setBlock(glm::uvec3(lx, ly, lz), 1);
+						setBlock(glm::uvec3(lx, ly, lz), std::rand() % 3 ? 1 : 0);
 				}
 
 		lightMap = new uint8_t * *[CHUNK_HEIGHT];

diff --git a/Jukcraft/src/world/chunk/ChunkManager.cpp b/Jukcraft/src/world/chunk/ChunkManager.cpp
@@ -14,7 +14,7 @@ namespace Jukcraft {
 						blocks, 
 						*this
 					);
-				chunksToUpdates.push(chunk);
+				chunksToUpdates.insert(chunk);
 				chunksToLight.insert(chunk);
 				if (z > 0) {
 					std::shared_ptr<Chunk>& northernChunk = chunks[x][z - 1];
@@ -43,32 +43,32 @@ namespace Jukcraft {
 				blocks, 
 				*this
 			);
-		chunksToUpdates.push(chunk);
+		chunksToUpdates.insert(chunk);
 		chunksToLight.insert(chunk);
 		return chunk;
 	}
 
 	void ChunkManager::tick() {
 		std::vector<std::future<void>> results;
-		if (!chunksToUpdates.empty()) {
-			auto& chunk = chunksToUpdates.front();
-			chunksToUpdates.pop();
+		for (std::shared_ptr<Chunk> chunk : chunksToUpdates) {
 			chunk->updateLayers();
 			// results.push_back(std::async(std::launch::async, std::bind(&Chunk::updateLayers, chunk.get())));
 		}
+		chunksToUpdates.clear();
+
 	}
 
 	void ChunkManager::updateChunkAtPosition(std::shared_ptr<Chunk>& chunk, const glm::ivec3& localPos) {
-		chunksToUpdates.push(chunk);
+		chunksToUpdates.insert(chunk);
 
 		if (Chunk::IsOutside(localPos + IEAST) && !chunk->neighbourChunks.east.expired())
-			chunksToUpdates.push(chunk->neighbourChunks.east.lock());
+			chunksToUpdates.insert(chunk->neighbourChunks.east.lock());
 		if (Chunk::IsOutside(localPos + INORTH) && !chunk->neighbourChunks.north.expired())
-			chunksToUpdates.push(chunk->neighbourChunks.north.lock());
+			chunksToUpdates.insert(chunk->neighbourChunks.north.lock());
 		if (Chunk::IsOutside(localPos + IWEST) && !chunk->neighbourChunks.west.expired())
-			chunksToUpdates.push(chunk->neighbourChunks.west.lock());
+			chunksToUpdates.insert(chunk->neighbourChunks.west.lock());
 		if (Chunk::IsOutside(localPos + ISOUTH) && !chunk->neighbourChunks.south.expired())
-			chunksToUpdates.push(chunk->neighbourChunks.south.lock());
+			chunksToUpdates.insert(chunk->neighbourChunks.south.lock());
 
 	}
 

diff --git a/Jukcraft/src/world/chunk/ChunkManager.h b/Jukcraft/src/world/chunk/ChunkManager.h
@@ -22,7 +22,7 @@ namespace Jukcraft {
 	private:
 
 		std::shared_ptr<Chunk> chunks[WORLD_SIZE][WORLD_SIZE];
-		std::queue<std::shared_ptr<Chunk>> chunksToUpdates;
+		std::unordered_set<std::shared_ptr<Chunk>> chunksToUpdates;
 		std::unordered_set<std::shared_ptr<Chunk>> chunksToLight;
 		const std::vector<Block>& blocks;
 		gfx::Buffer chunkUbo;

diff --git a/premake5.lua b/premake5.lua
@@ -218,6 +218,8 @@ project "Jukcraft"
 		runtime "debug"
 		symbols "on"
 
+		defines "JUK_DEBUG"
+
 	filter "configurations:Beta"
 		runtime "debug"
  		optimize "on"
@@ -227,6 +229,7 @@ project "Jukcraft"
 
 		defines {
 			"GLM_FORCE_INLINE",
+			"JUK_BETA"
 		}
 
 	filter "configurations:Release"

diff --git a/vendor/glad/Glad.vcxproj b/vendor/glad/Glad.vcxproj
@@ -80,7 +80,6 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <ExternalWarningLevel>Level3</ExternalWarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -101,7 +100,6 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <FloatingPointModel>Fast</FloatingPointModel>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <ExternalWarningLevel>Level3</ExternalWarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -127,7 +125,6 @@
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <FloatingPointModel>Fast</FloatingPointModel>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <ExternalWarningLevel>Level3</ExternalWarningLevel>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>