joybox 0.0.5 → 0.0.6

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

@@ -48,9 +48,9 @@
  */
 @interface CCSpriteFrameCache : NSObject
 {
-	NSMutableDictionary *spriteFrames_;
-	NSMutableDictionary *spriteFramesAliases_;
-	NSMutableSet		*loadedFilenames_;
+	NSMutableDictionary *_spriteFrames;
+	NSMutableDictionary *_spriteFramesAliases;
+	NSMutableSet		*_loadedFilenames;
 }
 
 /** Retruns ths shared instance of the Sprite Frame cache */
@@ -91,7 +91,7 @@
 
 /** Removes unused sprite frames.
  * Sprite Frames that have a retain count of 1 will be deleted.
- * It is convinient to call this method after when starting a new Scene.
+ * It is convenient to call this method after when starting a new Scene.
  */
 -(void) removeUnusedSpriteFrames;
 
@@ -101,13 +101,13 @@
 
 /** Removes multiple Sprite Frames from a plist file.
 * Sprite Frames stored in this file will be removed.
-* It is convinient to call this method when a specific texture needs to be removed.
+* It is convenient to call this method when a specific texture needs to be removed.
 * @since v0.99.5
 */
 - (void) removeSpriteFramesFromFile:(NSString*) plist;
 
 /** Removes all Sprite Frames associated with the specified textures.
- * It is convinient to call this method when a specific texture needs to be removed.
+ * It is convenient to call this method when a specific texture needs to be removed.
  * @since v0.995.
  */
 - (void) removeSpriteFramesFromTexture:(CCTexture2D*) texture;

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

@@ -63,36 +63,36 @@
  */
 @interface CCTMXLayer : CCSpriteBatchNode
 {
-	CCTMXTilesetInfo	*tileset_;
-	NSString			*layerName_;
-	CGSize				layerSize_;
-	CGSize				mapTileSize_;
-	uint32_t			*tiles_;			// GID are 32 bit
-	NSUInteger			layerOrientation_;
-	NSMutableArray		*properties_;
+	CCTMXTilesetInfo	*_tileset;
+	NSString			*_layerName;
+	CGSize				_layerSize;
+	CGSize				_mapTileSize;
+	uint32_t			*_tiles;			// GID are 32 bit
+	NSUInteger			_layerOrientation;
+	NSMutableArray		*_properties;
 
-	unsigned char		opacity_; // TMX Layer supports opacity
+	unsigned char		_opacity; // TMX Layer supports opacity
 
-	NSUInteger			minGID_;
-	NSUInteger			maxGID_;
+	NSUInteger			_minGID;
+	NSUInteger			_maxGID;
 
 	// Only used when vertexZ is used
-	NSInteger			vertexZvalue_;
-	BOOL				useAutomaticVertexZ_;
+	NSInteger			_vertexZvalue;
+	BOOL				_useAutomaticVertexZ;
 
 	// used for optimization
-	CCSprite		*reusedTile_;
-	ccCArray		*atlasIndexArray_;
+	CCSprite		*_reusedTile;
+	ccCArray		*_atlasIndexArray;
 }
 /** name of the layer */
 @property (nonatomic,readwrite,retain) NSString *layerName;
 /** size of the layer in tiles */
 @property (nonatomic,readwrite) CGSize layerSize;
-/** size of the map's tile (could be differnt from the tile's size) */
+/** size of the map's tile (could be different from the tile's size) */
 @property (nonatomic,readwrite) CGSize mapTileSize;
 /** pointer to the map of tiles */
 @property (nonatomic,readwrite) uint32_t *tiles;
-/** Tilset information for the layer */
+/** Tileset information for the layer */
 @property (nonatomic,readwrite,retain) CCTMXTilesetInfo *tileset;
 /** Layer orientation, which is the same as the map orientation */
 @property (nonatomic,readwrite) NSUInteger layerOrientation;

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

@@ -41,10 +41,10 @@
 */
 @interface CCTMXObjectGroup : NSObject
 {
-	NSString			*groupName_;
-	CGPoint				positionOffset_;
-	NSMutableArray		*objects_;
-	NSMutableDictionary	*properties_;
+	NSString			*_groupName;
+	CGPoint				_positionOffset;
+	NSMutableArray		*_objects;
+	NSMutableDictionary	*_properties;
 }
 
 /** name of the group */

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

@@ -71,14 +71,14 @@ enum
 
  Limitations:
  - It only supports one tileset per layer.
