-

aiekick · Nov 18, 2023 · e1fbc3f · e1fbc3f
1 parent 4a961b1
commit e1fbc3f
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 49 deletions.
diff --git a/Plugins/CodeGenerator/src/Headers/CodeGeneratorBuild.h b/Plugins/CodeGenerator/src/Headers/CodeGeneratorBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define CodeGenerator_Prefix "CodeGenerator"
-#define CodeGenerator_BuildNumber 599
+#define CodeGenerator_BuildNumber 605
 #define CodeGenerator_MinorNumber 0
 #define CodeGenerator_MajorNumber 0
-#define CodeGenerator_BuildId "0.0.599"
+#define CodeGenerator_BuildId "0.0.605"
diff --git a/Plugins/CodeGenerator/src/Modules/GeneratorNode.cpp b/Plugins/CodeGenerator/src/Modules/GeneratorNode.cpp
@@ -965,7 +965,9 @@ std::string GeneratorNode::GetGlslHeader(const std::string& vStage, const bool&
     for (const auto& input : m_Inputs) {
         if (input.second != nullptr) {
             if (input.second->slotType == "TEXTURE_2D") {
-                res += ct::toStr("layout(binding = %u) uniform sampler2D input_%s_map;\n", bindingStartIndex++, input.second->name. c_str());
+                std::string _name = ct::toLower(input.second->name);
+                ct::replaceString(_name, " ", "_");
+                res += ct::toStr("layout(binding = %u) uniform sampler2D input_%s_map;\n", bindingStartIndex++, _name.c_str());
             }
         }
     }

diff --git a/Plugins/CodeGenerator/src/Modules/GeneratorPass.cpp b/Plugins/CodeGenerator/src/Modules/GeneratorPass.cpp
@@ -176,17 +176,24 @@ PASS_CLASS_NAME::PASS_CLASS_NAME(GaiApi::VulkanCorePtr vVulkanCorePtr))";
 	: RtxShaderPass(vVulkanCorePtr))";
 	}
 
-	cpp_pass_file_code += u8R"(
-{)";
+	cpp_pass_file_code += u8R"( {)";
 
 	cpp_pass_file_code += u8R"(
 	ZoneScoped;
+	SetRenderDocDebugName("RENDERER_DISPLAY_TYPE Pass : MODULE_DISPLAY_NAME", COMPUTE_SHADER_PASS_DEBUG_COLOR);)";
 
-	SetRenderDocDebugName("RENDERER_DISPLAY_TYPE Pass : MODULE_DISPLAY_NAME", COMPUTE_SHADER_PASS_DEBUG_COLOR);
-)";
+	cpp_pass_file_code +=
+        u8R"(
+	m_DontUseShaderFilesOnDisk = true;)";
 
-	cpp_pass_file_code += u8R"(
-	m_DontUseShaderFilesOnDisk = true;
+	if (m_IsAnEffect) {
+        cpp_pass_file_code +=
+            u8R"(
+	*IsEffectEnabled() = true;)";
+    }
+
+    cpp_pass_file_code +=
+        u8R"(
 }
 
 PASS_CLASS_NAME::~PASS_CLASS_NAME()

diff --git a/Plugins/Lighting/src/Headers/LightingBuild.h b/Plugins/Lighting/src/Headers/LightingBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define Lighting_Prefix "Lighting"
-#define Lighting_BuildNumber 589
+#define Lighting_BuildNumber 590
 #define Lighting_MinorNumber 0
 #define Lighting_MajorNumber 0
-#define Lighting_BuildId "0.0.589"
+#define Lighting_BuildId "0.0.590"
diff --git a/Plugins/Misc/src/Headers/MiscBuild.h b/Plugins/Misc/src/Headers/MiscBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define Misc_Prefix "Misc"
-#define Misc_BuildNumber 140
+#define Misc_BuildNumber 141
 #define Misc_MinorNumber 1
 #define Misc_MajorNumber 0
-#define Misc_BuildId "0.1.140"
+#define Misc_BuildId "0.1.141"
diff --git a/Plugins/PostProcessing/src/Headers/PostProcessingBuild.h b/Plugins/PostProcessing/src/Headers/PostProcessingBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define PostProcessing_Prefix "PostProcessing"
-#define PostProcessing_BuildNumber 503
+#define PostProcessing_BuildNumber 509
 #define PostProcessing_MinorNumber 1
 #define PostProcessing_MajorNumber 0
