joybox 0.0.5 → 0.0.6

data/vendor/vendor-ios/cocos_2d/cocos_2d_exceptions.bridgesupport

@@ -0,0 +1,39 @@
+<?xml version='1.0'?>
+<!DOCTYPE signatures SYSTEM "file://localhost/System/Library/DTDs/BridgeSupport.dtd">
+<signatures version='1.0'>
+<class name='NSObject'>
+<method selector='ccTouchesBegan:withEvent:'>
+<arg declared_type='UIEvent*' index='1' />
+</method>
+<method selector='ccTouchesCancelled:withEvent:'>
+<arg declared_type='UIEvent*' index='1' />
+</method>
+<method selector='ccTouchesEnded:withEvent:'>
+<arg declared_type='UIEvent*' index='1' />
+</method>
+<method selector='ccTouchesMoved:withEvent:'>
+<arg declared_type='UIEvent*' index='1' />
+</method>
+<method selector='ccTouchBegan:withEvent:' >
+<arg declared_type='UITouch*' index='0' />
+<arg declared_type='UIEvent*' index='1' />
+</method>
+<method selector='ccTouchCancelled:withEvent:' >
+<arg declared_type='UITouch*' index='0' />
+<arg declared_type='UIEvent*' index='1' />
+</method>
+<method selector='ccTouchEnded:withEvent:' >
+<arg declared_type='UITouch*' index='0' />
+<arg declared_type='UIEvent*' index='1' />
+</method>
+<method selector='ccTouchMoved:withEvent:' >
+<arg declared_type='UITouch*' index='0' />
+<arg declared_type='UIEvent*' index='1' />
+</method>
+</class>
+<class name='CCDirector'>
+<method selector='convertTouchToGL:'>
+<arg declared_type='UITouch*' index='0'/>
+</method>
+</class>
+</signatures>

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

