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

Fixes 1605 include path in 541 files 

using the tools/coding-style/include-linter.py with -f options.
This commit is contained in:
Xpol Wan 2016-03-20 21:53:44 +08:00
parent 0001ac18f1
commit 90456d29ba
541 changed files with 1605 additions and 1605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCAtlasNode.cpp
View File

@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCAtlasNode.h" #include "2d/CCAtlasNode.h"
#include "renderer/CCTextureAtlas.h" #include "renderer/CCTextureAtlas.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"

2
cocos/2d/CCAutoPolygon.cpp
View File

@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCAutoPolygon.h" #include "2d/CCAutoPolygon.h"
#include "poly2tri/poly2tri.h" #include "poly2tri/poly2tri.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "renderer/CCTextureCache.h" #include "renderer/CCTextureCache.h"

4
cocos/2d/CCClippingRectangleNode.cpp
View File

@ -1,9 +1,9 @@
#include "CCClippingRectangleNode.h" #include "2d/CCClippingRectangleNode.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "renderer/CCRenderer.h" #include "renderer/CCRenderer.h"
#include "math/Vec2.h" #include "math/Vec2.h"
#include "CCGLView.h" #include "platform/CCGLView.h"
NS_CC_BEGIN NS_CC_BEGIN

4
cocos/2d/CCFastTMXTiledMap.h
View File

@ -27,8 +27,8 @@ THE SOFTWARE.
#ifndef __CC_FAST_TMX_TILEMAP_H__ #ifndef __CC_FAST_TMX_TILEMAP_H__
#define __CC_FAST_TMX_TILEMAP_H__ #define __CC_FAST_TMX_TILEMAP_H__
#include "CCNode.h" #include "2d/CCNode.h"
#include "CCTMXObjectGroup.h" #include "2d/CCTMXObjectGroup.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCFontAtlas.cpp
View File

@ -27,7 +27,7 @@
#if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_WINRT && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID #if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_WINRT && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID
#include <iconv.h> #include <iconv.h>
#elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
#include "android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h"
#endif #endif
#include "2d/CCFontFreeType.h" #include "2d/CCFontFreeType.h"
#include "base/ccUTF8.h" #include "base/ccUTF8.h"

2
cocos/2d/CCFontFNT.h
View File

@ -28,7 +28,7 @@
/// @cond DO_NOT_SHOW /// @cond DO_NOT_SHOW
#include "CCFont.h" #include "2d/CCFont.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCFontFreeType.cpp
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#include "2d/CCFontFreeType.h" #include "2d/CCFontFreeType.h"
#include FT_BBOX_H #include FT_BBOX_H
#include "edtaa3func.h" #include "edtaa3func.h"
#include "CCFontAtlas.h" #include "2d/CCFontAtlas.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/ccUTF8.h" #include "base/ccUTF8.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"

2
cocos/2d/CCFontFreeType.h
View File

@ -28,7 +28,7 @@
/// @cond DO_NOT_SHOW /// @cond DO_NOT_SHOW
#include "CCFont.h" #include "2d/CCFont.h"
#include <string> #include <string>
#include <ft2build.h> #include <ft2build.h>

