Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2, modify marco name

This commit is contained in:
Walzer 2010-07-09 09:02:00 +00:00
parent a9b4e37355
commit d70eb65227
4 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos2dx/include/CCAtlasNode.h
View File

@ -60,16 +60,16 @@ protected:
bool m_bOpacityModifyRGB; bool m_bOpacityModifyRGB;
/** conforms to CCTextureProtocol protocol */ /** conforms to CCTextureProtocol protocol */
CCX_DECLARE_VAR_READWRITE(CCTextureAtlas *, m_tTextureAtlas, TextureAtlas) CCX_PROPERTY(CCTextureAtlas *, m_tTextureAtlas, TextureAtlas)
/** conforms to CCTextureProtocol protocol */ /** conforms to CCTextureProtocol protocol */
CCX_DECLARE_VAR_READWRITE(ccBlendFunc, m_tBlendFunc, BlendFunc) CCX_PROPERTY(ccBlendFunc, m_tBlendFunc, BlendFunc)
/** conforms to CCRGBAProtocol protocol */ /** conforms to CCRGBAProtocol protocol */
CCX_DECLARE_VAR_READWRITE(GLubyte, m_cOpacity, Opacity) CCX_PROPERTY(GLubyte, m_cOpacity, Opacity)
/** conforms to CCRGBAProtocol protocol */ /** conforms to CCRGBAProtocol protocol */
CCX_DECLARE_VAR_READWRITE(ccColor3B, m_tColor, Color) CCX_PROPERTY(ccColor3B, m_tColor, Color)
private: private:

10
cocos2dx/include/CCLayer.h
View File