-#define PostProcessing_BuildId "0.1.503"
+#define PostProcessing_BuildId "0.1.509"
diff --git a/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/ColorBalanceModule_Comp_2D_Pass.cpp b/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/ColorBalanceModule_Comp_2D_Pass.cpp
@@ -57,13 +57,11 @@ std::shared_ptr<ColorBalanceModule_Comp_2D_Pass> ColorBalanceModule_Comp_2D_Pass
 //////////////////////////////////////////////////////////////
 
 ColorBalanceModule_Comp_2D_Pass::ColorBalanceModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr)
-	: ShaderPass(vVulkanCorePtr)
-{
+	: ShaderPass(vVulkanCorePtr) {
 	ZoneScoped;
-
 	SetRenderDocDebugName("Comp Pass : Color Balance", COMPUTE_SHADER_PASS_DEBUG_COLOR);
-
 	m_DontUseShaderFilesOnDisk = true;
+	*IsEffectEnabled() = true;
 }
 
 ColorBalanceModule_Comp_2D_Pass::~ColorBalanceModule_Comp_2D_Pass()
@@ -273,7 +271,7 @@ layout(std140, binding = 0) uniform UBO_Comp
 	float u_enabled;
 };
 
-layout(binding = 1) uniform sampler2D input_New Slot_map;
+layout(binding = 1) uniform sampler2D input_new_slot_map;
 
 layout(binding = 2, rgba32f) uniform image2D colorBuffer; // output
 

diff --git a/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/DepthofFieldModule_Comp_2D_Pass.cpp b/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/DepthofFieldModule_Comp_2D_Pass.cpp
@@ -57,13 +57,11 @@ std::shared_ptr<DepthofFieldModule_Comp_2D_Pass> DepthofFieldModule_Comp_2D_Pass
 //////////////////////////////////////////////////////////////
 
 DepthofFieldModule_Comp_2D_Pass::DepthofFieldModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr)
-	: ShaderPass(vVulkanCorePtr)
-{
+	: ShaderPass(vVulkanCorePtr) {
 	ZoneScoped;
-
 	SetRenderDocDebugName("Comp Pass : Depth of Field", COMPUTE_SHADER_PASS_DEBUG_COLOR);
-
 	m_DontUseShaderFilesOnDisk = true;
+	*IsEffectEnabled() = true;
 }
 
 DepthofFieldModule_Comp_2D_Pass::~DepthofFieldModule_Comp_2D_Pass()
@@ -271,7 +269,7 @@ layout(std140, binding = 0) uniform UBO_Comp
 	float u_enabled;
 };
 
-layout(binding = 1) uniform sampler2D input_New Slot_map;
+layout(binding = 1) uniform sampler2D input_new_slot_map;
 
 layout(binding = 2, rgba32f) uniform image2D colorBuffer; // output
 

diff --git a/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/FogModule_Comp_2D_Pass.cpp b/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/FogModule_Comp_2D_Pass.cpp
@@ -57,13 +57,11 @@ std::shared_ptr<FogModule_Comp_2D_Pass> FogModule_Comp_2D_Pass::Create(const ct:
 //////////////////////////////////////////////////////////////
 
 FogModule_Comp_2D_Pass::FogModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr)
-	: ShaderPass(vVulkanCorePtr)
-{
+	: ShaderPass(vVulkanCorePtr) {
 	ZoneScoped;
-
 	SetRenderDocDebugName("Comp Pass : Fog", COMPUTE_SHADER_PASS_DEBUG_COLOR);
-
 	m_DontUseShaderFilesOnDisk = true;
+	*IsEffectEnabled() = true;
 }
 
 FogModule_Comp_2D_Pass::~FogModule_Comp_2D_Pass()
@@ -269,7 +267,7 @@ layout(std140, binding = 0) uniform UBO_Comp
 	float u_enabled;
 };
 
-layout(binding = 1) uniform sampler2D input_New Slot_map;
+layout(binding = 1) uniform sampler2D input_new_slot_map;
 
 layout(binding = 2, rgba32f) uniform image2D colorBuffer; // output
 

diff --git a/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/OutliningModule_Comp_2D_Pass.cpp b/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/OutliningModule_Comp_2D_Pass.cpp
@@ -57,13 +57,11 @@ std::shared_ptr<OutliningModule_Comp_2D_Pass> OutliningModule_Comp_2D_Pass::Crea
 //////////////////////////////////////////////////////////////
 
 OutliningModule_Comp_2D_Pass::OutliningModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr)