2
cocos/2d/CCGLBufferedNode.cpp
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCGLBufferedNode.h" #include "2d/CCGLBufferedNode.h"
GLBufferedNode::GLBufferedNode() GLBufferedNode::GLBufferedNode()
{ {

2
cocos/2d/CCGrabber.cpp
View File

@ -23,7 +23,7 @@ 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.
****************************************************************************/ ****************************************************************************/
#include "CCGrabber.h" #include "2d/CCGrabber.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "renderer/CCTexture2D.h" #include "renderer/CCTexture2D.h"

2
cocos/2d/CCLabelAtlas.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#ifndef __CCLABEL_ATLAS_H__ #ifndef __CCLABEL_ATLAS_H__
#define __CCLABEL_ATLAS_H__ #define __CCLABEL_ATLAS_H__
#include "CCAtlasNode.h" #include "2d/CCAtlasNode.h"
#if CC_LABELATLAS_DEBUG_DRAW #if CC_LABELATLAS_DEBUG_DRAW
#include "renderer/CCCustomCommand.h" #include "renderer/CCCustomCommand.h"
#include "2d/CCDrawNode.h" #include "2d/CCDrawNode.h"

2
cocos/2d/CCProtectedNode.cpp
View File

@ -26,7 +26,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCProtectedNode.h" #include "2d/CCProtectedNode.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/CCScene.h" #include "2d/CCScene.h"

2
cocos/3d/CCAnimationCurve.h
View File

@ -107,6 +107,6 @@ protected:
NS_CC_END NS_CC_END
#include "CCAnimationCurve.inl" #include "3d/CCAnimationCurve.inl"
#endif #endif

2
cocos/3d/CCBundle3D.cpp
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "CCBundleReader.h" #include "3d/CCBundleReader.h"
#include "base/CCData.h" #include "base/CCData.h"
#include "json/document.h" #include "json/document.h"

2
cocos/3d/CCBundleReader.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCBundleReader.h" #include "3d/CCBundleReader.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/3d/CCOBB.h
View File

@ -25,7 +25,7 @@
#ifndef __CC_OBB_H__ #ifndef __CC_OBB_H__
#define __CC_OBB_H__ #define __CC_OBB_H__
#include "CCAABB.h" #include "3d/CCAABB.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/3d/CCObjLoader.cpp
View File

@ -38,7 +38,7 @@
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "base/ccUtils.h" #include "base/ccUtils.h"
#include "CCObjLoader.h" #include "3d/CCObjLoader.h"
namespace tinyobj { namespace tinyobj {

2
cocos/3d/CCPlane.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCPlane.h" #include "3d/CCPlane.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/3d/CCTerrain.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCTerrain.h" #include "3d/CCTerrain.h"
USING_NS_CC; USING_NS_CC;
#include <stdlib.h> #include <stdlib.h>

10
cocos/audio/AudioEngine.cpp
View File

@ -31,15 +31,15 @@
#include "base/ccUtils.h" #include "base/ccUtils.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
#include "android/AudioEngine-inl.h" #include "audio/android/AudioEngine-inl.h"
#elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC #elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "apple/AudioEngine-inl.h" #include "audio/apple/AudioEngine-inl.h"
#elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#include "win32/AudioEngine-win32.h" #include "audio/win32/AudioEngine-win32.h"
#elif CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #elif CC_TARGET_PLATFORM == CC_PLATFORM_WINRT
#include "winrt/AudioEngine-winrt.h" #include "audio/winrt/AudioEngine-winrt.h"
#elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
#include "linux/AudioEngine-linux.h" #include "audio/linux/AudioEngine-linux.h"
#endif #endif
#define TIME_DELAY_PRECISION 0.0001 #define TIME_DELAY_PRECISION 0.0001

2
cocos/audio/android/AudioEngine-inl.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
#include "AudioEngine-inl.h" #include "audio/android/AudioEngine-inl.h"
#include <unistd.h> #include <unistd.h>
// for native asset manager // for native asset manager

4
cocos/audio/android/ccdandroidUtils.cpp
View File

@ -22,11 +22,11 @@ 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.
****************************************************************************/ ****************************************************************************/
#include "ccdandroidUtils.h" #include "audio/android/ccdandroidUtils.h"
#include <jni.h> #include <jni.h>
#include <android/log.h> #include <android/log.h>
#include "jni/JniHelper.h" #include "platform/android/jni/JniHelper.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"

6
cocos/audio/android/cddSimpleAudioEngine.cpp
View File

@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "SimpleAudioEngine.h" #include "audio/include/SimpleAudioEngine.h"
#include "jni/cddandroidAndroidJavaEngine.h" #include "audio/android/jni/cddandroidAndroidJavaEngine.h"
#include "ccdandroidUtils.h" #include "audio/android/ccdandroidUtils.h"
namespace CocosDenshion { namespace CocosDenshion {

2
cocos/audio/android/jni/cddandroidAndroidJavaEngine.cpp
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "cddandroidAndroidJavaEngine.h" #include "audio/android/jni/cddandroidAndroidJavaEngine.h"
#include <stdlib.h> #include <stdlib.h>
#include <android/log.h> #include <android/log.h>
#include <sys/system_properties.h> #include <sys/system_properties.h>

2
cocos/audio/android/jni/cddandroidAndroidJavaEngine.h
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#ifndef __CDDANDRIODANDROIDJAVAENGINE_H__ #ifndef __CDDANDRIODANDROIDJAVAENGINE_H__
#define __CDDANDRIODANDROIDJAVAENGINE_H__ #define __CDDANDRIODANDROIDJAVAENGINE_H__
#include "SimpleAudioEngine.h" #include "audio/include/SimpleAudioEngine.h"
#include "platform/android/jni/JniHelper.h" #include "platform/android/jni/JniHelper.h"
#include <list> #include <list>

2
cocos/audio/apple/AudioCache.h
View File

@ -35,7 +35,7 @@
#include <mutex> #include <mutex>
#include <vector> #include <vector>
#include "CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#define QUEUEBUFFER_NUM 3 #define QUEUEBUFFER_NUM 3
#define QUEUEBUFFER_TIME_STEP 0.1 #define QUEUEBUFFER_TIME_STEP 0.1

4
cocos/audio/apple/AudioEngine-inl.h
View File

@ -31,8 +31,8 @@
#include <unordered_map> #include <unordered_map>
#include "base/CCRef.h" #include "base/CCRef.h"
#include "AudioCache.h" #include "audio/apple/AudioCache.h"
#include "AudioPlayer.h" #include "audio/apple/AudioPlayer.h"
NS_CC_BEGIN NS_CC_BEGIN
class Scheduler; class Scheduler;

2
cocos/audio/apple/AudioPlayer.h
View File

@ -33,7 +33,7 @@
#include <string> #include <string>
#include <thread> #include <thread>
#import <OpenAL/al.h> #import <OpenAL/al.h>
#include "CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN
namespace experimental{ namespace experimental{

2
cocos/audio/include/AudioEngine.h
View File

@ -33,7 +33,7 @@
#include <unordered_map> #include <unordered_map>
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "Export.h" #include "audio/include/Export.h"
#ifdef ERROR #ifdef ERROR
#undef ERROR #undef ERROR

2
cocos/audio/include/SimpleAudioEngine.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#ifndef _SIMPLE_AUDIO_ENGINE_H_ #ifndef _SIMPLE_AUDIO_ENGINE_H_
#define _SIMPLE_AUDIO_ENGINE_H_ #define _SIMPLE_AUDIO_ENGINE_H_
#include "Export.h" #include "audio/include/Export.h"
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#define CC_DEPRECATED_ATTRIBUTE __attribute__((deprecated)) #define CC_DEPRECATED_ATTRIBUTE __attribute__((deprecated))

2
cocos/audio/linux/AudioEngine-linux.cpp
View File

@ -2,7 +2,7 @@
* @author cesarpachon * @author cesarpachon
*/ */
#include <cstring> #include <cstring>
#include "AudioEngine-linux.h" #include "audio/linux/AudioEngine-linux.h"
#include "cocos2d.h" #include "cocos2d.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::experimental; using namespace cocos2d::experimental;

2
cocos/audio/linux/AudioEngine-linux.h
View File

@ -33,7 +33,7 @@
#include <map> #include <map>
#include "fmod.hpp" #include "fmod.hpp"
#include "fmod_errors.h" #include "fmod_errors.h"
#include "AudioEngine.h" #include "audio/include/AudioEngine.h"
#include "base/CCRef.h" #include "base/CCRef.h"

4
cocos/audio/linux/SimpleAudioEngine.cpp
View File

@ -1,7 +1,7 @@
#include <iostream> #include <iostream>
#include "../include/SimpleAudioEngine.h" #include "audio/include/SimpleAudioEngine.h"
#include "../include/AudioEngine.h" #include "audio/include/AudioEngine.h"
using namespace CocosDenshion; using namespace CocosDenshion;
using namespace cocos2d; using namespace cocos2d;

2
cocos/audio/openal/OpenALDecoder.cpp
View File

@ -1,4 +1,4 @@
#include "OpenALDecoder.h" #include "audio/openal/OpenALDecoder.h"
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <AL/alut.h> #include <AL/alut.h>

4
cocos/audio/openal/SimpleAudioEngineOpenAL.cpp
View File

@ -22,7 +22,7 @@ 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.
****************************************************************************/ ****************************************************************************/
#include "SimpleAudioEngine.h" #include "audio/include/SimpleAudioEngine.h"
#include <map> #include <map>
#include <string> #include <string>
@ -39,7 +39,7 @@ THE SOFTWARE.
#include <AL/alc.h> #include <AL/alc.h>
#include <AL/alut.h> #include <AL/alut.h>
#endif #endif
#include "OpenALDecoder.h" #include "audio/openal/OpenALDecoder.h"
#ifdef ENABLE_MPG123 #ifdef ENABLE_MPG123
#include <mpg123.h> #include <mpg123.h>

2
cocos/audio/win32/AudioCache.cpp
View File

@ -25,7 +25,7 @@
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#include "AudioCache.h" #include "audio/win32/AudioCache.h"
#include <thread> #include <thread>
#include <algorithm> #include <algorithm>
#include "vorbis/codec.h" #include "vorbis/codec.h"

2
cocos/audio/win32/AudioCache.h
View File

@ -36,7 +36,7 @@
#else #else
#include <AL/al.h> #include <AL/al.h>
#endif #endif
#include "CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#define QUEUEBUFFER_NUM 5 #define QUEUEBUFFER_NUM 5
#define QUEUEBUFFER_TIME_STEP 0.1f #define QUEUEBUFFER_TIME_STEP 0.1f

2
cocos/audio/win32/AudioEngine-win32.cpp
View File

@ -25,7 +25,7 @@
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#include "AudioEngine-win32.h" #include "audio/win32/AudioEngine-win32.h"
#ifdef OPENAL_PLAIN_INCLUDES #ifdef OPENAL_PLAIN_INCLUDES
#include "alc.h" #include "alc.h"

4
cocos/audio/win32/AudioEngine-win32.h
View File

@ -31,8 +31,8 @@
#include <unordered_map> #include <unordered_map>
#include "base/CCRef.h" #include "base/CCRef.h"
#include "AudioCache.h" #include "audio/win32/AudioCache.h"
#include "AudioPlayer.h" #include "audio/win32/AudioPlayer.h"
NS_CC_BEGIN NS_CC_BEGIN
namespace experimental{ namespace experimental{

4
cocos/audio/win32/AudioPlayer.cpp
View File

@ -24,8 +24,8 @@
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#include "AudioPlayer.h" #include "audio/win32/AudioPlayer.h"
#include "AudioCache.h" #include "audio/win32/AudioCache.h"
#include "base/CCConsole.h" #include "base/CCConsole.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "mpg123.h" #include "mpg123.h"

4
cocos/audio/win32/AudioPlayer.h
View File

@ -36,8 +36,8 @@
#else #else
#include <AL/al.h> #include <AL/al.h>
#endif #endif
#include "CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "AudioCache.h" #include "audio/win32/AudioCache.h"
NS_CC_BEGIN NS_CC_BEGIN
namespace experimental{ namespace experimental{

2
cocos/audio/win32/MciPlayer.cpp
View File

@ -1,4 +1,4 @@
#include "MciPlayer.h" #include "audio/win32/MciPlayer.h"
#include <tchar.h> #include <tchar.h>
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"

4
cocos/audio/win32/SimpleAudioEngine.cpp
View File

@ -22,12 +22,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.
****************************************************************************/ ****************************************************************************/
#include "SimpleAudioEngine.h" #include "audio/include/SimpleAudioEngine.h"
#include <map> #include <map>
#include <cstdlib> #include <cstdlib>
#include "MciPlayer.h" #include "audio/win32/MciPlayer.h"
#include "cocos2d.h" #include "cocos2d.h"
USING_NS_CC; USING_NS_CC;

6
cocos/audio/winrt/Audio.cpp
View File

@ -16,9 +16,9 @@
* See the License for the specific language governing permissions and limitations under the License. * See the License for the specific language governing permissions and limitations under the License.
*/ */
#include "Audio.h" #include "audio/winrt/Audio.h"
#include "CCCommon.h" #include "platform/CCCommon.h"
#include "AudioSourceReader.h" #include "audio/winrt/AudioSourceReader.h"
inline void ThrowIfFailed(HRESULT hr) inline void ThrowIfFailed(HRESULT hr)
{ {

2
cocos/audio/winrt/AudioCachePlayer.cpp
View File

@ -20,7 +20,7 @@
#if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT
#include "AudioCachePlayer.h" #include "audio/winrt/AudioCachePlayer.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCScheduler.h" #include "base/CCScheduler.h"

2
cocos/audio/winrt/AudioCachePlayer.h
View File

@ -23,7 +23,7 @@
#ifndef __AUDIO_CACHE_PLAYER_H_ #ifndef __AUDIO_CACHE_PLAYER_H_
#define __AUDIO_CACHE_PLAYER_H_ #define __AUDIO_CACHE_PLAYER_H_
#include "AudioSourceReader.h" #include "audio/winrt/AudioSourceReader.h"
NS_CC_BEGIN NS_CC_BEGIN
namespace experimental{ namespace experimental{

2
cocos/audio/winrt/AudioEngine-winrt.cpp
View File

@ -21,7 +21,7 @@
#if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT
#include "AudioEngine-winrt.h" #include "audio/winrt/AudioEngine-winrt.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCScheduler.h" #include "base/CCScheduler.h"

4
cocos/audio/winrt/AudioEngine-winrt.h
View File

@ -28,8 +28,8 @@
#include <unordered_map> #include <unordered_map>
#include "base/CCRef.h" #include "base/CCRef.h"
#include "AudioEngine.h" #include "audio/include/AudioEngine.h"
#include "AudioCachePlayer.h" #include "audio/winrt/AudioCachePlayer.h"
NS_CC_BEGIN NS_CC_BEGIN
namespace experimental{ namespace experimental{

4
cocos/audio/winrt/AudioSourceReader.cpp
View File

@ -23,8 +23,8 @@
#if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT
#include "CCWinRTUtils.h" #include "platform/winrt/CCWinRTUtils.h"
#include "AudioSourceReader.h" #include "audio/winrt/AudioSourceReader.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::experimental; using namespace cocos2d::experimental;

2
cocos/audio/winrt/AudioSourceReader.h
View File

@ -30,7 +30,7 @@
#include <mfreadwrite.h> #include <mfreadwrite.h>
#include <queue> #include <queue>
#include <mutex> #include <mutex>
#include "MediaStreamer.h" #include "audio/winrt/MediaStreamer.h"
#include "ogg/ogg.h" #include "ogg/ogg.h"
#include "vorbis/vorbisfile.h" #include "vorbis/vorbisfile.h"

2
cocos/audio/winrt/MediaStreamer.cpp
View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and limitations under the License. * See the License for the specific language governing permissions and limitations under the License.
*/ */
#include "MediaStreamer.h" #include "audio/winrt/MediaStreamer.h"
#include <Mfidl.h> #include <Mfidl.h>
#include <Mfreadwrite.h> #include <Mfreadwrite.h>

6
cocos/audio/winrt/SimpleAudioEngine.cpp
View File

@ -16,12 +16,12 @@
* See the License for the specific language governing permissions and limitations under the License. * See the License for the specific language governing permissions and limitations under the License.
*/ */
#include "SimpleAudioEngine.h" #include "audio/include/SimpleAudioEngine.h"
#include "Audio.h" #include "audio/winrt/Audio.h"
#include "cocos2d.h" #include "cocos2d.h"
#include <map> #include <map>
//#include "CCCommon.h" //#include "platform/CCCommon.h"
using namespace std; using namespace std;
USING_NS_CC; USING_NS_CC;

6
cocos/base/CCConsole.cpp
View File

@ -44,9 +44,9 @@
#endif #endif
#define bzero(a, b) memset(a, 0, b); #define bzero(a, b) memset(a, 0, b);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
#include "inet_ntop_winrt.h" #include "platform/winrt/inet_ntop_winrt.h"
#include "inet_pton_winrt.h" #include "platform/winrt/inet_pton_winrt.h"
#include "CCWinRTUtils.h" #include "platform/winrt/CCWinRTUtils.h"
#endif #endif
#else #else
#include <netdb.h> #include <netdb.h>

8
cocos/base/CCController-android.cpp
View File

@ -23,13 +23,13 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCController.h" #include "base/CCController.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
#include <functional> #include <functional>
#include "ccMacros.h" #include "base/ccMacros.h"
#include "CCDirector.h" #include "base/CCDirector.h"
#include "jni/JniHelper.h" #include "platform/android/jni/JniHelper.h"
#include "base/CCEventController.h" #include "base/CCEventController.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCDirector.cpp
View File

@ -63,7 +63,7 @@ THE SOFTWARE.
#include "platform/CCApplication.h" #include "platform/CCApplication.h"
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
#include "CCScriptSupport.h" #include "base/CCScriptSupport.h"
#endif #endif
/** /**

2
cocos/base/CCEventController.cpp
View File

@ -23,7 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCEventController.h" #include "base/CCEventController.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCNinePatchImageParser.cpp
View File

@ -21,7 +21,7 @@
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.
****************************************************************************/ ****************************************************************************/
#include "CCNinePatchImageParser.h" #include "base/CCNinePatchImageParser.h"
#include "platform/CCImage.h" #include "platform/CCImage.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"

2
cocos/base/CCProperties.cpp
View File

@ -20,7 +20,7 @@
*/ */
#include "CCProperties.h" #include "base/CCProperties.h"
#include <string.h> #include <string.h>

2
cocos/base/CCStencilStateManager.cpp
View File

@ -23,7 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCStencilStateManager.hpp" #include "base/CCStencilStateManager.hpp"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "renderer/CCGLProgramCache.h" #include "renderer/CCGLProgramCache.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"

2
cocos/base/CCUserDefault-winrt.cpp
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
#include "CCWinRTUtils.h" #include "platform/winrt/CCWinRTUtils.h"
using namespace Windows::Storage; using namespace Windows::Storage;
using namespace Windows::Foundation; using namespace Windows::Foundation;

2
cocos/base/TGAlib.cpp
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "TGAlib.h" #include "base/TGAlib.h"
#include "base/CCData.h" #include "base/CCData.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"

4
cocos/base/allocator/CCAllocatorDiagnostics.cpp
View File

@ -24,8 +24,8 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCAllocatorDiagnostics.h" #include "base/allocator/CCAllocatorDiagnostics.h"
#include "CCAllocatorGlobal.h" #include "base/allocator/CCAllocatorGlobal.h"
NS_CC_BEGIN NS_CC_BEGIN
NS_CC_ALLOCATOR_BEGIN NS_CC_ALLOCATOR_BEGIN

2
cocos/base/atitc.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "atitc.h" #include "base/atitc.h"
//Decode ATITC encode block to 4x4 RGB32 pixels //Decode ATITC encode block to 4x4 RGB32 pixels
static void atitc_decode_block(uint8_t **blockData, static void atitc_decode_block(uint8_t **blockData,

2
cocos/base/ccRandom.cpp
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "ccRandom.h" #include "base/ccRandom.h"
std::mt19937 &cocos2d::RandomHelper::getEngine() { std::mt19937 &cocos2d::RandomHelper::getEngine() {
static std::random_device seed_gen; static std::random_device seed_gen;

2
cocos/base/pvr.cpp
View File

@ -18,7 +18,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <cstdint> #include <cstdint>
#include "pvr.h" #include "base/pvr.h"
#define PVRT_MIN(a,b) (((a) < (b)) ? (a) : (b)) #define PVRT_MIN(a,b) (((a) < (b)) ? (a) : (b))
#define PVRT_MAX(a,b) (((a) > (b)) ? (a) : (b)) #define PVRT_MAX(a,b) (((a) > (b)) ? (a) : (b))

2
cocos/base/s3tc.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "s3tc.h" #include "base/s3tc.h"
//Decode S3TC encode block to 4x4 RGB32 pixels //Decode S3TC encode block to 4x4 RGB32 pixels
static void s3tc_decode_block(uint8_t **blockData, static void s3tc_decode_block(uint8_t **blockData,

2
cocos/deprecated/CCArray.cpp
View File

@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCArray.h" #include "deprecated/CCArray.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"

14
cocos/deprecated/CCDictionary.cpp
View File

@ -23,16 +23,16 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCDictionary.h" #include "deprecated/CCDictionary.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
#include "CCInteger.h" #include "deprecated/CCInteger.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
#include "CCBool.h" #include "deprecated/CCBool.h"
#include "CCInteger.h" #include "deprecated/CCInteger.h"
#include "CCFloat.h" #include "deprecated/CCFloat.h"
#include "CCDouble.h" #include "deprecated/CCDouble.h"
#include "CCArray.h" #include "deprecated/CCArray.h"
using namespace std; using namespace std;

2
cocos/deprecated/CCDictionary.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "base/uthash.h" #include "base/uthash.h"
#include "base/CCRef.h" #include "base/CCRef.h"
#include "CCArray.h" #include "deprecated/CCArray.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/deprecated/CCSet.cpp
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCSet.h" #include "deprecated/CCSet.h"
using namespace std; using namespace std;

2
cocos/deprecated/CCString.cpp
View File

@ -28,7 +28,7 @@ Copyright (c) 2013-2014 Chukong Technologies
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "CCArray.h" #include "deprecated/CCArray.h"
#include "base/ccUtils.h" #include "base/ccUtils.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/deprecated/CCString.h
View File

@ -35,7 +35,7 @@ THE SOFTWARE.
#include <string> #include <string>
#include <functional> #include <functional>
#include <sstream> #include <sstream>
#include "CCArray.h" #include "deprecated/CCArray.h"
#include "base/CCRef.h" #include "base/CCRef.h"
NS_CC_BEGIN NS_CC_BEGIN

8
cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp
View File

@ -1,9 +1,9 @@
#include "CCBAnimationManager.h" #include "editor-support/cocosbuilder/CCBAnimationManager.h"
#include "CCBReader.h" #include "editor-support/cocosbuilder/CCBReader.h"
#include "CCNode+CCBRelativePositioning.h" #include "editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h"
#include "audio/include/SimpleAudioEngine.h" #include "audio/include/SimpleAudioEngine.h"
#include "CCBSelectorResolver.h" #include "editor-support/cocosbuilder/CCBSelectorResolver.h"
#include <string> #include <string>
#include <sstream> #include <sstream>

6
cocos/editor-support/cocosbuilder/CCBAnimationManager.h
View File

@ -7,9 +7,9 @@
#include "2d/CCActionEase.h" #include "2d/CCActionEase.h"
#include "extensions/ExtensionMacros.h" #include "extensions/ExtensionMacros.h"
#include "CCBSequence.h" #include "editor-support/cocosbuilder/CCBSequence.h"
#include "CCBKeyframe.h" #include "editor-support/cocosbuilder/CCBKeyframe.h"
#include "CCBSequenceProperty.h" #include "editor-support/cocosbuilder/CCBSequenceProperty.h"
#include "extensions/GUI/CCControlExtension/CCControl.h" #include "extensions/GUI/CCControlExtension/CCControl.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCBFileLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCBFileLoader.h" #include "editor-support/cocosbuilder/CCBFileLoader.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocosbuilder/CCBFileLoader.h
View File

@ -1,7 +1,7 @@
#ifndef _CCB_CCBFILELOADER_H_ #ifndef _CCB_CCBFILELOADER_H_
#define _CCB_CCBFILELOADER_H_ #define _CCB_CCBFILELOADER_H_
#include "CCNodeLoader.h" #include "editor-support/cocosbuilder/CCNodeLoader.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCBKeyframe.cpp
View File

@ -1,4 +1,4 @@
#include "CCBKeyframe.h" #include "editor-support/cocosbuilder/CCBKeyframe.h"
using namespace cocos2d; using namespace cocos2d;

18
cocos/editor-support/cocosbuilder/CCBReader.cpp
View File

@ -7,15 +7,15 @@
#include "2d/CCSpriteFrameCache.h" #include "2d/CCSpriteFrameCache.h"
#include "renderer/CCTextureCache.h" #include "renderer/CCTextureCache.h"
#include "CCBReader.h" #include "editor-support/cocosbuilder/CCBReader.h"
#include "CCNodeLoader.h" #include "editor-support/cocosbuilder/CCNodeLoader.h"
#include "CCNodeLoaderLibrary.h" #include "editor-support/cocosbuilder/CCNodeLoaderLibrary.h"
#include "CCNodeLoaderListener.h" #include "editor-support/cocosbuilder/CCNodeLoaderListener.h"
#include "CCBMemberVariableAssigner.h" #include "editor-support/cocosbuilder/CCBMemberVariableAssigner.h"
#include "CCBSelectorResolver.h" #include "editor-support/cocosbuilder/CCBSelectorResolver.h"
#include "CCBAnimationManager.h" #include "editor-support/cocosbuilder/CCBAnimationManager.h"
#include "CCBSequenceProperty.h" #include "editor-support/cocosbuilder/CCBSequenceProperty.h"
#include "CCBKeyframe.h" #include "editor-support/cocosbuilder/CCBKeyframe.h"
#include <sstream> #include <sstream>
using namespace cocos2d; using namespace cocos2d;

4
cocos/editor-support/cocosbuilder/CCBReader.h
View File

@ -7,9 +7,9 @@
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "base/CCData.h" #include "base/CCData.h"
#include "base/CCMap.h" #include "base/CCMap.h"
#include "CCBSequence.h" #include "editor-support/cocosbuilder/CCBSequence.h"
#include "extensions/GUI/CCControlExtension/CCControl.h" #include "extensions/GUI/CCControlExtension/CCControl.h"
#include "cocosbuilder/CCBAnimationManager.h" #include "editor-support/cocosbuilder/CCBAnimationManager.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
#ifdef ABSOLUTE #ifdef ABSOLUTE

2
cocos/editor-support/cocosbuilder/CCBSequence.cpp
View File

@ -1,4 +1,4 @@
#include "CCBSequence.h" #include "editor-support/cocosbuilder/CCBSequence.h"
using namespace cocos2d; using namespace cocos2d;
using namespace std; using namespace std;

2
cocos/editor-support/cocosbuilder/CCBSequence.h
View File

@ -4,7 +4,7 @@
#include <string> #include <string>
#include "base/CCRef.h" #include "base/CCRef.h"
#include "CCBSequenceProperty.h" #include "editor-support/cocosbuilder/CCBSequenceProperty.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCBSequenceProperty.cpp
View File

@ -1,4 +1,4 @@
#include "CCBSequenceProperty.h" #include "editor-support/cocosbuilder/CCBSequenceProperty.h"
using namespace cocos2d; using namespace cocos2d;
using namespace std; using namespace std;

2
cocos/editor-support/cocosbuilder/CCBSequenceProperty.h
View File

@ -3,7 +3,7 @@
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCVector.h" #include "base/CCVector.h"
#include "CCBKeyframe.h" #include "editor-support/cocosbuilder/CCBKeyframe.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCControlButtonLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCControlButtonLoader.h" #include "editor-support/cocosbuilder/CCControlButtonLoader.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::extension; using namespace cocos2d::extension;

2
cocos/editor-support/cocosbuilder/CCControlButtonLoader.h
View File

@ -1,7 +1,7 @@
#ifndef _CCB_CCCONTROLBUTTONLOADER_H_ #ifndef _CCB_CCCONTROLBUTTONLOADER_H_
#define _CCB_CCCONTROLBUTTONLOADER_H_ #define _CCB_CCCONTROLBUTTONLOADER_H_
#include "CCControlLoader.h" #include "editor-support/cocosbuilder/CCControlLoader.h"
#include "extensions//GUI/CCControlExtension/CCControlButton.h" #include "extensions//GUI/CCControlExtension/CCControlButton.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCControlLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCControlLoader.h" #include "editor-support/cocosbuilder/CCControlLoader.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::extension; using namespace cocos2d::extension;

2
cocos/editor-support/cocosbuilder/CCControlLoader.h
View File

@ -1,7 +1,7 @@
#ifndef _CCB_CCCONTROLLOADER_H_ #ifndef _CCB_CCCONTROLLOADER_H_
#define _CCB_CCCONTROLLOADER_H_ #define _CCB_CCCONTROLLOADER_H_
#include "CCNodeLoader.h" #include "editor-support/cocosbuilder/CCNodeLoader.h"
#include "extensions/GUI/CCControlExtension/CCControl.h" #include "extensions/GUI/CCControlExtension/CCControl.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCLabelBMFontLoader.h" #include "editor-support/cocosbuilder/CCLabelBMFontLoader.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h
View File

@ -4,7 +4,7 @@
#include "base/CCRef.h" #include "base/CCRef.h"
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
#include "CCNodeLoader.h" #include "editor-support/cocosbuilder/CCNodeLoader.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCLabelTTFLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCLabelTTFLoader.h" #include "editor-support/cocosbuilder/CCLabelTTFLoader.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h
View File

@ -4,7 +4,7 @@
#include "base/CCRef.h" #include "base/CCRef.h"
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
#include "CCNodeLoader.h" #include "editor-support/cocosbuilder/CCNodeLoader.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCLayerColorLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCLayerColorLoader.h" #include "editor-support/cocosbuilder/CCLayerColorLoader.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocosbuilder/CCLayerColorLoader.h
View File

@ -1,7 +1,7 @@
#ifndef _CCB_CCLAYERCOLORLOADER_H_ #ifndef _CCB_CCLAYERCOLORLOADER_H_
#define _CCB_CCLAYERCOLORLOADER_H_ #define _CCB_CCLAYERCOLORLOADER_H_
#include "CCLayerLoader.h" #include "editor-support/cocosbuilder/CCLayerLoader.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCLayerGradientLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCLayerGradientLoader.h" #include "editor-support/cocosbuilder/CCLayerGradientLoader.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h
View File

@ -1,7 +1,7 @@
#ifndef _CCB_CCLAYERGRADIENTLOADER_H_ #ifndef _CCB_CCLAYERGRADIENTLOADER_H_
#define _CCB_CCLAYERGRADIENTLOADER_H_ #define _CCB_CCLAYERGRADIENTLOADER_H_
#include "CCLayerLoader.h" #include "editor-support/cocosbuilder/CCLayerLoader.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCLayerLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCLayerLoader.h" #include "editor-support/cocosbuilder/CCLayerLoader.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocosbuilder/CCLayerLoader.h
View File

@ -1,7 +1,7 @@
#ifndef _CCB_CCLAYERLOADER_H_ #ifndef _CCB_CCLAYERLOADER_H_
#define _CCB_CCLAYERLOADER_H_ #define _CCB_CCLAYERLOADER_H_
#include "CCNodeLoader.h" #include "editor-support/cocosbuilder/CCNodeLoader.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCMenuItemImageLoader.h" #include "editor-support/cocosbuilder/CCMenuItemImageLoader.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h
View File

@ -1,7 +1,7 @@
#ifndef _CCB_CCMENUITEMIMAGELOADER_H_ #ifndef _CCB_CCMENUITEMIMAGELOADER_H_
#define _CCB_CCMENUITEMIMAGELOADER_H_ #define _CCB_CCMENUITEMIMAGELOADER_H_
#include "CCMenuItemLoader.h" #include "editor-support/cocosbuilder/CCMenuItemLoader.h"
namespace cocosbuilder { namespace cocosbuilder {

2
cocos/editor-support/cocosbuilder/CCMenuItemLoader.cpp
View File

@ -1,4 +1,4 @@
#include "CCMenuItemLoader.h" #include "editor-support/cocosbuilder/CCMenuItemLoader.h"
using namespace cocos2d; using namespace cocos2d;

Some files were not shown because too many files have changed in this diff Show More