@ -60,12 +60,12 @@ public:
Only the touches of this node will be affected. This "method" is not propagated to it's children. Only the touches of this node will be affected. This "method" is not propagated to it's children.
@since v0.8.1 @since v0.8.1
*/ */
CCX_DECLARE_VAR_READWRITE_INLINE(bool, m_bIsTouchEnabled, IsTouchEnabled) CCX_SYNTHESIZE(bool, m_bIsTouchEnabled, IsTouchEnabled)
/** whether or not it will receive Accelerometer events /** whether or not it will receive Accelerometer events
You can enable / disable accelerometer events with this property. You can enable / disable accelerometer events with this property.
@since v0.8.1 @since v0.8.1
*/ */
CCX_DECLARE_VAR_READWRITE(bool, m_bIsAccelerometerEnabled, IsAccelerometerEnabled) CCX_PROPERTY(bool, m_bIsAccelerometerEnabled, IsAccelerometerEnabled)
}; };
// //
@ -105,11 +105,11 @@ public:
void changeWidthAndHeight(GLfloat w ,GLfloat h); void changeWidthAndHeight(GLfloat w ,GLfloat h);
/** Opacity: conforms to CCRGBAProtocol protocol */ /** Opacity: conforms to CCRGBAProtocol protocol */
CCX_DECLARE_VAR_READONLY(GLubyte, m_cOpacity, Opacity) CCX_PROPERTY_READONLY(GLubyte, m_cOpacity, Opacity)
/** Opacity: conforms to CCRGBAProtocol protocol */ /** Opacity: conforms to CCRGBAProtocol protocol */
CCX_DECLARE_VAR_READONLY(ccColor3B, m_tColor, Color) CCX_PROPERTY_READONLY(ccColor3B, m_tColor, Color)
/** BlendFunction. Conforms to CCBlendProtocol protocol */ /** BlendFunction. Conforms to CCBlendProtocol protocol */
CCX_DECLARE_VAR_READWRITE(ccBlendFunc, m_tBlendFunc, BlendFunc) CCX_PROPERTY(ccBlendFunc, m_tBlendFunc, BlendFunc)
}; };
/** CCMultipleLayer is a CCLayer with the ability to multiplex it's children. /** CCMultipleLayer is a CCLayer with the ability to multiplex it's children.

38
cocos2dx/include/CCNode.h
View File

@ -97,7 +97,7 @@ class CCNode{
// variable property // variable property
/** The z order of the node relative to it's "brothers": children of the same parent */ /** The z order of the node relative to it's "brothers": children of the same parent */
CCX_DECLARE_VAR_READONLY(int, m_iZOrder, ZOrder) CCX_PROPERTY_READONLY(int, m_iZOrder, ZOrder)
/** The real openGL Z vertex. /** The real openGL Z vertex.
Differences between openGL Z vertex and cocos2d Z order: Differences between openGL Z vertex and cocos2d Z order:
@ -107,35 +107,35 @@ class CCNode{
@warning: Use it at your own risk since it might break the cocos2d parent-children z order @warning: Use it at your own risk since it might break the cocos2d parent-children z order
@since v0.8 @since v0.8
*/ */
CCX_DECLARE_VAR_READWRITE(float, m_fVertexZ, VertexZ) CCX_PROPERTY(float, m_fVertexZ, VertexZ)
/** The rotation (angle) of the node in degrees. 0 is the default rotation angle. Positive values rotate node CW. */ /** The rotation (angle) of the node in degrees. 0 is the default rotation angle. Positive values rotate node CW. */
CCX_DECLARE_VAR_READWRITE(float, m_fRotation, Rotation) CCX_PROPERTY(float, m_fRotation, Rotation)
/** The scale factor of the node. 1.0 is the default scale factor. It modifies the X and Y scale at the same time. */ /** The scale factor of the node. 1.0 is the default scale factor. It modifies the X and Y scale at the same time. */
CCX_DECLARE_VAR_READWRITE(float, m_fScale, Scale) CCX_PROPERTY(float, m_fScale, Scale)
/** The scale factor of the node. 1.0 is the default scale factor. It only modifies the X scale factor. */ /** The scale factor of the node. 1.0 is the default scale factor. It only modifies the X scale factor. */
CCX_DECLARE_VAR_READWRITE(float, m_fScaleX, ScaleX) CCX_PROPERTY(float, m_fScaleX, ScaleX)
/** The scale factor of the node. 1.0 is the default scale factor. It only modifies the Y scale factor. */ /** The scale factor of the node. 1.0 is the default scale factor. It only modifies the Y scale factor. */
CCX_DECLARE_VAR_READWRITE(float, m_fScaleY, ScaleY) CCX_PROPERTY(float, m_fScaleY, ScaleY)
/** Position (x,y) of the node in OpenGL coordinates. (0,0) is the left-bottom corner. */ /** Position (x,y) of the node in OpenGL coordinates. (0,0) is the left-bottom corner. */
CCX_DECLARE_VAR_READWRITE(CGPoint, m_tPosition, Position) CCX_PROPERTY(CGPoint, m_tPosition, Position)
/** A CCCamera object that lets you move the node using a gluLookAt /** A CCCamera object that lets you move the node using a gluLookAt
*/ */
CCX_DECLARE_VAR_READONLY(NSMutableArray *, m_pChildren, Children) CCX_PROPERTY_READONLY(NSMutableArray *, m_pChildren, Children)
CCX_DECLARE_VAR_READONLY(CCCamera *, m_pCamera, Camera) CCX_PROPERTY_READONLY(CCCamera *, m_pCamera, Camera)
/** A CCGrid object that is used when applying effects */ /** A CCGrid object that is used when applying effects */
CCX_DECLARE_VAR_READWRITE(CCGridBase *, m_pGrid, Grid) CCX_PROPERTY(CCGridBase *, m_pGrid, Grid)
/** Whether of not the node is visible. Default is true */ /** Whether of not the node is visible. Default is true */
CCX_DECLARE_VAR_READWRITE(bool, m_bIsVisible, Visibility) CCX_PROPERTY(bool, m_bIsVisible, Visibility)
/** anchorPoint is the point around which all transformations and positioning manipulations take place. /** anchorPoint is the point around which all transformations and positioning manipulations take place.
It's like a pin in the node where it is "attached" to its parent. It's like a pin in the node where it is "attached" to its parent.
@ -144,37 +144,37 @@ class CCNode{
The default anchorPoint is (0.5,0.5), so it starts in the center of the node. The default anchorPoint is (0.5,0.5), so it starts in the center of the node.
@since v0.8 @since v0.8
*/ */
CCX_DECLARE_VAR_READWRITE(CGPoint, m_tAnchorPoint, AnchorPoint) CCX_PROPERTY(CGPoint, m_tAnchorPoint, AnchorPoint)
/** The anchorPoint in absolute pixels. /** The anchorPoint in absolute pixels.
Since v0.8 you can only read it. If you wish to modify it, use anchorPoint instead Since v0.8 you can only read it. If you wish to modify it, use anchorPoint instead
*/ */
CCX_DECLARE_VAR_READWRITE(CGPoint, m_tAnchorPointInPixels, AnchorPointInPixels) CCX_PROPERTY(CGPoint, m_tAnchorPointInPixels, AnchorPointInPixels)
/** The untransformed size of the node. /** The untransformed size of the node.
The contentSize remains the same no matter the node is scaled or rotated. The contentSize remains the same no matter the node is scaled or rotated.
All nodes has a size. Layer and Scene has the same size of the screen. All nodes has a size. Layer and Scene has the same size of the screen.
@since v0.8 @since v0.8
*/ */
CCX_DECLARE_VAR_READWRITE(CGSize, m_tContentSize, ContentSize) CCX_PROPERTY(CGSize, m_tContentSize, ContentSize)
/** whether or not the node is running */ /** whether or not the node is running */
CCX_DECLARE_VAR_READONLY(bool, m_bIsRunning, IsRunning) CCX_PROPERTY_READONLY(bool, m_bIsRunning, IsRunning)
/** A weak reference to the parent */ /** A weak reference to the parent */
CCX_DECLARE_VAR_READWRITE(CCNode *, m_pParent, Parent) CCX_PROPERTY(CCNode *, m_pParent, Parent)
/** If true the transformtions will be relative to it's anchor point. /** If true the transformtions will be relative to it's anchor point.
* Sprites, Labels and any other sizeble object use it have it enabled by default. * Sprites, Labels and any other sizeble object use it have it enabled by default.
* Scenes, Layers and other "whole screen" object don't use it, have it disabled by default. * Scenes, Layers and other "whole screen" object don't use it, have it disabled by default.
*/ */
CCX_DECLARE_VAR_READWRITE(bool, m_bIsRelativeAnchorPoint, IsRelativeAnchorPoint) CCX_PROPERTY(bool, m_bIsRelativeAnchorPoint, IsRelativeAnchorPoint)
/** A tag used to identify the node easily */ /** A tag used to identify the node easily */
CCX_DECLARE_VAR_READWRITE(int, m_iTag, Tag) CCX_PROPERTY(int, m_iTag, Tag)
/** A custom user data pointer */ /** A custom user data pointer */
CCX_DECLARE_VAR_READWRITE(void *, m_pUserData, UserData) CCX_PROPERTY(void *, m_pUserData, UserData)
protected: protected:

