joybox 0.0.5 → 0.0.6

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCActionGrid3D.h

@@ -29,9 +29,9 @@
 /** CCWaves3D action */
 @interface CCWaves3D : CCGrid3DAction
 {
-	int waves;
-	float amplitude;
-	float amplitudeRate;
+	NSUInteger _waves;
+	float _amplitude;
+	float _amplitudeRate;
 }
 
 /** amplitude of the wave */
@@ -39,8 +39,10 @@
 /** amplitude rate of the wave */
 @property (nonatomic,readwrite) float amplitudeRate;
 
-+(id)actionWithWaves:(int)wav amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
--(id)initWithWaves:(int)wav amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
+/** creates an action with duration, grid size, waves and amplitud */
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize waves:(NSUInteger)wav amplitude:(float)amp;
+/** initializeds an action with duration, grid size, waves and amplitud */
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize waves:(NSUInteger)wav amplitude:(float)amp;
 
 @end
 
@@ -53,7 +55,7 @@
 
 /** creates the action with duration */
 +(id) actionWithDuration:(ccTime)d;
-/** initizlies the action with duration */
+/** initializes the action with duration */
 -(id) initWithDuration:(ccTime)d;
 
 @end
@@ -64,7 +66,8 @@
 @interface CCFlipY3D : CCFlipX3D
 {
 }
-
+// Needed for bridge support
+-(void)update:(ccTime)time;
 @end
 
 ////////////////////////////////////////////////////////////
@@ -72,10 +75,10 @@
 /** CCLens3D action */
 @interface CCLens3D : CCGrid3DAction
 {
-	CGPoint	position_;
-	float	radius_;
-	float	lensEffect_;
-	BOOL	dirty_;
+	CGPoint	_position;
+	float	_radius;
+	float	_lensEffect;
+	BOOL	_dirty;
 }
 
 /** lens effect. Defaults to 0.7 - 0 means no effect, 1 is very strong effect */
@@ -84,9 +87,9 @@
 @property (nonatomic,readwrite) CGPoint position;
 
 /** creates the action with center position in Points, radius, a grid size and duration */
-+(id)actionWithPosition:(CGPoint)pos radius:(float)r grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize position:(CGPoint)pos radius:(float)radius;
 /** initializes the action with center position in Points, radius, a grid size and duration */
--(id)initWithPosition:(CGPoint)pos radius:(float)r grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize position:(CGPoint)pos radius:(float)radius;
 
 @end
 
@@ -95,11 +98,11 @@
 /** CCRipple3D action */
 @interface CCRipple3D : CCGrid3DAction
 {
-	CGPoint	position_;
-	float	radius_;
-	int		waves_;
-	float	amplitude_;
-	float	amplitudeRate_;
+	CGPoint	_position;
+	float	_radius;
+	NSUInteger		_waves;
+	float	_amplitude;
+	float	_amplitudeRate;
 }
 
 /** center position in Points */
@@ -110,9 +113,9 @@
 @property (nonatomic,readwrite) float amplitudeRate;
 
 /** creates the action with a position in points, radius, number of waves, amplitude, a grid size and duration */
-+(id)actionWithPosition:(CGPoint)pos radius:(float)r waves:(int)wav amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)d size:(CGSize)gridSize position:(CGPoint)pos radius:(float)r waves:(NSInteger)wav amplitude:(float)amp;
 /** initializes the action with a position in points, radius, number of waves, amplitude, a grid size and duration */
--(id)initWithPosition:(CGPoint)pos radius:(float)r waves:(int)wav amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)d size:(CGSize)gridSize position:(CGPoint)pos radius:(float)r waves:(NSInteger)wav amplitude:(float)amp;
 
 @end
 
@@ -121,14 +124,14 @@
 /** CCShaky3D action */
 @interface CCShaky3D : CCGrid3DAction
 {
-	int		randrange;
-	BOOL	shakeZ;
+	int		_randrange;
+	BOOL	_shakeZ;
 }
 
 /** creates the action with a range, shake Z vertices, a grid and duration */
