Replaced legacy 'float' with CGFloat where appropriate.

Author: pkclsoft

cocos2d/CCActionEase.h

@@ -136,12 +136,12 @@
  *  CCActionEaseRate adds an additional rate property to control the rate of change for the specified action.
  */
 @interface CCActionEaseRate :  CCActionEase <NSCopying> {
-	float	_rate;
+	CGFloat	_rate;
 }
 
 // purposefully undocumented: little need to change rate while action is running
 /* Rate value for the ease action. */
-@property (nonatomic,readwrite,assign) float rate;
+@property (nonatomic,readwrite,assign) CGFloat rate;
 
 /** @name Creating an Ease Action */
 
@@ -153,7 +153,7 @@
  *
  *  @return New rate action.
  */
-+ (id)actionWithAction:(CCActionInterval*)action rate:(float)rate;
++ (id)actionWithAction:(CCActionInterval*)action rate:(CGFloat)rate;
 
 /**
  *  Initializes the action with the inner action and the rate parameter.
@@ -163,7 +163,7 @@
  *
  *  @return New rate action.
  */
-- (id)initWithAction:(CCActionInterval*)action rate:(float)rate;
+- (id)initWithAction:(CCActionInterval*)action rate:(CGFloat)rate;
 
 @end
 
@@ -196,34 +196,34 @@
  *  CCActionEaseElastic adds a period property and applies a dampened oscillation to the specified action.
  */
 @interface CCActionEaseElastic : CCActionEase <NSCopying> {
-	float _period;
+	CGFloat _period;
 }
 
 // purposefully undocumented: little need to change period while action is running
 /* Period of the wave in radians. Default is 0.3. */
-@property (nonatomic,readwrite) float period;
+@property (nonatomic,readwrite) CGFloat period;
 
 /** @name Creating an Ease Action */
 
 /**
  *  Creates the action with the inner action and the period in radians (default is 0.3).
  *
  *  @param action Action to apply ease action to.
- *  @param period eriod of wave in radians.
+ *  @param period period of wave in radians.
  *
  *  @return New elastic action.
  */
-+ (id)actionWithAction:(CCActionInterval*)action period:(float)period;
++ (id)actionWithAction:(CCActionInterval*)action period:(CGFloat)period;
 
 /**
  *  Initializes the action with the inner action and the period in radians (default is 0.3).
  *
  *  @param action Action to apply ease action to.
- *  @param period eriod of wave in radians.
+ *  @param period period of wave in radians.
  *
  *  @return New elastic action.
  */
-- (id)initWithAction:(CCActionInterval*)action period:(float)period;
+- (id)initWithAction:(CCActionInterval*)action period:(CGFloat)period;
 
 @end
 

cocos2d/CCActionEase.m

@@ -36,7 +36,7 @@
 #import "CCActionEase.h"
 
 #ifndef M_PI_X_2
-#define M_PI_X_2 (float)M_PI * 2.0
+#define M_PI_X_2 M_PI * 2.0
 #endif
 
 #pragma mark EaseAction
@@ -98,7 +98,7 @@ -(CCActionInterval*) reverse
 @implementation CCActionEaseSineIn
 -(void) update: (CCTime) t
 {
-	[_inner update:-1*cosf(t * (float)M_PI_2) +1];
+	[_inner update:-1*cosf(t * M_PI_2) +1];
 }
 
 - (CCActionInterval*) reverse
@@ -113,7 +113,7 @@ - (CCActionInterval*) reverse
 @implementation CCActionEaseSineOut
 -(void) update: (CCTime) t
 {
-	[_inner update:sinf(t * (float)M_PI_2)];
+	[_inner update:sinf(t * M_PI_2)];
 }
 
 - (CCActionInterval*) reverse
@@ -128,7 +128,7 @@ - (CCActionInterval*) reverse
 @implementation CCActionEaseSineInOut
 -(void) update: (CCTime) t
 {
-	[_inner update:-0.5*(cosf( (float)M_PI*t) - 1)];
+	[_inner update:-0.5*(cosf( M_PI*t) - 1)];
 }
 @end
 
@@ -138,12 +138,12 @@ -(void) update: (CCTime) t
 
 @implementation CCActionEaseRate
 @synthesize rate=_rate;
-+(instancetype) actionWithAction: (CCActionInterval*) action rate:(float)rate
++(instancetype) actionWithAction: (CCActionInterval*) action rate:(CGFloat)rate
 {
 	return [[self alloc] initWithAction: action rate:rate];
 }
 
--(id) initWithAction: (CCActionInterval*) action rate:(float)rate
+-(id) initWithAction: (CCActionInterval*) action rate:(CGFloat)rate
 {
 	if( (self=[super initWithAction:action ]) )
 		self.rate = rate;
@@ -214,7 +214,7 @@ +(instancetype) actionWithAction: (CCActionInterval*) action
 	return [[self alloc] initWithAction:action period:0.3];
 }
 
-+(instancetype) actionWithAction: (CCActionInterval*) action period:(float)period
++(instancetype) actionWithAction: (CCActionInterval*) action period:(CGFloat)period
 {
 	return [[self alloc] initWithAction:action period:period];
 }
@@ -224,7 +224,7 @@ -(id) initWithAction: (CCActionInterval*) action
 	return [self initWithAction:action period:0.3];
 }
 
--(id) initWithAction: (CCActionInterval*) action period:(float)period
+-(id) initWithAction: (CCActionInterval*) action period:(CGFloat)period
 {
 	if( (self=[super initWithAction:action]) )
 		_period = period;
@@ -255,7 +255,7 @@ -(void) update: (CCTime) t
 		newT = t;
 
 	else {
-		float s = _period / 4;
+		CGFloat s = _period / 4;
 		t = t - 1;
 		newT = -powf(2, 10 * t) * sinf( (t-s) *M_PI_X_2 / _period);
 	}
@@ -279,7 +279,7 @@ -(void) update: (CCTime) t
 		newT = t;
 
 	} else {
-		float s = _period / 4;
+		CGFloat s = _period / 4;
 		newT = powf(2, -10 * t) * sinf( (t-s) *M_PI_X_2 / _period) + 1;
 	}
 	[_inner update:newT];