Merge latest features from CatDogEngine/CatDogEngine

Engine/Auto/Scripts/editor.lua

@@ -62,8 +62,7 @@ project("Editor")
 
 	if ENABLE_SPDLOG then
 		defines {
-			-- TODO : Remove _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING after spdlog updates the format to the right version.
-			"SPDLOG_ENABLE", "SPDLOG_NO_EXCEPTIONS", "FMT_USE_NONTYPE_TEMPLATE_ARGS=0", "_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING",
+			"SPDLOG_ENABLE", "SPDLOG_NO_EXCEPTIONS",
 		}
 
 		includedirs {
@@ -112,18 +111,15 @@ project("Editor")
 	staticruntime "on"
 	filter { "configurations:Debug" }
 		runtime "Debug" -- /MTd
-		libdirs {
-			BinariesPath,
-			path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Debug"),
-		}
 	filter { "configurations:Release" }
 		runtime "Release" -- /MT
-		libdirs {
-			BinariesPath,
-			path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Release"),
-		}
 	filter {}
 
+	libdirs {
+		BinariesPath,
+		path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/%{cfg.buildcfg}"),
+	}
+
 	links {
 		"Engine",
 		"AssetPipelineCore",
@@ -141,6 +137,18 @@ project("Editor")
 		}
 	end
 
+	if ENABLE_FBX_WORKFLOW then
+		links {
+			"FbxConsumer",
+			"FbxProducer",
+		}
+
+		defines {
+			"ENABLE_FBX_CONSUMER",
+			"ENABLE_FBX_PRODUCER",
+		}
+	end
+
 	-- Disable these options can reduce the size of compiled binaries.
 	justmycode("Off")
 	editAndContinue("Off")

Engine/Auto/Scripts/engine.lua

@@ -108,8 +108,7 @@ project("Engine")
 		}
 
 		defines {
-			-- TODO : Remove _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING after spdlog updates the format to the right version.
-			"SPDLOG_ENABLE", "SPDLOG_NO_EXCEPTIONS", "FMT_USE_NONTYPE_TEMPLATE_ARGS=0", "_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING",
+			"SPDLOG_ENABLE", "SPDLOG_NO_EXCEPTIONS",
 		}
 	end
 

Engine/Auto/Scripts/premake5.lua

@@ -25,24 +25,6 @@ function IsIOSPlatform()
 	return ChoosePlatform == "IOS"
 end
 
-USE_CLANG_TOOLSET = false
-if os.getenv("USE_CLANG_TOOLSET") then
-	USE_CLANG_TOOLSET = true
-end
-
-DDGI_SDK_PATH = os.getenv("DDGI_SDK_PATH") or ""
-if not os.isdir(DDGI_SDK_PATH) then
-	DDGI_SDK_PATH = ""
-end
-
-ENABLE_FREETYPE = not USE_CLANG_TOOLSET and not IsLinuxPlatform() and not IsAndroidPlatform()
-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"] = {
 	DisplayName = "Win64",
@@ -77,6 +59,33 @@ function GetPlatformMacroName()
 	return PlatformSettings[ChoosePlatform].MacroName
 end
 
+dofile("path.lua")
+
+--------------------------------------------------------------------------------------------------------
+-- Build Options
+--------------------------------------------------------------------------------------------------------
+USE_CLANG_TOOLSET = false
+if os.getenv("USE_CLANG_TOOLSET") then
+	USE_CLANG_TOOLSET = true
+end
+
+DDGI_SDK_PATH = os.getenv("DDGI_SDK_PATH") or ""
+if not os.isdir(DDGI_SDK_PATH) then
+	DDGI_SDK_PATH = ""
+end
+
+FBX_SDK_DEBUG_PATH = path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Debug/libfbxsdk.dll")
+FBX_SDK_RELEASE_PATH = path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Release/libfbxsdk.dll")
+
+ENABLE_DDGI = DDGI_SDK_PATH ~= ""
+ENABLE_FBX_WORKFLOW = os.isfile(FBX_SDK_DEBUG_PATH) and os.isfile(FBX_SDK_RELEASE_PATH)
+ENABLE_FREETYPE = not USE_CLANG_TOOLSET and not IsLinuxPlatform() and not IsAndroidPlatform()
+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()
+
+ShouldTreatWaringAsError = not (ENABLE_DDGI or USE_CLANG_TOOLSET)
+
 IDEConfigs = {}
 IDEConfigs.BuildIDEName = os.getenv("BUILD_IDE_NAME")
 
@@ -92,8 +101,7 @@ function SetLanguageAndToolset(projectName)
 	targetdir(BinariesPath)
 end
 
--- Parse folder path
-dofile("path.lua")
+-- Information about make
 print("================================================================")
 print("EngineBuildLibKind = "..EngineBuildLibKind)
 print("CurrentWorkingDirectory = "..CurrentWorkingDirectory)
