Moved registering ShaderProgram resources to Renderer
This commit is contained in:
@@ -102,9 +102,6 @@ public:
|
|||||||
ResourceManager::RegisterType<Model>("Model");
|
ResourceManager::RegisterType<Model>("Model");
|
||||||
ResourceManager::RegisterType<Sound>("Sound");
|
ResourceManager::RegisterType<Sound>("Sound");
|
||||||
ResourceManager::RegisterType<ConfigFile>("ConfigFile");
|
ResourceManager::RegisterType<ConfigFile>("ConfigFile");
|
||||||
ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
|
|
||||||
ResourceManager::RegisterType<VertexShader>("VertexShader");
|
|
||||||
ResourceManager::RegisterType<FragmentShader>("FragmentShader");
|
|
||||||
ResourceManager::LoadPreloadsFromFile();
|
ResourceManager::LoadPreloadsFromFile();
|
||||||
|
|
||||||
auto config = ResourceManager::Load<ConfigFile>("Config.ini");
|
auto config = ResourceManager::Load<ConfigFile>("Config.ini");
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
void dd::Renderer::Initialize()
|
void dd::Renderer::Initialize()
|
||||||
{
|
{
|
||||||
StaticSystem::Set(this);
|
StaticSystem::Set(this);
|
||||||
|
ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
|
||||||
|
|
||||||
// Initialize GLFW
|
// Initialize GLFW
|
||||||
if (!glfwInit()) {
|
if (!glfwInit()) {
|
||||||
|
|||||||
@@ -21,6 +21,10 @@
|
|||||||
|
|
||||||
void dd::Renderer::Initialize()
|
void dd::Renderer::Initialize()
|
||||||
{
|
{
|
||||||
|
ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
|
||||||
|
ResourceManager::RegisterType<VertexShader>("VertexShader");
|
||||||
|
ResourceManager::RegisterType<FragmentShader>("FragmentShader");
|
||||||
|
|
||||||
// Initialize GLFW
|
// Initialize GLFW
|
||||||
if (!glfwInit()) {
|
if (!glfwInit()) {
|
||||||
LOG_ERROR("GLFW: Initialization failed");
|
LOG_ERROR("GLFW: Initialization failed");
|
||||||
|
|||||||
Reference in New Issue
Block a user