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

Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_comments

This commit is contained in:
Huabing.Xu 2015-03-24 23:01:18 +08:00
parent 133955dba1 e6d1dcef58
commit d06d575e6e
69 changed files with 216 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/2d/CCComponent.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,8 @@ THE SOFTWARE.
#ifndef __CC_FRAMEWORK_COMPONENT_H__ #ifndef __CC_FRAMEWORK_COMPONENT_H__
#define __CC_FRAMEWORK_COMPONENT_H__ #define __CC_FRAMEWORK_COMPONENT_H__
/// @cond DO_NOT_SHOW
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCScriptSupport.h" #include "base/CCScriptSupport.h"
#include <string> #include <string>
@ -80,4 +82,5 @@ protected:
NS_CC_END NS_CC_END
/// @endcond
#endif // __FUNDATION__CCCOMPONENT_H__ #endif // __FUNDATION__CCCOMPONENT_H__

5
cocos/2d/CCComponentContainer.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,8 @@ THE SOFTWARE.
#ifndef __CC_FRAMEWORK_COMCONTAINER_H__ #ifndef __CC_FRAMEWORK_COMCONTAINER_H__
#define __CC_FRAMEWORK_COMCONTAINER_H__ #define __CC_FRAMEWORK_COMCONTAINER_H__
/// @cond DO_NOT_SHOW
#include "base/CCMap.h" #include "base/CCMap.h"
#include <string> #include <string>
@ -68,4 +70,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif // __FUNDATION__CCCOMPONENT_H__ #endif // __FUNDATION__CCCOMPONENT_H__

7
cocos/2d/CCFont.h
View File

@ -26,6 +26,8 @@
#ifndef _CCFont_h_ #ifndef _CCFont_h_
#define _CCFont_h_ #define _CCFont_h_
/// @cond DO_NOT_SHOW
#include <string> #include <string>
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
@ -33,8 +35,6 @@ NS_CC_BEGIN
class FontAtlas; class FontAtlas;
/// @cond
class CC_DLL Font : public Ref class CC_DLL Font : public Ref
{ {
public: public:
@ -65,8 +65,7 @@ protected:
}; };
/// @endcond
NS_CC_END NS_CC_END
/// @endcond
#endif #endif

10
cocos/2d/CCFontAtlas.h
View File

@ -22,9 +22,12 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef _CCFontAtlas_h_ #ifndef _CCFontAtlas_h_
#define _CCFontAtlas_h_ #define _CCFontAtlas_h_
/// @cond DO_NOT_SHOW
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@ -34,14 +37,11 @@
NS_CC_BEGIN NS_CC_BEGIN
//fwd
class Font; class Font;
class Texture2D; class Texture2D;
class EventCustom; class EventCustom;
class EventListenerCustom; class EventListenerCustom;
/// @cond
struct FontLetterDefinition struct FontLetterDefinition
{ {
unsigned short letteCharUTF16; unsigned short letteCharUTF16;
@ -130,9 +130,7 @@ protected:
bool _antialiasEnabled; bool _antialiasEnabled;
}; };
/// @endcond
NS_CC_END NS_CC_END
/// @endcond
#endif /* defined(__cocos2d_libs__CCFontAtlas__) */ #endif /* defined(__cocos2d_libs__CCFontAtlas__) */

7
cocos/2d/CCFontAtlasCache.h
View File

@ -26,6 +26,8 @@
#ifndef _CCFontAtlasCache_h_ #ifndef _CCFontAtlasCache_h_
#define _CCFontAtlasCache_h_ #define _CCFontAtlasCache_h_
/// @cond DO_NOT_SHOW
#include <unordered_map> #include <unordered_map>
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
@ -34,8 +36,6 @@ NS_CC_BEGIN
class FontAtlas; class FontAtlas;
/// @cond
class CC_DLL FontAtlasCache class CC_DLL FontAtlasCache
{ {
public: public:
@ -58,8 +58,7 @@ private:
static std::unordered_map<std::string, FontAtlas *> _atlasMap; static std::unordered_map<std::string, FontAtlas *> _atlasMap;
}; };
/// @endcond
NS_CC_END NS_CC_END
/// @endcond
#endif #endif

4
cocos/2d/CCFontCharMap.h
View File