-	: ShaderPass(vVulkanCorePtr)
-{
+	: ShaderPass(vVulkanCorePtr) {
 	ZoneScoped;
-
 	SetRenderDocDebugName("Comp Pass : Outlining", COMPUTE_SHADER_PASS_DEBUG_COLOR);
-
 	m_DontUseShaderFilesOnDisk = true;
+	*IsEffectEnabled() = true;
 }
 
 OutliningModule_Comp_2D_Pass::~OutliningModule_Comp_2D_Pass()
@@ -269,7 +267,7 @@ layout(std140, binding = 0) uniform UBO_Comp
 	float u_enabled;
 };
 
-layout(binding = 1) uniform sampler2D input_New Slot_map;
+layout(binding = 1) uniform sampler2D input_new_slot_map;
 
 layout(binding = 2, rgba32f) uniform image2D colorBuffer; // output
 

diff --git a/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/SSReflectionModule_Comp_2D_Pass.cpp b/Plugins/PostProcessing/src/Modules/PostPro/Effects/Pass/SSReflectionModule_Comp_2D_Pass.cpp
@@ -57,13 +57,11 @@ std::shared_ptr<SSReflectionModule_Comp_2D_Pass> SSReflectionModule_Comp_2D_Pass
 //////////////////////////////////////////////////////////////
 
 SSReflectionModule_Comp_2D_Pass::SSReflectionModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr)
-	: ShaderPass(vVulkanCorePtr)
-{
+	: ShaderPass(vVulkanCorePtr) {
 	ZoneScoped;
-
 	SetRenderDocDebugName("Comp Pass : SS Reflection", COMPUTE_SHADER_PASS_DEBUG_COLOR);
-
 	m_DontUseShaderFilesOnDisk = true;
+	*IsEffectEnabled() = true;
 }
 
 SSReflectionModule_Comp_2D_Pass::~SSReflectionModule_Comp_2D_Pass()
@@ -273,9 +271,9 @@ layout(std140, binding = 0) uniform UBO_Comp
 	float u_enabled;
 };
 
-layout(binding = 1) uniform sampler2D input_Color_map;
-layout(binding = 2) uniform sampler2D input_Position_map;
-layout(binding = 3) uniform sampler2D input_Normal_map;
+layout(binding = 1) uniform sampler2D input_color_map;
+layout(binding = 2) uniform sampler2D input_position_map;
+layout(binding = 3) uniform sampler2D input_normal_map;
 
 layout(binding = 4, rgba32f) uniform image2D colorBuffer; // output
 

diff --git a/Plugins/Simulation/src/Headers/SimulationBuild.h b/Plugins/Simulation/src/Headers/SimulationBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define Simulation_Prefix "Simulation"
-#define Simulation_BuildNumber 400
+#define Simulation_BuildNumber 401
 #define Simulation_MinorNumber 1
 #define Simulation_MajorNumber 0
-#define Simulation_BuildId "0.1.400"
+#define Simulation_BuildId "0.1.401"
diff --git a/libs/LumoBackend/include/LumoBackend/Base/ShaderPass.h b/libs/LumoBackend/include/LumoBackend/Base/ShaderPass.h
@@ -105,7 +105,7 @@ class LUMO_BACKEND_API ShaderPass : public conf::ConfigAbstract, public ShaderUp
 protected:
     bool m_Loaded = false;
     bool m_DontUseShaderFilesOnDisk = false;
-    bool m_EffectEnabled = true;
+    bool m_EffectEnabled = false;
     bool m_LastEffectEnabled = true;
 
     GaiApi::VulkanCorePtr m_VulkanCorePtr = nullptr;  // vulkan core

diff --git a/libs/LumoBackend/include/LumoBackend/Headers/LumoBackendBuild.h b/libs/LumoBackend/include/LumoBackend/Headers/LumoBackendBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define LumoBackend_Prefix "LumoBackend"
-#define LumoBackend_BuildNumber 493
+#define LumoBackend_BuildNumber 494
 #define LumoBackend_MinorNumber 2
 #define LumoBackend_MajorNumber 0
-#define LumoBackend_BuildId "0.2.493"
+#define LumoBackend_BuildId "0.2.494"
diff --git a/src/Headers/LumoBuild.h b/src/Headers/LumoBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define Lumo_Prefix "Lumo"
-#define Lumo_BuildNumber 5349
+#define Lumo_BuildNumber 5350
 #define Lumo_MinorNumber 0
 #define Lumo_MajorNumber 0
-#define Lumo_BuildId "0.0.5349"
+#define Lumo_BuildId "0.0.5350"