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

issue #116

This commit is contained in:
Ming 2010-09-02 02:44:40 +00:00
parent 6a4af3bcfd
commit 73d6ecb232
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/include/CCTileMapAtlas.h
View File

@ -26,7 +26,6 @@ THE SOFTWARE.
#include <string> #include <string>
#include <map> #include <map>
#include "CCAtlasNode.h" #include "CCAtlasNode.h"
#include "support\image_support\TGAlib.h"
namespace cocos2d { namespace cocos2d {
typedef std::map<std::string, int> StringToIntegerDictionary; typedef std::map<std::string, int> StringToIntegerDictionary;
@ -46,10 +45,11 @@ 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 */
CCX_PROPERTY(tImageTGA*, m_pTGAInfo, TGAInfo); CCX_PROPERTY(struct sImageTGA*, m_pTGAInfo, TGAInfo);
public: public:
CCTileMapAtlas(); CCTileMapAtlas();
virtual ~CCTileMapAtlas(); virtual ~CCTileMapAtlas();
@ -75,7 +75,7 @@ namespace cocos2d {
void loadTGAfile(const char *file); void loadTGAfile(const char *file);
void calculateItemsToRender(); void calculateItemsToRender();
void updateAtlasValueAt(ccGridSize pos, ccColor3B value, int index); void updateAtlasValueAt(ccGridSize pos, ccColor3B value, int index);
void CCTileMapAtlas::updateAtlasValues(); void updateAtlasValues();
protected: protected:
/// x,y to altas dicctionary /// x,y to altas dicctionary

1
cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
View File

@ -24,6 +24,7 @@ THE SOFTWARE.
#include "CCTileMapAtlas.h" #include "CCTileMapAtlas.h"
#include "CCXFileUtils.h" #include "CCXFileUtils.h"
#include "CCTextureAtlas.h" #include "CCTextureAtlas.h"
#include "support\image_support\TGAlib.h"
namespace cocos2d { namespace cocos2d {