@ -26,12 +26,12 @@
#ifndef _CCFontCharMap_h_ #ifndef _CCFontCharMap_h_
#define _CCFontCharMap_h_ #define _CCFontCharMap_h_
/// @cond DO_NOT_SHOW
#include "2d/CCFont.h" #include "2d/CCFont.h"
NS_CC_BEGIN NS_CC_BEGIN
/// @cond
class FontCharMap : public Font class FontCharMap : public Font
{ {
public: public:

4
cocos/2d/CCFontFNT.h
View File

@ -26,14 +26,14 @@
#ifndef _CCFontFNT_h_ #ifndef _CCFontFNT_h_
#define _CCFontFNT_h_ #define _CCFontFNT_h_
/// @cond DO_NOT_SHOW
#include "CCFont.h" #include "CCFont.h"
NS_CC_BEGIN NS_CC_BEGIN
class BMFontConfiguration; class BMFontConfiguration;
/// @cond FontFNT
class CC_DLL FontFNT : public Font class CC_DLL FontFNT : public Font
{ {

4
cocos/2d/CCFontFreeType.h
View File

@ -26,6 +26,8 @@
#ifndef _FontFreetype_h_ #ifndef _FontFreetype_h_
#define _FontFreetype_h_ #define _FontFreetype_h_
/// @cond DO_NOT_SHOW
#include "CCFont.h" #include "CCFont.h"
#include <string> #include <string>
@ -46,8 +48,6 @@
NS_CC_BEGIN NS_CC_BEGIN
/// @cond
class CC_DLL FontFreeType : public Font class CC_DLL FontFreeType : public Font
{ {
public: public:

7
cocos/2d/CCLabelBMFont.h
View File

@ -34,6 +34,8 @@ Use any of these editors to generate BMFonts:
#ifndef __CCBITMAP_FONT_ATLAS_H__ #ifndef __CCBITMAP_FONT_ATLAS_H__
#define __CCBITMAP_FONT_ATLAS_H__ #define __CCBITMAP_FONT_ATLAS_H__
/// @cond DO_NOT_SHOW
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
#if CC_LABELBMFONT_DEBUG_DRAW #if CC_LABELBMFONT_DEBUG_DRAW
#include "renderer/CCCustomCommand.h" #include "renderer/CCCustomCommand.h"
@ -42,8 +44,6 @@ Use any of these editors to generate BMFonts:
NS_CC_BEGIN NS_CC_BEGIN
/// @cond
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif _MSC_VER >= 1400 //vs 2005 or higher #elif _MSC_VER >= 1400 //vs 2005 or higher
@ -157,8 +157,7 @@ private:
#pragma warning (pop) #pragma warning (pop)
#endif #endif
/// @endcond
NS_CC_END NS_CC_END
/// @endcond
#endif //__CCBITMAP_FONT_ATLAS_H__ #endif //__CCBITMAP_FONT_ATLAS_H__

6
cocos/2d/CCLabelTTF.h
View File

@ -23,9 +23,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CCLABELTTF_H__ #ifndef __CCLABELTTF_H__
#define __CCLABELTTF_H__ #define __CCLABELTTF_H__
/// @cond DO_NOT_SHOW
#include "2d/CCNode.h" #include "2d/CCNode.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -171,9 +174,8 @@ protected:
#pragma warning (pop) #pragma warning (pop)
#endif #endif
/// @endcond
NS_CC_END NS_CC_END
/// @endcond
#endif //__CCLABEL_H__ #endif //__CCLABEL_H__

6
cocos/2d/CCLabelTextFormatter.h
View File

@ -26,13 +26,14 @@
#ifndef _CCLabelTextFormatter_h_ #ifndef _CCLabelTextFormatter_h_
#define _CCLabelTextFormatter_h_ #define _CCLabelTextFormatter_h_
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN
class Label; class Label;
/// @cond
class CC_DLL LabelTextFormatter class CC_DLL LabelTextFormatter
{ {
public: public:
@ -43,8 +44,7 @@ public:
}; };
/// @endcond
NS_CC_END NS_CC_END
/// @endcond
#endif #endif

6
cocos/2d/CCTMXXMLParser.h
View File

@ -2,7 +2,7 @@
Copyright (c) 2009-2010 Ricardo Quesada Copyright (c) 2009-2010 Ricardo Quesada
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc. Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -29,6 +29,8 @@ THE SOFTWARE.
#ifndef __CC_TM_XML_PARSER__ #ifndef __CC_TM_XML_PARSER__
#define __CC_TM_XML_PARSER__ #define __CC_TM_XML_PARSER__
/// @cond DO_NOT_SHOW
#include "math/CCGeometry.h" #include "math/CCGeometry.h"
#include "platform/CCSAXParser.h" #include "platform/CCSAXParser.h"
#include "base/CCVector.h" #include "base/CCVector.h"
@ -323,5 +325,5 @@ protected:
NS_CC_END NS_CC_END
/// @endcond
#endif #endif

5
cocos/2d/CCTweenFunction.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,8 @@ THE SOFTWARE.
#ifndef __CCTWEENFUNCTION_H__ #ifndef __CCTWEENFUNCTION_H__
#define __CCTWEENFUNCTION_H__ #define __CCTWEENFUNCTION_H__
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -293,4 +295,5 @@ namespace tweenfunc {
NS_CC_END NS_CC_END
/// @endcond
#endif /*__CCTWEENFUNCTION_H__*/ #endif /*__CCTWEENFUNCTION_H__*/

2
cocos/3d/cocos3d.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2014-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

5
cocos/base/CCConsole.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,9 +22,9 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CCCONSOLE_H__ #ifndef __CCCONSOLE_H__
#define __CCCONSOLE_H__ #define __CCCONSOLE_H__
/// @cond DO_NOT_SHOW
#if defined(_MSC_VER) || defined(__MINGW32__) #if defined(_MSC_VER) || defined(__MINGW32__)
#include <BaseTsd.h> #include <BaseTsd.h>
@ -158,4 +158,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif /* defined(__CCCONSOLE_H__) */ #endif /* defined(__CCCONSOLE_H__) */

8
cocos/base/CCDataVisitor.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -24,6 +24,7 @@
#ifndef __CCDATAVISITOR_H__ #ifndef __CCDATAVISITOR_H__
#define __CCDATAVISITOR_H__ #define __CCDATAVISITOR_H__
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include <string> #include <string>
@ -40,10 +41,6 @@ class __Array;
class __Dictionary; class __Dictionary;
class __Set; class __Set;
/**
* @cond
*/
/** /**
* Visitor that helps to perform action that depends on polymorphic object type * Visitor that helps to perform action that depends on polymorphic object type
* *
@ -111,4 +108,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif // __CCDATAVISITOR_H__ #endif // __CCDATAVISITOR_H__

4
cocos/base/CCEventType.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -24,6 +24,7 @@
#ifndef __CCEVENT_TYPE_H__ #ifndef __CCEVENT_TYPE_H__
#define __CCEVENT_TYPE_H__ #define __CCEVENT_TYPE_H__
/// @cond DO_NOT_SHOW
/** /**
* This header is used for defining event types using in NotificationCenter * This header is used for defining event types using in NotificationCenter
@ -43,4 +44,5 @@
// This message is posted in cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp and cocos\platform\wp8-xaml\cpp\Cocos2dRenderer.cpp. // This message is posted in cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp and cocos\platform\wp8-xaml\cpp\Cocos2dRenderer.cpp.
#define EVENT_COME_TO_BACKGROUND "event_come_to_background" #define EVENT_COME_TO_BACKGROUND "event_come_to_background"
/// @endcond
#endif // __CCEVENT_TYPE_H__ #endif // __CCEVENT_TYPE_H__

5
cocos/base/CCGameController.h
View File

@ -1,6 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 cocos2d-x.org Copyright (c) 2014-2015 Chukong Technologies Inc.
Copyright (c) 2014 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +24,11 @@
#ifndef __cocos2d_libs__CCGameController__ #ifndef __cocos2d_libs__CCGameController__
#define __cocos2d_libs__CCGameController__ #define __cocos2d_libs__CCGameController__
/// @cond DO_NOT_SHOW
#include "base/CCController.h" #include "base/CCController.h"
#include "base/CCEventController.h" #include "base/CCEventController.h"
#include "base/CCEventListenerController.h" #include "base/CCEventListenerController.h"
/// @endcond
#endif /* defined(__cocos2d_libs__CCGameController__) */ #endif /* defined(__cocos2d_libs__CCGameController__) */

5
cocos/base/CCProfiling.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010 Stuart Carnie Copyright (c) 2010 Stuart Carnie
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,8 +23,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __SUPPORT_CCPROFILING_H__ #ifndef __SUPPORT_CCPROFILING_H__
#define __SUPPORT_CCPROFILING_H__ #define __SUPPORT_CCPROFILING_H__
/// @cond DO_NOT_SHOW
#include <string> #include <string>
#include <chrono> #include <chrono>
@ -161,4 +163,5 @@ extern bool kProfilerCategoryParticles;
NS_CC_END NS_CC_END
/// @endcond
#endif // __SUPPORT_CCPROFILING_H__ #endif // __SUPPORT_CCPROFILING_H__

4
cocos/base/CCProtocols.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,6 +26,7 @@ THE SOFTWARE.
#ifndef __BASE_CCPROTOCOLS_H__ #ifndef __BASE_CCPROTOCOLS_H__
#define __BASE_CCPROTOCOLS_H__ #define __BASE_CCPROTOCOLS_H__
/// @cond DO_NOT_SHOW
#include <string> #include <string>
@ -268,4 +269,5 @@ public:
NS_CC_END NS_CC_END
/// @endcond
#endif // __BASE_CCPROTOCOLS_H__ #endif // __BASE_CCPROTOCOLS_H__

10
cocos/base/CCRefPtr.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 PlayFirst Inc. Copyright (c) 2014 PlayFirst Inc.
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2014-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@
#ifndef __CC_REF_PTR_H__ #ifndef __CC_REF_PTR_H__
#define __CC_REF_PTR_H__ #define __CC_REF_PTR_H__
/// @cond DO_NOT_SHOW
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
@ -33,8 +34,6 @@
NS_CC_BEGIN NS_CC_BEGIN
/** /**
* @cond DO_NOT_SHOW
*
* Utility/support macros. Defined to enable RefPtr<T> to contain types like 'const T' because we do not * Utility/support macros. Defined to enable RefPtr<T> to contain types like 'const T' because we do not
* regard retain()/release() as affecting mutability of state. * regard retain()/release() as affecting mutability of state.
*/ */
@ -307,8 +306,7 @@ template<class T, class U> RefPtr<T> dynamic_pointer_cast(const RefPtr<U> & r)
#undef CC_REF_PTR_SAFE_RELEASE #undef CC_REF_PTR_SAFE_RELEASE
#undef CC_REF_PTR_SAFE_RELEASE_NULL #undef CC_REF_PTR_SAFE_RELEASE_NULL
/** @} */
NS_CC_END NS_CC_END
/// @endcond
#endif // __CC_REF_PTR_H__ #endif // __CC_REF_PTR_H__

4
cocos/base/TGAlib.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __SUPPORT_DATA_SUPPORT_TGALIB_H__ #ifndef __SUPPORT_DATA_SUPPORT_TGALIB_H__
#define __SUPPORT_DATA_SUPPORT_TGALIB_H__ #define __SUPPORT_DATA_SUPPORT_TGALIB_H__
/// @cond DO_NOT_SHOW
namespace cocos2d { namespace cocos2d {
@ -73,4 +74,5 @@ void tgaDestroy(tImageTGA *info);
}//namespace cocos2d }//namespace cocos2d
/// @endcond
#endif // __SUPPORT_DATA_SUPPORT_TGALIB_H__ #endif // __SUPPORT_DATA_SUPPORT_TGALIB_H__

4
cocos/base/ZipUtils.h
View File

@ -22,8 +22,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __SUPPORT_ZIPUTILS_H__ #ifndef __SUPPORT_ZIPUTILS_H__
#define __SUPPORT_ZIPUTILS_H__ #define __SUPPORT_ZIPUTILS_H__
/// @cond DO_NOT_SHOW
#include <string> #include <string>
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
@ -294,5 +296,5 @@ typedef struct unz_file_info_s unz_file_info;
// end group // end group
/// @} /// @}
/// @endcond
#endif // __SUPPORT_ZIPUTILS_H__ #endif // __SUPPORT_ZIPUTILS_H__

3
cocos/base/allocator/CCAllocatorBase.h
View File

@ -25,7 +25,7 @@
#ifndef CC_ALLOCATOR_BASE_H #ifndef CC_ALLOCATOR_BASE_H
#define CC_ALLOCATOR_BASE_H #define CC_ALLOCATOR_BASE_H
/// @cond /// @cond DO_NOT_SHOW
#include <string> #include <string>
@ -113,5 +113,4 @@ NS_CC_ALLOCATOR_END
NS_CC_END NS_CC_END
/// @endcond /// @endcond
#endif//CC_ALLOCATOR_BASE_H #endif//CC_ALLOCATOR_BASE_H

3
cocos/base/allocator/CCAllocatorDiagnostics.h
View File

@ -25,7 +25,7 @@
#ifndef CC_ALLOCATOR_DIAGNOSTICS_H #ifndef CC_ALLOCATOR_DIAGNOSTICS_H
#define CC_ALLOCATOR_DIAGNOSTICS_H #define CC_ALLOCATOR_DIAGNOSTICS_H
/// @cond /// @cond DO_NOT_SHOW
#include <unordered_set> #include <unordered_set>
@ -59,5 +59,4 @@ NS_CC_ALLOCATOR_END
NS_CC_END NS_CC_END
/// @endcond /// @endcond
#endif//CC_ALLOCATOR_DIAGNOSTICS_H #endif//CC_ALLOCATOR_DIAGNOSTICS_H

3
cocos/base/allocator/CCAllocatorGlobal.h
View File

@ -25,7 +25,7 @@
#ifndef CC_ALLOCATOR_GLOBAL_H #ifndef CC_ALLOCATOR_GLOBAL_H
#define CC_ALLOCATOR_GLOBAL_H #define CC_ALLOCATOR_GLOBAL_H
/// @cond /// @cond DO_NOT_SHOW
#include "base/allocator/CCAllocatorMacros.h" #include "base/allocator/CCAllocatorMacros.h"
#include "base/allocator/CCAllocatorStrategyDefault.h" #include "base/allocator/CCAllocatorStrategyDefault.h"
@ -40,5 +40,4 @@ NS_CC_ALLOCATOR_END
NS_CC_END NS_CC_END
/// @endcond /// @endcond
#endif//CC_ALLOCATOR_GLOBAL_H #endif//CC_ALLOCATOR_GLOBAL_H

3
cocos/base/allocator/CCAllocatorMacros.h
View File

@ -25,7 +25,7 @@
#ifndef CC_ALLOCATOR_MACROS_H #ifndef CC_ALLOCATOR_MACROS_H
#define CC_ALLOCATOR_MACROS_H #define CC_ALLOCATOR_MACROS_H
/// @cond /// @cond DO_NOT_SHOW
#include "base/ccConfig.h" #include "base/ccConfig.h"
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
@ -128,5 +128,4 @@
} }
/// @endcond /// @endcond
#endif//CC_ALLOCATOR_MACROS_H #endif//CC_ALLOCATOR_MACROS_H

3
cocos/base/allocator/CCAllocatorMutex.h
View File

@ -25,7 +25,7 @@
#ifndef CC_ALLOCATOR_MUTEX_H #ifndef CC_ALLOCATOR_MUTEX_H
#define CC_ALLOCATOR_MUTEX_H #define CC_ALLOCATOR_MUTEX_H
/// @cond /// @cond DO_NOT_SHOW
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
@ -122,5 +122,4 @@ NS_CC_ALLOCATOR_END
NS_CC_END NS_CC_END
/// @endcond /// @endcond
#endif//CC_ALLOCATOR_MUTEX_H #endif//CC_ALLOCATOR_MUTEX_H

3
cocos/base/allocator/CCAllocatorStrategyDefault.h
View File

@ -25,7 +25,7 @@
#ifndef CC_ALLOCATOR_STRATEGY_DEFAULT_H #ifndef CC_ALLOCATOR_STRATEGY_DEFAULT_H
#define CC_ALLOCATOR_STRATEGY_DEFAULT_H #define CC_ALLOCATOR_STRATEGY_DEFAULT_H
/// @cond /// @cond DO_NOT_SHOW
#include "base/allocator/CCAllocatorMacros.h" #include "base/allocator/CCAllocatorMacros.h"
#include "base/allocator/CCAllocatorBase.h" #include "base/allocator/CCAllocatorBase.h"
@ -56,5 +56,4 @@ NS_CC_ALLOCATOR_END
NS_CC_END NS_CC_END
/// @endcond /// @endcond
#endif//CC_ALLOCATOR_STRATEGY_DEFAULT_H #endif//CC_ALLOCATOR_STRATEGY_DEFAULT_H

3
cocos/base/allocator/CCAllocatorStrategyFixedBlock.h
View File

@ -25,7 +25,7 @@
#ifndef CC_ALLOCATOR_STRATEGY_FIXED_BLOCK_H #ifndef CC_ALLOCATOR_STRATEGY_FIXED_BLOCK_H
#define CC_ALLOCATOR_STRATEGY_FIXED_BLOCK_H #define CC_ALLOCATOR_STRATEGY_FIXED_BLOCK_H
/// @cond /// @cond DO_NOT_SHOW
/**************************************************************************** /****************************************************************************
WARNING! WARNING!
@ -274,5 +274,4 @@ NS_CC_ALLOCATOR_END
NS_CC_END NS_CC_END
/// @endcond /// @endcond
#endif//CC_ALLOCATOR_STRATEGY_FIXED_BLOCK_H #endif//CC_ALLOCATOR_STRATEGY_FIXED_BLOCK_H

3
cocos/base/allocator/CCAllocatorStrategyGlobalSmallBlock.h
View File

@ -25,7 +25,7 @@
#ifndef CC_ALLOCATOR_STRATEGY_GLOBAL_SMALL_BLOCK_H #ifndef CC_ALLOCATOR_STRATEGY_GLOBAL_SMALL_BLOCK_H
#define CC_ALLOCATOR_STRATEGY_GLOBAL_SMALL_BLOCK_H #define CC_ALLOCATOR_STRATEGY_GLOBAL_SMALL_BLOCK_H
/// @cond /// @cond DO_NOT_SHOW
/**************************************************************************** /****************************************************************************
WARNING! WARNING!
@ -316,5 +316,4 @@ NS_CC_ALLOCATOR_END
NS_CC_END NS_CC_END
/// @endcond /// @endcond
#endif//CC_ALLOCATOR_STRATEGY_GLOBAL_SMALL_BLOCK_H #endif//CC_ALLOCATOR_STRATEGY_GLOBAL_SMALL_BLOCK_H

3
cocos/base/allocator/CCAllocatorStrategyPool.h
View File

@ -25,7 +25,7 @@
#ifndef CC_ALLOCATOR_STRATEGY_POOL_H #ifndef CC_ALLOCATOR_STRATEGY_POOL_H
#define CC_ALLOCATOR_STRATEGY_POOL_H #define CC_ALLOCATOR_STRATEGY_POOL_H
/// @cond /// @cond DO_NOT_SHOW
#include <vector> #include <vector>
#include <typeinfo> #include <typeinfo>
@ -169,5 +169,4 @@ NS_CC_ALLOCATOR_END
NS_CC_END NS_CC_END
/// @endcond /// @endcond
#endif//CC_ALLOCATOR_STRATEGY_POOL_H #endif//CC_ALLOCATOR_STRATEGY_POOL_H

7
cocos/base/atitc.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,9 +22,9 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef COCOS2DX_PLATFORM_THIRDPARTY_ATITC_ #ifndef COCOS2DX_PLATFORM_THIRDPARTY_ATITC_
#define COCOS2DX_PLATFORM_THIRDPARTY_ATITC_ #define COCOS2DX_PLATFORM_THIRDPARTY_ATITC_
/// @cond DO_NOT_SHOW
#include "platform/CCStdC.h" #include "platform/CCStdC.h"
@ -43,6 +43,5 @@ void atitc_decode(uint8_t *encode_data,
ATITCDecodeFlag decodeFlag ATITCDecodeFlag decodeFlag
); );
/// @endcond
#endif /* defined(COCOS2DX_PLATFORM_THIRDPARTY_ATITC_) */ #endif /* defined(COCOS2DX_PLATFORM_THIRDPARTY_ATITC_) */

4
cocos/base/base64.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __SUPPORT_BASE64_H__ #ifndef __SUPPORT_BASE64_H__
#define __SUPPORT_BASE64_H__ #define __SUPPORT_BASE64_H__
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
@ -64,4 +65,5 @@ int CC_DLL base64Encode(const unsigned char *in, unsigned int inLength, char **o
} }
#endif #endif
/// @endcond
#endif // __SUPPORT_BASE64_H__ #endif // __SUPPORT_BASE64_H__

4
cocos/base/ccCArray.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2007 Scott Lembcke Copyright (c) 2007 Scott Lembcke
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -42,6 +42,7 @@ THE SOFTWARE.
#ifndef CC_ARRAY_H #ifndef CC_ARRAY_H
#define CC_ARRAY_H #define CC_ARRAY_H
/// @cond DO_NOT_SHOW
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/CCRef.h" #include "base/CCRef.h"
@ -203,4 +204,5 @@ void ccCArrayFullRemoveArray(ccCArray *arr, ccCArray *minusArr);
NS_CC_END NS_CC_END
/// @endcond
#endif // CC_ARRAY_H #endif // CC_ARRAY_H

49
cocos/base/ccFPSImages.h
View File

@ -1,29 +1,31 @@
/* /****************************************************************************
* cocos2d for iPhone: http://www.cocos2d-iphone.org Copyright (c) 2012 Zynga Inc.
* Copyright (c) 2013-2015 Chukong Technologies Inc.
* Copyright (c) 2012 Zynga Inc.
* http://www.cocos2d-x.org
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal Permission is hereby granted, free of charge, to any person obtaining a copy
* in the Software without restriction, including without limitation the rights of this software and associated documentation files (the "Software"), to deal
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell in the Software without restriction, including without limitation the rights
* copies of the Software, and to permit persons to whom the Software is to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* furnished to do so, subject to the following conditions: copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* THE SOFTWARE. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
*/ THE SOFTWARE.
****************************************************************************/
#ifndef __BASE_CCFPSIMAGES__H #ifndef __BASE_CCFPSIMAGES__H
#define __BASE_CCFPSIMAGES__H #define __BASE_CCFPSIMAGES__H
/// @cond DO_NOT_SHOW
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -36,4 +38,5 @@ unsigned int cc_fps_images_len(void);
} }
#endif #endif
/// @endcond
#endif // __BASE_CCFPSIMAGES__H #endif // __BASE_CCFPSIMAGES__H

2
cocos/base/etc1.h
View File

@ -14,6 +14,7 @@
#ifndef __etc1_h__ #ifndef __etc1_h__
#define __etc1_h__ #define __etc1_h__
/// @cond DO_NOT_SHOW
#define ETC1_ENCODED_BLOCK_SIZE 8 #define ETC1_ENCODED_BLOCK_SIZE 8
#define ETC1_DECODED_BLOCK_SIZE 48 #define ETC1_DECODED_BLOCK_SIZE 48
@ -103,4 +104,5 @@ etc1_uint32 etc1_pkm_get_height(const etc1_byte* pHeader);
} }
#endif #endif
/// @endcond
#endif #endif

4
cocos/base/firePngData.h
View File

@ -1,3 +1,5 @@
/// @cond DO_NOT_SHOW
const unsigned char __firePngData[] = { const unsigned char __firePngData[] = {
0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7A, 0x7A, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7A, 0x7A,
@ -46,3 +48,5 @@ const unsigned char __firePngData[] = {
0x72, 0x89, 0x08, 0x10, 0x07, 0x7D, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x72, 0x89, 0x08, 0x10, 0x07, 0x7D, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42,
0x60, 0x82 0x60, 0x82
}; };
/// @endcond

7
cocos/base/s3tc.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Copyright (c) 2013-2015 Chukong Technologies
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,9 +22,9 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef COCOS2DX_PLATFORM_THIRDPARTY_S3TC_ #ifndef COCOS2DX_PLATFORM_THIRDPARTY_S3TC_
#define COCOS2DX_PLATFORM_THIRDPARTY_S3TC_ #define COCOS2DX_PLATFORM_THIRDPARTY_S3TC_
/// @cond DO_NOT_SHOW
#include "platform/CCStdC.h" #include "platform/CCStdC.h"
@ -43,6 +43,5 @@ enum class S3TCDecodeFlag
S3TCDecodeFlag decodeFlag S3TCDecodeFlag decodeFlag
); );
/// @endcond
#endif /* defined(COCOS2DX_PLATFORM_THIRDPARTY_S3TC_) */ #endif /* defined(COCOS2DX_PLATFORM_THIRDPARTY_S3TC_) */

