From df7306b25899f3fafa4adb969e70ea83ac567ffb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 10 Mar 2014 00:25:58 +0300 Subject: Remove duplicate code from renderers. --- src/render/openglgraphicsdef.hpp | 144 ++++++++------------------------------- 1 file changed, 28 insertions(+), 116 deletions(-) (limited to 'src/render/openglgraphicsdef.hpp') diff --git a/src/render/openglgraphicsdef.hpp b/src/render/openglgraphicsdef.hpp index 5e8e3390c..c8937717b 100644 --- a/src/render/openglgraphicsdef.hpp +++ b/src/render/openglgraphicsdef.hpp @@ -20,131 +20,43 @@ * along with this program. If not, see . */ - bool setVideoMode(const int w, const int h, - const int scalle, - const int bpp, - const bool fs, - const bool hwaccel, - const bool resize, - const bool noFrame) override final; +public: + void setColor(const Color &color) override final + { + mColor = color; + mColor2 = color; + mColorAlpha = (color.a != 255); + } + void setColorAll(const Color &color, const Color &color2) + { + mColor = color; + mColor2 = color2; + mColorAlpha = (color.a != 255); + } - /** - * Draws a resclaled version of the image - */ - bool drawRescaledImage(const Image *const image, - int dstX, int dstY, - const int desiredWidth, - const int desiredHeight) override final; + void drawRectangle(const Rect &rect, + const bool filled); - void inline drawPatternInline(const Image *const image, - const int x, const int y, - const int w, const int h); + static void dumpSettings(); - void drawPattern(const Image *const image, - const int x, const int y, - const int w, const int h) override final; + void prepareScreenshot() override final; - /** - * Draw a pattern based on a rescaled version of the given image... - */ - void drawRescaledPattern(const Image *const image, - const int x, const int y, - const int w, const int h, - const int scaledWidth, - const int scaledHeight) override final; + int getMemoryUsage() A_WARN_UNUSED; - void calcPattern(ImageVertexes* const vert, - const Image *const image, - const int x, const int y, - const int w, const int h) const override final; + void updateTextureFormat(); - void calcPattern(ImageCollection* const vert, - const Image *const image, - const int x, const int y, - const int w, const int h) const override final; + bool isAllowScale() const override final + { return true; } - void calcTileVertexes(ImageVertexes *const vert, - const Image *const image, - int x, int y) const override final; + static void bindTexture(const GLenum target, const GLuint texture); - void calcTileCollection(ImageCollection *const vertCol, - const Image *const image, - int x, int y) override final; + static GLuint mLastImage; - void drawTileCollection(const ImageCollection *const vertCol) - override final; +protected: + void setTexturingAndBlending(const bool enable); - void drawTileVertexes(const ImageVertexes *const vert) override final; +private: + void inline setColorAlpha(const float alpha); - void calcWindow(ImageCollection *const vertCol, - const int x, const int y, - const int w, const int h, - const ImageRect &imgRect) override final; - - void updateScreen() override final; - - void _beginDraw() override final; - - void _endDraw() override final; - - bool pushClipArea(Rect area) override final; - - void popClipArea() override final; - - void setColor(const Color &color) override final - { - mColor = color; - mColor2 = color; - mColorAlpha = (color.a != 255); - } - - void setColorAll(const Color &color, const Color &color2) - { - mColor = color; - mColor2 = color2; - mColorAlpha = (color.a != 255); - } - - void drawPoint(int x, int y) override final; - - void drawLine(int x1, int y1, int x2, int y2) override final; - - void drawRectangle(const Rect &rect, - const bool filled); - - void drawRectangle(const Rect &rect) override final; - - void fillRectangle(const Rect &rect) override final; - - static void dumpSettings(); - - /** - * Takes a screenshot and returns it as SDL surface. - */ - SDL_Surface *getScreenshot() override final A_WARN_UNUSED; - - void prepareScreenshot() override final; - - int getMemoryUsage() A_WARN_UNUSED; - - void updateTextureFormat(); - - bool drawImage(const Image *const image, - int dstX, int dstY) override final; - - void drawImageCached(const Image *const image, - int x, int y) override final; - - void drawPatternCached(const Image *const image, - const int x, const int y, - const int w, const int h) override final; - - void completeCache() override final; - - bool isAllowScale() const override final - { return true; } - - static void bindTexture(const GLenum target, const GLuint texture); - - static GLuint mLastImage; + void inline restoreColor(); -- cgit v1.2.3-60-g2f50