-+(id)actionWithRange:(int)range shakeZ:(BOOL)shakeZ grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize range:(int)range shakeZ:(BOOL)shakeZ;
 /** initializes the action with a range, shake Z vertices, a grid and duration */
--(id)initWithRange:(int)range shakeZ:(BOOL)shakeZ grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize range:(int)range shakeZ:(BOOL)shakeZ;
 
 @end
 
@@ -137,9 +140,9 @@
 /** CCLiquid action */
 @interface CCLiquid : CCGrid3DAction
 {
-	int waves;
-	float amplitude;
-	float amplitudeRate;
+	NSUInteger _waves;
+	float _amplitude;
+	float _amplitudeRate;
 
 }
 
@@ -149,9 +152,9 @@
 @property (nonatomic,readwrite) float amplitudeRate;
 
 /** creates the action with amplitude, a grid and duration */
-+(id)actionWithWaves:(int)wav amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize waves:(NSUInteger)wav amplitude:(float)amp;
 /** initializes the action with amplitude, a grid and duration */
--(id)initWithWaves:(int)wav amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize waves:(NSUInteger)wav amplitude:(float)amp;
 
 @end
 
@@ -160,11 +163,11 @@
 /** CCWaves action */
 @interface CCWaves : CCGrid3DAction
 {
-	int		waves;
-	float	amplitude;
-	float	amplitudeRate;
-	BOOL	vertical;
-	BOOL	horizontal;
+	NSUInteger	_waves;
+	float	_amplitude;
+	float	_amplitudeRate;
+	BOOL	_vertical;
+	BOOL	_horizontal;
 }
 
 /** amplitude */
@@ -173,9 +176,9 @@
 @property (nonatomic,readwrite) float amplitudeRate;
 
 /** initializes the action with amplitude, horizontal sin, vertical sin, a grid and duration */
-+(id)actionWithWaves:(int)wav amplitude:(float)amp horizontal:(BOOL)h vertical:(BOOL)v grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize waves:(NSUInteger)wav amplitude:(float)amp horizontal:(BOOL)h vertical:(BOOL)v;
 /** creates the action with amplitude, horizontal sin, vertical sin, a grid and duration */
--(id)initWithWaves:(int)wav amplitude:(float)amp horizontal:(BOOL)h vertical:(BOOL)v grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize waves:(NSUInteger)wav amplitude:(float)amp horizontal:(BOOL)h vertical:(BOOL)v;
 
 @end
 
@@ -184,10 +187,10 @@
 /** CCTwirl action */
 @interface CCTwirl : CCGrid3DAction
 {
-	CGPoint	position_;
-	int		twirls_;
-	float	amplitude_;
-	float	amplitudeRate_;
+	CGPoint	_position;
+	NSUInteger	_twirls;
+	float	_amplitude;
+	float	_amplitudeRate;
 }
 
 /** twirl center */
@@ -198,8 +201,8 @@
 @property (nonatomic,readwrite) float amplitudeRate;
 
 /** creates the action with center position, number of twirls, amplitude, a grid size and duration */
-+(id)actionWithPosition:(CGPoint)pos twirls:(int)t amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize position:(CGPoint)pos twirls:(NSUInteger)t amplitude:(float)amp;
 /** initializes the action with center position, number of twirls, amplitude, a grid size and duration */
--(id)initWithPosition:(CGPoint)pos twirls:(int)t amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize position:(CGPoint)pos twirls:(NSUInteger)t amplitude:(float)amp;
 
 @end

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCActionInstant.h

@@ -33,6 +33,8 @@
 @interface CCActionInstant : CCFiniteTimeAction <NSCopying>
 {
 }
