update according to review

Author: ZzzhHe

libopenage/renderer/demo/demo_7.cpp

@@ -29,7 +29,7 @@ void renderer_demo_7(const util::Path &path) {
 
 	auto shaderdir = path / "assets" / "test" / "shaders";
 
-	// Initialize shader templlalte
+	// Initialize shader template
 	world::ShaderTemplate frag_template(shaderdir / "demo_7_shader_command.frag.glsl");
 
 	// Load snippets from a snippet directory
@@ -42,10 +42,7 @@ void renderer_demo_7(const util::Path &path) {
 		vert_shader_file.read());
 	vert_shader_file.close();
 
-	auto frag_shader_src = resources::ShaderSource(
-		resources::shader_lang_t::glsl,
-		resources::shader_stage_t::fragment,
-		frag_template.generate_source());
+	auto frag_shader_src = frag_template.generate_source();
 
 	auto shader = renderer->add_shader({vert_shader_src, frag_shader_src});
 

libopenage/renderer/stages/world/shader_template.cpp

@@ -26,40 +26,46 @@ void ShaderTemplate::load_snippets(const util::Path &snippet_path) {
 }
 
 void ShaderTemplate::add_snippet(const util::Path &snippet_path) {
-	std::string file_name = snippet_path.get_name();
-	std::string name = file_name.substr(0, file_name.find_last_of('.'));
 	auto file = snippet_path.open();
 	std::string content = file.read();
 	file.close();
 
+	std::string name = snippet_path.get_stem();
+
 	snippets[name] = content;
 }
 
-std::string ShaderTemplate::generate_source() const {
-	std::string result = template_code;
+renderer::resources::ShaderSource ShaderTemplate::generate_source() const {
+	std::string result_src = template_code;
 
 	// Process each placeholder
 	for (const auto &[name, snippet_code] : snippets) {
 		std::string placeholder = "// PLACEHOLDER: " + name;
-		size_t pos = result.find(placeholder);
+		size_t pos = result_src.find(placeholder);
 
 		if (pos != std::string::npos) {
-			result.replace(pos, placeholder.length(), snippet_code);
+			result_src.replace(pos, placeholder.length(), snippet_code);
 		}
 		else {
 			log::log(WARN << "Placeholder not found in template: " << name);
 		}
 	}
 
 	// Check if all placeholders were replaced
-	size_t placeholder_pos = result.find("// PLACEHOLDER:");
+	size_t placeholder_pos = result_src.find("// PLACEHOLDER:");
 	if (placeholder_pos != std::string::npos) {
-		size_t line_end = result.find('\n', placeholder_pos);
-		std::string missing = result.substr(placeholder_pos,
-		                                    line_end - placeholder_pos);
+		size_t line_end = result_src.find('\n', placeholder_pos);
+		std::string missing = result_src.substr(placeholder_pos,
+		                                        line_end - placeholder_pos);
 		throw Error(MSG(err) << "Missing snippet for placeholder: " << missing);
 	}
 
+	auto result = resources::ShaderSource(
+		resources::shader_lang_t::glsl,
+		resources::shader_stage_t::fragment,
+		std::move(result_src));
+
 	return result;
 }
+
 } // namespace openage::renderer::world

libopenage/renderer/stages/world/shader_template.h

@@ -7,6 +7,7 @@
 #include <string>
 #include <vector>
 
+#include "renderer/resources/shader_source.h"
 #include "util/path.h"
 
 namespace openage {
@@ -49,12 +50,12 @@ class ShaderTemplate {
 	 * @return Complete shader code.
 	 * @throws Error if any required placeholders are missing snippets.
 	 */
-	std::string generate_source() const;
+	renderer::resources::ShaderSource generate_source() const;
 
 private:
-	// Original template code with placeholders
+	/// Original template code with placeholders
 	std::string template_code;
-	// Mapping of placeholder IDs to their code snippets
+	/// Mapping of placeholder IDs to their code snippets
 	std::map<std::string, std::string> snippets;
 };
 } // namespace world