- - Embeded images are not supported
+ - Embedded images are not supported
  - It only supports the XML format (the JSON format is not supported)
 
  Technical description:
    Each layer is created using an CCTMXLayer (subclass of CCSpriteBatchNode). If you have 5 layers, then 5 CCTMXLayer will be created,
    unless the layer visibility is off. In that case, the layer won't be created at all.
    You can obtain the layers (CCTMXLayer objects) at runtime by:
-  - [map getChildByTag: tag_number];  // 0=1st layer, 1=2nd layer, 2=3rd layer, etc...
+  - [map getChildByTag: tax_number];  // 0=1st layer, 1=2nd layer, 2=3rd layer, etc...
   - [map layerNamed: name_of_the_layer];
 
    Each object group is created using a CCTMXObjectGroup which is a subclass of NSMutableArray.
@@ -99,12 +99,12 @@ enum
  */
 @interface CCTMXTiledMap : CCNode
 {
-	CGSize				mapSize_;
-	CGSize				tileSize_;
-	int					mapOrientation_;
-	NSMutableArray		*objectGroups_;
-	NSMutableDictionary	*properties_;
-	NSMutableDictionary	*tileProperties_;
+	CGSize				_mapSize;
+	CGSize				_tileSize;
+	int					_mapOrientation;
+	NSMutableArray		*_objectGroups;
+	NSMutableDictionary	*_properties;
+	NSMutableDictionary	*_tileProperties;
 }
 
 /** the map's size property measured in tiles */
@@ -133,7 +133,7 @@ enum
 /** return the TMXLayer for the specific layer */
 -(CCTMXLayer*) layerNamed:(NSString *)layerName;
 
-/** return the TMXObjectGroup for the secific group */
+/** return the TMXObjectGroup for the specific group */
 -(CCTMXObjectGroup*) objectGroupNamed:(NSString *)groupName;
 
 /** return the value for the specific property name */

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

