From 61e9fc59323157bbd3ea024e816981b975d5b2c8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Jun 2014 22:11:31 +0300 Subject: Add basic texture drawing in modernopengl. --- src/render/shaders/shadersmanager.cpp | 7 +++++++ src/render/shaders/shadersmanager.h | 2 ++ 2 files changed, 9 insertions(+) (limited to 'src/render/shaders') diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp index f9c305d79..8a1072deb 100644 --- a/src/render/shaders/shadersmanager.cpp +++ b/src/render/shaders/shadersmanager.cpp @@ -118,4 +118,11 @@ ShaderProgram *ShadersManager::getSimpleProgram() return createProgram(dir + paths.getStringValue("simpleVertexShader"), dir + paths.getStringValue("simpleFragmentShader")); } + +ShaderProgram *ShadersManager::getTextureProgram() +{ + const std::string dir = paths.getStringValue("shaders"); + return createProgram(dir + paths.getStringValue("textureVertexShader"), + dir + paths.getStringValue("textureFragmentShader")); +} #endif diff --git a/src/render/shaders/shadersmanager.h b/src/render/shaders/shadersmanager.h index 50e714aba..b525d18e1 100644 --- a/src/render/shaders/shadersmanager.h +++ b/src/render/shaders/shadersmanager.h @@ -41,6 +41,8 @@ class ShadersManager final A_WARN_UNUSED; ShaderProgram *getSimpleProgram(); + + ShaderProgram *getTextureProgram(); }; extern ShadersManager shaders; -- cgit v1.2.3-60-g2f50