WIP: shaders, imgui fix, materials, project render save

Author: sheazywi

Core/Source/Lux/Asset/MeshRuntimeSerializer.cpp

@@ -11,6 +11,20 @@
 
 namespace Lux
 {
+	namespace
+	{
+		std::string NormalizeRuntimeMaterialShaderName(std::string shaderName)
+		{
+			if (shaderName == "LuxPBR_Static")
+				return "HazelPBR_Static";
+
+			if (shaderName == "LuxPBR_Transparent")
+				return "HazelPBR_Transparent";
+
+			return shaderName;
+		}
+	}
+
 	struct MeshMaterial
 	{
 		std::string MaterialName;
@@ -104,7 +118,7 @@ namespace Lux
 
 				material.MaterialName = sourceMaterial->GetName();
 				if (Ref<Shader> shader = sourceMaterial->GetShader())
-					material.ShaderName = shader->GetName();
+					material.ShaderName = NormalizeRuntimeMaterialShaderName(shader->GetName());
 				material.AlbedoColor = materialAsset->GetAlbedoColor();
 				material.Emission = materialAsset->GetEmission();
 				material.Metalness = materialAsset->GetMetalness();
@@ -183,9 +197,16 @@ namespace Lux
 				if (Ref<ShaderLibrary> shaderLibrary = Renderer::GetShaderLibrary())
 				{
 					const auto& shaders = shaderLibrary->GetShaders();
-					if (!meshMaterial.ShaderName.empty())
+					const std::string shaderName = NormalizeRuntimeMaterialShaderName(meshMaterial.ShaderName);
+					if (!shaderName.empty())
+					{
+						if (auto it = shaders.find(shaderName); it != shaders.end())
+							shader = it->second;
+					}
+
+					if (!shader)
 					{
-						if (auto it = shaders.find(meshMaterial.ShaderName); it != shaders.end())
+						if (auto it = shaders.find("HazelPBR_Static"); it != shaders.end())
 							shader = it->second;
 					}
 

Core/Source/Lux/ImGui/ImGuiEx.cpp

@@ -135,12 +135,15 @@ namespace Lux::ImGuiEx {
 		window->DC.CurrLineTextBaseOffset = 3.0f;
 		const ImVec2 rowAreaMin = ImGui::TableGetCellBgRect(ImGui::GetCurrentTable(), 0).Min;
 		const ImVec2 rowAreaMax = { ImGui::TableGetCellBgRect(ImGui::GetCurrentTable(), ImGui::TableGetColumnCount() - 1).Max.x, rowAreaMin.y + rowHeight };
+		const ImRect rowArea(rowAreaMin, rowAreaMax);
+		if (rowArea.Min.x > rowArea.Max.x || rowArea.Min.y > rowArea.Max.y)
+			return false;
 
-		ImGui::PushClipRect(rowAreaMin, rowAreaMax, false);
+		ImGui::PushClipRect(rowArea.Min, rowArea.Max, false);
 		ImGui::SetNextItemAllowOverlap();
 
 		bool isRowHovered, held;
-		bool isRowClicked = ImGui::ButtonBehavior(ImRect(rowAreaMin, rowAreaMax), ImGui::GetID(id),
+		bool isRowClicked = ImGui::ButtonBehavior(rowArea, ImGui::GetID(id),
 			&isRowHovered, &held, ImGuiButtonFlags_AllowOverlap);
 
 		ImGui::PopClipRect();

Core/Source/Lux/ImGui/ImGuiUtilities.cpp

@@ -5,6 +5,14 @@
 
 namespace Lux::ImGuiEx {
 
+	namespace
+	{
+		bool IsValidClipRect(const ImRect& rect)
+		{
+			return rect.Min.x <= rect.Max.x && rect.Min.y <= rect.Max.y;
+		}
+	}
+
 	ScopedDisable::ScopedDisable(bool disabled /*= true*/)
 	{
 		ImGuiEx::BeginDisabled(disabled);
@@ -24,12 +32,15 @@ namespace Lux::ImGuiEx {
 			// Fill background wiht nice gradient
 			const float padding = ImGui::GetStyle().WindowBorderSize;
 			const ImRect windowRect = ImGuiEx::RectExpanded(ImGui::GetCurrentWindow()->Rect(), -padding, -padding);
-			ImGui::PushClipRect(windowRect.Min, windowRect.Max, false);
-			const ImColor col1 = ImGui::GetStyleColorVec4(ImGuiCol_PopupBg);// Colors::Theme::backgroundPopup;
-			const ImColor col2 = ImGuiEx::ColourWithMultipliedValue(col1, 0.8f);
-			ImGui::GetWindowDrawList()->AddRectFilledMultiColor(windowRect.Min, windowRect.Max, col1, col1, col2, col2);
-			ImGui::GetWindowDrawList()->AddRect(windowRect.Min, windowRect.Max, ImGuiEx::ColourWithMultipliedValue(col1, 1.1f));
-			ImGui::PopClipRect();
+			if (IsValidClipRect(windowRect))
+			{
+				ImGui::PushClipRect(windowRect.Min, windowRect.Max, false);
+				const ImColor col1 = ImGui::GetStyleColorVec4(ImGuiCol_PopupBg);// Colors::Theme::backgroundPopup;
+				const ImColor col2 = ImGuiEx::ColourWithMultipliedValue(col1, 0.8f);
+				ImGui::GetWindowDrawList()->AddRectFilledMultiColor(windowRect.Min, windowRect.Max, col1, col1, col2, col2);
+				ImGui::GetWindowDrawList()->AddRect(windowRect.Min, windowRect.Max, ImGuiEx::ColourWithMultipliedValue(col1, 1.1f));
+				ImGui::PopClipRect();
+			}
 
 			// Popped in EndPopup()
 			ImGui::PushStyleColor(ImGuiCol_HeaderHovered, IM_COL32(0, 0, 0, 80));
@@ -68,6 +79,15 @@ namespace Lux::ImGuiEx {
 			IM_ROUND(ImMax(bar_rect.Min.x + window->Pos.x, bar_rect.Max.x - ImMax(window->WindowRounding, window->WindowBorderSize))), IM_ROUND(bar_rect.Max.y + window->Pos.y));
 
 		clip_rect.ClipWith(window->OuterRectClipped);
+		if (!IsValidClipRect(clip_rect))
+		{
+			ImGuiContext& g = *GImGui;
+			ImGui::PopID();
+			g.GroupStack.back().EmitItem = false;
+			ImGui::EndGroup();
+			return false;
+		}
+
 		ImGui::PushClipRect(clip_rect.Min, clip_rect.Max, false);
 
 		// We overwrite CursorMaxPos because BeginGroup sets it to CursorPos (essentially the .EmitItem hack in EndMenuBar() would need something analogous here, maybe a BeginGroupEx() with flags).
@@ -681,6 +701,9 @@ namespace Lux::ImGuiEx {
 		ImU32 tintNormal, ImU32 tintHovered, ImU32 tintPressed,
 		ImVec2 rectMin, ImVec2 rectMax, ImVec2 uv0, ImVec2 uv1)
 	{
+		if (rectMin.x > rectMax.x || rectMin.y > rectMax.y)
+			return;
+
 		auto* drawList = ImGui::GetWindowDrawList();
 		if (ImGui::IsItemActive())
 			drawList->AddImage(GetTextureID(imagePressed), rectMin, rectMax, uv0, uv1, tintPressed);
@@ -694,6 +717,9 @@ namespace Lux::ImGuiEx {
 		ImU32 tintNormal, ImU32 tintHovered, ImU32 tintPressed,
 		ImVec2 rectMin, ImVec2 rectMax, ImVec2 uv0, ImVec2 uv1)
 	{
+		if (rectMin.x > rectMax.x || rectMin.y > rectMax.y)
+			return;
+
 		auto* drawList = ImGui::GetWindowDrawList();
 		if (ImGui::IsItemActive())
 			drawList->AddImage(GetTextureID(imagePressed), rectMin, rectMax, uv0, uv1, tintPressed);

Core/Source/Lux/Platform/Vulkan/VulkanRenderer.cpp

@@ -1096,7 +1096,7 @@ namespace Lux {
 		{
 			LUX_PROFILE_FUNC("VulkanRenderer::SetSceneEnvironment");
 
-			const auto shader = Renderer::GetShaderLibrary()->Get("LuxPBR_Static");
+			const auto shader = Renderer::GetShaderLibrary()->Get("HazelPBR_Static");
 			Ref<VulkanShader> pbrShader = shader.As<VulkanShader>();
 			const uint32_t bufferIndex = Renderer::RT_GetCurrentFrameIndex();
 

Core/Source/Lux/Project/Project.h

@@ -50,6 +50,42 @@ namespace Lux
 		std::vector<ProjectPhysicsLayer> Layers;
 	};
 
+	struct ProjectSceneRendererSettings
+	{
+		bool EnableFrustumCulling = true;
+		bool EnableGPUDrivenRendering = true;
+		bool EnableGTAO = true;
+		bool GTAOBentNormals = false;
+		int GTAODenoisePasses = 4;
+		float AOShadowTolerance = 1.0f;
+		bool EnableSSR = false;
+		bool EnableJumpFlood = true;
+
+		bool SoftShadows = true;
+		float MaxShadowDistance = 200.0f;
+		float ShadowFade = 25.0f;
+		float ShadowCascadeSplitLambda = 0.92f;
+		float ShadowCascadeNearPlaneOffset = 0.0f;
+		float ShadowCascadeFarPlaneOffset = 50.0f;
+		float ShadowCascadeTransitionFade = 1.0f;
+
+		bool BloomEnabled = true;
+		float BloomThreshold = 1.0f;
+		float BloomKnee = 0.1f;
+		float BloomUpsampleScale = 1.0f;
+		float BloomIntensity = 1.0f;
+		float BloomDirtIntensity = 1.0f;
+
+		bool DOFEnabled = false;
+		float DOFFocusDistance = 0.0f;
+		float DOFBlurSize = 1.0f;
+
+		bool SSRHalfRes = true;
+		int SSRMaxSteps = 70;
+		float SSRBrightness = 0.7f;
+		float SSRDepthTolerance = 0.8f;
+	};
+
 	struct ProjectConfig
 	{
 		std::string Name = "Untitled";
@@ -76,6 +112,7 @@ namespace Lux
 
 		ProjectAudioSettings Audio;
 		ProjectPhysicsSettings Physics;
+		ProjectSceneRendererSettings SceneRenderer;
 	};
 
 	class Project : public RefCounted

Core/Source/Lux/Project/ProjectRuntimeFormat.h

@@ -11,7 +11,7 @@ namespace Lux
 		struct FileHeader
 		{
 			char Header[4] = { 'L', 'P', 'R', 'J' };
-			uint32_t Version = 1;
+			uint32_t Version = 2;
 		};
 
 		struct Audio