From 7d613787059471c8e7323afd80d3d3f5764a2620 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 26 Apr 2016 15:24:59 +0300 Subject: Move graphicsvertexes into render/vertexes. --- src/render/mobileopengl2graphics.cpp | 3 +- src/render/mobileopenglgraphics.cpp | 3 +- src/render/modernopenglgraphics.cpp | 3 +- src/render/normalopenglgraphics.cpp | 3 +- src/render/nullopenglgraphics.cpp | 3 +- src/render/sdl2graphics.cpp | 3 +- src/render/sdl2softwaregraphics.cpp | 3 +- src/render/sdlgraphics.cpp | 3 +- src/render/vertexes/graphicsvertexes.cpp | 284 +++++++++++++++++++++++++++++++ src/render/vertexes/graphicsvertexes.h | 178 +++++++++++++++++++ 10 files changed, 478 insertions(+), 8 deletions(-) create mode 100644 src/render/vertexes/graphicsvertexes.cpp create mode 100644 src/render/vertexes/graphicsvertexes.h (limited to 'src/render') diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp index ed2ca8b17..7e40f4139 100644 --- a/src/render/mobileopengl2graphics.cpp +++ b/src/render/mobileopengl2graphics.cpp @@ -25,7 +25,6 @@ #include "render/mobileopengl2graphics.h" #include "graphicsmanager.h" -#include "graphicsvertexes.h" #include "logger.h" #include "render/opengl/mgl.h" @@ -36,6 +35,8 @@ #include "render/shaders/shaderprogram.h" #include "render/shaders/shadersmanager.h" +#include "render/vertexes/graphicsvertexes.h" + #include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index 20d8f3661..b3aca8ed8 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -24,7 +24,6 @@ #include "render/mobileopenglgraphics.h" -#include "graphicsvertexes.h" #include "logger.h" #include "render/opengl/mgl.h" @@ -32,6 +31,8 @@ #include "render/opengl/naclglfunctions.h" #endif +#include "render/vertexes/graphicsvertexes.h" + #include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index b5d97b80a..1cfb07690 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -25,7 +25,6 @@ #include "render/modernopenglgraphics.h" #include "graphicsmanager.h" -#include "graphicsvertexes.h" #include "logger.h" #include "render/opengl/mgl.h" @@ -36,6 +35,8 @@ #include "render/shaders/shaderprogram.h" #include "render/shaders/shadersmanager.h" +#include "render/vertexes/graphicsvertexes.h" + #include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index 9aaa2aa47..bd6aa2b38 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -24,11 +24,12 @@ #include "render/normalopenglgraphics.h" -#include "graphicsvertexes.h" #include "logger.h" #include "render/opengl/mgl.h" +#include "render/vertexes/graphicsvertexes.h" + #include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp index 51abe9183..7203468a6 100644 --- a/src/render/nullopenglgraphics.cpp +++ b/src/render/nullopenglgraphics.cpp @@ -25,12 +25,13 @@ #include "render/nullopenglgraphics.h" #include "graphicsmanager.h" -#include "graphicsvertexes.h" #ifdef DEBUG_BIND_TEXTURE #include "logger.h" #endif +#include "render/vertexes/graphicsvertexes.h" + #include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index 96ade5e4f..6b798eaec 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -71,9 +71,10 @@ #include "configuration.h" #include "graphicsmanager.h" -#include "graphicsvertexes.h" #include "logger.h" +#include "render/vertexes/graphicsvertexes.h" + #include "resources/image.h" #include "resources/imagehelper.h" #include "resources/imagerect.h" diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index f59ee5f51..a8f307124 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -28,9 +28,10 @@ #include "configuration.h" #include "graphicsmanager.h" -#include "graphicsvertexes.h" #include "logger.h" +#include "render/vertexes/graphicsvertexes.h" + #include "resources/image.h" #include "resources/imagehelper.h" #include "resources/imagerect.h" diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 8b7711a5c..421b2508b 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -27,12 +27,13 @@ #include "main.h" #include "graphicsmanager.h" -#include "graphicsvertexes.h" #include "utils/sdlcheckutils.h" #include "utils/sdlpixel.h" +#include "render/vertexes/graphicsvertexes.h" + #include "resources/image.h" #include "resources/imagerect.h" diff --git a/src/render/vertexes/graphicsvertexes.cpp b/src/render/vertexes/graphicsvertexes.cpp new file mode 100644 index 000000000..8c4283f6a --- /dev/null +++ b/src/render/vertexes/graphicsvertexes.cpp @@ -0,0 +1,284 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2016 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/vertexes/graphicsvertexes.h" + +#ifdef USE_OPENGL +#include "render/graphics.h" +#endif + +#include "utils/dtor.h" + +#include "debug.h" + +#ifdef USE_OPENGL +unsigned int vertexBufSize = 500; +#endif + +SDLGraphicsVertexes::SDLGraphicsVertexes() : + mList() +{ + mList.reserve(30); +} + +SDLGraphicsVertexes::~SDLGraphicsVertexes() +{ + delete_all(mList); +} + +#ifdef USE_OPENGL +OpenGLGraphicsVertexes::OpenGLGraphicsVertexes() : + ptr(0), + mFloatTexArray(nullptr), + mIntTexArray(nullptr), + mIntVertArray(nullptr), + mShortVertArray(nullptr), + mVp(), + mFloatTexPool(), + mIntVertPool(), + mShortVertPool(), + mIntTexPool(), + mVbo() +{ + mFloatTexPool.reserve(30); + mIntVertPool.reserve(30); + mShortVertPool.reserve(30); + mIntTexPool.reserve(30); + mVp.reserve(30); + mVbo.reserve(30); +} + +OpenGLGraphicsVertexes::~OpenGLGraphicsVertexes() +{ + clear(); +} + +void OpenGLGraphicsVertexes::clear() restrict2 +{ + for (std::vector::iterator it = mFloatTexPool.begin(); + it != mFloatTexPool.end(); ++ it) + { + delete [] (*it); + } + mFloatTexPool.clear(); + + for (std::vector::iterator it = mIntVertPool.begin(); + it != mIntVertPool.end(); ++ it) + { + delete [] (*it); + } + mIntVertPool.clear(); + + for (std::vector::iterator it = mShortVertPool.begin(); + it != mShortVertPool.end(); ++ it) + { + delete [] (*it); + } + mShortVertPool.clear(); + + for (std::vector::iterator it = mIntTexPool.begin(); + it != mIntTexPool.end(); ++ it) + { + delete [] (*it); + } + mIntTexPool.clear(); + + const int sz = CAST_S32(mVbo.size()); + if (sz > 0) + { + mainGraphics->removeArray(sz, &mVbo[0]); + mVbo.clear(); + } + + mVp.clear(); + if (ptr) + { + ptr = 0; + delete []mFloatTexArray; + mFloatTexArray = nullptr; + delete []mIntTexArray; + mIntTexArray = nullptr; + delete []mIntVertArray; + mIntVertArray = nullptr; + delete []mShortVertArray; + mShortVertArray = nullptr; + } +} + +void OpenGLGraphicsVertexes::init() restrict2 +{ + clear(); +} + +GLfloat *OpenGLGraphicsVertexes::switchFloatTexArray() restrict2 +{ + mFloatTexArray = new GLfloat[CAST_SIZE(vertexBufSize * 4 + 30)]; + mFloatTexPool.push_back(mFloatTexArray); + return mFloatTexArray; +} + +GLint *OpenGLGraphicsVertexes::switchIntVertArray() restrict2 +{ + mIntVertArray = new GLint[CAST_SIZE(vertexBufSize * 4 + 30)]; + mIntVertPool.push_back(mIntVertArray); + return mIntVertArray; +} + +GLshort *OpenGLGraphicsVertexes::switchShortVertArray() restrict2 +{ + mShortVertArray = new GLshort[CAST_SIZE(vertexBufSize * 4 + 30)]; + mShortVertPool.push_back(mShortVertArray); + return mShortVertArray; +} + +GLint *OpenGLGraphicsVertexes::switchIntTexArray() restrict2 +{ + mIntTexArray = new GLint[CAST_SIZE(vertexBufSize * 4 + 30)]; + mIntTexPool.push_back(mIntTexArray); + return mIntTexArray; +} + +void OpenGLGraphicsVertexes::switchVp(const int n) restrict2 +{ + mVp.push_back(n); +} + +int OpenGLGraphicsVertexes::continueVp() restrict2 +{ + if (mVp.empty()) + { + return 0; + } + else + { + const int val = mVp.back(); + mVp.pop_back(); + return val; + } +} + +void OpenGLGraphicsVertexes::updateVp(const int n) restrict2 +{ + if (!mVp.empty()) + mVp.pop_back(); + mVp.push_back(n); +} + +GLfloat *OpenGLGraphicsVertexes::continueFloatTexArray() restrict2 +{ + if (mFloatTexPool.empty()) + { + mFloatTexArray = new GLfloat[CAST_SIZE( + vertexBufSize * 4 + 30)]; + mFloatTexPool.push_back(mFloatTexArray); + } + else + { + mFloatTexArray = mFloatTexPool.back(); + } + return mFloatTexArray; +} + +GLint *OpenGLGraphicsVertexes::continueIntVertArray() restrict2 +{ + if (mIntVertPool.empty()) + { + mIntVertArray = new GLint[CAST_SIZE(vertexBufSize * 4 + 30)]; + mIntVertPool.push_back(mIntVertArray); + } + else + { + mIntVertArray = mIntVertPool.back(); + } + return mIntVertArray; +} + +GLshort *OpenGLGraphicsVertexes::continueShortVertArray() restrict2 +{ + if (mShortVertPool.empty()) + { + mShortVertArray = new GLshort[CAST_SIZE( + vertexBufSize * 4 + 30)]; + mShortVertPool.push_back(mShortVertArray); + } + else + { + mShortVertArray = mShortVertPool.back(); + } + return mShortVertArray; +} + +GLint *OpenGLGraphicsVertexes::continueIntTexArray() restrict2 +{ + if (mIntTexPool.empty()) + { + mIntTexArray = new GLint[CAST_SIZE(vertexBufSize * 4 + 30)]; + mIntTexPool.push_back(mIntTexArray); + } + else + { + mIntTexArray = mIntTexPool.back(); + } + return mIntTexArray; +} +#endif + +ImageVertexes::ImageVertexes() : + image(nullptr), +#ifdef USE_OPENGL + ogl(), +#endif + sdl() +{ + sdl.reserve(30); +} + +ImageVertexes::~ImageVertexes() +{ + delete_all(sdl); + sdl.clear(); +} + +ImageCollection::ImageCollection() : +#ifdef USE_OPENGL + currentGLImage(0), +#endif + currentImage(nullptr), + currentVert(nullptr), + draws() +{ +} + +ImageCollection::~ImageCollection() +{ + clear(); +} + +void ImageCollection::clear() restrict2 +{ +#ifdef USE_OPENGL + currentGLImage = 0; +#endif + currentImage = nullptr; + currentVert = nullptr; + + delete_all(draws); + draws.clear(); +} diff --git a/src/render/vertexes/graphicsvertexes.h b/src/render/vertexes/graphicsvertexes.h new file mode 100644 index 000000000..8f54c5550 --- /dev/null +++ b/src/render/vertexes/graphicsvertexes.h @@ -0,0 +1,178 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2016 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 GRAPHICSVERTEXES_H +#define GRAPHICSVERTEXES_H + +#include "main.h" + +#include "localconsts.h" + +#ifdef USE_OPENGL + +#ifdef ANDROID +#include +#else +#ifndef USE_SDL2 +#define GL_GLEXT_PROTOTYPES 1 +#endif +#include +#endif + +#endif + +#include + +#include + +class Image; + +struct DoubleRect final +{ + SDL_Rect src; + SDL_Rect dst; +}; + +class SDLGraphicsVertexes final +{ + public: + SDLGraphicsVertexes(); + + A_DELETE_COPY(SDLGraphicsVertexes) + + ~SDLGraphicsVertexes(); + + std::vector mList; +}; + +#ifdef USE_OPENGL +class OpenGLGraphicsVertexes final +{ + public: + OpenGLGraphicsVertexes(); + + A_DELETE_COPY(OpenGLGraphicsVertexes) + + ~OpenGLGraphicsVertexes(); + + GLfloat *switchFloatTexArray() restrict2; + + GLint *switchIntVertArray() restrict2; + + GLint *switchIntTexArray() restrict2; + + GLshort *switchShortVertArray() restrict2; + + std::vector *getFloatTexPool() restrict2 A_WARN_UNUSED + { return &mFloatTexPool; } + + std::vector *getIntVertPool() restrict2 A_WARN_UNUSED + { return &mIntVertPool; } + + std::vector *getShortVertPool() restrict2 A_WARN_UNUSED + { return &mShortVertPool; } + + std::vector *getIntTexPool() restrict2 A_WARN_UNUSED + { return &mIntTexPool; } + + void switchVp(const int n) restrict2; + + GLfloat *continueFloatTexArray() restrict2 RETURNS_NONNULL; + + GLint *continueIntVertArray() restrict2 RETURNS_NONNULL; + + GLshort *continueShortVertArray() restrict2 RETURNS_NONNULL; + + GLint *continueIntTexArray() restrict2 RETURNS_NONNULL; + + int continueVp() restrict2; + + void updateVp(const int n) restrict2; + + std::vector *getVp() restrict2 A_WARN_UNUSED + { return &mVp; } + + void init() restrict2; + + void clear() restrict2; + + int ptr; + + GLfloat *mFloatTexArray; + GLint *mIntTexArray; + GLint *mIntVertArray; + GLshort *mShortVertArray; + std::vector mVp; + std::vector mFloatTexPool; + std::vector mIntVertPool; + std::vector mShortVertPool; + std::vector mIntTexPool; + std::vector mVbo; +}; +#endif + +typedef std::vector DoubleRects; + +class ImageVertexes final +{ + public: + ImageVertexes(); + + A_DELETE_COPY(ImageVertexes) + + ~ImageVertexes(); + + const Image *restrict image; +#ifdef USE_OPENGL + OpenGLGraphicsVertexes ogl; +#endif + DoubleRects sdl; +}; + +typedef std::vector ImageVertexesVector; +typedef ImageVertexesVector::iterator ImageCollectionIter; +typedef ImageVertexesVector::const_iterator ImageCollectionCIter; + +class ImageCollection final +{ + public: + ImageCollection(); + + A_DELETE_COPY(ImageCollection) + + ~ImageCollection(); + + void clear() restrict2; + +#ifdef USE_OPENGL + GLuint currentGLImage; +#endif + const Image *restrict currentImage; + + ImageVertexes *restrict currentVert; + + ImageVertexesVector draws; +}; + +#ifdef USE_OPENGL +extern unsigned int vertexBufSize; +#endif + +#endif // GRAPHICSVERTEXES_H -- cgit v1.2.3-70-g09d2