From 142177b927df3eca428fc5f3274af7eed1b25bcc Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 26 May 2016 18:41:36 +0300 Subject: Move shader load function from resourcemanager into separate file. --- src/render/shaders/shadersmanager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/render/shaders/shadersmanager.cpp') diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp index 2138df1f5..f40e570a2 100644 --- a/src/render/shaders/shadersmanager.cpp +++ b/src/render/shaders/shadersmanager.cpp @@ -33,6 +33,8 @@ #include "render/shaders/shader.h" #include "render/shaders/shaderprogram.h" +#include "resources/loaders/shaderloader.h" + #include "resources/resourcemanager/resourcemanager.h" #include "utils/files.h" @@ -70,12 +72,12 @@ ShaderProgram *ShadersManager::createProgram(const std::string &vertex, const bool isNewShader) { Shader *const vertexShader = static_cast( - resourceManager->getShader(GL_VERTEX_SHADER, vertex)); + Loader::getShader(GL_VERTEX_SHADER, vertex)); if (!vertexShader) return nullptr; Shader *const fragmentShader = static_cast( - resourceManager->getShader(GL_FRAGMENT_SHADER, fragment)); + Loader::getShader(GL_FRAGMENT_SHADER, fragment)); if (!fragmentShader) { -- cgit v1.2.3-60-g2f50