+// XXX Needed for BridgeSupport
+-(id) init;
 @end
 
 /** Show the node
@@ -40,6 +42,8 @@
  @interface CCShow : CCActionInstant
 {
 }
+// XXX Needed for BridgeSupport
+-(void) update:(ccTime)time;
 @end
 
 /** Hide the node
@@ -47,6 +51,7 @@
 @interface CCHide : CCActionInstant
 {
 }
+-(void) update:(ccTime)time;
 @end
 
 /** Toggles the visibility of a node
@@ -54,6 +59,7 @@
 @interface CCToggleVisibility : CCActionInstant
 {
 }
+-(void) update:(ccTime)time;
 @end
 
 /** Flips the sprite horizontally
@@ -61,7 +67,7 @@
  */
 @interface CCFlipX : CCActionInstant
 {
-	BOOL	flipX;
+	BOOL	_flipX;
 }
 +(id) actionWithFlipX:(BOOL)x;
 -(id) initWithFlipX:(BOOL)x;
@@ -72,7 +78,7 @@
  */
 @interface CCFlipY : CCActionInstant
 {
-	BOOL	flipY;
+	BOOL	_flipY;
 }
 +(id) actionWithFlipY:(BOOL)y;
 -(id) initWithFlipY:(BOOL)y;
@@ -82,7 +88,7 @@
  */
 @interface CCPlace : CCActionInstant <NSCopying>
 {
-	CGPoint position;
+	CGPoint _position;
 }
 /** creates a Place action with a position */
 +(id) actionWithPosition: (CGPoint) pos;
@@ -94,8 +100,8 @@
  */
 @interface CCCallFunc : CCActionInstant <NSCopying>
 {
-	id targetCallback_;
-	SEL selector_;
+	id _targetCallback;
+	SEL _selector;
 }
 
 /** Target that will be called */
@@ -105,7 +111,7 @@
 +(id) actionWithTarget: (id) t selector:(SEL) s;
 /** initializes the action with the callback */
 -(id) initWithTarget: (id) t selector:(SEL) s;
-/** exeuctes the callback */
+/** executes the callback */
 -(void) execute;
 @end
 
@@ -115,6 +121,8 @@
 @interface CCCallFuncN : CCCallFunc
 {
 }
+// XXX: Needed for BridgeSupport
+-(void) execute;
 @end
 
 typedef void (*CC_CALLBACK_ND)(id, SEL, id, void *);
@@ -123,8 +131,8 @@ typedef void (*CC_CALLBACK_ND)(id, SEL, id, void *);
  */
 @interface CCCallFuncND : CCCallFuncN
 {
-	void			*data_;
-	CC_CALLBACK_ND	callbackMethod_;
+	void			*_data;
+	CC_CALLBACK_ND	_callbackMethod;
 }
 
 /** Invocation object that has the target#selector and the parameters */
@@ -142,7 +150,7 @@ typedef void (*CC_CALLBACK_ND)(id, SEL, id, void *);
  */
 @interface CCCallFuncO : CCCallFunc
 {
-	id	object_;
+	id	_object;
 }
 /** object to be passed as argument */
 @property (nonatomic, readwrite, retain) id object;
@@ -160,7 +168,7 @@ typedef void (*CC_CALLBACK_ND)(id, SEL, id, void *);
  */
 @interface CCCallBlock : CCActionInstant<NSCopying>
 {
-	void (^block_)();
+	void (^_block)();
 }
 
 /** creates the action with the specified block, to be used as a callback.
@@ -183,7 +191,7 @@ typedef void (*CC_CALLBACK_ND)(id, SEL, id, void *);
  */
 @interface CCCallBlockN : CCActionInstant<NSCopying>
 {
-	void (^block_)(CCNode *);
+	void (^_block)(CCNode *);
 }
 
 /** creates the action with the specified block, to be used as a callback.
@@ -205,8 +213,8 @@ typedef void (*CC_CALLBACK_ND)(id, SEL, id, void *);
  */
 @interface CCCallBlockO : CCActionInstant<NSCopying>
 {
-	void (^block_)(id object);
-	id object_;
+	void (^_block)(id object);
+	id _object;
 }
 
 /** object to be passed to the block */