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

issue #2129: [Removing CC Prefix] Removing backward compatible macros, since they are conflict with no CC Prefix ones.

This commit is contained in:
James Chen 2013-06-17 21:12:34 +08:00
parent e75c58584e
commit 136a9743d4
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cocos2dx/particle_nodes/CCParticleSystem.h
View File

@ -49,11 +49,7 @@ enum {
kCCParticleStartSizeEqualToEndSize = -1, kCCParticleStartSizeEqualToEndSize = -1,
/** The starting radius of the particle is equal to the ending radius */ /** The starting radius of the particle is equal to the ending radius */
kCCParticleStartRadiusEqualToEndRadius = -1, kCCParticleStartRadiusEqualToEndRadius = -1
// backward compatible
kParticleStartSizeEqualToEndSize = kCCParticleStartSizeEqualToEndSize,
kParticleDurationInfinity = kCCParticleDurationInfinity,
}; };
//* @enum //* @enum
@ -82,11 +78,6 @@ typedef enum {
kCCPositionTypeGrouped, kCCPositionTypeGrouped,
}tCCPositionType; }tCCPositionType;
// backward compatible
enum {
kPositionTypeFree = kCCPositionTypeFree,
kPositionTypeGrouped = kCCPositionTypeGrouped,
};
/** /**
Structure that contains the values of each particle Structure that contains the values of each particle

12
cocos2dx/textures/CCTexture2D.h
View File

@ -73,17 +73,7 @@ typedef enum {
//! Default texture format: RGBA8888 //! Default texture format: RGBA8888
kCCTexture2DPixelFormat_Default = kCCTexture2DPixelFormat_RGBA8888, kCCTexture2DPixelFormat_Default = kCCTexture2DPixelFormat_RGBA8888
// backward compatibility stuff
kTexture2DPixelFormat_RGBA8888 = kCCTexture2DPixelFormat_RGBA8888,
kTexture2DPixelFormat_RGB888 = kCCTexture2DPixelFormat_RGB888,
kTexture2DPixelFormat_RGB565 = kCCTexture2DPixelFormat_RGB565,
kTexture2DPixelFormat_A8 = kCCTexture2DPixelFormat_A8,
kTexture2DPixelFormat_RGBA4444 = kCCTexture2DPixelFormat_RGBA4444,
kTexture2DPixelFormat_RGB5A1 = kCCTexture2DPixelFormat_RGB5A1,
kTexture2DPixelFormat_Default = kCCTexture2DPixelFormat_Default
} CCTexture2DPixelFormat; } CCTexture2DPixelFormat;
class CCGLProgram; class CCGLProgram;