2
cocos/base/uthash.h
View File

@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef UTHASH_H #ifndef UTHASH_H
#define UTHASH_H #define UTHASH_H
/// @cond DO_NOT_SHOW
#include <string.h> /* memcmp,strlen */ #include <string.h> /* memcmp,strlen */
#include <stddef.h> /* ptrdiff_t */ #include <stddef.h> /* ptrdiff_t */
@ -937,4 +938,5 @@ typedef struct UT_hash_handle {
unsigned hashv; /* result of hash-fcn(key) */ unsigned hashv; /* result of hash-fcn(key) */
} UT_hash_handle; } UT_hash_handle;
/// @endcond
#endif /* UTHASH_H */ #endif /* UTHASH_H */

3
cocos/base/utlist.h
View File

@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef UTLIST_H #ifndef UTLIST_H
#define UTLIST_H #define UTLIST_H
/// @cond DO_NOT_SHOW
#define UTLIST_VERSION 1.9.8 #define UTLIST_VERSION 1.9.8
@ -724,5 +725,5 @@ do {
} \ } \
} while (0) \ } while (0) \
/// @endcond
#endif /* UTLIST_H */ #endif /* UTLIST_H */

5
cocos/deprecated/CCArray.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010 ForzeField Studios S.L. http://forzefield.com Copyright (c) 2010 ForzeField Studios S.L. http://forzefield.com
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,8 +23,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CCARRAY_H__ #ifndef __CCARRAY_H__
#define __CCARRAY_H__ #define __CCARRAY_H__
/// @cond DO_NOT_SHOW
#define CC_USE_ARRAY_VECTOR 0 #define CC_USE_ARRAY_VECTOR 0
@ -556,4 +558,5 @@ public:
NS_CC_END NS_CC_END
/// @endcond
#endif // __CCARRAY_H__ #endif // __CCARRAY_H__

