diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index 0c5bccd9a..095a3926e 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -1528,87 +1528,6 @@ void Graphics::origin() pixelSizeStack.back() = 1; } -Graphics::DisplayState::DisplayState() - : color(255, 255, 255, 255) - , backgroundColor(0, 0, 0, 255) - , blendMode(BLEND_ALPHA) - , blendMultiplyAlpha(true) - , lineWidth(1.0f) - , lineStyle(LINE_SMOOTH) - , lineJoin(LINE_JOIN_MITER) - , pointSize(1.0f) - , scissor(false) - , scissorBox() - , stencilTest(false) - , stencilInvert(false) - , font(nullptr) - , shader(nullptr) - , colorMask({true, true, true, true}) - , wireframe(false) - , defaultFilter() - , defaultMipmapFilter(Texture::FILTER_NEAREST) - , defaultMipmapSharpness(0.0f) -{ -} - -Graphics::DisplayState::DisplayState(const DisplayState &other) - : color(other.color) - , backgroundColor(other.backgroundColor) - , blendMode(other.blendMode) - , blendMultiplyAlpha(other.blendMultiplyAlpha) - , lineWidth(other.lineWidth) - , lineStyle(other.lineStyle) - , lineJoin(other.lineJoin) - , pointSize(other.pointSize) - , scissor(other.scissor) - , scissorBox(other.scissorBox) - , stencilTest(other.stencilTest) - , stencilInvert(other.stencilInvert) - , font(other.font) - , shader(other.shader) - , canvases(other.canvases) - , colorMask(other.colorMask) - , wireframe(other.wireframe) - , defaultFilter(other.defaultFilter) - , defaultMipmapFilter(other.defaultMipmapFilter) - , defaultMipmapSharpness(other.defaultMipmapSharpness) -{ -} - -Graphics::DisplayState::~DisplayState() -{ -} - -Graphics::DisplayState &Graphics::DisplayState::operator = (const DisplayState &other) -{ - color = other.color; - backgroundColor = other.backgroundColor; - blendMode = other.blendMode; - blendMultiplyAlpha = other.blendMultiplyAlpha; - lineWidth = other.lineWidth; - lineStyle = other.lineStyle; - lineJoin = other.lineJoin; - pointSize = other.pointSize; - scissor = other.scissor; - scissorBox = other.scissorBox; - stencilTest = other.stencilTest; - stencilInvert = other.stencilInvert; - - font = other.font; - shader = other.shader; - canvases = other.canvases; - - colorMask = other.colorMask; - - wireframe = other.wireframe; - - defaultFilter = other.defaultFilter; - defaultMipmapFilter = other.defaultMipmapFilter; - defaultMipmapSharpness = other.defaultMipmapSharpness; - - return *this; -} - } // opengl } // graphics } // love diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h index c84577521..1fc72bde7 100644 --- a/src/modules/graphics/opengl/Graphics.h +++ b/src/modules/graphics/opengl/Graphics.h @@ -463,44 +463,38 @@ private: struct DisplayState { - Color color; - Color backgroundColor; + Color color = Color(255, 255, 255, 255); + Color backgroundColor = Color(0, 0, 0, 255); - BlendMode blendMode; - bool blendMultiplyAlpha; + BlendMode blendMode = BLEND_ALPHA; + bool blendMultiplyAlpha = true; - float lineWidth; - LineStyle lineStyle; - LineJoin lineJoin; + float lineWidth = 1.0f; + LineStyle lineStyle = LINE_SMOOTH; + LineJoin lineJoin = LINE_JOIN_MITER; - float pointSize; + float pointSize = 1.0f; - bool scissor; - OpenGL::Viewport scissorBox; + bool scissor = false; + OpenGL::Viewport scissorBox = OpenGL::Viewport(); // Stencil. - bool stencilTest; - bool stencilInvert; + bool stencilTest = false; + bool stencilInvert = false; StrongRef font; StrongRef shader; std::vector> canvases; - ColorMask colorMask; + ColorMask colorMask = {true, true, true, true}; - bool wireframe; + bool wireframe = false; - Texture::Filter defaultFilter; + Texture::Filter defaultFilter = Texture::Filter(); - Texture::FilterMode defaultMipmapFilter; - float defaultMipmapSharpness; - - DisplayState(); - DisplayState(const DisplayState &other); - ~DisplayState(); - - DisplayState &operator = (const DisplayState &other); + Texture::FilterMode defaultMipmapFilter = Texture::FILTER_NEAREST; + float defaultMipmapSharpness = 0.0f; }; void restoreState(const DisplayState &s);