Skip to content

Commit e8c9029

Browse files
committed
Renames interpolation method in CCColor
Former-commit-id: 6efbdff
1 parent cb2d5b5 commit e8c9029

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cocos2d/Support/CCColor.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,14 +307,14 @@
307307
/// -----------------------------------------------------------------------
308308

309309
/**
310-
* Linearly interpolate from this color to 'toColor'. Parameter t is normalised
310+
* Linearly interpolate from this color to 'toColor'. Parameter alpha is normalised
311311
*
312312
* @param toColor Color to interpolate to.
313-
* @param t Normalised progress.
313+
* @param alpha Normalised alpha opacity of toColor.
314314
*
315315
* @return The interpolated color.
316316
*/
317-
- (CCColor*)interpolateTo:(CCColor *) toColor time:(float) t;
317+
- (CCColor*)interpolateTo:(CCColor *) toColor alpha:(float) alpha;
318318

319319
@end
320320

@@ -357,4 +357,4 @@
357357
//
358358
- (BOOL)isEqualToColor:(CCColor*) color;
359359

360-
@end
360+
@end

cocos2d/Support/CCColor.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ - (BOOL) getWhite:(float *)white alpha:(float *)alpha
211211
return YES;
212212
}
213213

214-
- (CCColor*) interpolateTo:(CCColor *) toColor time:(float) t
214+
- (CCColor*) interpolateTo:(CCColor *) toColor alpha:(float) t
215215
{
216216
return [CCColor colorWithCcColor4f:ccc4FInterpolated(self.ccColor4f, toColor.ccColor4f, t)];
217217
}

0 commit comments

Comments
 (0)