diff options
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/graphics.cpp | 3 | ||||
-rw-r--r-- | src/render/graphics.h | 16 | ||||
-rw-r--r-- | src/render/modernopenglgraphics.cpp | 7 | ||||
-rw-r--r-- | src/render/modernopenglgraphics.h | 3 | ||||
-rw-r--r-- | src/render/openglgraphicsdef1.hpp | 9 |
5 files changed, 1 insertions, 37 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp index e40a4eb7d..9ea8c7cad 100644 --- a/src/render/graphics.cpp +++ b/src/render/graphics.cpp @@ -124,8 +124,7 @@ Graphics::Graphics() : mStartFreeMem(0), mSync(false), mScale(1), - mColor(), - mColor2() + mColor() { mRect.x = 0; mRect.y = 0; diff --git a/src/render/graphics.h b/src/render/graphics.h index d6860d621..d6f74d854 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -303,27 +303,12 @@ class Graphics notfinal virtual void setColor(const Color &color) { mColor = color; - mColor2 = color; - mAlpha = (color.a != 255); - } - - void setColor2(const Color &color) - { mColor2 = color; } - - virtual void setColorAll(const Color &color, - const Color &color2) - { - mColor = color; - mColor2 = color2; mAlpha = (color.a != 255); } const Color &getColor() const { return mColor; } - const Color &getColor2() const - { return mColor2; } - #ifdef DEBUG_DRAW_CALLS virtual unsigned int getDrawCalls() const { return 0; } @@ -536,7 +521,6 @@ class Graphics notfinal bool mSync; int mScale; Color mColor; - Color mColor2; }; extern Graphics *mainGraphics; diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index 04393eab6..9e0644138 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -236,13 +236,6 @@ bool ModernOpenGLGraphics::setVideoMode(const int w, const int h, void ModernOpenGLGraphics::setColor(const Color &color) { - setColorAll(color, color); -} - -void ModernOpenGLGraphics::setColorAll(const Color &color, - const Color &color2) -{ - mColor2 = color2; mColorAlpha = (color.a != 255); if (mColor != color) { diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h index 6604e3361..0577f5db2 100644 --- a/src/render/modernopenglgraphics.h +++ b/src/render/modernopenglgraphics.h @@ -58,9 +58,6 @@ class ModernOpenGLGraphics final : public Graphics void setColor(const Color &color) override final; - void setColorAll(const Color &color, - const Color &color2) override final; - void screenResized() override final; void finalize(ImageCollection *const col) override final; diff --git a/src/render/openglgraphicsdef1.hpp b/src/render/openglgraphicsdef1.hpp index 368f09f49..0a1ed7ba2 100644 --- a/src/render/openglgraphicsdef1.hpp +++ b/src/render/openglgraphicsdef1.hpp @@ -24,14 +24,5 @@ public: void setColor(const Color &color) override final { mColor = color; - mColor2 = color; - mColorAlpha = (color.a != 255); - } - - void setColorAll(const Color &color, - const Color &color2) override final - { - mColor = color; - mColor2 = color2; mColorAlpha = (color.a != 255); } |