cleanup

angad-k · Jul 15, 2024 · 36134b8 · 36134b8
1 parent 48e5387
commit 36134b8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/ProcSDF/Common/constant.h b/ProcSDF/Common/constant.h
@@ -5,8 +5,6 @@
 #include "ImGui/imgui.h"
 
 namespace sdf {
-	const std::string SHADER_FOLDER_PATH = "Assets/Shaders/";
-	const std::string SHADER_FILE_EXTENSION = ".glsl";
 	const std::string TRANSLATION_NODE = "Translation";
 	const std::string ROTATION_X_NODE = "Rotation_X";
 	const std::string ROTATION_Y_NODE = "Rotation_Y";

diff --git a/ProcSDF/GUI/Inspector.cpp b/ProcSDF/GUI/Inspector.cpp
@@ -153,6 +153,15 @@ void Inspector::drawRenderingSettings()
 			}
 			Renderer::getSingleton()->m_render_uniforms_debug_values[i] = value;
 		}
+		if (!Renderer::getSingleton()->m_render_uniforms_debug_values[0])
+		{
+			ImGui::BeginDisabled();
+		}
+		ImGui::Checkbox("Print Shader Code", &ShaderGenerator::getSingleton()->m_print_shader);
+		if (!Renderer::getSingleton()->m_render_uniforms_debug_values[0])
+		{
+			ImGui::EndDisabled();
+		}
 		ImGui::Unindent();
 		ImGui::TreePop();
 	}

diff --git a/ProcSDF/Rendering/ShaderGenerator.cpp b/ProcSDF/Rendering/ShaderGenerator.cpp
@@ -150,6 +150,7 @@ void ShaderGenerator::generateAndSetShader() {
 	// Appends the raymarch and main function.
 	l_shaderString.append(l_shaderFooter);
 
+	if(m_print_shader)
 	std::cout << l_shaderString;
 
 	//std::cout << l_shaderString;
@@ -158,12 +159,6 @@ void ShaderGenerator::generateAndSetShader() {
 	m_shaderModified = true;
 }
 
-std::string ShaderGenerator::generateShaderFilePath(std::string p_fileName)
-{
-	std::string l_filePath = sdf::SHADER_FOLDER_PATH + p_fileName + sdf::SHADER_FILE_EXTENSION;
-	return l_filePath;
-}
-
 std::string ShaderGenerator::generateUniformDeclarations()
 {
 	std::string l_uniformDeclarations = "";

diff --git a/ProcSDF/Rendering/ShaderGenerator.h b/ProcSDF/Rendering/ShaderGenerator.h
@@ -21,7 +21,6 @@ class ShaderGenerator
 
 	bool m_shaderModified = true;
 
-	std::string generateShaderFilePath(std::string p_fileName);
 	std::string generateUniformDeclarations();
 	std::string generateObjectFunctions();
 	std::string generateGetColorFunction();
@@ -46,6 +45,7 @@ class ShaderGenerator
 	}
 
 	static std::string getUniformStringFromLabel(std::string p_variable_name, std::string p_label);
+	bool m_print_shader = false;
 
 	std::string getShader() {
 		return m_shader;