@@ -78,16 +78,16 @@ typedef enum ccTMXTileFlags_ {
  */
 @interface CCTMXLayerInfo : NSObject
 {
-	NSString			*name_;
-	CGSize				layerSize_;
-	unsigned int		*tiles_;
-	BOOL				visible_;
-	unsigned char		opacity_;
-	BOOL				ownTiles_;
-	unsigned int		minGID_;
-	unsigned int		maxGID_;
-	NSMutableDictionary	*properties_;
-	CGPoint				offset_;
+	NSString			*_name;
+	CGSize				_layerSize;
+	unsigned int		*_tiles;
+	BOOL				_visible;
+	unsigned char		_opacity;
+	BOOL				_ownTiles;
+	unsigned int		_minGID;
+	unsigned int		_maxGID;
+	NSMutableDictionary	*_properties;
+	CGPoint				_offset;
 }
 
 @property (nonatomic,readwrite,retain)	NSString *name;
@@ -114,17 +114,26 @@ typedef enum ccTMXTileFlags_ {
  */
 @interface CCTMXTilesetInfo : NSObject
 {
-	NSString		*name_;
-	unsigned int	firstGid_;
-	CGSize			tileSize_;
-	unsigned int	spacing_;
-	unsigned int	margin_;
+	NSString		*_name;
+	unsigned int	_firstGid;
+	CGSize			_tileSize;
+	unsigned int	_spacing;
+	unsigned int	_margin;
+	
+	//	Offset of tiles. New TMX XML node introduced here: https://github.com/bjorn/tiled/issues/16 .
+	//	Node structure:
+	//	(...) <tileset firstgid="1" name="mytileset-ipad" tilewidth="40" tileheight="40" spacing="1" margin="1">
+	//			  <tileoffset x="0" y="10"/>
+	//			  <image source="mytileset-ipad.png" width="256" height="256"/>
+	//	(...)
+	CGPoint         _tileOffset;
+	CGPoint			_tileAnchorPoint; //normalized anchor point	
 
 	// filename containing the tiles (should be spritesheet / texture atlas)
-	NSString	*sourceImage_;
+	NSString	*_sourceImage;
 
 	// size in pixels of the image
-	CGSize		imageSize_;
+	CGSize		_imageSize;
 }
 @property (nonatomic,readwrite,retain) NSString *name;
 @property (nonatomic,readwrite,assign) unsigned int firstGid;
@@ -133,6 +142,8 @@ typedef enum ccTMXTileFlags_ {
 @property (nonatomic,readwrite,assign) unsigned int margin;
 @property (nonatomic,readwrite,retain) NSString *sourceImage;
 @property (nonatomic,readwrite,assign) CGSize imageSize;
+@property (nonatomic,readwrite,assign) CGPoint tileOffset; //setter has a custom implementation
+@property (nonatomic,readonly,assign) CGPoint tileAnchorPoint; //set automatically when tileOffset changes
 
 -(CGRect) rectForGID:(unsigned int)gid;
 @end
@@ -152,42 +163,42 @@ typedef enum ccTMXTileFlags_ {
  */
 @interface CCTMXMapInfo : NSObject <NSXMLParserDelegate>
 {
-	NSMutableString	*currentString;
-    BOOL				storingCharacters;
-	int					layerAttribs;
-	int					parentElement;
-	unsigned int		parentGID_;
-
+	NSMutableString		*_currentString;
+    BOOL				_storingCharacters;
+	int					_layerAttribs;
+	int					_parentElement;
+	unsigned int		_parentGID;
+	unsigned int		_currentFirstGID;
 
 	// tmx filename
-	NSString *filename_;
+	NSString *_filename;
 
 	// tmx resource path
-	NSString *resources_;
+	NSString *_resources;
 
 	// map orientation
-	int	orientation_;
+	int		_orientation;
 
 	// map width & height
-	CGSize	mapSize_;
+	CGSize	_mapSize;
 
 	// tiles width & height
-	CGSize	tileSize_;
+	CGSize	_tileSize;
 
 	// Layers
-	NSMutableArray *layers_;
+	NSMutableArray *_layers;
 
 	// tilesets
-	NSMutableArray *tilesets_;
+	NSMutableArray *_tilesets;
 
 	// ObjectGroups
-	NSMutableArray *objectGroups_;
+	NSMutableArray *_objectGroups;
 
 	// properties
-	NSMutableDictionary *properties_;
+	NSMutableDictionary *_properties;
 
 	// tile properties
-	NSMutableDictionary *tileProperties_;
+	NSMutableDictionary *_tileProperties;
 }
 
 @property (nonatomic,readwrite,assign) int orientation;

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

@@ -111,25 +111,23 @@ typedef enum {
  */
 @interface CCTexture2D : NSObject
 {
-	GLuint						name_;
-	CGSize						size_;
-	NSUInteger					width_,
-								height_;
-	CCTexture2DPixelFormat		format_;
-	GLfloat						maxS_,
-								maxT_;
-	BOOL						hasPremultipliedAlpha_;
-	BOOL						hasMipmaps_;
-
-#ifdef __CC_PLATFORM_IOS
-	ccResolutionType			resolutionType_;
-#endif
+	GLuint						_name;
+	CGSize						_size;
+	NSUInteger					_width,
+								_height;
+	CCTexture2DPixelFormat		_format;
+	GLfloat						_maxS,
+								_maxT;
+	BOOL						_hasPremultipliedAlpha;
+	BOOL						_hasMipmaps;
+
+	ccResolutionType			_resolutionType;
 
 	// needed for drawAtRect, drawInPoint
-	CCGLProgram					*shaderProgram_;
+	CCGLProgram					*_shaderProgram;
 
 }
-/** Intializes with a texture2d with data */
+/** Initializes with a texture2d with data */
 - (id) initWithData:(const void*)data pixelFormat:(CCTexture2DPixelFormat)pixelFormat pixelsWide:(NSUInteger)width pixelsHigh:(NSUInteger)height contentSize:(CGSize)size;
 
 /** These functions are needed to create mutable textures */
@@ -159,17 +157,15 @@ typedef enum {
 /** shader program used by drawAtPoint and drawInRect */
 @property(nonatomic,readwrite,retain) CCGLProgram *shaderProgram;
 
-#ifdef __CC_PLATFORM_IOS
 /** Returns the resolution type of the texture.
- Is it a RetinaDisplay texture, an iPad texture or an standard texture ?
- Only valid on iOS. Not valid on OS X.
+ Is it a RetinaDisplay texture, an iPad texture, a Mac, a Mac RetinaDisplay or an standard texture ?
 
  Should be a readonly property. It is readwrite as a hack.
 
  @since v1.1
  */
 @property (nonatomic, readwrite) ccResolutionType resolutionType;
-#endif
+
 
 /** returns the content size of the texture in points */
 -(CGSize) contentSize;
@@ -194,11 +190,7 @@ Note that RGBA type textures will have their alpha premultiplied - use the blend
 */
 @interface CCTexture2D (Image)
 /** Initializes a texture from a CGImage object */
-#ifdef __CC_PLATFORM_IOS
 - (id) initWithCGImage:(CGImageRef)cgImage resolutionType:(ccResolutionType)resolution;
-#elif defined(__CC_PLATFORM_MAC)
-- (id) initWithCGImage:(CGImageRef)cgImage;
-#endif
 @end
 
 /**
@@ -212,9 +204,9 @@ Note that the generated textures are of type A8 - use the blending mode (GL_SRC_
 	- Mac: Only NSLineBreakByWordWrapping is supported.
  @since v1.0
  */
-- (id) initWithString:(NSString*)string dimensions:(CGSize)dimensions hAlignment:(CCTextAlignment)alignment vAlignment:(CCVerticalTextAlignment) vertAlignment lineBreakMode:(CCLineBreakMode)lineBreakMode fontName:(NSString*)name fontSize:(CGFloat)size;
+- (id) initWithString:(NSString*)string fontName:(NSString*)name fontSize:(CGFloat)size dimensions:(CGSize)dimensions hAlignment:(CCTextAlignment)alignment vAlignment:(CCVerticalTextAlignment) vertAlignment lineBreakMode:(CCLineBreakMode)lineBreakMode ;
 /** Initializes a texture from a string with dimensions, alignment, font name and font size */
-- (id) initWithString:(NSString*)string dimensions:(CGSize)dimensions hAlignment:(CCTextAlignment)alignment vAlignment:(CCVerticalTextAlignment) vertAlignment fontName:(NSString*)name fontSize:(CGFloat)size;
+- (id) initWithString:(NSString*)string fontName:(NSString*)name fontSize:(CGFloat)size dimensions:(CGSize)dimensions hAlignment:(CCTextAlignment)alignment vAlignment:(CCVerticalTextAlignment) vertAlignment;
 /** Initializes a texture from a string with font name and font size */
 - (id) initWithString:(NSString*)string fontName:(NSString*)name fontSize:(CGFloat)size;
 @end

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

@@ -30,8 +30,8 @@
 
 /** A class that implements a Texture Atlas.
  Supported features:
-   * The atlas file can be a PVRTC, PNG or any other fomrat supported by Texture2D
-   * Quads can be udpated in runtime
+   * The atlas file can be a PVRTC, PNG or any other format supported by Texture2D
+   * Quads can be updated in runtime
    * Quads can be added in runtime
    * Quads can be removed in runtime
    * Quads can be re-ordered in runtime
@@ -42,17 +42,17 @@
  */
 @interface CCTextureAtlas : NSObject
 {
-	NSUInteger			totalQuads_;
-	NSUInteger			capacity_;
-	ccV3F_C4B_T2F_Quad	*quads_;	// quads to be rendered
-	GLushort			*indices_;
-	CCTexture2D			*texture_;
+	NSUInteger			_totalQuads;
+	NSUInteger			_capacity;
+	ccV3F_C4B_T2F_Quad	*_quads;	// quads to be rendered
+	GLushort			*_indices;
+	CCTexture2D			*_texture;
 	
-	GLuint				buffersVBO_[2]; //0: vertex  1: indices
-	BOOL				dirty_;			//indicates whether or not the array buffer of the VBO needs to be updated
+	GLuint				_buffersVBO[2]; //0: vertex  1: indices
+	BOOL				_dirty;			//indicates whether or not the array buffer of the VBO needs to be updated
 
 #if CC_TEXTURE_ATLAS_USE_VAO
-	GLuint				VAOname_;
+	GLuint				_VAOname;
 #endif
 }
 

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

@@ -40,7 +40,7 @@
  */
 @interface CCTextureCache : NSObject
 {
-	NSMutableDictionary *textures_;
+	NSMutableDictionary *_textures;
 
 	dispatch_queue_t _loadingQueue;
 	dispatch_queue_t _dictQueue;
@@ -58,7 +58,7 @@
 /** Returns a Texture2D object given an file image
  * If the file image was not previously loaded, it will create a new CCTexture2D
  *  object and it will return it. It will use the filename as a key.
- * Otherwise it will return a reference of a previosly loaded image.
+ * Otherwise it will return a reference of a previously loaded image.
  * Supported image extensions: .png, .bmp, .tiff, .jpeg, .pvr, .gif
  */
 -(CCTexture2D*) addImage: (NSString*) fileimage;
@@ -106,7 +106,7 @@
 
 /** Removes unused textures
  * Textures that have a retain count of 1 will be deleted
- * It is convinient to call this method after when starting a new Scene
+ * It is convenient to call this method after when starting a new Scene
  * @since v0.8
  */
 -(void) removeUnusedTextures;
@@ -127,7 +127,7 @@
 
 /** Returns a Texture2D object given an PVR filename.
  * If the file image was not previously loaded, it will create a new CCTexture2D
- *  object and it will return it. Otherwise it will return a reference of a previosly loaded image
+ *  object and it will return it. Otherwise it will return a reference of a previously loaded image
  *
  */
 -(CCTexture2D*) addPVRImage:(NSString*) filename;

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

@@ -59,6 +59,16 @@ struct CCPVRMipmap {
 	unsigned int len;
 };
 
+typedef struct _ccPVRTexturePixelFormatInfo {
+	GLenum internalFormat;
+	GLenum format;
+	GLenum type;
+	uint32_t bpp;
+	BOOL compressed;
+	BOOL alpha;
+	CCTexture2DPixelFormat ccPixelFormat;
+} ccPVRTexturePixelFormatInfo;
+
 enum {
 	CC_PVRMIPMAP_MAX = 16,
 };
@@ -87,17 +97,20 @@ enum {
  */
 @interface CCTexturePVR : NSObject
 {
-	struct CCPVRMipmap	mipmaps_[CC_PVRMIPMAP_MAX];	// pointer to mipmap images
-	NSUInteger	numberOfMipmaps_;					// number of mipmap used
+	struct CCPVRMipmap	_mipmaps[CC_PVRMIPMAP_MAX];	// pointer to mipmap images
+	NSUInteger	_numberOfMipmaps;					// number of mipmap used
 
-	unsigned int	tableFormatIndex_;
-	uint32_t width_, height_;
-	GLuint	name_;
-	BOOL hasAlpha_;
+	uint32_t _width, _height;
+	GLuint	_name;
+	BOOL	_hasAlpha;
+	BOOL	_hasPremultipliedAlpha;
+	BOOL	_forcePremultipliedAlpha;
 
 	// cocos2d integration
-	BOOL retainName_;
-	CCTexture2DPixelFormat format_;
+	BOOL _retainName;
+	CCTexture2DPixelFormat _format;
+	
+	const ccPVRTexturePixelFormatInfo *_pixelFormatInfo;
 }
 
 /** initializes a CCTexturePVR with a path */
@@ -117,6 +130,10 @@ enum {
 @property (nonatomic,readonly) uint32_t height;
 /** whether or not the texture has alpha */
 @property (nonatomic,readonly) BOOL hasAlpha;
+/** whether or not the texture has premultiplied alpha */
+@property (nonatomic,readonly) BOOL hasPremultipliedAlpha;
+/** whether or not the texture should use hasPremultipliedAlpha instead of global default */
+@property (nonatomic,readonly) BOOL forcePremultipliedAlpha;
 /** how many mipmaps the texture has. 1 means one level (level 0 */
 @property (nonatomic, readonly) NSUInteger numberOfMipmaps;
 

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

@@ -47,13 +47,13 @@
 {
 
 	/// info about the map file
-	tImageTGA		*tgaInfo;
+	tImageTGA		*_tgaInfo;
 
-	/// x,y to altas dicctionary
-	NSMutableDictionary	*posToAtlasIndex;
+	/// x,y to altas dictionary
+	NSMutableDictionary	*_posToAtlasIndex;
 
 	/// numbers of tiles to render
-	int				itemsToRender;
+	int				_itemsToRender;
 }
 
 /** TileMap info */
@@ -72,12 +72,12 @@
 /** returns a tile from position x,y.
  For the moment only channel R is used
  */
--(ccColor3B) tileAt: (ccGridSize) position;
+-(ccColor3B) tileAt: (CGPoint) position;
 
 /** sets a tile at position x,y.
  For the moment only channel R is used
  */
--(void) setTile:(ccColor3B)tile at:(ccGridSize)position;
+-(void) setTile:(ccColor3B)tile at:(CGPoint)position;
 /** dealloc the map from memory */
 -(void) releaseMap;
 @end