Moved registering ShaderProgram resources to Renderer

This commit is contained in:
2015-10-22 15:35:32 +02:00
parent 61801f23d1
commit 3fb85cd049
3 changed files with 5 additions and 3 deletions
-3
View File
@@ -102,9 +102,6 @@ public:
ResourceManager::RegisterType<Model>("Model");
ResourceManager::RegisterType<Sound>("Sound");
ResourceManager::RegisterType<ConfigFile>("ConfigFile");
ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
ResourceManager::RegisterType<VertexShader>("VertexShader");
ResourceManager::RegisterType<FragmentShader>("FragmentShader");
ResourceManager::LoadPreloadsFromFile();
auto config = ResourceManager::Load<ConfigFile>("Config.ini");
+1
View File
@@ -8,6 +8,7 @@
void dd::Renderer::Initialize()
{
StaticSystem::Set(this);
ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
// Initialize GLFW
if (!glfwInit()) {
+4
View File
@@ -21,6 +21,10 @@
void dd::Renderer::Initialize()
{
ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
ResourceManager::RegisterType<VertexShader>("VertexShader");
ResourceManager::RegisterType<FragmentShader>("FragmentShader");
// Initialize GLFW
if (!glfwInit()) {
LOG_ERROR("GLFW: Initialization failed");