elexis
3028551b91
Introduce MOVABLE idiom indicating that a class can use move semantics. Make values of CGUI struct maps holding XML data const to ensure at the root that the data is not modified. Use NONCOPYABLE and MOVABLE for SGUIIcon and SGUIStyle to enforce the non-copy policy on the compiler level (until someone changes the GUI design to make modifications needed). As indicated by that: Replace copy operations by in place move operations for these CGUI struct maps in the CGUI Xeromyces XML loading functions. Replace copy operations by const references for CSize and SGUIIcon in CGUIString::GenerateTextCall and CGUI::GenerateText. This avoids copying of non primitive members, such as the strings and containers of strings. Further related cleanup to be kept separated for auditability. Differential Revision: https://code.wildfiregames.com/D2163 Few comments on IRC by: wraitii, Itms Tested on: gcc 9, Jenkins, partially VS2015 Refs #1984, NONCOPYABLE CGUISpriteInstances:0a7d0ecdde,8f4f8e240f,c19f3608a5NONCOPYABLE Image, Sprite:fb8032043bNONCOPYABLE GUI page:94c57085e9NONCOPYABLE GUIManager:7c2e9027c2NONCOPYABLE macro:16ccae10cdThis was SVN commit r22637.
88 lines
2.0 KiB
C++
88 lines
2.0 KiB
C++
/* Copyright (C) 2019 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. 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
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. 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 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef INCLUDED_GUIRENDERER
|
|
#define INCLUDED_GUIRENDERER
|
|
|
|
#include "graphics/ShaderTechnique.h"
|
|
#include "graphics/Texture.h"
|
|
#include "gui/CGUIColor.h"
|
|
#include "lib/res/handle.h"
|
|
#include "ps/CStr.h"
|
|
#include "ps/Shapes.h"
|
|
|
|
#include <vector>
|
|
|
|
struct SGUIImageEffects;
|
|
struct SGUIImage;
|
|
|
|
namespace GUIRenderer
|
|
{
|
|
class IGLState
|
|
{
|
|
public:
|
|
virtual ~IGLState() {};
|
|
virtual void Set(const CTexturePtr& tex) = 0;
|
|
virtual void Unset() = 0;
|
|
};
|
|
|
|
struct SDrawCall
|
|
{
|
|
SDrawCall(const SGUIImage* image) : m_Image(image) {}
|
|
CRect ComputeTexCoords() const;
|
|
|
|
const SGUIImage* m_Image;
|
|
|
|
bool m_HasTexture;
|
|
CTexturePtr m_Texture;
|
|
|
|
CRect m_ObjectSize;
|
|
int m_CellID;
|
|
|
|
bool m_EnableBlending;
|
|
|
|
CShaderTechniquePtr m_Shader;
|
|
CColor m_ShaderColorParameter;
|
|
|
|
CRect m_Vertices;
|
|
float m_DeltaZ;
|
|
|
|
CGUIColor m_BorderColor; // == CGUIColor() for no border
|
|
CGUIColor m_BackColor;
|
|
};
|
|
|
|
class DrawCalls : public std::vector<SDrawCall>
|
|
{
|
|
public:
|
|
DrawCalls();
|
|
// Copy/assignment results in an empty list, not an actual copy
|
|
DrawCalls(const DrawCalls&);
|
|
DrawCalls& operator=(const DrawCalls&);
|
|
};
|
|
}
|
|
|
|
#include "gui/CGUISprite.h"
|
|
|
|
namespace GUIRenderer
|
|
{
|
|
void UpdateDrawCallCache(DrawCalls& Calls, const CStr& SpriteName, const CRect& Size, int CellID, std::map<CStr, const CGUISprite*>& Sprites);
|
|
|
|
void Draw(DrawCalls& Calls, float Z);
|
|
}
|
|
|
|
#endif // INCLUDED_GUIRENDERER
|