Cleanup

src/renderers/material.h

@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include "graphics_types.h"
 #include "math_types.h"
 #include "resource_types.h"
 #include <bgfx/bgfx.h>
@@ -12,8 +13,6 @@
 namespace crown
 {
 
-struct MaterialManager;
-
 struct Material
 {
 	void create(const MaterialResource* mr, MaterialManager& mm);

src/renderers/material_manager.h

@@ -14,8 +14,14 @@
 namespace crown
 {
 
-struct MaterialManager
+class MaterialManager
 {
+	Allocator* _allocator;
+	ResourceManager* _resource_manager;
+	SortMap<StringId64, Material*> _materials;
+
+public:
+
 	MaterialManager(Allocator& a, ResourceManager& rm);
 	~MaterialManager();
 
@@ -27,12 +33,6 @@ struct MaterialManager
 
 	/// Returns the material @a id.
 	Material* get(StringId64 id);
-
-private:
-
-	Allocator* _allocator;
-	ResourceManager* _resource_manager;
-	SortMap<StringId64, Material*> _materials;
 };
 
 } // namespace crown

src/resource/material_resource.cpp

@@ -47,8 +47,8 @@ namespace material_resource
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		const typename JsonObject::Node* begin = map::begin(object);
-		const typename JsonObject::Node* end = map::end(object);
+		auto begin = map::begin(object);
+		auto end = map::end(object);
 
 		for (; begin != end; ++begin)
 		{
@@ -107,8 +107,8 @@ namespace material_resource
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		const typename JsonObject::Node* begin = map::begin(object);
-		const typename JsonObject::Node* end = map::end(object);
+		auto begin = map::begin(object);
+		auto end = map::end(object);
 
 		for (; begin != end; ++begin)
 		{

src/resource/physics_resource.cpp

@@ -309,8 +309,8 @@ namespace physics_config_resource
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		const typename JsonObject::Node* begin = map::begin(object);
-		const typename JsonObject::Node* end = map::end(object);
+		auto begin = map::begin(object);
+		auto end = map::end(object);
 
 		for (; begin != end; ++begin)
 		{
@@ -336,8 +336,8 @@ namespace physics_config_resource
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		const typename JsonObject::Node* begin = map::begin(object);
-		const typename JsonObject::Node* end = map::end(object);
+		auto begin = map::begin(object);
+		auto end = map::end(object);
 
 		for (; begin != end; ++begin)
 		{
@@ -361,8 +361,8 @@ namespace physics_config_resource
 		JsonObject object(ta);
 		sjson::parse(json, object);
 
-		const typename JsonObject::Node* begin = map::begin(object);
-		const typename JsonObject::Node* end = map::end(object);
+		auto begin = map::begin(object);
+		auto end = map::end(object);
 
 		for (; begin != end; ++begin)
 		{

src/resource/unit_compiler.cpp

@@ -210,8 +210,8 @@ void UnitCompiler::compile_unit_from_json(const char* json)
 		JsonObject keys(ta);
 		sjson::parse(components, keys);
 
-		const typename JsonObject::Node* begin = map::begin(keys);
-		const typename JsonObject::Node* end = map::end(keys);
+		auto begin = map::begin(keys);
+		auto end = map::end(keys);
 
 		for (; begin != end; ++begin)
 		{

src/world/world_types.h

@@ -11,10 +11,10 @@
 namespace crown
 {
 
-struct UnitManager;
-struct SceneGraph;
-class World;
 class Level;
+class UnitManager;
+class World;
+struct SceneGraph;
 
 #define UNIT_INDEX_BITS 22
 #define UNIT_INDEX_MASK 0x003fffff