Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Magic_Game/core/e2dcomponent.h

1203 lines
18 KiB
C
Raw Normal View History

加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
#pragma once
Refactoring : header files name
2018-09-05 13:17:07 +08:00
#include "e2dcommon.h"
add e2devent.h
2018-08-14 00:41:59 +08:00
#include "e2devent.h"
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
namespace e2d
{
new feature: shape and collision.
2018-02-03 22:04:43 +08:00
Action类重命名；去除Action构造器
2018-05-08 20:03:29 +08:00
class Action;
Refactoring : header files name
2018-09-05 13:17:07 +08:00
class Scene;
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
// <20><>ͼ<EFBFBD>ӿ<EFBFBD>
class Drawable
{
public:
// <20><>Ⱦͼ<C8BE><CDBC>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Draw() const = 0;
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
};
// <20><><EFBFBD>½ӿ<C2BD>
class Updatable
{
public:
// <20><>Ⱦͼ<C8BE><CDBC>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Update() = 0;
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
};
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD><EFBFBD>ӿ<EFBFBD>
class KeyEventHandler
{
public:
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Handle(KeyEvent e) = 0;
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
};
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD><EFBFBD>ӿ<EFBFBD>
class MouseEventHandler
{
public:
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Handle(MouseEvent e) = 0;
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
};
// <20><>ײ<EFBFBD><D7B2>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD><EFBFBD>ӿ<EFBFBD>
class CollisionHandler
{
public:
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ײ<EFBFBD><D7B2>Ϣ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Handle(Collision collision) = 0;
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
};
// <20>ڵ<EFBFBD>
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
class Node :
重做GC引用计数方式
2018-07-07 01:43:41 +08:00
public Ref
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
{
增加Exception类
2018-05-24 00:58:16 +08:00
friend class Collider;
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
public:
// <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD>
struct Property
{
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Point pos; // <20><><EFBFBD><EFBFBD>
Size size; // <20><>С
Point anchor; // ê<><C3AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Point scale; // <20><><EFBFBD><EFBFBD>
Point skew; // <20><>б<EFBFBD>Ƕ<EFBFBD>
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
float rotation; // <20><>ת<EFBFBD>Ƕ<EFBFBD>
Collider::Type改为Collider::Shape；增加节点变化差值。
2018-07-10 00:30:17 +08:00
Property operator+ (Property const & prop) const;
Property operator- (Property const & prop) const;
static const Property Origin;
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
};
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
public:
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
typedef std::vector<Node*> Nodes;
移除ActionManager
2018-09-05 00:08:03 +08:00
typedef std::vector<Action*> Actions;
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node();
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
virtual ~Node();
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD>ʾ״̬
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool IsVisible() const;
new attribute of Action: name
2018-03-06 09:56:17 +08:00
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const String& GetName() const;
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
update collision detection method Using initializer_list to implement variable parameters. Add InputListener & CollisionListener.
2018-03-31 18:12:01 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD>Ƶ<EFBFBD> Hash ֵ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
size_t GetHashName() const;
update collision detection method Using initializer_list to implement variable parameters. Add InputListener & CollisionListener.
2018-03-31 18:12:01 +08:00
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD>ͼ˳<CDBC><CBB3>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
int GetOrder() const;
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetPosX() const;
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetPosY() const;
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Point GetPos() const;
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetWidth() const;
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5>߶<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetHeight() const;
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
Revert "Refactoring: getter & setter coding style" This reverts commit 0905c91dd00e04ffc73611bfcac0912a64f0edee.
2018-08-23 16:37:51 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD>ȣ<EFBFBD><C8A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetRealWidth() const;
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
Revert "Refactoring: getter & setter coding style" This reverts commit 0905c91dd00e04ffc73611bfcac0912a64f0edee.
2018-08-23 16:37:51 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5>߶ȣ<DFB6><C8A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetRealHeight() const;
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
Revert "Refactoring: getter & setter coding style" This reverts commit 0905c91dd00e04ffc73611bfcac0912a64f0edee.
2018-08-23 16:37:51 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Size GetRealSize() const;
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
代码优化
2018-08-23 16:58:32 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD>ê<EFBFBD><C3AA>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetAnchorX() const;
添加了Geometry类；重整了监听器和定时器的绑定。
2017-10-26 17:17:30 +08:00
代码优化
2018-08-23 16:58:32 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD>ê<EFBFBD><C3AA>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetAnchorY() const;
添加了Geometry类；重整了监听器和定时器的绑定。
2017-10-26 17:17:30 +08:00
Revert "Refactoring: getter & setter coding style" This reverts commit 0905c91dd00e04ffc73611bfcac0912a64f0edee.
2018-08-23 16:37:51 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD>С
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Size GetSize() const;
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ű<EFBFBD><C5B1><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetScaleX() const;
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ű<EFBFBD><C5B1><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetScaleY() const;
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>Ƕ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetSkewX() const;
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>Ƕ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetSkewY() const;
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD>ת<EFBFBD>Ƕ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetRotation() const;
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD>͸<EFBFBD><CDB8><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetOpacity() const;
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
增加NodeProperty结构体，可以直接获取和设置节点的所有属性
2018-04-21 18:42:07 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Property GetProperty() const;
增加NodeProperty结构体，可以直接获取和设置节点的所有属性
2018-04-21 18:42:07 +08:00
增加碰撞消息处理
2018-07-13 00:45:39 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Property GetExtrapolate() const;
Revert "Refactoring: getter & setter coding style" This reverts commit 0905c91dd00e04ffc73611bfcac0912a64f0edee.
2018-08-23 16:37:51 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD>ײ<EFBFBD><D7B2>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Collider * GetCollider();
Revert "Refactoring: getter & setter coding style" This reverts commit 0905c91dd00e04ffc73611bfcac0912a64f0edee.
2018-08-23 16:37:51 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD>ڵ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Node * GetParent() const;
Revert "Refactoring: getter & setter coding style" This reverts commit 0905c91dd00e04ffc73611bfcac0912a64f0edee.
2018-08-23 16:37:51 +08:00
// <20><>ȡ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD>ڳ<EFBFBD><DAB3><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Scene * GetParentScene() const;
Revert "Refactoring: getter & setter coding style" This reverts commit 0905c91dd00e04ffc73611bfcac0912a64f0edee.
2018-08-23 16:37:51 +08:00
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
// <20><><EFBFBD>ýڵ<C3BD><DAB5>Ƿ<EFBFBD><C7B7><EFBFBD>ʾ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetVisible(
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
bool value
);
更新ENode
2017-10-14 11:40:47 +08:00
// <20><><EFBFBD>ýڵ<C3BD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetName(
函数参数中的String替换为const String&
2018-05-07 15:48:06 +08:00
const String& name
更新ENode
2017-10-14 18:43:32 +08:00
);
更新ENode
2017-10-14 11:40:47 +08:00
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
// <20><><EFBFBD>ýڵ<C3BD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetPosX(
性能优化
2018-07-28 20:06:27 +08:00
float x
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
);
// <20><><EFBFBD>ýڵ<C3BD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetPosY(
性能优化
2018-07-28 20:06:27 +08:00
float y
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
);
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
// <20><><EFBFBD>ýڵ<C3BD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetPos(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
const Point & point
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
);
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
// <20><><EFBFBD>ýڵ<C3BD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetPos(
性能优化
2018-07-28 20:06:27 +08:00
float x,
float y
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
);
增加Node::setPosFixed方法，使节点坐标固定
2018-05-07 17:15:57 +08:00
// <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̶<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetPosFixed(
增加Node::setPosFixed方法，使节点坐标固定
2018-05-07 17:15:57 +08:00
bool fixed
);
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
// <20>ƶ<EFBFBD><C6B6>ڵ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Move(
性能优化
2018-07-28 20:06:27 +08:00
float x,
float y
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
);
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
// <20>ƶ<EFBFBD><C6B6>ڵ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Move(
const Point & v
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
);
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
// <20><><EFBFBD>ýڵ<C3BD><DAB5><EFBFBD>ͼ˳<CDBC><CBB3>
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// Ĭ<><C4AC>Ϊ 0
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetOrder(
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
int order
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
);
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// <20><><EFBFBD>ú<EFBFBD><C3BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ű<EFBFBD><C5B1><EFBFBD>
增加Node::setClipEnabled方法，实现渲染区域裁剪
2018-07-28 18:44:37 +08:00
// Ĭ<><C4AC>Ϊ 1.0
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetScaleX(
float scale_x
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
);
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ű<EFBFBD><C5B1><EFBFBD>
增加Node::setClipEnabled方法，实现渲染区域裁剪
2018-07-28 18:44:37 +08:00
// Ĭ<><C4AC>Ϊ 1.0
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetScaleY(
float scale_y
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
);
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ű<EFBFBD><C5B1><EFBFBD>
增加Node::setClipEnabled方法，实现渲染区域裁剪
2018-07-28 18:44:37 +08:00
// Ĭ<><C4AC>Ϊ (1.0, 1.0)
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetScale(
float scale_x,
float scale_y
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
);
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ű<EFBFBD><C5B1><EFBFBD>
增加Node::setClipEnabled方法，实现渲染区域裁剪
2018-07-28 18:44:37 +08:00
// Ĭ<><C4AC>Ϊ 1.0
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetScale(
性能优化
2018-07-28 20:06:27 +08:00
float scale
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
);
// <20><><EFBFBD>ú<EFBFBD><C3BA><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>Ƕ<EFBFBD>
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// Ĭ<><C4AC>Ϊ 0
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetSkewX(
float skew_x
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>Ƕ<EFBFBD>
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// Ĭ<><C4AC>Ϊ 0
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetSkewY(
float skew_y
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>Ƕ<EFBFBD>
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// Ĭ<><C4AC>Ϊ (0, 0)
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetSkew(
float skew_x,
float skew_y
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ת<EFBFBD>Ƕ<EFBFBD>
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
// Ĭ<><C4AC>Ϊ 0
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetRotation(
性能优化
2018-07-28 20:06:27 +08:00
float rotation
更新了ENode二维变换矩阵算法
2017-10-15 02:46:24 +08:00
);
// <20><><EFBFBD><EFBFBD>͸<EFBFBD><CDB8><EFBFBD><EFBFBD>
增加Node::setClipEnabled方法，实现渲染区域裁剪
2018-07-28 18:44:37 +08:00
// Ĭ<><C4AC>Ϊ 1.0, <20><>Χ [0, 1]
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetOpacity(
性能优化
2018-07-28 20:06:27 +08:00
float opacity
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
);
代码优化
2018-08-23 16:58:32 +08:00
// <20><><EFBFBD><EFBFBD>ê<EFBFBD><C3AA><EFBFBD>ĺ<EFBFBD><C4BA><EFBFBD>λ<EFBFBD><CEBB>
中心点默认位置改为(0,0)；新增ENode::setDefaultPivot函数设置默认中心点；修复了启用或禁用按钮后按钮消失的bug；更新了判断点是否在节点内的算法；修复了切换开关按钮状态不执行回调函数的bug；修复了子节点与父节点相对位置错误的bug；修复了其他的一些小bug。
2017-11-09 18:22:41 +08:00
// Ĭ<><C4AC>Ϊ 0, <20><>Χ [0, 1]
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetAnchorX(
float anchor_x
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
);
代码优化
2018-08-23 16:58:32 +08:00
// <20><><EFBFBD><EFBFBD>ê<EFBFBD><C3AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>
中心点默认位置改为(0,0)；新增ENode::setDefaultPivot函数设置默认中心点；修复了启用或禁用按钮后按钮消失的bug；更新了判断点是否在节点内的算法；修复了切换开关按钮状态不执行回调函数的bug；修复了子节点与父节点相对位置错误的bug；修复了其他的一些小bug。
2017-11-09 18:22:41 +08:00
// Ĭ<><C4AC>Ϊ 0, <20><>Χ [0, 1]
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetAnchorY(
float anchor_y
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
);
代码优化
2018-08-23 16:58:32 +08:00
// <20><><EFBFBD><EFBFBD>ê<EFBFBD><C3AA>λ<EFBFBD><CEBB>
中心点默认位置改为(0,0)；新增ENode::setDefaultPivot函数设置默认中心点；修复了启用或禁用按钮后按钮消失的bug；更新了判断点是否在节点内的算法；修复了切换开关按钮状态不执行回调函数的bug；修复了子节点与父节点相对位置错误的bug；修复了其他的一些小bug。
2017-11-09 18:22:41 +08:00
// Ĭ<><C4AC>Ϊ (0, 0), <20><>Χ [0, 1]
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetAnchor(
float anchor_x,
float anchor_y
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
);
fixed bugs
2018-03-01 19:28:22 +08:00
// <20>޸Ľڵ<C4BD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetWidth(
性能优化
2018-07-28 20:06:27 +08:00
float width
fixed bugs
2018-03-01 19:28:22 +08:00
);
// <20>޸Ľڵ<C4BD><DAB5>߶<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetHeight(
性能优化
2018-07-28 20:06:27 +08:00
float height
fixed bugs
2018-03-01 19:28:22 +08:00
);
// <20>޸Ľڵ<C4BD><DAB5><EFBFBD>С
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetSize(
性能优化
2018-07-28 20:06:27 +08:00
float width,
float height
fixed bugs
2018-03-01 19:28:22 +08:00
);
// <20>޸Ľڵ<C4BD><DAB5><EFBFBD>С
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetSize(
fixed bugs
2018-03-01 19:28:22 +08:00
Size size
);
增加NodeProperty结构体，可以直接获取和设置节点的所有属性
2018-04-21 18:42:07 +08:00
// <20><><EFBFBD>ýڵ<C3BD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetProperty(
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
Property prop
增加NodeProperty结构体，可以直接获取和设置节点的所有属性
2018-04-21 18:42:07 +08:00
);
增加Node::setClipEnabled方法，实现渲染区域裁剪
2018-07-28 18:44:37 +08:00
// <20><><EFBFBD>û<EFBFBD><C3BB>ر<EFBFBD><D8B1><EFBFBD>Ⱦ<EFBFBD><C8BE><EFBFBD><EFBFBD><EFBFBD>ü<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetClipEnabled(
增加Node::setClipEnabled方法，实现渲染区域裁剪
2018-07-28 18:44:37 +08:00
bool enabled
);
增加节点的Border属性
2018-09-01 23:00:08 +08:00
// <20><><EFBFBD>ýڵ<C3BD><DAB5><EFBFBD>Ե<EFBFBD><D4B5>ɫ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetBorderColor(
增加节点的Border属性
2018-09-01 23:00:08 +08:00
const Color& color
);
代码优化
2018-08-23 16:58:32 +08:00
// <20>жϵ<D0B6><CFB5>Ƿ<EFBFBD><C7B7>ڽڵ<DABD><DAB5><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool ContainsPoint(
代码优化
2018-08-23 16:58:32 +08:00
const Point& point
);
// <20>ж<EFBFBD><D0B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7>ཻ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool Intersects(
代码优化
2018-08-23 16:58:32 +08:00
Node * node
);
更新ENode
2017-10-14 11:40:47 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>ӽڵ<D3BD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void AddChild(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * child,
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
int order = 0 /* <20><>Ⱦ˳<C8BE><CBB3> */
update collision detection method Using initializer_list to implement variable parameters. Add InputListener & CollisionListener.
2018-03-31 18:12:01 +08:00
);
// <20><><EFBFBD>Ӷ<EFBFBD><D3B6><EFBFBD><EFBFBD>ӽڵ<D3BD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void AddChild(
const Nodes& nodes, /* <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD> */
int order = 0 /* <20><>Ⱦ˳<C8BE><CBB3> */
更新ENode
2017-10-14 18:43:32 +08:00
);
更新ENode
2017-10-14 11:40:47 +08:00
代码优化
2018-08-23 16:58:32 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD><CDAC><EFBFBD>ӽڵ<D3BD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Nodes GetChildren(
代码优化
2018-08-23 16:58:32 +08:00
const String& name
) const;
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD><CDAC><EFBFBD>ӽڵ<D3BD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Node* GetChild(
代码优化
2018-08-23 16:58:32 +08:00
const String& name
) const;
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD>ӽڵ<D3BD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Nodes& GetAllChildren() const;
代码优化
2018-08-23 16:58:32 +08:00
// <20><>ȡ<EFBFBD>ӽڵ<D3BD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
int GetChildrenCount() const;
代码优化
2018-08-23 16:58:32 +08:00
// <20>Ƴ<EFBFBD><C6B3>ӽڵ<D3BD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool RemoveChild(
代码优化
2018-08-23 16:58:32 +08:00
Node * child
);
// <20>Ƴ<EFBFBD><C6B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD><CDAC><EFBFBD>ӽڵ<D3BD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void RemoveChildren(
const String& child_name
代码优化
2018-08-23 16:58:32 +08:00
);
// <20>Ƴ<EFBFBD><C6B3><EFBFBD><EFBFBD>нڵ<D0BD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void RemoveAllChildren();
代码优化
2018-08-23 16:58:32 +08:00
// <20>Ӹ<EFBFBD><D3B8>ڵ<EFBFBD><DAB5>Ƴ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void RemoveFromParent();
代码优化
2018-08-23 16:58:32 +08:00
新增Animate类；细节调整
2018-05-10 00:58:43 +08:00
// ִ<>ж<EFBFBD><D0B6><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void RunAction(
Action类重命名；去除Action构造器
2018-05-08 20:03:29 +08:00
Action * action
新增EActions
2017-10-19 00:50:04 +08:00
);
新增Animate类；细节调整
2018-05-10 00:58:43 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void ResumeAction(
碰撞监听器移动到Collision类中
2018-05-22 00:11:57 +08:00
const String& name
新增同时动作； 新增EFileUtils和ERandom
2017-10-19 12:47:36 +08:00
);
新增Animate类；细节调整
2018-05-10 00:58:43 +08:00
// <20><>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void PauseAction(
碰撞监听器移动到Collision类中
2018-05-22 00:11:57 +08:00
const String& name
新增同时动作； 新增EFileUtils和ERandom
2017-10-19 12:47:36 +08:00
);
新增Animate类；细节调整
2018-05-10 00:58:43 +08:00
// ֹͣ<CDA3><D6B9><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void StopAction(
碰撞监听器移动到Collision类中
2018-05-22 00:11:57 +08:00
const String& name
new attribute of Action: name
2018-03-06 09:56:17 +08:00
);
新增Animate类；细节调整
2018-05-10 00:58:43 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void ResumeAllActions();
修复了若干BUG
2017-10-21 19:09:31 +08:00
新增Animate类；细节调整
2018-05-10 00:58:43 +08:00
// <20><>ͣ<EFBFBD><CDA3><EFBFBD>ж<EFBFBD><D0B6><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void PauseAllActions();
修复了若干BUG
2017-10-21 19:09:31 +08:00
新增Animate类；细节调整
2018-05-10 00:58:43 +08:00
// ֹͣ<CDA3><D6B9><EFBFBD>ж<EFBFBD><D0B6><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void StopAllActions();
修复了若干BUG
2017-10-21 19:09:31 +08:00
移除ActionManager
2018-09-05 00:08:03 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD>ж<EFBFBD><D0B6><EFBFBD>
const Actions& GetAllActions() const;
// ˢ<><EFBFBD><C2B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
void UpdateActionsTime();
增加按键消息、鼠标消息、碰撞消息
2018-07-16 22:11:27 +08:00
// <20>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual bool Dispatch(
增加EventHandler类，用于处理消息；移除Node::onUpdate方法
2018-08-13 23:24:08 +08:00
const MouseEvent& e,
bool handled
增加按键消息、鼠标消息、碰撞消息
2018-07-16 22:11:27 +08:00
);
// <20>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual bool Dispatch(
增加EventHandler类，用于处理消息；移除Node::onUpdate方法
2018-08-13 23:24:08 +08:00
const KeyEvent& e,
bool handled
增加按键消息、鼠标消息、碰撞消息
2018-07-16 22:11:27 +08:00
);
重做Scene，继承Node类
2018-08-13 23:47:10 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Visit();
Collider作为Node的成员对象；禁止Ref子类的拷贝
2018-07-07 15:12:18 +08:00
refactoring
2018-08-15 00:06:03 +08:00
protected:
E2D_DISABLE_COPY(Node);
添加碰撞消息监听
2017-10-29 23:48:32 +08:00
增加节点的Border属性
2018-09-01 23:00:08 +08:00
// <20><>Ⱦ<EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD>Ե
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void DrawBorder();
增加节点的Border属性
2018-09-01 23:00:08 +08:00
// <20><>Ⱦ<EFBFBD><C8BE>ײ<EFBFBD><D7B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void DrawCollider();
增加节点的Border属性
2018-09-01 23:00:08 +08:00
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
// <20><><EFBFBD>ýڵ<C3BD><DAB5><EFBFBD><EFBFBD>ڳ<EFBFBD><DAB3><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetParentScene(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Scene * scene
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
);
节点渲染前进行一次矩阵转换和子节点排序
2018-06-01 17:53:56 +08:00
// <20>ӽڵ<D3BD><DAB5><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SortChildren();
节点渲染前进行一次矩阵转换和子节点排序
2018-06-01 17:53:56 +08:00
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
// <20><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void UpdateTransform();
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
perfect the pause function.
2018-02-04 21:24:27 +08:00
// <20><><EFBFBD>½ڵ<C2BD>͸<EFBFBD><CDB8><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void UpdateOpacity();
移除onFixedUpdate函数
2018-05-19 00:00:12 +08:00
移除ActionManager
2018-09-05 00:08:03 +08:00
// <20><><EFBFBD><EFBFBD><C2B6><EFBFBD>
void UpdateActions();
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
protected:
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
String name_;
size_t hash_name_;
Point pos_;
Size size_;
Point scale_;
Point anchor_;
Point skew_;
float rotation_;
float display_opacity_;
float real_opacity_;
int order_;
bool visible_;
bool clip_enabled_;
bool need_sort_;
bool need_transform_;
bool fixed_position_;
Collider collider_;
Scene * parent_scene_;
Node * parent_;
Property extrapolate_;
Color border_color_;
移除ActionManager
2018-09-05 00:08:03 +08:00
Actions actions_;
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Nodes children_;
ID2D1Geometry* border_;
D2D1::Matrix3x2F initial_matrix_;
D2D1::Matrix3x2F final_matrix_;
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
};
更新ENode
2017-10-14 18:43:32 +08:00
重做Scene，继承Node类
2018-08-13 23:47:10 +08:00
// <20><><EFBFBD><EFBFBD>
class Scene :
public Node
{
public:
Scene();
virtual ~Scene();
// <20><><EFBFBD>볡<EFBFBD><EBB3A1>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void OnEnter() {}
重做Scene，继承Node类
2018-08-13 23:47:10 +08:00
// <20>˳<EFBFBD><CBB3><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void OnExit() {}
重做Scene，继承Node类
2018-08-13 23:47:10 +08:00
// <20>رմ<D8B1><D5B4><EFBFBD>
// ˵<><CBB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> false <20><><EFBFBD><EFBFBD>ֹ<EFBFBD><D6B9><EFBFBD>ڹر<DAB9>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual bool OnCloseWindow() { return true; }
重做Scene，继承Node类
2018-08-13 23:47:10 +08:00
增加节点的Border属性
2018-09-01 23:00:08 +08:00
// <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD>ؽڵ<D8BD><DAB5><EFBFBD>Ե
refactoring...
2018-08-19 15:11:20 +08:00
// Ĭ<>ϣ<EFBFBD><CFA3><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void ShowBorder(
refactoring...
2018-08-19 15:11:20 +08:00
bool visible
);
增加节点的Border属性
2018-09-01 23:00:08 +08:00
// <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ײ<EFBFBD><D7B2>
// Ĭ<>ϣ<EFBFBD><CFA3><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void ShowCollider(
refactoring...
2018-08-19 15:11:20 +08:00
bool visible
);
// <20><><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Visit() override;
refactoring...
2018-08-19 15:11:20 +08:00
重做Scene，继承Node类
2018-08-13 23:47:10 +08:00
protected:
E2D_DISABLE_COPY(Scene);
refactoring...
2018-08-19 15:11:20 +08:00
protected:
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool border_visible_;
bool collider_visible_;
重做Scene，继承Node类
2018-08-13 23:47:10 +08:00
};
// <20><><EFBFBD><EFBFBD>
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
class Sprite :
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
public Node,
public Drawable
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
{
public:
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Sprite();
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Sprite(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Image * image
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Sprite(
增加File类和Resource类；图片和音乐资源统一为Resource map
2018-07-08 02:41:44 +08:00
const Resource& res
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
);
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Sprite(
增加File类和Resource类；图片和音乐资源统一为Resource map
2018-07-08 02:41:44 +08:00
const Resource& res,
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Rect& crop_rect /* <20>ü<EFBFBD><C3BC><EFBFBD><EFBFBD><EFBFBD> */
增加从资源加载图片的功能；修复可以手动修改窗口大小的Bug；
2018-04-27 00:16:14 +08:00
);
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Sprite(
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const String& file_name
增加从资源加载图片的功能；修复可以手动修改窗口大小的Bug；
2018-04-27 00:16:14 +08:00
);
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Sprite(
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const String& file_name,
const Rect& crop_rect /* <20>ü<EFBFBD><C3BC><EFBFBD><EFBFBD><EFBFBD> */
新增Sprite裁剪函数，修复了最小化窗口时cpu占用高的bug
2017-10-18 01:15:25 +08:00
);
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
virtual ~Sprite();
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
增加从资源加载图片的功能；修复可以手动修改窗口大小的Bug；
2018-04-27 00:16:14 +08:00
// <20><><EFBFBD><EFBFBD>ͼƬ<CDBC>ļ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool Open(
增加File类和Resource类；图片和音乐资源统一为Resource map
2018-07-08 02:41:44 +08:00
const Resource& res
增加从资源加载图片的功能；修复可以手动修改窗口大小的Bug；
2018-04-27 00:16:14 +08:00
);
增加File类和Resource类；图片和音乐资源统一为Resource map
2018-07-08 02:41:44 +08:00
// <20><><EFBFBD><EFBFBD>ͼƬ<CDBC>ļ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool Open(
const String& file_name
添加了Geometry类；重整了监听器和定时器的绑定。
2017-10-26 17:17:30 +08:00
);
New class Listener;Fixed String bugs;class File rename to Path.
2018-03-11 23:56:40 +08:00
// <20><><EFBFBD><EFBFBD>ͼƬ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool Open(
New class Listener;Fixed String bugs;class File rename to Path.
2018-03-11 23:56:40 +08:00
Image * image
);
添加了Geometry类；重整了监听器和定时器的绑定。
2017-10-26 17:17:30 +08:00
refactor functions
2018-04-06 11:31:24 +08:00
// <20><>ͼƬ<CDBC>ü<EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void Crop(
const Rect& crop_rect /* <20>ü<EFBFBD><C3BC><EFBFBD><EFBFBD><EFBFBD> */
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
);
增加从资源加载图片的功能；修复可以手动修改窗口大小的Bug；
2018-04-27 00:16:14 +08:00
// <20><>ȡ Image <20><><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Image * GetImage() const;
new feature: shape and collision.
2018-02-03 22:04:43 +08:00
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
// <20><>Ⱦ<EFBFBD><C8BE><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Draw() const override;
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
Collider作为Node的成员对象；禁止Ref子类的拷贝
2018-07-07 15:12:18 +08:00
protected:
E2D_DISABLE_COPY(Sprite);
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
protected:
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Image * image_;
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
};
新增Sprite裁剪函数，修复了最小化窗口时cpu占用高的bug
2017-10-18 01:15:25 +08:00
修复无效的动作倒转
2018-05-14 00:36:01 +08:00
// <20>ı<EFBFBD>
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
class Text :
分离节点功能，抽象为接口
2018-08-19 17:46:37 +08:00
public Node,
public Drawable
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
{
public:
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
// <20>ı<EFBFBD><C4B1><EFBFBD><EFBFBD>뷽ʽ
enum命名改为大驼峰式
2018-05-24 20:37:34 +08:00
enum class Align
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
{
enum命名改为大驼峰式
2018-05-24 20:37:34 +08:00
Left, /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
Right, /* <20>Ҷ<EFBFBD><D2B6><EFBFBD> */
Center /* <20><><EFBFBD>ж<EFBFBD><D0B6><EFBFBD> */
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
};
// <20>ı<EFBFBD><C4B1><EFBFBD>ʽ
class Style
{
public:
Color color; // <20><>ɫ
Align alignment; // <20><><EFBFBD>뷽ʽ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool wrap; // <20><><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD>
float wrap_width; // <20>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>п<EFBFBD><D0BF><EFBFBD>
float line_spacing; // <20>м<EFBFBD><D0BC><EFBFBD>
bool underline; // <20>»<EFBFBD><C2BB><EFBFBD>
bool strikethrough; // ɾ<><C9BE><EFBFBD><EFBFBD>
bool outline; // <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>
Color outline_color; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
float outline_width; // <20><><EFBFBD><EFBFBD><EFBFBD>߿<EFBFBD>
Stroke outline_stroke; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ཻ<EFBFBD><E0BDBB>ʽ
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
public:
Style();
Style(
Color color,
enum命名改为大驼峰式
2018-05-24 20:37:34 +08:00
Align alignment = Align::Left,
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool wrap = false,
float wrap_width = 0.f,
float line_spacing = 0.f,
bool underline = false,
bool strikethrough = false,
bool outline = true,
Color outline_color = Color(Color::Black, 0.5),
float outline_width = 1.f,
Stroke outline_stroke = Stroke::Round
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
);
};
新增ETimer和ETimerManager
2017-10-17 21:22:25 +08:00
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
public:
Text();
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Text(
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
const String& text, /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
const Font& font = Font(), /* <20><><EFBFBD><EFBFBD> */
const Style& style = Style() /* <20>ı<EFBFBD><C4B1><EFBFBD>ʽ */
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
);
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
virtual ~Text();
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
// <20><>ȡ<EFBFBD>ı<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const String& GetText() const;
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Font& GetFont() const;
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20><>ȡ<EFBFBD>ı<EFBFBD><C4B1><EFBFBD>ʽ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Style& GetStyle() const;
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const String& GetFontFamily() const;
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20><>ȡ<EFBFBD><C8A1>ǰ<EFBFBD>ֺ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetFontSize() const;
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20><>ȡ<EFBFBD><C8A1>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸֵ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
UINT GetFontWeight() const;
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Color& GetColor() const;
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Color& GetOutlineColor() const;
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD>߿<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetOutlineWidth() const;
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ཻ<EFBFBD><E0BDBB>ʽ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Stroke GetOutlineStroke() const;
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
new feature: use Text::getLineCount to get the number of rows
2018-04-09 01:07:49 +08:00
// <20><>ȡ<EFBFBD>ı<EFBFBD><C4B1><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
int GetLineCount() const;
new feature: use Text::getLineCount to get the number of rows
2018-04-09 01:07:49 +08:00
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20>Ƿ<EFBFBD><C7B7><EFBFBD>б<EFBFBD><D0B1>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool IsItalic() const;
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
Text部分方法命名改动
2018-04-22 14:08:29 +08:00
// <20>Ƿ<EFBFBD><C7B7><EFBFBD>ʾɾ<CABE><C9BE><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool strikethrough() const;
Text部分方法命名改动
2018-04-22 14:08:29 +08:00
// <20>Ƿ<EFBFBD><C7B7><EFBFBD>ʾ<EFBFBD>»<EFBFBD><C2BB><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool underline() const;
Text部分方法命名改动
2018-04-22 14:08:29 +08:00
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
// <20>Ƿ<EFBFBD><C7B7><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool outline() const;
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetText(
函数参数中的String替换为const String&
2018-05-07 15:48:06 +08:00
const String& text
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
);
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1><EFBFBD>ʽ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetStyle(
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
const Style& style
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetFont(
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
const Font& font
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetFontFamily(
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
const String& family
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD>ֺţ<D6BA>Ĭ<EFBFBD><C4AC>ֵΪ 22<32><32>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetFontSize(
性能优化
2018-07-28 20:06:27 +08:00
float size
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
);
enum命名改为大驼峰式
2018-05-24 20:37:34 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸֵ<CFB8><D6B5>Ĭ<EFBFBD><C4AC>ֵΪ Text::Font::Weight::Normal<61><6C>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetFontWeight(
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
UINT weight
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ<EFBFBD><C9AB>Ĭ<EFBFBD><C4AC>ֵΪ Color::WHITE<54><45>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetColor(
增加颜色类，包含rgba四个属性
2018-04-22 13:15:57 +08:00
Color color
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>壨Ĭ<E5A3A8><C4AC>ֵΪ false<73><65>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetItalic(
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
bool value
);
将部分枚举类型替换为强枚举类型
2018-04-24 21:22:34 +08:00
// <20>򿪻<EFBFBD><F2BFAABB>ر<EFBFBD><D8B1>ı<EFBFBD><C4B1>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>У<EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ<EFBFBD>رգ<D8B1>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetWrapEnabled(
bool wrap
将部分枚举类型替换为强枚举类型
2018-04-24 21:22:34 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>еĿ<D0B5><C4BF>ȣ<EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ 0<><30>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetWrapWidth(
float wrap_width
update class Text new feature: Text alignment, underline, strikethrough, line spacing. Remove Text::setWrappingEnable.
2018-03-30 01:41:29 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD>м<EFBFBD><D0BC>ࣨĬ<E0A3A8><C4AC>Ϊ 0<><30>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetLineSpacing(
float line_spacing
update class Text new feature: Text alignment, underline, strikethrough, line spacing. Remove Text::setWrappingEnable.
2018-03-30 01:41:29 +08:00
);
enum命名改为大驼峰式
2018-05-24 20:37:34 +08:00
// <20><><EFBFBD>ö<EFBFBD><C3B6>뷽ʽ<EBB7BD><CABD>Ĭ<EFBFBD><C4AC>Ϊ Align::Left<66><74>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetAlignment(
部分全局枚举类型修改为类内嵌套枚举
2018-05-17 15:22:14 +08:00
Align align
update class Text new feature: Text alignment, underline, strikethrough, line spacing. Remove Text::setWrappingEnable.
2018-03-30 01:41:29 +08:00
);
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>»<EFBFBD><C2BB>ߣ<EFBFBD>Ĭ<EFBFBD><C4AC>ֵΪ false<73><65>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetUnderline(
bool underline
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
);
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20><><EFBFBD><EFBFBD>ɾ<EFBFBD><C9BE><EFBFBD>ߣ<EFBFBD>Ĭ<EFBFBD><C4AC>ֵΪ false<73><65>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetStrikethrough(
bool strikethrough
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
);
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetOutline(
bool outline
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetOutlineColor(
Color outline_color
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߿<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetOutlineWidth(
float outline_width
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ཻ<EFBFBD><E0BDBB>ʽ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetOutlineStroke(
Stroke outline_stroke
增加Text描边功能（包括描边颜色、线宽、相交线样式）
2018-04-22 00:33:20 +08:00
);
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
// <20><>Ⱦ<EFBFBD><C8BE><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Draw() const override;
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
update a lot of new features.
2018-01-30 16:45:38 +08:00
protected:
Collider作为Node的成员对象；禁止Ref子类的拷贝
2018-07-07 15:12:18 +08:00
E2D_DISABLE_COPY(Text);
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>Ű<EFBFBD><C5B0><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void Reset();
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD>ʽ<EFBFBD><CABD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void CreateFormat();
Text changes Font changes into struct. class Text has some new features.
2018-03-30 23:37:42 +08:00
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֲ<EFBFBD><D6B2><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void CreateLayout();
新增ETexture、EFont、EText，删除了ERactangle
2017-10-18 22:13:20 +08:00
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
protected:
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
String text_;
Font font_;
Style style_;
IDWriteTextFormat * text_format_;
IDWriteTextLayout * text_layout_;
更新ENode矩形变换，增加按下和双击鼠标消息监听器
2017-10-15 23:58:39 +08:00
};
修复了若干BUG
2017-10-21 19:09:31 +08:00
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
class Button :
public Node
修复了若干BUG
2017-10-21 19:09:31 +08:00
{
public:
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Button();
修复了若干BUG
2017-10-21 19:09:31 +08:00
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Button(
细节调整
2018-05-08 11:37:11 +08:00
Node * normal, /* <20><>ͨ״̬ */
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Function& func = nullptr /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD> */
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Button(
细节调整
2018-05-08 11:37:11 +08:00
Node * normal, /* <20><>ͨ״̬ */
Node * selected, /* <20><><EFBFBD>갴<EFBFBD><EAB0B4>״̬ */
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Function& func = nullptr /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD> */
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Button(
细节调整
2018-05-08 11:37:11 +08:00
Node * normal, /* <20><>ͨ״̬ */
Node * mouseover, /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ */
Node * selected, /* <20><><EFBFBD>갴<EFBFBD><EAB0B4>״̬ */
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Function& func = nullptr /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD> */
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Button(
细节调整
2018-05-08 11:37:11 +08:00
Node * normal, /* <20><>ͨ״̬ */
Node * mouseover, /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ */
Node * selected, /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ */
Node * disabled, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>״̬ */
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const Function& func = nullptr /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD> */
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
);
// <20><>ȡ<EFBFBD><C8A1>ť״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB>ǽ<EFBFBD><C7BD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool IsEnable() const;
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD><C5A5><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetEnabled(
新增Config配置类
2018-07-04 17:00:21 +08:00
bool enabled
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
// <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetNormal(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * normal
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>밴ťʱ<C5A5><CAB1>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetMouseOver(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * mouseover
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
The callback function is changed to a function object
2018-03-28 17:56:04 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>갴<EFBFBD>°<EFBFBD>ťʱ<C5A5><CAB1>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetSelected(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * selected
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetDisabled(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * disabled
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD>
void SetCallbackOnClick(
细节调整
2018-05-08 11:37:11 +08:00
const Function& func
修复了若干BUG
2017-10-21 19:09:31 +08:00
);
代码优化
2018-08-23 16:58:32 +08:00
// <20><><EFBFBD><EFBFBD>ê<EFBFBD><C3AA>λ<EFBFBD><CEBB>
移除Config中的不合理设置
2018-07-28 20:48:25 +08:00
// Ĭ<><C4AC>Ϊ (0, 0), <20><>Χ [0, 1]
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetAnchor(
float anchor_x,
float anchor_y
移除Config中的不合理设置
2018-07-28 20:48:25 +08:00
) override;
按钮消息处理方式优化
2018-07-28 22:22:58 +08:00
// <20>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual bool Dispatch(
增加EventHandler类，用于处理消息；移除Node::onUpdate方法
2018-08-13 23:24:08 +08:00
const MouseEvent& e,
bool handled
按钮消息处理方式优化
2018-07-28 22:22:58 +08:00
) override;
refactoring...
2018-08-19 15:11:20 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void Visit() override;
重做Scene，继承Node类
2018-08-13 23:47:10 +08:00
修复了若干BUG
2017-10-21 19:09:31 +08:00
protected:
Collider作为Node的成员对象；禁止Ref子类的拷贝
2018-07-07 15:12:18 +08:00
E2D_DISABLE_COPY(Button);
update Shape Now you can directly set the shape of nodes by Shape::TYPE. The subclasses of Shape are prefixed with 'Shape'.
2018-03-31 11:59:51 +08:00
// <20><>ť״̬ö<CCAC><C3B6>
按钮消息处理方式优化
2018-07-28 22:22:58 +08:00
enum class Status { Normal, Mouseover, Selected };
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
// <20><><EFBFBD>ð<EFBFBD>ť״̬
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetStatus(
Status status
);
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
// ˢ<>°<EFBFBD>ť<EFBFBD><C5A5>ʾ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void UpdateVisible();
修复了若干BUG
2017-10-21 19:09:31 +08:00
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>ص<EFBFBD>
virtual void OnClick();
节点渲染前进行一次矩阵转换和子节点排序
2018-06-01 17:53:56 +08:00
修复了若干BUG
2017-10-21 19:09:31 +08:00
protected:
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Node * normal_;
Node * mouseover_;
Node * selected_;
Node * disabled_;
bool enabled_;
bool is_selected_;
Status status_;
Function callback_;
修复了若干BUG
2017-10-21 19:09:31 +08:00
};
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
命名规则修改
2018-05-22 22:29:42 +08:00
class ToggleButton :
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
public Button
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
{
public:
命名规则修改
2018-05-22 22:29:42 +08:00
ToggleButton();
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit ToggleButton(
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Node * normal_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ͨ״̬ */
Node * normal_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ͨ״̬ */
const Function& func = nullptr /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD> */
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
);
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit ToggleButton(
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Node * normal_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ͨ״̬ */
Node * normal_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ͨ״̬ */
Node * selected_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>갴<EFBFBD><EAB0B4>״̬ */
Node * selected_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>갴<EFBFBD><EAB0B4>״̬ */
const Function& func = nullptr /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD> */
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
);
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit ToggleButton(
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Node * normal_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ͨ״̬ */
Node * normal_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ͨ״̬ */
Node * mouseover_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ */
Node * mouseover_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ */
Node * selected_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>갴<EFBFBD><EAB0B4>״̬ */
Node * selected_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>갴<EFBFBD><EAB0B4>״̬ */
const Function& func = nullptr /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD> */
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
);
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit ToggleButton(
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Node * normal_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ͨ״̬ */
Node * normal_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ͨ״̬ */
Node * mouseover_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ */
Node * mouseover_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ */
Node * selected_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>갴<EFBFBD><EAB0B4>״̬ */
Node * selected_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>갴<EFBFBD><EAB0B4>״̬ */
Node * disabled_on, /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ */
Node * disabled_off, /* <20><>ť<EFBFBD>ر<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ */
const Function& func = nullptr /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD> */
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
);
移除Config中的不合理设置
2018-07-28 20:48:25 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>״̬
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool IsChecked() const;
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
移除Config中的不合理设置
2018-07-28 20:48:25 +08:00
// <20><><EFBFBD>ÿ<EFBFBD><C3BF>ذ<EFBFBD>ť<EFBFBD><C5A5>״̬
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetChecked(
移除Config中的不合理设置
2018-07-28 20:48:25 +08:00
bool checked
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
);
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetNormal(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * normal
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
) override;
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>״̬<D7B4>£<EFBFBD><C2A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>밴ťʱ<C5A5><CAB1>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetMouseOver(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * mouseover
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
) override;
The callback function is changed to a function object
2018-03-28 17:56:04 +08:00
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>״̬<D7B4>£<EFBFBD><C2A3><EFBFBD><EFBFBD>갴<EFBFBD>°<EFBFBD>ťʱ<C5A5><CAB1>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetSelected(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * selected
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
) override;
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>״̬<D7B4>£<EFBFBD><C2A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetDisabled(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * disabled
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
) override;
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD>ر<EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetNormalOff(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * normal
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
);
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD>ر<EFBFBD>״̬<D7B4>£<EFBFBD><C2A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>밴ťʱ<C5A5><CAB1>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetMouseOverOff(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * mouseover
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
);
The callback function is changed to a function object
2018-03-28 17:56:04 +08:00
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD>ر<EFBFBD>״̬<D7B4>£<EFBFBD><C2A3><EFBFBD><EFBFBD>갴<EFBFBD>°<EFBFBD>ťʱ<C5A5><CAB1>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetSelectedOff(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * selected
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
);
// <20><><EFBFBD>ð<EFBFBD>ť<EFBFBD>ر<EFBFBD>״̬<D7B4>£<EFBFBD><C2A3><EFBFBD>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>ʾ<EFBFBD>İ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetDisabledOff(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Node * disabled
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
);
代码优化
2018-08-23 16:58:32 +08:00
// <20><><EFBFBD><EFBFBD>ê<EFBFBD><C3AA>λ<EFBFBD><CEBB>
移除Config中的不合理设置
2018-07-28 20:48:25 +08:00
// Ĭ<><C4AC>Ϊ (0, 0), <20><>Χ [0, 1]
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void SetAnchor(
float anchor_x,
float anchor_y
移除Config中的不合理设置
2018-07-28 20:48:25 +08:00
) override;
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
protected:
Collider作为Node的成员对象；禁止Ref子类的拷贝
2018-07-07 15:12:18 +08:00
E2D_DISABLE_COPY(ToggleButton);
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
// ˢ<>°<EFBFBD>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void UpdateStatus();
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
The callback function is changed to a function object
2018-03-28 17:56:04 +08:00
// ִ<>а<EFBFBD>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
virtual void OnClick() override;
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
protected:
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Node* normal_on_;
Node* mouseover_on_;
Node* selected_on_;
Node* disabled_on_;
Node* normal_off_;
Node* mouseover_off_;
Node* selected_off_;
Node* disabled_off_;
bool checked_;
修复了所有回调函数不检测空引用就执行的bug；修复了EFont某些情况下崩溃的bug；修复了EButton没有获取启用和禁用状态的函数的bug；修复了EButton不显示禁用状态的bug；更新了EButton的监听方法；增加了EButtonToggle开关按钮类。
2017-11-07 22:20:46 +08:00
};
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
class Menu :
public Node
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
{
public:
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Menu();
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
增加explicit限定符
2018-05-24 16:25:05 +08:00
explicit Menu(
移除va_list和std::initializer_list两种添加多个对象的方法，统一为std::vector
2018-05-10 17:02:18 +08:00
const std::vector<Button*>& buttons /* <20><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD> */
新增Animate类；细节调整
2018-05-10 00:58:43 +08:00
);
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
// <20><>ȡ<EFBFBD>˵<EFBFBD><CBB5>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool IsEnable() const;
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
// <20><>ȡ<EFBFBD>˵<EFBFBD><CBB5>еİ<D0B5>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
size_t GetButtonCount() const;
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
// <20><><EFBFBD>ò˵<C3B2><CBB5><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetEnabled(
新增Config配置类
2018-07-04 17:00:21 +08:00
bool enabled
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
);
// <20><><EFBFBD>Ӱ<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void AddButton(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Button * button
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
);
// <20>Ƴ<EFBFBD><C6B3><EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool RemoveButton(
Timer and TimeManager have a new interface.
2018-02-07 16:37:12 +08:00
Button * button
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
);
性能优化
2018-05-10 14:16:36 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD>а<EFBFBD>ť
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
const std::vector<Button*>& GetAllButtons() const;
性能优化
2018-05-10 14:16:36 +08:00
Collider作为Node的成员对象；禁止Ref子类的拷贝
2018-07-07 15:12:18 +08:00
protected:
E2D_DISABLE_COPY(Menu);
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
protected:
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
bool enabled_;
std::vector<Button*> buttons_;
添加EMenu菜单类；修复了EFileUtils中参数与EString不兼容的问题。
2017-11-07 23:32:44 +08:00
};
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
// <20><><EFBFBD><EFBFBD>
class Canvas :
完善Canvas
2018-08-23 12:25:31 +08:00
public Node,
public Drawable
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
{
public:
完善Canvas
2018-08-23 12:25:31 +08:00
Canvas(
float width,
float height
);
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
virtual ~Canvas();
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetLineColor(
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
const Color& color
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetFillColor(
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
const Color& color
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetStrokeWidth(
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
float width
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ཻ<EFBFBD><E0BDBB>ʽ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void SetStrokeStyle(
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
Stroke strokeStyle
);
完善Canvas
2018-08-23 12:25:31 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Color GetLineColor() const;
完善Canvas
2018-08-23 12:25:31 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Color GetFillColor() const;
完善Canvas
2018-08-23 12:25:31 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float GetStrokeWidth() const;
完善Canvas
2018-08-23 12:25:31 +08:00
// <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD>ཻ<EFBFBD><E0BDBB>ʽ
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
Stroke GetStrokeStyle() const;
完善Canvas
2018-08-23 12:25:31 +08:00
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
// <20><>ֱ<EFBFBD><D6B1>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void DrawLine(
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
const Point& begin,
const Point& end
);
完善Canvas
2018-08-23 12:25:31 +08:00
// <20><>Բ<EFBFBD>α߿<CEB1>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void DrawCircle(
完善Canvas
2018-08-23 12:25:31 +08:00
const Point& center,
float radius
);
// <20><><EFBFBD><EFBFBD>Բ<EFBFBD>α߿<CEB1>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void DrawEllipse(
完善Canvas
2018-08-23 12:25:31 +08:00
const Point& center,
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float radius_x,
float radius_y
完善Canvas
2018-08-23 12:25:31 +08:00
);
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD>α߿<CEB1>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void DrawRect(
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
const Rect& rect
);
// <20><>Բ<EFBFBD>Ǿ<EFBFBD><C7BE>α߿<CEB1>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void DrawRoundedRect(
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
const Rect& rect,
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float radius_x,
float radius_y
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
);
完善Canvas
2018-08-23 12:25:31 +08:00
// <20><><EFBFBD><EFBFBD>Բ<EFBFBD><D4B2>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void FillCircle(
完善Canvas
2018-08-23 12:25:31 +08:00
const Point& center,
float radius
);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Բ<EFBFBD><D4B2>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void FillEllipse(
完善Canvas
2018-08-23 12:25:31 +08:00
const Point& center,
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float radius_x,
float radius_y
完善Canvas
2018-08-23 12:25:31 +08:00
);
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void FillRect(
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
const Rect& rect
);
// <20><><EFBFBD><EFBFBD>Բ<EFBFBD>Ǿ<EFBFBD><C7BE><EFBFBD>
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
void FillRoundedRect(
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
const Rect& rect,
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float radius_x,
float radius_y
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
);
protected:
E2D_DISABLE_COPY(Canvas);
protected:
Refactoring : Google C++ style
2018-09-04 22:42:34 +08:00
float stroke_width_;
Stroke stroke_;
ID2D1RenderTarget * render_target_;
ID2D1SolidColorBrush * fill_brush_;
ID2D1SolidColorBrush * line_brush_;
ID2D1StrokeStyle * stroke_style_;
增加Canvas画布节点
2018-08-23 00:03:26 +08:00
};
加入了EScene,EObject,ENode和EObjectManager
2017-10-12 23:34:13 +08:00
}