Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-30 18:16:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renamed cImage::Size() to cImage::MemSize(), since it was confusing.

Browse Source 
cImage::Size() now returns the image dimensions.
Changed how cUIControl::SetSkin works, it was confusing, now just spects a Skin const reference and make a copy from it.
Fixed DoAfterSetTheme to be virtual, now SetSkin works for all the controls.
Restructured cPrimitives.
Removed some Draw* calls, since it was a little bit bloated, sometimes less is more.
Also added fill mode, blend mode and line width as members of the instance of the primitives class, this way i reduced the number of parameters in almost all the functions, and, it's cleaner.
This commit is contained in:
Martín Lucas Golini
2013-01-03 02:24:28 -03:00
parent bf81f1d6d5
commit 9fdffcabea
30 changed files with 513 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/eepp/graphics/cimage.hpp
View File

@@ -3,6 +3,9 @@
#include <eepp/base.hpp>
#include <eepp/math/size.hpp>
using namespace EE::Math;
#include <eepp/system/colors.hpp>
#include <eepp/system/clog.hpp>
#include <eepp/system/cpack.hpp>
@@ -102,7 +105,10 @@ class EE_API cImage {
void ClearCache();
/** @return The Image Size on Memory (in bytes) */
eeUint Size() const;
eeUint MemSize() const;
/** @return The image dimensions */
eeSize Size();
/** Save the Image to a new File in a specific format */
virtual bool SaveToFile( const std::string& filepath, const EE_SAVE_TYPE& Format );

280
include/eepp/graphics/cprimitives.hpp
View File

@@ -2,9 +2,6 @@
#define EE_GRAPHICSCPRIMITIVES_H
#include <eepp/graphics/base.hpp>
#include <eepp/graphics/ctexturefactory.hpp>
#include <eepp/graphics/cbatchrenderer.hpp>
#include <eepp/graphics/cglobalbatchrenderer.hpp>
namespace EE { namespace Graphics {
@@ -15,172 +12,53 @@ class EE_API cPrimitives {
~cPrimitives();
/** Draw a Line on screen
* @param x First point x axis
* @param y First point y axis
* @param x2 Second Point x axis
* @param y2 Second Point y axis
* @param lineWidth The line width ( default 1.0f )
*/
void DrawLine(const eeFloat& x, const eeFloat& y, const eeFloat& x2, const eeFloat& y2, const eeFloat& lineWidth = 1.0f);
/** Draw a Line on screen
* @param p1 First Point
* @param p2 Second Point
* @param lineWidth The line width ( default 1.0f )
*/
void DrawLine(const eeVector2f& p1, const eeVector2f& p2, const eeFloat& lineWidth = 1.0f);
/** Draw a point on the screen
* @param x Point x axis
* @param y Point y axis
* @param pointSize Point Size (default 1.0f )
*/
void DrawPoint(const eeFloat& x, const eeFloat& y, const eeFloat& pointSize = 1.0f);
/** Draw a point on the screen
* @param p The coordinates
* @param pointSize Point Size (default 1.0f )
*/
void DrawPoint(const eeVector2f& p, const eeFloat& pointSize = 1.0f);
void DrawPoint( const eeVector2f& p, const eeFloat& pointSize = 1.0f );
/** Draw a Line on screen
* @param line The line
*/
void DrawLine( const eeLine2f& line );
/** Draw a circle on the screen
* @param p The coordinates ( x and y represents the center of the circle )
* @param radius The Circle Radius
* @param points Number of points to represent the circle
* @param fillmode Draw filled or only lines
* @param lineWidth The line width ( default 1.0f )
*/
void DrawCircle(const eeVector2f& p, const eeFloat& radius, Uint32 points = 360, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const eeFloat& lineWidth = 1.0f);
/** Draw a circle on the screen
* @param x Point x axis
* @param y Point y axis
* @param radius The Circle Radius
* @param points Number of points to represent the circle
* @param fillmode Draw filled or only lines
* @param lineWidth The line width ( default 1.0f )
*/
void DrawCircle(const eeFloat& x, const eeFloat& y, const eeFloat& radius, Uint32 points = 360, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const eeFloat& lineWidth = 1.0f);
/** Draw a triangle on the screen
* @param x1 First Point x axis
* @param y1 First Point y axis
* @param x2 Second Point x axis
* @param y2 Second Point y axis
* @param x3 Third Point x axis
* @param y3 Third Point y axis
* @param Color1 First Point Color
* @param Color2 Second Point Color
* @param Color3 Third Point Color
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawTriangle(const eeFloat& x1, const eeFloat& y1, const eeFloat& x2, const eeFloat& y2, const eeFloat& x3, const eeFloat& y3, const eeColorA& Color1, const eeColorA& Color2, const eeColorA& Color3, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f);
/** Draw a triangle on the screen
* @param x1 First Point x axis
* @param y1 First Point y axis
* @param x2 Second Point x axis
* @param y2 Second Point y axis
* @param x3 Third Point x axis
* @param y3 Third Point y axis
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawTriangle(const eeFloat& x1, const eeFloat& y1, const eeFloat& x2, const eeFloat& y2, const eeFloat& x3, const eeFloat& y3, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f);
/** Draw a triangle on the screen
* @param p1 First Point axis
* @param p2 Second Point axis
* @param p3 Third Point axis
* @param Color1 First Point Color
* @param Color2 Second Point Color
* @param Color3 Third Point Color
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawTriangle(const eeVector2f& p1, const eeVector2f& p2, const eeVector2f& p3, const eeColorA& Color1, const eeColorA& Color2, const eeColorA& Color3, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f);
/** Draw a triangle on the screen
* @param p1 First Point axis
* @param p2 Second Point axis
* @param p3 Third Point axis
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawTriangle(const eeVector2f& p1, const eeVector2f& p2, const eeVector2f& p3, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f);
void DrawCircle( const eeVector2f& p, const eeFloat& radius, Uint32 points = 360 );
/** Draw a triangle on the screen
* @param t The Triangle (eeTriangle2f)
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawTriangle(const eeTriangle2f& t, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f);
void DrawTriangle( const eeTriangle2f& t );
/** Draw a triangle on the screen
/** Draw a triangle on the screen setting per vertex color
* @param t The Triangle (eeTriangle2f)
* @param Color1 First Point Color
* @param Color2 Second Point Color
* @param Color3 Third Point Color
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawTriangle(const eeTriangle2f& t, const eeColorA& Color1, const eeColorA& Color2, const eeColorA& Color3, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f);
/** Draw a rectangle on the screen
* @param x Screen x axis
* @param y Screen y axis
* @param width Rectangle Width
* @param height Rectangle Height
* @param Angle Rectangle Angle
* @param Scale Rectangle Scale ( default 1.0f )
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawRectangle(const eeFloat& x, const eeFloat& y, const eeFloat& width, const eeFloat& height, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeUint& Corners = 0 );
void DrawRoundedRectangle(const eeFloat& x, const eeFloat& y, const eeFloat& width, const eeFloat& height, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeUint& Corners = 8 );
/** Draw a rectangle on the screen
* @param x Screen x axis
* @param y Screen y axis
* @param width Rectangle Width
* @param height Rectangle Height
* @param TopLeft The Top Left Rectangle Color
* @param BottomLeft The Bottom Left Rectangle Color
* @param BottomRight The Bottom Right Rectangle Color
* @param TopRight The Top Right Rectangle Color
* @param Angle Rectangle Angle
* @param Scale Rectangle Scale ( default 1.0f )
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawRectangle(const eeFloat& x, const eeFloat& y, const eeFloat& width, const eeFloat& height, const eeColorA& TopLeft, const eeColorA& BottomLeft, const eeColorA& BottomRight, const eeColorA& TopRight, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeUint& Corners = 0 );
void DrawRoundedRectangle(const eeFloat& x, const eeFloat& y, const eeFloat& width, const eeFloat& height, const eeColorA& TopLeft, const eeColorA& BottomLeft, const eeColorA& BottomRight, const eeColorA& TopRight, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeUint& Corners = 8 );
void DrawTriangle( const eeTriangle2f& t, const eeColorA& Color1, const eeColorA& Color2, const eeColorA& Color3 );
/** Draw a rectangle on the screen
* @param R The Rectangle eeRectf
* @param Angle Rectangle Angle
* @param Scale Rectangle Scale ( default 1.0f )
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawRectangle( const eeRectf& R, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeUint& Corners = 0 );
void DrawRectangle( const eeRectf& R, const eeFloat& Angle = 0, const eeFloat& Scale = 1 );
void DrawRoundedRectangle( const eeRectf& R, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeUint& Corners = 8 );
/** Draw a rounded rectangle on the screen
* @param R The Rectangle eeRectf
* @param Angle Rectangle Angle
* @param Scale Rectangle Scale ( default 1.0f )
* @param Corners Number of vertices per corner ( how rounded is each corner )
*/
void DrawRoundedRectangle( const eeRectf& R, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const eeUint& Corners = 8 );
/** Draw a rectangle on the screen
/** Draw a rectangle on the screen setting per vertex color
* @param R The Rectangle eeRectf
* @param TopLeft The Top Left Rectangle Color
* @param BottomLeft The Bottom Left Rectangle Color
@@ -188,89 +66,43 @@ class EE_API cPrimitives {
* @param TopRight The Top Right Rectangle Color
* @param Angle Rectangle Angle
* @param Scale Rectangle Scale ( default 1.0f )
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawRectangle( const eeRectf& R, const eeColorA& TopLeft, const eeColorA& BottomLeft, const eeColorA& BottomRight, const eeColorA& TopRight, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeUint& Corners = 0 );
void DrawRectangle( const eeRectf& R, const eeColorA& TopLeft, const eeColorA& BottomLeft, const eeColorA& BottomRight, const eeColorA& TopRight, const eeFloat& Angle = 0, const eeFloat& Scale = 1 );
void DrawRoundedRectangle( const eeRectf& R, const eeColorA& TopLeft, const eeColorA& BottomLeft, const eeColorA& BottomRight, const eeColorA& TopRight, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeUint& Corners = 8 );
/** Draw a four edges polygon on screen
* @param x1 First Point x axis
* @param y1 First Point y axis
* @param x2 Second Point x axis
* @param y2 Second Point y axis
* @param x3 Third Point x axis
* @param y3 Third Point y axis
* @param x4 Fourth Point x axis
* @param y4 Fourth Point y axis
* @param Color1 First Point Color
* @param Color2 Second Point Color
* @param Color3 Third Point Color
* @param Color4 Fourth Point Color
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
/** Draw a rounded rectangle on the screen setting per vertex color
* @param R The Rectangle eeRectf
* @param TopLeft The Top Left Rectangle Color
* @param BottomLeft The Bottom Left Rectangle Color
* @param BottomRight The Bottom Right Rectangle Color
* @param TopRight The Top Right Rectangle Color
* @param Angle Rectangle Angle
* @param Scale Rectangle Scale ( default 1.0f )
* @param Corners Number of vertices per corner ( how rounded is each corner )
*/
void DrawQuad(const eeFloat& x1, const eeFloat& y1, const eeFloat& x2, const eeFloat& y2, const eeFloat& x3, const eeFloat& y3, const eeFloat& x4, const eeFloat& y4, const eeColorA& Color1, const eeColorA& Color2, const eeColorA& Color3, const eeColorA& Color4, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeFloat& OffsetX = 0, const eeFloat& OffsetY = 0);
/** Draw a four edges polygon on screen
* @param x1 First Point x axis
* @param y1 First Point y axis
* @param x2 Second Point x axis
* @param y2 Second Point y axis
* @param x3 Third Point x axis
* @param y3 Third Point y axis
* @param x4 Fourth Point x axis
* @param y4 Fourth Point y axis
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawQuad(const eeFloat& x1, const eeFloat& y1, const eeFloat& x2, const eeFloat& y2, const eeFloat& x3, const eeFloat& y3, const eeFloat& x4, const eeFloat& y4, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeFloat& OffsetX = 0, const eeFloat& OffsetY = 0);
/** Draw a four edges polygon on screen
* @param p1 First Point
* @param p2 Second Point
* @param p3 Third Point
* @param p4 Fourth Point
* @param Color1 First Point Color
* @param Color2 Second Point Color
* @param Color3 Third Point Color
* @param Color4 Fourth Point Color
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawQuad(const eeVector2f& p1, const eeVector2f& p2, const eeVector2f& p3, const eeVector2f& p4, const eeColorA& Color1, const eeColorA& Color2, const eeColorA& Color3, const eeColorA& Color4, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeFloat& OffsetX = 0, const eeFloat& OffsetY = 0);
/** Draw a four edges polygon on screen
* @param p1 First Point
* @param p2 Second Point
* @param p3 Third Point
* @param p4 Fourth Point
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawQuad(const eeVector2f& p1, const eeVector2f& p2, const eeVector2f& p3, const eeVector2f& p4, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeFloat& OffsetX = 0, const eeFloat& OffsetY = 0);
void DrawRoundedRectangle( const eeRectf& R, const eeColorA& TopLeft, const eeColorA& BottomLeft, const eeColorA& BottomRight, const eeColorA& TopRight, const eeFloat& Angle = 0, const eeFloat& Scale = 1, const eeUint& Corners = 8 );
/** Draw a four edges polygon on screen
* @param q The Quad
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
* @param OffsetX X offset for the quad
* @param OffsetY Y offset for the quad
*/
void DrawQuad(const eeQuad2f& q, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f, const eeFloat& OffsetX = 0, const eeFloat& OffsetY = 0);
void DrawQuad( const eeQuad2f& q, const eeFloat& OffsetX = 0, const eeFloat& OffsetY = 0 );
/** Draw a four edges polygon on screen
* @param q The Quad
* @param Color1 First Point Color
* @param Color2 Second Point Color
* @param Color3 Third Point Color
* @param Color4 Fourth Point Color
* @param OffsetX X offset for the quad
* @param OffsetY Y offset for the quad
*/
void DrawQuad( const eeQuad2f& q, const eeColorA& Color1, const eeColorA& Color2, const eeColorA& Color3, const eeColorA& Color4, const eeFloat& OffsetX = 0, const eeFloat& OffsetY = 0 );
/** Draw a polygon on screen
* @param p The Polygon
* @param fillmode Draw filled or only lines
* @param blend The Blend Mode
* @param lineWidth The line width ( default 1.0f )
*/
void DrawPolygon(const eePolygon2f& p, const EE_FILL_MODE& fillmode = EE_DRAW_FILL, const EE_BLEND_MODE& blend = ALPHA_NORMAL, const eeFloat& lineWidth = 1.0f);
void DrawPolygon( const eePolygon2f& p );
/** Set the current color for drawing primitives */
void SetColor( const eeColorA& Color );
@@ -282,9 +114,29 @@ class EE_API cPrimitives {
/** Force to draw the batched vertexs. */
void DrawBatch();
/** Set the fill mode used to draw primitives */
void FillMode( const EE_FILL_MODE& Mode );
/** @return The fill mode used to draw primitives */
const EE_FILL_MODE& FillMode() const;
/** Set the blend mode used to draw primitives */
void BlendMode( const EE_BLEND_MODE& Mode );
/** @return The blend mode used to draw primitives */
const EE_BLEND_MODE& BlendMode() const;
/** Set the line width to draw primitives */
void LineWidth( const eeFloat& width );
/** @return The line with to draw primitives */
const eeFloat& LineWidth() const;
private:
eeColorA mColor;
cGlobalBatchRenderer * mBR;
EE_FILL_MODE mFillMode;
EE_BLEND_MODE mBlendMode;
eeFloat mLineWidth;
bool mForceDraw;
};

42
include/eepp/math/quad2.hpp
View File

@@ -11,6 +11,8 @@ class Quad2 {
public:
Quad2();
Quad2( const tRECT<T>& R );
Quad2( const Vector2<T>& v1, const Vector2<T>& v2, const Vector2<T>& v3, const Vector2<T>& v4 );
const Vector2<T>& operator[] ( const Uint32& Pos ) const;
@@ -38,6 +40,30 @@ class Quad2 {
void Scale( const T& scale, const Vector2<T>& Center );
};
template <typename T>
Quad2<T>::Quad2() {
V[0] = Vector2<T>();
V[1] = Vector2<T>();
V[2] = Vector2<T>();
V[3] = Vector2<T>();
}
template <typename T>
Quad2<T>::Quad2( const Vector2<T>& v1, const Vector2<T>& v2, const Vector2<T>& v3, const Vector2<T>& v4 ) {
V[0] = v1;
V[1] = v2;
V[2] = v3;
V[3] = v4;
}
template <typename T>
Quad2<T>::Quad2( const tRECT<T>& R ) {
V[0] = Vector2<T>( R.Left, R.Top );
V[1] = Vector2<T>( R.Left, R.Bottom );
V[2] = Vector2<T>( R.Right, R.Bottom );
V[3] = Vector2<T>( R.Right, R.Top );
}
template <typename T>
void Quad2<T>::Rotate( const T& Angle ) {
Rotate( Angle, GetCenter() );
@@ -125,22 +151,6 @@ const Vector2<T>& Quad2<T>::operator[] ( const Uint32& Pos ) const {
return V[0];
}
template <typename T>
Quad2<T>::Quad2() {
V[0] = Vector2<T>();
V[1] = Vector2<T>();
V[2] = Vector2<T>();
V[3] = Vector2<T>();
}
template <typename T>
Quad2<T>::Quad2( const Vector2<T>& v1, const Vector2<T>& v2, const Vector2<T>& v3, const Vector2<T>& v4 ) {
V[0] = v1;
V[1] = v2;
V[2] = v3;
V[3] = v4;
}
typedef Quad2<eeFloat> eeQuad2f;
}}

7
include/eepp/math/rect.hpp
View File

@@ -51,6 +51,8 @@ class tRECT {
Vector2<T> Pos();
Vector2<T> Center();
tSize<T> Size();
};
@@ -105,6 +107,11 @@ Vector2<T> tRECT<T>::Pos() {
return Vector2<T>( Left, Top );
}
template <typename T>
Vector2<T> tRECT<T>::Center() {
return Vector2<T>( Left + ( ( Right - Left ) * 0.5 ), Top + ( ( Bottom - Top ) * 0.5 ) );
}
template <typename T>
tSize<T> tRECT<T>::Size() {
return tSize<T>( Right - Left, Bottom - Top );

6
include/eepp/ui/cuicontrol.hpp
View File

@@ -199,7 +199,7 @@ class EE_API cUIControl {
void SetSkinFromTheme( cUITheme * Theme, const std::string& ControlName );
virtual void SetSkin( cUISkin * Skin );
virtual void SetSkin( const cUISkin& Skin );
cUIControl * ChildGetFirst() const;
@@ -319,6 +319,8 @@ class EE_API cUIControl {
virtual void DrawChilds();
virtual void DoAfterSetTheme();
virtual cUIControl * OverFind( const eeVector2f& Point );
void ClipMe();
@@ -370,6 +372,8 @@ class EE_API cUIControl {
void SafeDeleteSkinState();
eeSize GetSkinSize( cUISkin * Skin, const Uint32& State = cUISkinState::StateNormal );
eeRectf GetRectf();
};
}}

4
include/eepp/ui/cuipushbutton.hpp
View File

@@ -62,8 +62,6 @@ class EE_API cUIPushButton : public cUIComplexControl {
virtual bool IsType( const Uint32& type ) const;
virtual void SetSkin( cUISkin * Skin );
virtual void SetTheme( cUITheme * Theme );
virtual void Icon( cSubTexture * Icon );
@@ -98,7 +96,7 @@ class EE_API cUIPushButton : public cUIComplexControl {
virtual void OnStateChange();
void DoAfterSetTheme();
virtual void DoAfterSetTheme();
virtual Uint32 OnKeyDown( const cUIEventKey& Event );