@@ -39,9 +39,9 @@ enum {
  */
 @interface CCAction : NSObject <NSCopying>
 {
-	id			originalTarget_;
-	id			target_;
-	NSInteger	tag_;
+	id			_originalTarget;
+	id			_target;
+	NSInteger	_tag;
 }
 
 /** The "target". The action will modify the target properties.
@@ -91,12 +91,12 @@ enum {
  Possible actions:
    - An action with a duration of 0 seconds
    - An action with a duration of 35.5 seconds
- Infitite time actions are valid
+ Infinite time actions are valid
  */
 @interface CCFiniteTimeAction : CCAction <NSCopying>
 {
 	//! duration in seconds
-	ccTime duration_;
+	ccTime _duration;
 }
 //! duration in seconds of the action
 @property (nonatomic,readwrite) ccTime duration;
@@ -109,11 +109,11 @@ enum {
 @class CCActionInterval;
 /** Repeats an action for ever.
  To repeat the an action for a limited number of times use the Repeat action.
- @warning This action can't be Sequenceable because it is not an IntervalAction
+ @warning This action can't be Sequence-able because it is not an IntervalAction
  */
 @interface CCRepeatForever : CCAction <NSCopying>
 {
-	CCActionInterval *innerAction_;
+	CCActionInterval *_innerAction;
 }
 /** Inner action */
 @property (nonatomic, readwrite, retain) CCActionInterval *innerAction;
@@ -127,22 +127,22 @@ enum {
 /** Changes the speed of an action, making it take longer (speed<1)
  or less (speed>1) time.
  Useful to simulate 'slow motion' or 'fast forward' effect.
- @warning This action can't be Sequenceable because it is not an CCIntervalAction
+ @warning This action can't be Sequence-able because it is not an CCIntervalAction
  */
 @interface CCSpeed : CCAction <NSCopying>
 {
-	CCActionInterval	*innerAction_;
-	float speed_;
+	CCActionInterval	*_innerAction;
+	CGFloat _speed;
 }
 /** alter the speed of the inner function in runtime */
-@property (nonatomic,readwrite) float speed;
+@property (nonatomic,readwrite) CGFloat speed;
 /** Inner action of CCSpeed */
 @property (nonatomic, readwrite, retain) CCActionInterval *innerAction;
 
 /** creates the action */
-+(id) actionWithAction: (CCActionInterval*) action speed:(float)value;
++(id) actionWithAction: (CCActionInterval*) action speed:(CGFloat)value;
 /** initializes the action */
--(id) initWithAction: (CCActionInterval*) action speed:(float)value;
+-(id) initWithAction: (CCActionInterval*) action speed:(CGFloat)value;
 @end
 
 @class CCNode;
@@ -157,23 +157,23 @@ enum {
 @interface CCFollow : CCAction <NSCopying>
 {
 	/* node to follow */
-	CCNode	*followedNode_;
+	CCNode	*_followedNode;
 
 	/* whether camera should be limited to certain area */
-	BOOL boundarySet;
+	BOOL _boundarySet;
 
-	/* if screensize is bigger than the boundary - update not needed */
-	BOOL boundaryFullyCovered;
+	/* if screen-size is bigger than the boundary - update not needed */
+	BOOL _boundaryFullyCovered;
 
 	/* fast access to the screen dimensions */
-	CGPoint halfScreenSize;
-	CGPoint fullScreenSize;
+	CGPoint _halfScreenSize;
+	CGPoint _fullScreenSize;
 
 	/* world boundaries */
-	float leftBoundary;
-	float rightBoundary;
-	float topBoundary;
-	float bottomBoundary;
+	float _leftBoundary;
+	float _rightBoundary;
+	float _topBoundary;
+	float _bottomBoundary;
 }
 
 /** alter behavior - turn on/off boundary */

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

@@ -32,18 +32,20 @@
  */
 @interface CCActionCamera : CCActionInterval <NSCopying>
 {
-	float centerXOrig_;
-	float centerYOrig_;
-	float centerZOrig_;
+	float _centerXOrig;
+	float _centerYOrig;
+	float _centerZOrig;
 
-	float eyeXOrig_;
-	float eyeYOrig_;
-	float eyeZOrig_;
+	float _eyeXOrig;
+	float _eyeYOrig;
+	float _eyeZOrig;
 
-	float upXOrig_;
-	float upYOrig_;
-	float upZOrig_;
+	float _upXOrig;
+	float _upYOrig;
+	float _upZOrig;
 }
+// XXX Needed for BridgeSupport
+-(void) startWithTarget:(id)aTarget;
 @end
 
 /** CCOrbitCamera action
@@ -51,17 +53,17 @@
  */
 @interface CCOrbitCamera : CCActionCamera <NSCopying>
 {
-	float radius_;
-	float deltaRadius_;
-	float angleZ_;
-	float deltaAngleZ_;
-	float angleX_;
-	float deltaAngleX_;
+	float _radius;
+	float _deltaRadius;
+	float _angleZ;
+	float _deltaAngleZ;
+	float _angleX;
+	float _deltaAngleX;
 
-	float radZ_;
-	float radDeltaZ_;
-	float radX_;
-	float radDeltaX_;
+	float _radZ;
+	float _radDeltaZ;
+	float _radX;
+	float _radDeltaX;
 
 }
 /** creates a CCOrbitCamera action with radius, delta-radius,  z, deltaZ, x, deltaX */

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

@@ -40,7 +40,7 @@
  */
 @interface CCPointArray : NSObject <NSCopying>
 {
-	NSMutableArray *controlPoints_;
+	NSMutableArray	*_controlPoints;
 }
 
 /** Array that contains the control points */
@@ -82,9 +82,11 @@
  */
 @interface CCCardinalSplineTo : CCActionInterval
 {
-	CCPointArray		*points_;
-	CGFloat			deltaT_;
-	CGFloat			tension_;
+	CCPointArray	*_points;
+	CGFloat			_deltaT;
+	CGFloat			_tension;
+	CGPoint			_previousPosition;
+	CGPoint			_accumulatedDiff;
 }
 
 /** Array of control points */
@@ -103,8 +105,10 @@
  */
 @interface CCCardinalSplineBy : CCCardinalSplineTo
 {
-	CGPoint				startPosition_;
+	CGPoint		_startPosition;
 }
+// XXX: To make BridgeSupport happy
+-(void) startWithTarget:(id)target;
 @end
 
 /** An action that moves the target with a CatmullRom curve to a destination point.
@@ -135,5 +139,13 @@
 -(id) initWithDuration:(ccTime)dt points:(CCPointArray*)points;
 @end
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** Returns the Cardinal Spline position for a given set of control points, tension and time */
- CGPoint ccCardinalSplineAt( CGPoint p0, CGPoint p1, CGPoint p2, CGPoint p3, CGFloat tension, ccTime t );
+CGPoint ccCardinalSplineAt( CGPoint p0, CGPoint p1, CGPoint p2, CGPoint p3, CGFloat tension, ccTime t );
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -30,8 +30,11 @@
  */
 @interface CCActionEase : CCActionInterval <NSCopying>
 {
-	CCActionInterval * other;
+	CCActionInterval *_inner;
 }
+/** The inner action */
+@property (nonatomic, readonly) CCActionInterval *inner;
+
 /** creates the action */
 +(id) actionWithAction: (CCActionInterval*) action;
 /** initializes the action */
@@ -42,7 +45,7 @@
  */
 @interface CCEaseRateAction :  CCActionEase <NSCopying>
 {
-	float	rate;
+	float	_rate;
 }
 /** rate value for the actions */
 @property (nonatomic,readwrite,assign) float rate;
@@ -54,41 +57,82 @@
 
 /** CCEaseIn action with a rate
  */
-@interface CCEaseIn : CCEaseRateAction <NSCopying> {} @end
+@interface CCEaseIn : CCEaseRateAction <NSCopying>
+{} 
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** CCEaseOut action with a rate
  */
-@interface CCEaseOut : CCEaseRateAction <NSCopying> {} @end
+@interface CCEaseOut : CCEaseRateAction <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** CCEaseInOut action with a rate
  */
-@interface CCEaseInOut : CCEaseRateAction <NSCopying> {} @end
+@interface CCEaseInOut : CCEaseRateAction <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** CCEase Exponential In
  */
-@interface CCEaseExponentialIn : CCActionEase <NSCopying> {} @end
+@interface CCEaseExponentialIn : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
+
 /** Ease Exponential Out
  */
-@interface CCEaseExponentialOut : CCActionEase <NSCopying> {} @end
+@interface CCEaseExponentialOut : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
+
 /** Ease Exponential InOut
  */
-@interface CCEaseExponentialInOut : CCActionEase <NSCopying> {} @end
+@interface CCEaseExponentialInOut : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
+
 /** Ease Sine In
  */
-@interface CCEaseSineIn : CCActionEase <NSCopying> {} @end
+@interface CCEaseSineIn : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
+
 /** Ease Sine Out
  */
-@interface CCEaseSineOut : CCActionEase <NSCopying> {} @end
+@interface CCEaseSineOut : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
+
 /** Ease Sine InOut
  */
-@interface CCEaseSineInOut : CCActionEase <NSCopying> {} @end
+@interface CCEaseSineInOut : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** Ease Elastic abstract class
  @since v0.8.2
  */
 @interface CCEaseElastic : CCActionEase <NSCopying>
 {
-	float period_;
+	float _period;
 }
 
 /** period of the wave in radians. default is 0.3 */
@@ -101,59 +145,101 @@
 @end
 
 /** Ease Elastic In action.
- @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action.
+ @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  @since v0.8.2
  */
-@interface CCEaseElasticIn : CCEaseElastic <NSCopying> {} @end
+@interface CCEaseElasticIn : CCEaseElastic <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
+
 /** Ease Elastic Out action.
- @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action.
+ @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  @since v0.8.2
  */
-@interface CCEaseElasticOut : CCEaseElastic <NSCopying> {} @end
+@interface CCEaseElasticOut : CCEaseElastic <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
+
 /** Ease Elastic InOut action.
- @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action.
+ @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  @since v0.8.2
  */
-@interface CCEaseElasticInOut : CCEaseElastic <NSCopying> {} @end
+@interface CCEaseElasticInOut : CCEaseElastic <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** CCEaseBounce abstract class.
  @since v0.8.2
 */
-@interface CCEaseBounce : CCActionEase <NSCopying> {} @end
+@interface CCEaseBounce : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(ccTime) bounceTime:(ccTime) t;
+@end
 
 /** CCEaseBounceIn action.
- @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action.
+ @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  @since v0.8.2
 */
-@interface CCEaseBounceIn : CCEaseBounce <NSCopying> {} @end
+@interface CCEaseBounceIn : CCEaseBounce <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** EaseBounceOut action.
- @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action.
+ @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  @since v0.8.2
  */
-@interface CCEaseBounceOut : CCEaseBounce <NSCopying> {} @end
+@interface CCEaseBounceOut : CCEaseBounce <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** CCEaseBounceInOut action.
- @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action.
+ @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  @since v0.8.2
  */
-@interface CCEaseBounceInOut : CCEaseBounce <NSCopying> {} @end
+@interface CCEaseBounceInOut : CCEaseBounce <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** CCEaseBackIn action.
- @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action.
+ @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  @since v0.8.2
  */
-@interface CCEaseBackIn : CCActionEase <NSCopying> {} @end
+@interface CCEaseBackIn : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** CCEaseBackOut action.
- @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action.
+ @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  @since v0.8.2
  */
-@interface CCEaseBackOut : CCActionEase <NSCopying> {} @end
+@interface CCEaseBackOut : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 
 /** CCEaseBackInOut action.
- @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action.
+ @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action.
  @since v0.8.2
  */
-@interface CCEaseBackInOut : CCActionEase <NSCopying> {} @end
+@interface CCEaseBackInOut : CCActionEase <NSCopying>
+{}
+// Needed for BridgeSupport
+-(void) update: (ccTime) t;
+@end
 

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

@@ -33,16 +33,16 @@
 /** Base class for Grid actions */
 @interface CCGridAction : CCActionInterval
 {
-	ccGridSize gridSize_;
+	CGSize _gridSize;
 }
 
 /** size of the grid */
-@property (nonatomic,readwrite) ccGridSize gridSize;
+@property (nonatomic,readwrite) CGSize gridSize;
 
 /** creates the action with size and duration */
-+(id) actionWithSize:(ccGridSize)size duration:(ccTime)d;
++(id) actionWithDuration:(ccTime)duration size:(CGSize)gridSize;
 /** initializes the action with size and duration */
--(id) initWithSize:(ccGridSize)gridSize duration:(ccTime)d;
+-(id) initWithDuration:(ccTime)duration size:(CGSize)gridSize;
 /** returns the grid */
 -(CCGridBase *)grid;
 
@@ -58,11 +58,11 @@
 }
 
 /** returns the vertex than belongs to certain position in the grid */
--(ccVertex3F)vertex:(ccGridSize)pos;
+-(ccVertex3F)vertex:(CGPoint)position;
 /** returns the non-transformed vertex than belongs to certain position in the grid */
--(ccVertex3F)originalVertex:(ccGridSize)pos;
+-(ccVertex3F)originalVertex:(CGPoint)position;
 /** sets a new vertex to a certain position of the grid */
--(void)setVertex:(ccGridSize)pos vertex:(ccVertex3F)vertex;
+-(void)setVertex:(CGPoint)position vertex:(ccVertex3F)vertex;
 
 @end
 
@@ -74,11 +74,11 @@
 }
 
 /** returns the tile that belongs to a certain position of the grid */
--(ccQuad3)tile:(ccGridSize)pos;
+-(ccQuad3)tile:(CGPoint)position;
 /** returns the non-transformed tile that belongs to a certain position of the grid */
--(ccQuad3)originalTile:(ccGridSize)pos;
+-(ccQuad3)originalTile:(CGPoint)position;
 /** sets a new tile to a certain position of the grid */
--(void)setTile:(ccGridSize)pos coords:(ccQuad3)coords;
+-(void)setTile:(CGPoint)position coords:(ccQuad3)coords;
 
 @end
 
@@ -87,8 +87,8 @@
 /** CCAccelDeccelAmplitude action */
 @interface CCAccelDeccelAmplitude : CCActionInterval
 {
-	float			rate_;
-	CCActionInterval *other_;
+	float			_rate;
+	CCActionInterval *_other;
 }
 
 /** amplitude rate */
@@ -106,8 +106,8 @@
 /** CCAccelAmplitude action */
 @interface CCAccelAmplitude : CCActionInterval
 {
-	float			rate_;
-	CCActionInterval *other_;
+	float			_rate;
+	CCActionInterval *_other;
 }
 
 /** amplitude rate */
@@ -125,8 +125,8 @@
 /** CCDeccelAmplitude action */
 @interface CCDeccelAmplitude : CCActionInterval
 {
-	float			rate_;
-	CCActionInterval *other_;
+	float			_rate;
+	CCActionInterval *_other;
 }
 
 /** amplitude rate */
@@ -149,6 +149,8 @@
 @interface CCStopGrid : CCActionInstant
 {
 }
+// to make BridgeSupport happy
+-(void)startWithTarget:(id)aTarget;
 @end
 
 ////////////////////////////////////////////////////////////
@@ -156,7 +158,7 @@
 /** CCReuseGrid action */
 @interface CCReuseGrid : CCActionInstant
 {
-	int t_;
+	int _times;
 }
 /** creates an action with the number of times that the current grid will be reused */
 +(id) actionWithTimes: (int) times;