mirror of https://github.com/axmolengine/axmol.git
issue #2129: [Removing CC Prefix] Removing backward compatible macros, since they are conflict with no CC Prefix ones.
This commit is contained in:
parent
e75c58584e
commit
136a9743d4
|
@ -49,11 +49,7 @@ enum {
|
|||
kCCParticleStartSizeEqualToEndSize = -1,
|
||||
|
||||
/** The starting radius of the particle is equal to the ending radius */
|
||||
kCCParticleStartRadiusEqualToEndRadius = -1,
|
||||
|
||||
// backward compatible
|
||||
kParticleStartSizeEqualToEndSize = kCCParticleStartSizeEqualToEndSize,
|
||||
kParticleDurationInfinity = kCCParticleDurationInfinity,
|
||||
kCCParticleStartRadiusEqualToEndRadius = -1
|
||||
};
|
||||
|
||||
//* @enum
|
||||
|
@ -82,11 +78,6 @@ typedef enum {
|
|||
kCCPositionTypeGrouped,
|
||||
}tCCPositionType;
|
||||
|
||||
// backward compatible
|
||||
enum {
|
||||
kPositionTypeFree = kCCPositionTypeFree,
|
||||
kPositionTypeGrouped = kCCPositionTypeGrouped,
|
||||
};
|
||||
|
||||
/**
|
||||
Structure that contains the values of each particle
|
||||
|
|
|
@ -73,17 +73,7 @@ typedef enum {
|
|||
|
||||
|
||||
//! Default texture format: 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
|
||||
|
||||
kCCTexture2DPixelFormat_Default = kCCTexture2DPixelFormat_RGBA8888
|
||||
} CCTexture2DPixelFormat;
|
||||
|
||||
class CCGLProgram;
|
||||
|
|
Loading…
Reference in New Issue