This commit is contained in:
Walzer 2010-09-29 08:33:52 +00:00
parent f1c48be489
commit 8633fa5d9e
6 changed files with 29 additions and 15 deletions

View File

@ -33,6 +33,7 @@ THE SOFTWARE.
namespace cocos2d { namespace cocos2d {
struct _hashElement;
/** /**
@brief CCActionManager is a singleton that manages all the actions. @brief CCActionManager is a singleton that manages all the actions.
Normally you won't need to use this singleton directly. 99% of the cases you will use the CCNode interface, Normally you won't need to use this singleton directly. 99% of the cases you will use the CCNode interface,
@ -44,7 +45,6 @@ namespace cocos2d {
@since v0.8 @since v0.8
*/ */
struct _hashElement;
class CCX_DLL CCActionManager : public NSObject, public SelectorProtocol class CCX_DLL CCActionManager : public NSObject, public SelectorProtocol
{ {
public: public:

View File

@ -98,7 +98,6 @@ namespace cocos2d {
@since v0.8.1 @since v0.8.1
*/ */
class CCX_DLL CCTMXTiledMap : public CCNode class CCX_DLL CCTMXTiledMap : public CCNode
{ {
/** the map's size property measured in tiles */ /** the map's size property measured in tiles */

View File

@ -29,7 +29,9 @@ THE SOFTWARE.
#include "Cocos2dDefine.h" #include "Cocos2dDefine.h"
namespace cocos2d { namespace cocos2d {
/* class CCTMXObjectGroup;
/** @file
* Internal TMX parser * Internal TMX parser
* *
* IMPORTANT: These classed should not be documented using doxygen strings * IMPORTANT: These classed should not be documented using doxygen strings
@ -52,7 +54,7 @@ namespace cocos2d {
TMXPropertyTile TMXPropertyTile
}; };
/* @brief CCTMXLayerInfo contains the information about the layers like: /** @brief CCTMXLayerInfo contains the information about the layers like:
- Layer name - Layer name
- Layer size - Layer size
- Layer opacity at creation time (it can be modified at runtime) - Layer opacity at creation time (it can be modified at runtime)
@ -78,7 +80,7 @@ namespace cocos2d {
virtual ~CCTMXLayerInfo(); virtual ~CCTMXLayerInfo();
}; };
/* @brief CCTMXTilesetInfo contains the information about the tilesets like: /** @brief CCTMXTilesetInfo contains the information about the tilesets like:
- Tileset name - Tileset name
- Tilset spacing - Tilset spacing
- Tileset margin - Tileset margin
@ -105,7 +107,8 @@ namespace cocos2d {
virtual ~CCTMXTilesetInfo(); virtual ~CCTMXTilesetInfo();
CGRect rectForGID(unsigned int gid); CGRect rectForGID(unsigned int gid);
}; };
/* @brief CCTMXMapInfo contains the information about the map like:
/** @brief CCTMXMapInfo contains the information about the map like:
- Map orientation (hexagonal, isometric or orthogonal) - Map orientation (hexagonal, isometric or orthogonal)
- Tile size - Tile size
- Map size - Map size
@ -118,7 +121,6 @@ namespace cocos2d {
This information is obtained from the TMX file. This information is obtained from the TMX file.
*/ */
class CCTMXObjectGroup;
class CCX_DLL CCTMXMapInfo : public NSObject class CCX_DLL CCTMXMapInfo : public NSObject
{ {
public: public:

View File

@ -30,6 +30,7 @@ namespace cocos2d {
typedef std::map<std::string, int> StringToIntegerDictionary; typedef std::map<std::string, int> StringToIntegerDictionary;
typedef std::pair<std::string, int> StringToIntegerPair; typedef std::pair<std::string, int> StringToIntegerPair;
struct sImageTGA;
/** @brief CCTileMapAtlas is a subclass of CCAtlasNode. /** @brief CCTileMapAtlas is a subclass of CCAtlasNode.
It knows how to render a map based of tiles. It knows how to render a map based of tiles.
@ -45,7 +46,6 @@ namespace cocos2d {
You SHOULD not use this class. You SHOULD not use this class.
Instead, use the newer TMX file format: CCTMXTiledMap Instead, use the newer TMX file format: CCTMXTiledMap
*/ */
struct sImageTGA;
class CCX_DLL CCTileMapAtlas : public CCAtlasNode class CCX_DLL CCTileMapAtlas : public CCAtlasNode
{ {
/** TileMap info */ /** TileMap info */

View File

@ -65,7 +65,20 @@ public:
virtual void ccTouchesEnded(NSSet *pTouches, UIEvent *pEvent) {} virtual void ccTouchesEnded(NSSet *pTouches, UIEvent *pEvent) {}
virtual void ccTouchesCancelled(NSSet *pTouches, UIEvent *pEvent) {} virtual void ccTouchesCancelled(NSSet *pTouches, UIEvent *pEvent) {}
}; };
/**
@brief
Using this type of delegate results in two benefits:
- 1. You don't need to deal with NSSets, the dispatcher does the job of splitting
them. You get exactly one UITouch per call.
- 2. You can *claim* a UITouch by returning YES in ccTouchBegan. Updates of claimed
touches are sent only to the delegate(s) that claimed them. So if you get a move/
ended/cancelled update you're sure it's your touch. This frees you from doing a
lot of checks when doing multi-touch.
(The name TargetedTouchDelegate relates to updates "targeting" their specific
handler, without bothering the other handlers.)
@since v0.8
*/
class CCX_DLL CCTargetedTouchDelegate : public CCTouchDelegate class CCX_DLL CCTargetedTouchDelegate : public CCTouchDelegate
{ {
public: public:
@ -81,7 +94,7 @@ class CCX_DLL CCTargetedTouchDelegate : public CCTouchDelegate
virtual void ccTouchCancelled(CCTouch *pTouch, UIEvent *pEvent) {} virtual void ccTouchCancelled(CCTouch *pTouch, UIEvent *pEvent) {}
}; };
/** @brief CCStandardTouchDelegate. /** @brief
This type of delegate is the same one used by CocoaTouch. You will receive all the events (Began,Moved,Ended,Cancelled). This type of delegate is the same one used by CocoaTouch. You will receive all the events (Began,Moved,Ended,Cancelled).
@since v0.8 @since v0.8
*/ */

View File

@ -415,11 +415,11 @@ public:
virtual void onExit(); virtual void onExit();
}; };
class CCRenderTexture;
/** /**
@brief CCCrossFadeTransition: @brief CCCrossFadeTransition:
Cross fades two scenes using the CCRenderTexture object. Cross fades two scenes using the CCRenderTexture object.
*/ */
class CCRenderTexture;
class CCX_DLL CCCrossFadeTransition : public CCTransitionScene class CCX_DLL CCCrossFadeTransition : public CCTransitionScene
{ {
public : public :