From ac47d2d0286ee93e76c55ec5f647989c1c5983a6 Mon Sep 17 00:00:00 2001 From: prefect Date: Sun, 24 Sep 2006 12:06:36 +0000 Subject: [PATCH] Cleanup: Remove unused COverlay class This was SVN commit r4388. --- source/ps/Overlay.cpp | 17 +------- source/ps/Overlay.h | 93 +------------------------------------------ 2 files changed, 2 insertions(+), 108 deletions(-) diff --git a/source/ps/Overlay.cpp b/source/ps/Overlay.cpp index 16413d7bba..e8f556a090 100644 --- a/source/ps/Overlay.cpp +++ b/source/ps/Overlay.cpp @@ -1,5 +1,5 @@ /* -COverlay +Overlay.cpp by Rich Cross rich@0ad.wildfiregames.com */ @@ -46,21 +46,6 @@ bool CColor::ParseString(const CStr& Value, float DefaultAlpha) return true; } -COverlay::COverlay() - : m_Rect(CRect(0.f,0.f,0.f,0.f)), m_Z(0), m_Texture(""), m_Color(CColor(0,0,0,0)), m_HasBorder(false), m_BorderColor(CColor(0,0,0,0)) -{ -} - - -COverlay::COverlay(const CRect& rect,int z,const CColor& color,const char* texturename, - bool hasBorder,const CColor& bordercolor) - : m_Rect(rect), m_Z(z), m_Texture(texturename), m_Color(color), m_HasBorder(hasBorder), m_BorderColor(bordercolor) -{ -} - -COverlay::~COverlay() -{ -} /*************************************************************************/ diff --git a/source/ps/Overlay.h b/source/ps/Overlay.h index 27938b1065..33607cc972 100644 --- a/source/ps/Overlay.h +++ b/source/ps/Overlay.h @@ -1,5 +1,5 @@ /* -COverlay +Overlay.h by Rich Cross, rich@0ad.wildfiregames.com @@ -219,95 +219,4 @@ public: }; -//-------------------------------------------------------- -// Includes / Compiler directives -//-------------------------------------------------------- -#include "graphics/Texture.h" - - -//-------------------------------------------------------- -// Macros -//-------------------------------------------------------- - -//-------------------------------------------------------- -// Types -//-------------------------------------------------------- - -//-------------------------------------------------------- -// Error declarations -//-------------------------------------------------------- - -//-------------------------------------------------------- -// Declarations -//-------------------------------------------------------- - -/** - * @author Rich Cross - * - * Overlay class definition. - */ -class COverlay -{ -public: - /** - * Default constructor; creates an overlay that won't actually be renderable - */ - COverlay(); - /** - * Constructor with setup for more common parameters - */ - COverlay(const CRect& rect,int z,const CColor& color,const char* texturename="",bool hasBorder=false, - const CColor& bordercolor=CColor(0,0,0,0)); - /** - * Destructor - */ - ~COverlay(); - - /** - * Get coordinates - */ - const CRect& GetRect() const { return m_Rect; } - - /** - * Get depth - */ - int GetZ() const { return m_Z; } - - /** - * Get texture (not const as Renderer need to modify texture to store handle) - */ - CTexture& GetTexture() { return m_Texture; } - - /** - * Get color - */ - const CColor& GetColor() const { return m_Color; } - - /** - * Get border flag - */ - bool HasBorder() const { return m_HasBorder; } - - /** - * Get border color - */ - const CColor& GetBorderColor() const { return m_BorderColor; } - - -private: - /// screen space coordinates of overlay - CRect m_Rect; - /// depth of overlay, for correctly overlapping overlays; higher z implies in-front-of behaviour - int m_Z; - /// texture to use in rendering overlay; can be a null texture - CTexture m_Texture; - /// overlay color - CColor m_Color; - // flag indicating whether to render overlay using a border - bool m_HasBorder; - /// border color - CColor m_BorderColor; -}; - - #endif