clean up codes (#334)

meta4d-me · Aug 6, 2023 · 8f43d93 · 8f43d93
1 parent 9a98fad
commit 8f43d93
Show file tree

Hide file tree

Showing 22 changed files with 107 additions and 1,040 deletions.
diff --git a/Engine/Auto/Scripts/editor.lua b/Engine/Auto/Scripts/editor.lua
@@ -103,16 +103,10 @@ project("Editor")
 	if not USE_CLANG_TOOLSET then
 		links {
 			"GenericProducer",
-			"TerrainProducer",
 		}
 
 		defines {
 			"ENABLE_GENERIC_PRODUCER",
-			"ENABLE_TERRAIN_PRODUCER",
-		}
-	else
-		excludes {
-			path.join(EditorSourcePath, "UILayers/TerrainEditor.*")
 		}
 	end
 

diff --git a/Engine/Auto/Scripts/engine.lua b/Engine/Auto/Scripts/engine.lua
@@ -36,7 +36,6 @@ project("Engine")
 		}
 	end
 
-
 	local bgfxBuildBinPath = nil
 	local platformDefines = {}
 	local platformIncludeDirs = {}
@@ -161,22 +160,26 @@ project("Engine")
 		}
 	filter {}
 
-	filter { "configurations:Release" }
-		if DDGI_SDK_PATH ~= "" then
-			includedirs {
-				path.join(DDGI_SDK_PATH, "include"),
-			}
-			libdirs {
-				path.join(DDGI_SDK_PATH, "lib"),
-			}
-			links {
-				"ddgi_sdk", "mright_sdk", "DDGIProbeDecoderBin"
-			}
-			defines {
-				"DDGI_SDK_PATH=\""..DDGI_SDK_PATH.."\"",
-			}
-		end
-	filter {}
+	if ENABLE_DDGI then
+		includedirs {
+			path.join(DDGI_SDK_PATH, "include"),
+		}
+		libdirs {
+			path.join(DDGI_SDK_PATH, "lib"),
+		}
+		links {
+			"ddgi_sdk", "mright_sdk", "DDGIProbeDecoderBin"
+		}
+		defines {
+			"ENABLE_DDGI",
+			"DDGI_SDK_PATH=\""..DDGI_SDK_PATH.."\"",
+		}
+	else
+		excludes {
+			path.join(RuntimeSourcePath, "ECWorld/DDGIComponent.*"),
+			path.join(RuntimeSourcePath, "Rendering/DDGIRenderer.*"),
+		}
+	end
 
 	if "SharedLib" == EngineBuildLibKind then
 		table.insert(platformDefines, "ENGINE_BUILD_SHARED")
@@ -217,7 +220,7 @@ project("Engine")
 		"MultiProcessorCompile", -- compiler uses multiple thread
 	}
 
-	if DDGI_SDK_PATH == "" and not USE_CLANG_TOOLSET then
+	if ShouldTreatWaringAsError then
 		flags {
 			"FatalWarnings", -- treat warnings as errors
 		}

diff --git a/Engine/Auto/Scripts/game.lua b/Engine/Auto/Scripts/game.lua
@@ -64,10 +64,6 @@ project("Game")
 		"CDConsumer",
 	}
 
-	excludes {
-		path.join(EditorSourcePath, "UILayers/TerrainEditor.*")
-	}
-
 	-- Disable these options can reduce the size of compiled binaries.
 	justmycode("Off")
 	editAndContinue("Off")

diff --git a/Engine/Auto/Scripts/premake5.lua b/Engine/Auto/Scripts/premake5.lua
@@ -39,6 +39,9 @@ ENABLE_FREETYPE = not USE_CLANG_TOOLSET and not IsLinuxPlatform() and not IsAndr
 ENABLE_SPDLOG = not USE_CLANG_TOOLSET and not IsLinuxPlatform() and not IsAndroidPlatform()
 ENABLE_SUBPROCESS = not USE_CLANG_TOOLSET and not IsLinuxPlatform() and not IsAndroidPlatform()
 ENABLE_TRACY = not USE_CLANG_TOOLSET and not IsLinuxPlatform() and not IsAndroidPlatform()
+ENABLE_DDGI = DDGI_SDK_PATH ~= ""
+
+ShouldTreatWaringAsError = not (ENABLE_DDGI or USE_CLANG_TOOLSET)
 
 PlatformSettings = {}
 PlatformSettings["Windows"] = {
@@ -175,7 +178,6 @@ function CopyDllAutomatically()
 		if not USE_CLANG_TOOLSET then
 			postbuildcommands {
 				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Debug/GenericProducer.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Debug/TerrainProducer.*").."\" \""..BinariesPath.."\"",
 				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Debug/assimp-*-mtd.*").."\" \""..BinariesPath.."\"",
 			}
 		end
@@ -199,21 +201,18 @@ function CopyDllAutomatically()
 		if not USE_CLANG_TOOLSET then
 			postbuildcommands {
 				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Release/GenericProducer.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Release/TerrainProducer.*").."\" \""..BinariesPath.."\"",
 				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Release/assimp-*-mt.*").."\" \""..BinariesPath.."\"",
 			}
 		end
 	filter {}
 
-	filter { "configurations:Release" }
-		if DDGI_SDK_PATH ~= "" then
-			postbuildcommands {
-				"{COPYFILE} \""..path.join(DDGI_SDK_PATH, "bin/*.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(DDGI_SDK_PATH, "bin/ThirdParty/ffmpeg/*.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(DDGI_SDK_PATH, "bin/ThirdParty/zlib/*.*").."\" \""..BinariesPath.."\"",
-			}
-		end
-	filter {}
+	if ENABLE_DDGI then
+		postbuildcommands {
+			"{COPYFILE} \""..path.join(DDGI_SDK_PATH, "bin/*.*").."\" \""..BinariesPath.."\"",
+			"{COPYFILE} \""..path.join(DDGI_SDK_PATH, "bin/ThirdParty/ffmpeg/*.*").."\" \""..BinariesPath.."\"",
+			"{COPYFILE} \""..path.join(DDGI_SDK_PATH, "bin/ThirdParty/zlib/*.*").."\" \""..BinariesPath.."\"",
+		}
+	end
 end
 
 -- thirdparty projects

diff --git a/Engine/Source/Editor/ECWorld/ECTerrainConsumer.cpp b/Engine/Source/Editor/ECWorld/ECTerrainConsumer.cpp
diff --git a/Engine/Source/Editor/ECWorld/ECTerrainConsumer.h b/Engine/Source/Editor/ECWorld/ECTerrainConsumer.h