4
cocos/deprecated/CCBool.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ Copyright (c) 2013-2014 Chukong Technologies Inc.
#ifndef __CCBOOL_H__ #ifndef __CCBOOL_H__
#define __CCBOOL_H__ #define __CCBOOL_H__
/// @cond DO_NOT_SHOW
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCDataVisitor.h" #include "base/CCDataVisitor.h"
@ -69,4 +70,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif /* __CCBOOL_H__ */ #endif /* __CCBOOL_H__ */

6
cocos/deprecated/CCDeprecated.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013 cocos2d-x.org Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,6 +23,8 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
/// @cond DO_NOT_SHOW
/** Add deprecated global functions and variables here /** Add deprecated global functions and variables here
*/ */
@ -1155,5 +1157,5 @@ CC_DEPRECATED_ATTRIBUTE CC_DLL Vec4* kmVec4Transform(Vec4* pOut, const Vec4* pV,
NS_CC_END NS_CC_END
/// @endcond
#endif // __COCOS2D_CCDEPRECATED_H__ #endif // __COCOS2D_CCDEPRECATED_H__

4
cocos/deprecated/CCDictionary.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2012 cocos2d-x.org Copyright (c) 2012 cocos2d-x.org
opyright (c) 2013-2014 Chukong Technologies Inc. opyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __CCDICTIONARY_H__ #ifndef __CCDICTIONARY_H__
#define __CCDICTIONARY_H__ #define __CCDICTIONARY_H__
/// @cond DO_NOT_SHOW
#include "base/uthash.h" #include "base/uthash.h"
#include "base/CCRef.h" #include "base/CCRef.h"
@ -456,4 +457,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif /* __CCDICTIONARY_H__ */ #endif /* __CCDICTIONARY_H__ */

4
cocos/deprecated/CCDouble.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Copyright (c) 2013-2015 Chukong Technologies
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -24,6 +24,7 @@
#ifndef __CCDOUBLE_H__ #ifndef __CCDOUBLE_H__
#define __CCDOUBLE_H__ #define __CCDOUBLE_H__
/// @cond DO_NOT_SHOW
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCDataVisitor.h" #include "base/CCDataVisitor.h"
@ -68,4 +69,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif /* __CCDOUBLE_H__ */ #endif /* __CCDOUBLE_H__ */

4
cocos/deprecated/CCFloat.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Copyright (c) 2013-2015 Chukong Technologies
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -24,6 +24,7 @@
#ifndef __CCFLOAT_H__ #ifndef __CCFLOAT_H__
#define __CCFLOAT_H__ #define __CCFLOAT_H__
/// @cond DO_NOT_SHOW
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCDataVisitor.h" #include "base/CCDataVisitor.h"
@ -69,4 +70,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif /* __CCFLOAT_H__ */ #endif /* __CCFLOAT_H__ */

4
cocos/deprecated/CCInteger.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Copyright (c) 2013-2015 Chukong Technologies
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -24,6 +24,7 @@
#ifndef __CCINTEGER_H__ #ifndef __CCINTEGER_H__
#define __CCINTEGER_H__ #define __CCINTEGER_H__
/// @cond DO_NOT_SHOW
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCConsole.h" #include "base/CCConsole.h"
@ -78,4 +79,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif /* __CCINTEGER_H__ */ #endif /* __CCINTEGER_H__ */

4
cocos/deprecated/CCNotificationCenter.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2011 Erawppa Copyright (c) 2011 Erawppa
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,6 +26,7 @@ THE SOFTWARE.
#ifndef __CCNOTIFICATIONCENTER_H__ #ifndef __CCNOTIFICATIONCENTER_H__
#define __CCNOTIFICATIONCENTER_H__ #define __CCNOTIFICATIONCENTER_H__
/// @cond DO_NOT_SHOW
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
@ -208,4 +209,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif//__CCNOTIFICATIONCENTER_H__ #endif//__CCNOTIFICATIONCENTER_H__

5
cocos/deprecated/CCSet.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Copyright (c) 2013-2015 Chukong Technologies
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __CC_SET_H__ #ifndef __CC_SET_H__
#define __CC_SET_H__ #define __CC_SET_H__
/// @cond DO_NOT_SHOW
#include <set> #include <set>
#include "base/CCRef.h" #include "base/CCRef.h"
@ -117,5 +118,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif // __CC_SET_H__ #endif // __CC_SET_H__

5
cocos/deprecated/CCString.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Copyright (c) 2013-2015 Chukong Technologies
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,8 +22,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CCSTRING_H__ #ifndef __CCSTRING_H__
#define __CCSTRING_H__ #define __CCSTRING_H__
/// @cond DO_NOT_SHOW
#if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) #if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY)
#include <string.h> #include <string.h>
@ -224,4 +226,5 @@ std::string CC_DLL format(const char* format, ...) CC_FORMAT_PRINTF(1, 2);
NS_CC_END NS_CC_END
/// @endcond
#endif //__CCSTRING_H__ #endif //__CCSTRING_H__

5
cocos/network/HttpAsynConnection.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -21,8 +21,10 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __HTTPASYNCONNECTION_H__ #ifndef __HTTPASYNCONNECTION_H__
#define __HTTPASYNCONNECTION_H__ #define __HTTPASYNCONNECTION_H__
/// @cond DO_NOT_SHOW
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <Security/Security.h> #import <Security/Security.h>
@ -58,5 +60,6 @@
-(void) startRequest:(NSURLRequest*)request; -(void) startRequest:(NSURLRequest*)request;
@end @end
/// @endcond /// @endcond
#endif //__HTTPASYNCONNECTION_H__ #endif //__HTTPASYNCONNECTION_H__

4
cocos/network/HttpCookie.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -24,6 +24,7 @@
#ifndef HTTP_COOKIE_H #ifndef HTTP_COOKIE_H
#define HTTP_COOKIE_H #define HTTP_COOKIE_H
/// @cond DO_NOT_SHOW
struct CookiesInfo struct CookiesInfo
{ {
@ -53,4 +54,5 @@ private:
std::vector<CookiesInfo> _cookies; std::vector<CookiesInfo> _cookies;
}; };
/// @endcond
#endif /* HTTP_COOKIE_H */ #endif /* HTTP_COOKIE_H */

4
cocos/platform/CCApplication.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_CCAPPLICATION_H__ #ifndef __PLATFORM_CCAPPLICATION_H__
#define __PLATFORM_CCAPPLICATION_H__ #define __PLATFORM_CCAPPLICATION_H__
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
@ -42,4 +43,5 @@ THE SOFTWARE.
#include "platform/linux/CCApplication-linux.h" #include "platform/linux/CCApplication-linux.h"
#endif #endif
/// @endcond
#endif /* __PLATFORM_CCAPPLICATION_H__*/ #endif /* __PLATFORM_CCAPPLICATION_H__*/

4
cocos/platform/CCCommon.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __CC_COMMON_H__ #ifndef __CC_COMMON_H__
#define __CC_COMMON_H__ #define __CC_COMMON_H__
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
@ -76,4 +77,5 @@ enum class LanguageType
NS_CC_END NS_CC_END
/// @endcond
#endif // __CC_COMMON_H__ #endif // __CC_COMMON_H__

4
cocos/platform/CCGL.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_CCGL_H__ #ifndef __PLATFORM_CCGL_H__
#define __PLATFORM_CCGL_H__ #define __PLATFORM_CCGL_H__
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
@ -42,4 +43,5 @@ THE SOFTWARE.
#include "platform/linux/CCGL-linux.h" #include "platform/linux/CCGL-linux.h"
#endif #endif
/// @endcond
#endif /* __PLATFORM_CCPLATFORMDEFINE_H__*/ #endif /* __PLATFORM_CCPLATFORMDEFINE_H__*/

4
cocos/platform/CCImage.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __CC_IMAGE_H__ #ifndef __CC_IMAGE_H__
#define __CC_IMAGE_H__ #define __CC_IMAGE_H__
/// @cond DO_NOT_SHOW
#include "base/CCRef.h" #include "base/CCRef.h"
#include "renderer/CCTexture2D.h" #include "renderer/CCTexture2D.h"
@ -217,4 +218,5 @@ protected:
NS_CC_END NS_CC_END
/// @endcond
#endif // __CC_IMAGE_H__ #endif // __CC_IMAGE_H__

5
cocos/platform/CCPlatformConfig.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Copyright (c) 2013-2015 Chukong Technologies
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __BASE_CC_PLATFORM_CONFIG_H__ #ifndef __BASE_CC_PLATFORM_CONFIG_H__
#define __BASE_CC_PLATFORM_CONFIG_H__ #define __BASE_CC_PLATFORM_CONFIG_H__
/// @cond DO_NOT_SHOW
/** /**
Config of cocos2d-x project, per target platform. Config of cocos2d-x project, per target platform.
@ -156,5 +157,5 @@ THE SOFTWARE.
#endif #endif
#endif // CC_PLATFORM_WIN32 #endif // CC_PLATFORM_WIN32
/// @endcond
#endif // __BASE_CC_PLATFORM_CONFIG_H__ #endif // __BASE_CC_PLATFORM_CONFIG_H__

4
cocos/platform/CCPlatformDefine.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __PLATFORM_CCPLATFORMDEFINE_H__ #ifndef __PLATFORM_CCPLATFORMDEFINE_H__
#define __PLATFORM_CCPLATFORMDEFINE_H__ #define __PLATFORM_CCPLATFORMDEFINE_H__
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
@ -42,4 +43,5 @@ THE SOFTWARE.
#include "platform/linux/CCPlatformDefine-linux.h" #include "platform/linux/CCPlatformDefine-linux.h"
#endif #endif
/// @endcond
#endif /* __PLATFORM_CCPLATFORMDEFINE_H__*/ #endif /* __PLATFORM_CCPLATFORMDEFINE_H__*/

5
cocos/platform/CCPlatformMacros.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Copyright (c) 2013-2015 Chukong Technologies
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,8 +22,10 @@ Copyright (c) 2013-2014 Chukong Technologies
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CC_PLATFORM_MACROS_H__ #ifndef __CC_PLATFORM_MACROS_H__
#define __CC_PLATFORM_MACROS_H__ #define __CC_PLATFORM_MACROS_H__
/// @cond DO_NOT_SHOW
/** /**
* define some platform specific macros * define some platform specific macros
@ -318,4 +320,5 @@ public: virtual void set##funName(varType var) \
#endif #endif
#endif #endif
/// @endcond
#endif // __CC_PLATFORM_MACROS_H__ #endif // __CC_PLATFORM_MACROS_H__

2
cocos/platform/CCSAXParser.h
View File

@ -23,6 +23,7 @@
#ifndef __CCSAXPARSER_H__ #ifndef __CCSAXPARSER_H__
#define __CCSAXPARSER_H__ #define __CCSAXPARSER_H__
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "platform/CCCommon.h" #include "platform/CCCommon.h"
@ -115,4 +116,5 @@ public:
NS_CC_END NS_CC_END
/// @endcond
#endif //__CCSAXPARSER_H__ #endif //__CCSAXPARSER_H__

2
cocos/platform/CCStdC.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

4
cocos/platform/CCThread.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,6 +25,7 @@ THE SOFTWARE.
#ifndef __CC_PLATFORM_THREAD_H__ #ifndef __CC_PLATFORM_THREAD_H__
#define __CC_PLATFORM_THREAD_H__ #define __CC_PLATFORM_THREAD_H__
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
@ -61,4 +62,5 @@ public:
NS_CC_END NS_CC_END
/// @endcond
#endif // __CC_PLATFORM_THREAD_H__ #endif // __CC_PLATFORM_THREAD_H__

5
cocos/renderer/CCRenderCommandPool.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,9 +22,9 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CC_RENDERCOMMANDPOOL_H__ #ifndef __CC_RENDERCOMMANDPOOL_H__
#define __CC_RENDERCOMMANDPOOL_H__ #define __CC_RENDERCOMMANDPOOL_H__
/// @cond DO_NOT_SHOW
#include <list> #include <list>
@ -98,4 +98,5 @@ private:
NS_CC_END NS_CC_END
/// @endcond
#endif #endif

5
cocos/renderer/ccShaders.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2011 Zynga Inc. Copyright (c) 2011 Zynga Inc.
Copyright (c) 2012 cocos2d-x.org Copyright (c) 2012 cocos2d-x.org
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,8 +23,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CCSHADER_H__ #ifndef __CCSHADER_H__
#define __CCSHADER_H__ #define __CCSHADER_H__
/// @cond DO_NOT_SHOW
#include "platform/CCGL.h" #include "platform/CCGL.h"
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
@ -87,4 +89,5 @@ extern CC_DLL const GLchar * cc3D_Particle_color_frag;
NS_CC_END NS_CC_END
/// @endcond
#endif /* __CCSHADER_H__ */ #endif /* __CCSHADER_H__ */

4
cocos/ui/UIDeprecated.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2013-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -24,6 +24,7 @@
#ifndef cocos2d_libs_UIDeprecated_h #ifndef cocos2d_libs_UIDeprecated_h
#define cocos2d_libs_UIDeprecated_h #define cocos2d_libs_UIDeprecated_h
/// @cond DO_NOT_SHOW
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "ui/UIWidget.h" #include "ui/UIWidget.h"
@ -161,4 +162,5 @@ CC_DEPRECATED_ATTRIBUTE extern const Margin MarginZero;
NS_CC_END NS_CC_END
/// @endcond
#endif #endif

6
cocos/ui/UIWebView-inl.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2014-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,14 +22,13 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
/// @cond DO_NOT_SHOW
#include "UIWebView.h" #include "UIWebView.h"
#include "platform/CCGLView.h" #include "platform/CCGLView.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
NS_CC_BEGIN NS_CC_BEGIN
namespace experimental{ namespace experimental{
namespace ui{ namespace ui{
@ -202,3 +201,4 @@ namespace experimental{
} // namespace experimental } // namespace experimental
} //namespace cocos2d } //namespace cocos2d
/// @endcond

4
cocos/ui/UIWebViewImpl-android.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2014-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -24,6 +24,7 @@
#ifndef __COCOS2D__UI__WEBVIEWIMPL_ANDROID_H_ #ifndef __COCOS2D__UI__WEBVIEWIMPL_ANDROID_H_
#define __COCOS2D__UI__WEBVIEWIMPL_ANDROID_H_ #define __COCOS2D__UI__WEBVIEWIMPL_ANDROID_H_
/// @cond DO_NOT_SHOW
#ifdef __ANDROID__ #ifdef __ANDROID__
@ -97,4 +98,5 @@ namespace cocos2d {
#endif // __ANDROID__ #endif // __ANDROID__
/// @endcond
#endif /* __COCOS2D__UI__WEBVIEWIMPL_ANDROID_H_ */ #endif /* __COCOS2D__UI__WEBVIEWIMPL_ANDROID_H_ */

4
cocos/ui/UIWebViewImpl-ios.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2014-2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -24,6 +24,7 @@
#ifndef __COCOS2D_UI_WEBVIEWIMPL_IOS_H_ #ifndef __COCOS2D_UI_WEBVIEWIMPL_IOS_H_
#define __COCOS2D_UI_WEBVIEWIMPL_IOS_H_ #define __COCOS2D_UI_WEBVIEWIMPL_IOS_H_
/// @cond DO_NOT_SHOW
#include <iosfwd> #include <iosfwd>
@ -88,4 +89,5 @@ private:
} // namespace experimental } // namespace experimental
}//namespace cocos2d }//namespace cocos2d
/// @endcond
#endif /* __COCOS2D_UI_WEBVIEWIMPL_IOS_H_ */ #endif /* __COCOS2D_UI_WEBVIEWIMPL_IOS_H_ */