@@ -105,7 +113,12 @@ print("EngineSourcePath = "..EngineSourcePath)
 print("GameSourcePath = "..GameSourcePath)
 print("RuntimeSourcePath = "..RuntimeSourcePath)
 print("IDEConfigs.BuildIDEName = "..IDEConfigs.BuildIDEName)
-print("DDGI_SDK_PATH = "..DDGI_SDK_PATH)
+print("================================================================")
+print("ENABLE_FBX_WORKFLOW = "..tostring(ENABLE_FBX_WORKFLOW))
+print("ENABLE_FREETYPE = "..tostring(ENABLE_FREETYPE))
+print("ENABLE_SPDLOG = "..tostring(ENABLE_SPDLOG))
+print("ENABLE_SUBPROCESS = "..tostring(ENABLE_SUBPROCESS))
+print("ENABLE_TRACY = "..tostring(ENABLE_TRACY))
 print("================================================================")
 
 -- workspace means solution in Visual Studio
@@ -156,53 +169,27 @@ function CopyDllAutomatically()
 	end
 
 	-- copy dll into binary folder automatically.
-	filter { "configurations:Debug" }
-		if IsAndroidPlatform() then
-			postbuildcommands {
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "sdl/build/Debug/SDL2d.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/ARM64/Debug/AssetPipelineCore.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/ARM64/Debug/CDProducer.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/ARM64/Debug/CDConsumer.*").."\" \""..BinariesPath.."\"",
-			}
-		else
-			postbuildcommands {
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "sdl/build/Debug/SDL2d.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Debug/AssetPipelineCore.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Debug/CDProducer.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Debug/CDConsumer.*").."\" \""..BinariesPath.."\"",
-			}
-		end
-
-		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/assimp-*-mtd.*").."\" \""..BinariesPath.."\"",
-			}
-		end
-	filter { "configurations:Release" }
-		if IsAndroidPlatform() then
-			postbuildcommands {
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "sdl/build/Release/SDL2.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/ARM64/Release/AssetPipelineCore.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/ARM64/Release/CDProducer.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/ARM64/Release/CDConsumer.*").."\" \""..BinariesPath.."\"",
-			}
-		else
-			postbuildcommands {
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "sdl/build/Release/SDL2.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Release/AssetPipelineCore.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Release/CDProducer.*").."\" \""..BinariesPath.."\"",
-				"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/Release/CDConsumer.*").."\" \""..BinariesPath.."\"",
-			}
-		end
-
-		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/assimp-*-mt.*").."\" \""..BinariesPath.."\"",
-			}
-		end
-	filter {}
+	postbuildcommands {
+		"{COPYFILE} \""..path.join(ThirdPartySourcePath, "sdl/build/%{cfg.buildcfg}/SDL2*.*").."\" \""..BinariesPath.."\"",
+		"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/%{cfg.buildcfg}/AssetPipelineCore.*").."\" \""..BinariesPath.."\"",
+		"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/%{cfg.buildcfg}/CDProducer.*").."\" \""..BinariesPath.."\"",
+		"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/%{cfg.buildcfg}/CDConsumer.*").."\" \""..BinariesPath.."\"",
+	}
+
+	if not USE_CLANG_TOOLSET then
+		postbuildcommands {
+			"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/%{cfg.buildcfg}/GenericProducer.*").."\" \""..BinariesPath.."\"",
+			"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/%{cfg.buildcfg}/assimp-*-mt*.*").."\" \""..BinariesPath.."\"",
+		}
+	end
+
+	if ENABLE_FBX_WORKFLOW then
+		postbuildcommands {
+			"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/%{cfg.buildcfg}/FbxConsumer.*").."\" \""..BinariesPath.."\"",
+			"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/%{cfg.buildcfg}/FbxProducer.*").."\" \""..BinariesPath.."\"",
+			"{COPYFILE} \""..path.join(ThirdPartySourcePath, "AssetPipeline/build/bin/%{cfg.buildcfg}/libfbxsdk.*").."\" \""..BinariesPath.."\"",
+		}
+	end
 
 	if ENABLE_DDGI then
 		postbuildcommands {

Engine/BuiltInShaders/UniformDefines/U_Particle.sh

@@ -0,0 +1 @@
+#define PT_RIBBON_VERTEX_STAGE 1

Engine/BuiltInShaders/common/BRDF.sh

@@ -13,17 +13,36 @@ float DistributionGGX(float NdotH, float rough) {
 	return a2 * CD_PI_INV * denom_inv * denom_inv;
 }
 
-// Geometry
-float Visibility(float NdotV, float NdotL, float rough) {
-	// Specular BRDF = (F * D * G) / (4 * NdotV * NdotL)
-	// = (F * D * (NdotV / (NdotV * (1 - K) + K)) * (NdotL / (NdotL * (1 - K) + K))) / (4 * NdotV * NdotL)
-	// = (F * D * (1 / (NdotV * (1 - K) + K)) * (1 / (NdotL * (1 - K) + K))) / 4
-	// = F * D * Vis
-	// Vis = 1 / (NdotV * (1 - K) + K) / (NdotL * (1 - K) + K) / 4
+float Visibility_HighQuality(float NdotV, float NdotL, float rough) {
+	// BRDF = (F * D * G) / (4 * NdotV * NdotL) = F * D * V
+	// V = G / (4 * NdotV * NdotL)
+	// = 0.5 / (NdotL * sqrt(a2 + (1 - a2) * NdotV^2) + NdotV * sqrt(a2 + (1 - a2) * NdotL^2))
+
+	// rough = (rough + 1) / 2, by Disney
+	// a = rough^2
+	float a2 = pow((rough + 1.0) * 0.5, 4);
+	float lambda_v = NdotL * sqrt(a2 + (1.0 - a2) * NdotV * NdotV);
+	float lambda_l = NdotV * sqrt(a2 + (1.0 - a2) * NdotL * NdotL);
+
+	return 0.5 / (lambda_v + lambda_l);
+}
+
+float Visibility_LowQuality(float NdotV, float NdotL, float rough) {
+	// BRDF = (F * D * G) / (4 * NdotV * NdotL) = F * D * V
+	// V = G / (4 * NdotV * NdotL)
+	// = 1 / ((NdotV * (2 - a) + a) * (NdotL * (2 - a) + a))
+
+	// rough = (rough + 1) / 2, by Disney
+	// a = rough^2
+	float a = (rough + 1.0) * (rough + 1.0) * 0.25;
+	float g1_v_inv = NdotV * (2.0 - a) + a;
+	float g1_l_inv = NdotL * (2.0 - a) + a;
 
-	float f = rough + 1.0;
-	float k = f * f * 0.125;
-	float ggxV  = 1.0 / (NdotV * (1.0 - k) + k);
-	float ggxL  = 1.0 / (NdotL * (1.0 - k) + k);
-	return ggxV * ggxL * 0.25;
+	return 1.0 / (g1_v_inv * g1_l_inv);
 }
+
+// Geometry
+float Visibility(float NdotV, float NdotL, float rough) {
+	// TODO : Wrap them in macros after we've collected enough approximate / exact formulas.
+	return Visibility_LowQuality(NdotV, NdotL, rough);
+}

Engine/BuiltInShaders/common/CelMaterial.sh

@@ -0,0 +1 @@
+uniform vec4 u_outLine;

Engine/BuiltInShaders/common/Envirnoment.sh

@@ -25,16 +25,16 @@ SAMPLERCUBE(s_texCubeIrr, IBL_IRRADIANCE_SLOT);
 SAMPLERCUBE(s_texCubeRad, IBL_RADIANCE_SLOT);
 SAMPLER2D(s_texLUT, BRDF_LUT_SLOT);
 
-vec3 SampleEnvIrradiance(vec3 normal, float mip) {
+uniform vec4 u_iblStrength;
+
+vec3 SampleEnvIrradiance(vec3 normal) {
 	// We use the HDR texture which in linear space.
-	vec3 cubeNormalDir = normalize(fixCubeLookup(normal, mip, 256.0));
-	return textureCube(s_texCubeIrr, cubeNormalDir).xyz;
+	return textureCube(s_texCubeIrr, normal).xyz;
 }
 
 vec3 SampleEnvRadiance(vec3 reflectDir, float mip) {
 	// We use the HDR texture which in linear space.
-	vec3 cubeReflectDir = normalize(fixCubeLookup(reflectDir, mip, 256.0));
-	return textureCubeLod(s_texCubeRad, cubeReflectDir, mip).xyz;
+	return textureCubeLod(s_texCubeRad, reflectDir, mip).xyz;
 }
 
 vec2 SampleIBLSpecularBRDFLUT(float NdotV, float roughness) {
@@ -55,11 +55,10 @@ vec3 GetIBL(Material material, vec3 vertexNormal, vec3 viewDir) {
 	horizonOcclusion *= horizonOcclusion;
 	float finalSpecularOcclusion = min(specularOcclusion, horizonOcclusion);
 
-	float mip = clamp(6.0 * material.roughness, 0.1, 6.0);
-
 	// Environment Prefiltered Irradiance
-	vec3 envIrradiance = SampleEnvIrradiance(material.normal, 0.0);
+	vec3 envIrradiance = SampleEnvIrradiance(material.normal);
 	// Environment Specular Radiance
+	float mip = material.roughness * 6.0;
 	vec3 envRadiance = SampleEnvRadiance(reflectDir, mip);
 
 	// Environment Specular BRDF
@@ -74,6 +73,8 @@ vec3 GetIBL(Material material, vec3 vertexNormal, vec3 viewDir) {
 
 	// Specular
 	envColor += (envSpecularBRDF * envRadiance * finalSpecularOcclusion);
+
+	envColor *= vec3_splat(u_iblStrength.x);
 #endif
 
 	return envColor;