Merge remote-tracking branch 'upstream/gles20' into gles20

AUTHORS

@@ -44,6 +44,9 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
 	CCGLProgram: fixes in fragmentShaderLog
 	CCShaderCache: Added addProgram:forKey: method
 	CCArray: Fixed copyWithZone
+
+* Karl Stenerud (http://www.mindsnacks.com/):
+	Author of ActionTargeted
 
 * manucorporat (manu.valladolid) (http://forzefield.com/):
 	Author of new Retina Display code:

CHANGELOG

@@ -5,6 +5,7 @@ version 2.0-rc0 XX-Feb-2012
 		Sprite: fixed possible setColor and opacity
 		TileMap: Flipped tiles can be changed during runtime (issue #1264)
 		TileMap: Fixed a problem with multiple layers and multiple tile sets that could cause TMX maps to not load if rotation is used (issue #1302)
+. [NEW] Actions: Added ActionTargeted action. Useful to target other nodes from a sequence.
 . [NEW] Animation: Added new animation format that supports delays per frame and notifications per frame
 . [NEW] Director: When the stats are on, the number of GL draw calls per frame are displayed
 		Added support for main-thread director (Mac only. Needed for some editors)

cocos2d/CCActionInterval.h

@@ -423,3 +423,22 @@ typedef struct _ccBezierConfig {
  */
 -(id) initWithDuration:(ccTime)duration animation:(CCAnimation*)animation restoreOriginalFrame:(BOOL)restoreOriginalFrame;
 @end
+
+/** Overrides the target of an action so that it always runs on the target
+ * specified at action creation rather than the one specified by runAction.
+ */
+@interface CCTargetedAction : CCActionInterval <NSCopying>
+{
+	id forcedTarget_;
+	CCFiniteTimeAction* action_;
+}
+/** This is the target that the action will be forced to run with */
+@property(readwrite,nonatomic,retain) id forcedTarget;
+
+/** Create an action with the specified action and forced target */
++ (id) actionWithTarget:(id) target action:(CCFiniteTimeAction*) action;
+
+/** Init an action with the specified action and forced target */
+- (id) initWithTarget:(id) target action:(CCFiniteTimeAction*) action;
+
+@end

cocos2d/CCActionInterval.m

@@ -1364,5 +1364,61 @@ - (CCActionInterval *) reverse
 	CCAnimation *newAnim = [CCAnimation animationWithFrames:newArray delayPerUnit:animation_.delayPerUnit];
 	return [[self class] actionWithDuration:duration_ animation:newAnim restoreOriginalFrame:restoreOriginalFrame_];
 }
+@end
+
+
+@implementation CCTargetedAction
+
+@synthesize forcedTarget = forcedTarget_;
+
++ (id) actionWithTarget:(id) target action:(CCFiniteTimeAction*) action
+{
+	return [[ (CCTargetedAction*)[self alloc] initWithTarget:target action:action] autorelease];
+}
+
+- (id) initWithTarget:(id) targetIn action:(CCFiniteTimeAction*) actionIn
+{
+	if((self = [super initWithDuration:actionIn.duration]))
+	{
+		forcedTarget_ = [targetIn retain];
+		action_ = [actionIn retain];
+	}
+	return self;
+}
+
+-(id) copyWithZone: (NSZone*) zone
+{
+	CCAction *copy = [ (CCTargetedAction*) [[self class] allocWithZone: zone] initWithTarget:target_ action:[[action_ copy] autorelease]];
+	return copy;
+}
+
+- (void) dealloc
+{
+	[forcedTarget_ release];
+	[action_ release];
+	[super dealloc];
+}
+
+//- (void) updateDuration:(id)aTarget
+//{
+//	[action updateDuration:forcedTarget];
+//	duration_ = action.duration;
+//}
+
+- (void) startWithTarget:(id)aTarget
+{
+	[super startWithTarget:forcedTarget_];
+	[action_ startWithTarget:forcedTarget_];
+}
+
+- (void) stop
+{
+	[action_ stop];
+}
+
+- (void) update:(ccTime) time
+{
+	[action_ update:time];
+}
 
 @end

cocos2d/CCTextureAtlas.m

@@ -542,4 +542,4 @@ -(void) drawNumberOfQuads: (NSUInteger) n fromIndex: (NSUInteger) start
 
 	CHECK_GL_ERROR_DEBUG();
 }
-@end
+@end

cocos2d/ccMacros.h

@@ -339,4 +339,4 @@ extern NSUInteger __ccNumberOfDraws;
 /** @def CCAnimationFrameDisplayedNotification
  Notification name when a CCSpriteFrame is displayed
  */
-#define CCAnimationFrameDisplayedNotification @"CCAnimationFrameDisplayedNotification"
+#define CCAnimationFrameDisplayedNotification @"CCAnimationFrameDisplayedNotification"

tests/ActionsTest.h

@@ -138,4 +138,8 @@
 {}
 @end
 
+@interface ActionTargeted : ActionDemo
+{}
+@end
+
 

tests/ActionsTest.m

@@ -19,8 +19,6 @@
 static int sceneIdx=-1;
 static NSString *transitions[] = {
 
-	@"ActionAnimate",
-
 	@"ActionManual",
 	@"ActionMove",
 	@"ActionRotate",
@@ -50,6 +48,7 @@
 	@"ActionOrbit",
 	@"ActionFollow",
 	@"ActionProperty",
+	@"ActionTargeted",
 };
 
 Class nextAction()
@@ -1138,6 +1137,38 @@ -(NSString*) subtitle
 
 @end
 
+@implementation ActionTargeted
+-(void) onEnter
+{
+	[super onEnter];
+
+	[self centerSprites:2];
+
+	CCJumpBy *jump1 = [CCJumpBy actionWithDuration:2 position:CGPointZero height:100 jumps:3];
+	CCJumpBy *jump2 = [[jump1 copy] autorelease];
+	CCRotateBy *rot1 =  [CCRotateBy actionWithDuration:1 angle:360];
+	CCRotateBy *rot2 = [[rot1 copy] autorelease];
+
+	CCTargetedAction *t1 = [CCTargetedAction actionWithTarget:kathia action:jump2];
+	CCTargetedAction *t2 = [CCTargetedAction actionWithTarget:kathia action:rot2];
+
+
+	CCSequence *seq = [CCSequence actions:jump1, t1, rot1, t2, nil];
+	CCRepeatForever *always = [CCRepeatForever actionWithAction:seq];
+
+	[tamara runAction:always];
+}
+
+-(NSString *) title
+{
+	return @"ActionTargeted";
+}
+
+-(NSString*) subtitle
+{
+	return @"Action that runs on another target. Useful for sequences";
+}
+@end
 
 
 // CLASS IMPLEMENTATIONS