renderer: Move shader template to resources namespace.

Author: heinezen

libopenage/renderer/demo/demo_7.cpp

@@ -11,8 +11,9 @@
 #include "renderer/render_target.h"
 #include "renderer/resources/mesh_data.h"
 #include "renderer/resources/shader_source.h"
+#include "renderer/resources/shader_template.h"
 #include "renderer/shader_program.h"
-#include "renderer/stages/world/shader_template.h"
+
 
 namespace openage::renderer::tests {
 
@@ -30,7 +31,7 @@ void renderer_demo_7(const util::Path &path) {
 	auto shaderdir = path / "assets" / "test" / "shaders";
 
 	// Initialize shader template
-	world::ShaderTemplate frag_template(shaderdir / "demo_7_shader_command.frag.glsl");
+	resources::ShaderTemplate frag_template(shaderdir / "demo_7_shader_command.frag.glsl");
 
 	// Load snippets from a snippet directory
 	frag_template.load_snippets(shaderdir / "demo_7_snippets");

libopenage/renderer/resources/CMakeLists.txt

@@ -4,6 +4,7 @@ add_sources(libopenage
 	mesh_data.cpp
 	palette_info.cpp
 	shader_source.cpp
+    shader_template.cpp
 	texture_data.cpp
 	texture_info.cpp
 	texture_subinfo.cpp

libopenage/renderer/stages/world/shader_template.cpp renamed to libopenage/renderer/resources/shader_template.cpp

@@ -7,7 +7,7 @@
 #include "error/error.h"
 #include "log/log.h"
 
-namespace openage::renderer::world {
+namespace openage::renderer::resources {
 
 ShaderTemplate::ShaderTemplate(const util::Path &template_path) {
 	auto file = template_path.open();

libopenage/renderer/stages/world/shader_template.h renamed to libopenage/renderer/resources/shader_template.h

@@ -12,7 +12,7 @@
 
 namespace openage {
 namespace renderer {
-namespace world {
+namespace resources {
 
 /**
  * Manages shader templates and their code snippets.
@@ -57,7 +57,7 @@ class ShaderTemplate {
 	/// Mapping of placeholder IDs to their code snippets
 	std::map<std::string, std::string> snippets;
 
-	/// Info about a placeholder found in the template 
+	/// Info about a placeholder found in the template
 	struct Placeholder {
 			std::string name;
 			size_t position;

libopenage/renderer/stages/world/CMakeLists.txt

@@ -2,5 +2,4 @@ add_sources(libopenage
 	object.cpp
 	render_entity.cpp
 	render_stage.cpp
-	shader_template.cpp
 )