From 0f500fab826a57f8aae8a3e2062a90ee9e80a199 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 8 Jun 2014 13:57:15 +0300 Subject: Add ShaderManager and Shader class. --- src/CMakeLists.txt | 4 +++ src/Makefile.am | 4 +++ src/render/mgltypes.h | 2 +- src/render/shaders/shader.cpp | 39 ++++++++++++++++++++++ src/render/shaders/shader.h | 42 ++++++++++++++++++++++++ src/render/shaders/shadersmanager.cpp | 62 +++++++++++++++++++++++++++++++++++ src/render/shaders/shadersmanager.h | 42 ++++++++++++++++++++++++ src/resources/resourcemanager.cpp | 28 +++++++++++++++- src/resources/resourcemanager.h | 3 ++ src/utils/files.cpp | 16 +++++++++ src/utils/files.h | 2 ++ 11 files changed, 242 insertions(+), 2 deletions(-) create mode 100644 src/render/shaders/shader.cpp create mode 100644 src/render/shaders/shader.h create mode 100644 src/render/shaders/shadersmanager.cpp create mode 100644 src/render/shaders/shadersmanager.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 697b7bfe4..6f9081b1f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -937,6 +937,10 @@ SET(SRCS statuseffect.h render/surfacegraphics.cpp render/surfacegraphics.h + render/shaders/shader.cpp + render/shaders/shader.h + render/shaders/shadersmanager.cpp + render/shaders/shadersmanager.h text.cpp text.h textmanager.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 27d501638..c2aef8836 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1054,6 +1054,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ statuseffect.h \ render/surfacegraphics.cpp \ render/surfacegraphics.h \ + render/shaders/shader.cpp \ + render/shaders/shader.h \ + render/shaders/shadersmanager.cpp \ + render/shaders/shadersmanager.h \ text.cpp \ text.h \ textmanager.cpp \ diff --git a/src/render/mgltypes.h b/src/render/mgltypes.h index 65fd8a978..497fa6afa 100644 --- a/src/render/mgltypes.h +++ b/src/render/mgltypes.h @@ -83,7 +83,7 @@ typedef void (APIENTRY *glDeleteBuffers_t) (GLsizei n, GLuint *buffers); typedef void (APIENTRY *glBindBuffer_t) (GLenum target, GLuint buffer); typedef void (APIENTRY *glBufferData_t) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void (APIENTRY *glCreateShader_t) (GLenum shaderType); +typedef GLuint (APIENTRY *glCreateShader_t) (GLenum shaderType); typedef void (APIENTRY *glDeleteShader_t) (GLenum shader); typedef void (APIENTRY *glGetShaderiv_t) (GLuint shader, GLenum pname, GLint *params); diff --git a/src/render/shaders/shader.cpp b/src/render/shaders/shader.cpp new file mode 100644 index 000000000..9a0d317a5 --- /dev/null +++ b/src/render/shaders/shader.cpp @@ -0,0 +1,39 @@ +/* + * The ManaPlus Client + * Copyright (C) 2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef USE_OPENGL + +#include "render/shaders/shader.h" + +#include "render/mgl.h" + +Shader::Shader(const unsigned int id) : + Resource(), + mShaderId(id) +{ +} + +Shader::~Shader() +{ + if (mShaderId) + mglDeleteShader(mShaderId); +} + +#endif // USE_OPENGL diff --git a/src/render/shaders/shader.h b/src/render/shaders/shader.h new file mode 100644 index 000000000..6ee964704 --- /dev/null +++ b/src/render/shaders/shader.h @@ -0,0 +1,42 @@ +/* + * The ManaPlus Client + * Copyright (C) 2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef RENDER_SHADER_H +#define RENDER_SHADER_H + +#ifdef USE_OPENGL + +#include "resources/resource.h" + +class Shader final : public Resource +{ + public: + Shader(const unsigned int id); + + ~Shader(); + + A_DELETE_COPY(Shader) + + protected: + unsigned int mShaderId; +}; + +#endif // USE_OPENGL +#endif // RENDER_SHADER_H diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp new file mode 100644 index 000000000..85c5bf64e --- /dev/null +++ b/src/render/shaders/shadersmanager.cpp @@ -0,0 +1,62 @@ +/* + * The ManaPlus Client + * Copyright (C) 2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "render/shaders/shadersmanager.h" + +#ifdef USE_OPENGL + +#include "logger.h" +#include "settings.h" + +#include "render/mgl.h" + +#include "render/shaders/shader.h" + +#include "utils/files.h" + +#include "debug.h" + +ShadersManager shaders; + +Shader *ShadersManager::createShader(const unsigned int type, + const std::string &fileName) +{ + const std::string str = Files::loadTextFileString(fileName); + const char *ptrStr = str.c_str(); + GLuint shaderId = mglCreateShader(type); + mglShaderSource(shaderId, 1, &ptrStr, nullptr); + mglCompileShader(shaderId); + + GLint isCompiled = 0; + mglGetShaderiv(shaderId, GL_COMPILE_STATUS, &isCompiled); + if (isCompiled == GL_TRUE) + return new Shader(shaderId); + GLint len = 0; + mglGetShaderiv(shaderId, GL_INFO_LOG_LENGTH, &len); + char *buf = new char[len + 1]; + mglGetShaderInfoLog(shaderId, len, &len, buf); + buf[len] = 0; + logger->log("Shader '%s' compilation error: %s", fileName.c_str(), buf); + delete [] buf; + mglDeleteShader(shaderId); + return nullptr; +} + +#endif diff --git a/src/render/shaders/shadersmanager.h b/src/render/shaders/shadersmanager.h new file mode 100644 index 000000000..0ad8556c8 --- /dev/null +++ b/src/render/shaders/shadersmanager.h @@ -0,0 +1,42 @@ +/* + * The ManaPlus Client + * Copyright (C) 2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef RENDER_SHADERSMANAGER_H +#define RENDER_SHADERSMANAGER_H + +#ifdef USE_OPENGL + +#include + +#include "localconsts.h" + +struct Shader; + +class ShadersManager final +{ + public: + Shader *createShader(const unsigned int type, + const std::string &fileName) A_WARN_UNUSED; +}; + +extern ShadersManager shaders; + +#endif // USE_OPENGL +#endif // RENDER_SHADERSMANAGER_H diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index bf7b09897..8bce250fb 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -43,6 +43,9 @@ #include "utils/physfsrwops.h" #include "utils/sdlcheckutils.h" +#include "render/shaders/shader.h" +#include "render/shaders/shadersmanager.h" + #include #include @@ -703,9 +706,32 @@ Resource *ResourceManager::getAtlas(const std::string &name, const StringVect &files) { AtlasLoader rl = { name, &files }; - return get("atlas_" + name, &AtlasLoader::load, &rl); } + +struct ShaderLoader final +{ + const std::string name; + const unsigned int type; + + static Resource *load(const void *const v) + { + if (!v) + return nullptr; + + const ShaderLoader *const rl + = static_cast(v); + Shader *const resource = shaders.createShader(rl->type, rl->name); + return resource; + } +}; + +Resource *ResourceManager::getShader(const unsigned int type, + const std::string &name) +{ + ShaderLoader rl = { name, type }; + return get("shader_" + name, &ShaderLoader::load, &rl); +} #endif struct WalkLayerLoader final diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 16640c7fd..f7d901f09 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -175,6 +175,9 @@ class ResourceManager final #ifdef USE_OPENGL Resource *getAtlas(const std::string &name, const StringVect &files) A_WARN_UNUSED; + + Resource *getShader(const unsigned int type, + const std::string &name) A_WARN_UNUSED; #endif WalkLayer *getWalkLayer(const std::string &name, Map *const map); diff --git a/src/utils/files.cpp b/src/utils/files.cpp index d3a04d69f..e435249da 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -270,6 +270,22 @@ std::string Files::getPath(const std::string &file) return path; } +std::string Files::loadTextFileString(const std::string &fileName) +{ + int contentsLength; + char *fileContents = static_cast( + PhysFs::loadFile(fileName, contentsLength)); + + if (!fileContents) + { + logger->log("Couldn't load text file: %s", fileName.c_str()); + return std::string(); + } + const std::string str = std::string(fileContents, contentsLength); + free(fileContents); + return str; +} + bool Files::loadTextFile(const std::string &fileName, StringVect &lines) { diff --git a/src/utils/files.h b/src/utils/files.h index 1db9993a7..5e17f8f5a 100644 --- a/src/utils/files.h +++ b/src/utils/files.h @@ -69,6 +69,8 @@ namespace Files bool loadTextFile(const std::string &fileName, StringVect &lines); + std::string loadTextFileString(const std::string &fileName); + bool loadTextFileLocal(const std::string &fileName, StringVect &lines); -- cgit v1.2.3-70-g09d2