mirror of https://github.com/axmolengine/axmol.git
change FastTiledMap namespace to cocos2d::experimental
This commit is contained in:
parent
2403bc2e50
commit
880c2c4c3f
|
@ -49,6 +49,7 @@ THE SOFTWARE.
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
NS_CC_BEGIN
|
NS_CC_BEGIN
|
||||||
|
namespace experimental {
|
||||||
|
|
||||||
const int FastTMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0;
|
const int FastTMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0;
|
||||||
const int FastTMXLayer::FAST_TMX_ORIENTATION_HEX = 1;
|
const int FastTMXLayer::FAST_TMX_ORIENTATION_HEX = 1;
|
||||||
|
@ -857,4 +858,6 @@ std::string FastTMXLayer::getDescription() const
|
||||||
return StringUtils::format("<FastTMXLayer | tag = %d, size = %d,%d>", _tag, (int)_mapTileSize.width, (int)_mapTileSize.height);
|
return StringUtils::format("<FastTMXLayer | tag = %d, size = %d,%d>", _tag, (int)_mapTileSize.width, (int)_mapTileSize.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} //end of namespace experimental
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -45,6 +45,8 @@ class Texture2D;
|
||||||
class Sprite;
|
class Sprite;
|
||||||
struct _ccCArray;
|
struct _ccCArray;
|
||||||
|
|
||||||
|
namespace experimental{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @addtogroup tilemap_parallax_nodes
|
* @addtogroup tilemap_parallax_nodes
|
||||||
* @{
|
* @{
|
||||||
|
@ -256,7 +258,7 @@ public:
|
||||||
|
|
||||||
// end of tilemap_parallax_nodes group
|
// end of tilemap_parallax_nodes group
|
||||||
/// @}
|
/// @}
|
||||||
|
} //end of namespace experimental
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
||||||
#endif //__CCTMX_LAYER2_H__
|
#endif //__CCTMX_LAYER2_H__
|
||||||
|
|
|
@ -34,6 +34,7 @@ THE SOFTWARE.
|
||||||
#include "deprecated/CCString.h"
|
#include "deprecated/CCString.h"
|
||||||
|
|
||||||
NS_CC_BEGIN
|
NS_CC_BEGIN
|
||||||
|
namespace experimental {
|
||||||
|
|
||||||
// implementation FastTMXTiledMap
|
// implementation FastTMXTiledMap
|
||||||
|
|
||||||
|
@ -251,6 +252,7 @@ std::string FastTMXTiledMap::getDescription() const
|
||||||
return StringUtils::format("<FastTMXTiledMap | Tag = %d, Layers = %d", _tag, static_cast<int>(_children.size()));
|
return StringUtils::format("<FastTMXTiledMap | Tag = %d, Layers = %d", _tag, static_cast<int>(_children.size()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} //end of namespace experimental
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
||||||
|
|
|
@ -33,11 +33,14 @@ THE SOFTWARE.
|
||||||
NS_CC_BEGIN
|
NS_CC_BEGIN
|
||||||
|
|
||||||
class TMXObjectGroup;
|
class TMXObjectGroup;
|
||||||
class FastTMXLayer;
|
|
||||||
class TMXLayerInfo;
|
class TMXLayerInfo;
|
||||||
class TMXTilesetInfo;
|
class TMXTilesetInfo;
|
||||||
class TMXMapInfo;
|
class TMXMapInfo;
|
||||||
|
|
||||||
|
namespace experimental {
|
||||||
|
|
||||||
|
class FastTMXLayer;
|
||||||
|
|
||||||
/** @brief FastTMXTiledMap knows how to parse and render a TMX map.
|
/** @brief FastTMXTiledMap knows how to parse and render a TMX map.
|
||||||
|
|
||||||
It adds support for the TMX tiled map format used by http://www.mapeditor.org
|
It adds support for the TMX tiled map format used by http://www.mapeditor.org
|
||||||
|
@ -179,6 +182,8 @@ private:
|
||||||
|
|
||||||
// end of tilemap_parallax_nodes group
|
// end of tilemap_parallax_nodes group
|
||||||
/// @}
|
/// @}
|
||||||
|
|
||||||
|
} //end of namespace experimental
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,9 @@
|
||||||
#include "2d/CCFastTMXLayer.h"
|
#include "2d/CCFastTMXLayer.h"
|
||||||
#include "2d/CCFastTMXTiledMap.h"
|
#include "2d/CCFastTMXTiledMap.h"
|
||||||
|
|
||||||
|
using cocos2d::experimental::FastTMXLayer;
|
||||||
|
using cocos2d::experimental::FastTMXTiledMap;
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
enum
|
enum
|
||||||
|
|
Loading…
Reference in New Issue