Cleanup

src/world/debug_line.cpp

@@ -154,7 +154,7 @@ void DebugLine::submit()
 	bgfx::allocTransientVertexBuffer(&tvb, _num * 2, _vertex_decl);
 	memcpy(tvb.data, _lines, sizeof(Line) * _num);
 
-	const ShaderManager::ShaderData& sd = device()->shader_manager()->get(_shader);
+	const ShaderData& sd = device()->shader_manager()->get(_shader);
 
 	bgfx::setVertexBuffer(&tvb, 0, _num * 2);
 	bgfx::setState(sd.state);

src/world/material.cpp

@@ -62,7 +62,7 @@ void Material::bind(ResourceManager& rm, ShaderManager& sm) const
 		bgfx::setUniform(buh, (char*)uh + sizeof(uh->uniform_handle));
 	}
 
-	const ShaderManager::ShaderData& sd = sm.get(resource->shader);
+	const ShaderData& sd = sm.get(resource->shader);
 	bgfx::setState(sd.state);
 	bgfx::submit(0, sd.program);
 }

src/world/shader_manager.cpp

@@ -108,7 +108,7 @@ void ShaderManager::add_shader(StringId32 name, uint64_t state, bgfx::ProgramHan
 	sort_map::sort(_shader_map);
 }
 
-const ShaderManager::ShaderData& ShaderManager::get(StringId32 id)
+const ShaderData& ShaderManager::get(StringId32 id)
 {
 	CE_ASSERT(sort_map::has(_shader_map, id), "Shader not found");
 	ShaderData deffault;

src/world/shader_manager.h

@@ -15,15 +15,21 @@
 namespace crown
 {
 
+struct ShaderData
+{
+	uint64_t state;
+	bgfx::ProgramHandle program;
+};
+
+/// Manages shaders.
+///
+/// @ingroup World
 class ShaderManager
 {
-public:
+	typedef SortMap<StringId32, ShaderData> ShaderMap;
+	ShaderMap _shader_map;
 
-	struct ShaderData
-	{
-		uint64_t state;
-		bgfx::ProgramHandle program;
-	};
+	void add_shader(StringId32 name, uint64_t state, bgfx::ProgramHandle program);
 
 public:
 
@@ -36,16 +42,6 @@ public:
 
 	/// Returns the shader @a id.
 	const ShaderData& get(StringId32 id);
-
-private:
-
-	void add_shader(StringId32 name, uint64_t state, bgfx::ProgramHandle program);
-
-private:
-
-	typedef SortMap<StringId32, ShaderData> ShaderMap;
-
-	ShaderMap _shader_map;
 };
 
 } // namespace crown