27
cocos2dx/include/Cocos2dDefine.h
View File

@ -25,60 +25,63 @@ THE SOFTWARE.
#ifndef __COCOS2D_DEFINE_H__ #ifndef __COCOS2D_DEFINE_H__
#define __COCOS2D_DEFINE_H__ #define __COCOS2D_DEFINE_H__
/** CCX_DECLARE_VAR_READONLY is used to declare a protected variable. /** CCX_PROPERTY_READONLY is used to declare a protected variable.
We can use get method to read the variable. We can use get method to read the variable.
@param varType : the type of variable. @param varType : the type of variable.
@param varName : variable name. @param varName : variable name.
@param funName : "get + funName" is the name of the get method. @param funName : "get + funName" is the name of the get method.
@warning : The get method is a public virtual function, you should override it first. @warning : The get method is a public virtual function, you should override it first.
The variables and methods declared after CCX_DECLARE_VAR_READONLY are all public. The variables and methods declared after CCX_PROPERTY_READONLY are all public.
If you need protected or private, please declare. If you need protected or private, please declare.
*/ */
#define CCX_DECLARE_VAR_READONLY(varType, varName, funName)\ #define CCX_PROPERTY_READONLY(varType, varName, funName)\
protected: varType varName;\ protected: varType varName;\
public: virtual varType get##funName(void); public: virtual varType get##funName(void);
/** CCX_DECLARE_VAR_READWRITE is used to declare a protected variable. /** CCX_PROPERTY is used to declare a protected variable.
We can use get method to read the variable, and use the set method to change the variable. We can use get method to read the variable, and use the set method to change the variable.
@param varType : the type of variable. @param varType : the type of variable.
@param varName : variable name. @param varName : variable name.
@param funName : "get + funName" is the name of the get method. @param funName : "get + funName" is the name of the get method.
"set + funName" is the name of the set method. "set + funName" is the name of the set method.
@warning : The get and set methods are public virtual functions, you should override them first. @warning : The get and set methods are public virtual functions, you should override them first.
The variables and methods declared after CCX_DECLARE_VAR_READWRITE are all public. The variables and methods declared after CCX_PROPERTY are all public.
If you need protected or private, please declare. If you need protected or private, please declare.
*/ */
#define CCX_DECLARE_VAR_READWRITE(varType, varName, funName)\ #define CCX_PROPERTY(varType, varName, funName)\
protected: varType varName;\ protected: varType varName;\
public: virtual varType get##funName(void);\ public: virtual varType get##funName(void);\
public: virtual void set##funName(varType var); public: virtual void set##funName(varType var);
/** CCX_DECLARE_VAR_READONLY_INLINE is used to declare a protected variable. /** CCX_SYNTHESIZE_READONLY is used to declare a protected variable.
We can use get method to read the variable. We can use get method to read the variable.
@param varType : the type of variable. @param varType : the type of variable.
@param varName : variable name. @param varName : variable name.
@param funName : "get + funName" is the name of the get method. @param funName : "get + funName" is the name of the get method.
@warning : The get method is a public inline function. @warning : The get method is a public inline function.
The variables and methods declared after CCX_DECLARE_VAR_READONLY_INLINE are all public. The variables and methods declared after CCX_SYNTHESIZE_READONLY are all public.
If you need protected or private, please declare. If you need protected or private, please declare.
*/ */
#define CCX_DECLARE_VAR_READONLY_INLINE(varType, varName, funName)\ #define CCX_SYNTHESIZE_READONLY(varType, varName, funName)\
protected: varType varName;\ protected: varType varName;\
public: inline varType get##funName(void){ return varName; } public: inline varType get##funName(void){ return varName; }
/** CCX_DECLARE_VAR_READWRITE_INLINE is used to declare a protected variable. /** CCX_SYNTHESIZE is used to declare a protected variable.
We can use get method to read the variable, and use the set method to change the variable. We can use get method to read the variable, and use the set method to change the variable.
@param varType : the type of variable. @param varType : the type of variable.
@param varName : variable name. @param varName : variable name.
@param funName : "get + funName" is the name of the get method. @param funName : "get + funName" is the name of the get method.
"set + funName" is the name of the set method. "set + funName" is the name of the set method.
@warning : The get and set methods are public inline functions. @warning : The get and set methods are public inline functions.
The variables and methods declared after CCX_DECLARE_VAR_READWRITE_INLINE are all public. The variables and methods declared after CCX_SYNTHESIZE are all public.
If you need protected or private, please declare. If you need protected or private, please declare.
*/ */
#define CCX_DECLARE_VAR_READWRITE_INLINE(varType, varName, funName)\ #define CCX_SYNTHESIZE(varType, varName, funName)\
protected: varType varName;\ protected: varType varName;\
public: inline varType get##funName(void){ return varName; }\ public: inline varType get##funName(void){ return varName; }\
public: inline void set##funName(varType var){ varName = var; } public: inline void set##funName(varType var){ varName = var; }
#define CCX_SAFE_DELETE(p) if(p) {delete p; p=NULL;}
#define CXX_BREAK_IF(cond) if(cond) break;
#endif // __COCOS2D_DEFINE_H__ #endif // __COCOS2D_DEFINE_H__