joybox 0.0.5 → 0.0.6

data/vendor/vendor-osx/cocos_2d/cocos_2d_include/ccShader_PositionTextureColor_frag.h

@@ -0,0 +1,39 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2011 Ricardo Quesada
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+"											\n\
+#ifdef GL_ES								\n\
+precision lowp float;						\n\
+#endif										\n\
+											\n\
+varying vec4 v_fragmentColor;				\n\
+varying vec2 v_texCoord;					\n\
+uniform sampler2D CC_Texture0;				\n\
+											\n\
+void main()									\n\
+{											\n\
+	gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord);			\n\
+}											\n\
+";

data/vendor/vendor-osx/cocos_2d/cocos_2d_include/ccShader_PositionTextureColor_vert.h

@@ -0,0 +1,45 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2011 Ricardo Quesada
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+"													\n\
+attribute vec4 a_position;							\n\
+attribute vec2 a_texCoord;							\n\
+attribute vec4 a_color;								\n\
+													\n\
+#ifdef GL_ES										\n\
+varying lowp vec4 v_fragmentColor;					\n\
+varying mediump vec2 v_texCoord;					\n\
+#else												\n\
+varying vec4 v_fragmentColor;						\n\
+varying vec2 v_texCoord;							\n\
+#endif												\n\
+													\n\
+void main()											\n\
+{													\n\
+    gl_Position = CC_MVPMatrix * a_position;		\n\
+	v_fragmentColor = a_color;						\n\
+	v_texCoord = a_texCoord;						\n\
+}													\n\
+";

data/vendor/vendor-osx/cocos_2d/cocos_2d_include/ccShader_PositionTexture_frag.h

@@ -0,0 +1,38 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2011 Ricardo Quesada
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+"																		\n\
+#ifdef GL_ES															\n\
+precision lowp float;													\n\
+#endif																	\n\
+																		\n\
+varying vec2 v_texCoord;												\n\
+uniform sampler2D CC_Texture0;											\n\
+																		\n\
+void main()																\n\
+{																		\n\
+	gl_FragColor =  texture2D(CC_Texture0, v_texCoord);					\n\
+}																		\n\
+";

data/vendor/vendor-osx/cocos_2d/cocos_2d_include/ccShader_PositionTexture_uColor_frag.h

@@ -0,0 +1,41 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2011 Ricardo Quesada
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+"										\n\
+#ifdef GL_ES							\n\
+precision lowp float;					\n\
+#endif									\n\
+										\n\
+uniform		vec4 u_color;				\n\
+										\n\
+varying vec2 v_texCoord;				\n\
+										\n\
+uniform sampler2D CC_Texture0;			\n\
+										\n\
+void main()								\n\
+{										\n\
+	gl_FragColor =  texture2D(CC_Texture0, v_texCoord) * u_color;	\n\
+}										\n\
+";

data/vendor/vendor-osx/cocos_2d/cocos_2d_include/ccShader_PositionTexture_uColor_vert.h

@@ -0,0 +1,41 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2011 Ricardo Quesada
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+"									\n\
+attribute vec4 a_position;			\n\
+attribute vec2 a_texCoord;			\n\
+									\n\
+#ifdef GL_ES						\n\
+varying mediump vec2 v_texCoord;	\n\
+#else								\n\
+varying vec2 v_texCoord;			\n\
+#endif								\n\
+									\n\
+void main()							\n\
+{									\n\
+    gl_Position = CC_MVPMatrix * a_position;		\n\
+	v_texCoord = a_texCoord;		\n\
+}									\n\
+";

data/vendor/vendor-osx/cocos_2d/cocos_2d_include/ccShader_PositionTexture_vert.h

@@ -0,0 +1,41 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2011 Ricardo Quesada
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+"														\n\
+attribute vec4 a_position;								\n\
+attribute vec2 a_texCoord;								\n\
+														\n\
+#ifdef GL_ES											\n\
+varying mediump vec2 v_texCoord;						\n\
+#else													\n\
+varying vec2 v_texCoord;								\n\
+#endif													\n\
+														\n\
+void main()												\n\
+{														\n\
+    gl_Position = CC_MVPMatrix * a_position;			\n\
+	v_texCoord = a_texCoord;							\n\
+}														\n\
+";

data/vendor/vendor-osx/cocos_2d/cocos_2d_include/ccShader_Position_uColor_frag.h

@@ -0,0 +1,37 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2011 Ricardo Quesada
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+"										\n\
+#ifdef GL_ES							\n\
+precision lowp float;					\n\
+#endif									\n\
+										\n\
+varying vec4 v_fragmentColor;			\n\
+										\n\
+void main()								\n\
+{										\n\
+	gl_FragColor = v_fragmentColor;		\n\
+}										\n\
+";

data/vendor/vendor-osx/cocos_2d/cocos_2d_include/ccShader_Position_uColor_vert.h

@@ -0,0 +1,43 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2011 Ricardo Quesada
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+"													\n\
+attribute vec4 a_position;							\n\
+uniform	vec4 u_color;								\n\
+uniform float u_pointSize;							\n\
+													\n\
+#ifdef GL_ES										\n\
+varying lowp vec4 v_fragmentColor;					\n\
+#else												\n\
+varying vec4 v_fragmentColor;						\n\
+#endif												\n\
+													\n\
+void main()											\n\
+{													\n\
+    gl_Position = CC_MVPMatrix * a_position;		\n\
+	gl_PointSize = u_pointSize;						\n\
+	v_fragmentColor = u_color;						\n\
+}													\n\
+";

data/vendor/vendor-osx/cocos_2d/cocos_2d_include/ccShaders.h

@@ -0,0 +1,56 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2012 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import "Platforms/CCGL.h"
+
+#ifdef __cplusplus__
+extern "C" {
+#endif // __cplusplus__
+
+extern const GLchar * ccPosition_uColor_frag;
+extern const GLchar * ccPosition_uColor_vert;
+
+extern const GLchar * ccPositionColor_frag;
+extern const GLchar * ccPositionColor_vert;
+
+extern const GLchar * ccPositionTexture_frag;
+extern const GLchar * ccPositionTexture_vert;
+
+extern const GLchar * ccPositionTextureA8Color_frag;
+extern const GLchar * ccPositionTextureA8Color_vert;
+
+extern const GLchar * ccPositionTextureColor_frag;
+extern const GLchar * ccPositionTextureColor_vert;
+
+extern const GLchar * ccPositionTextureColorAlphaTest_frag;
+
+extern const GLchar * ccPositionTexture_uColor_frag;
+extern const GLchar * ccPositionTexture_uColor_vert;
+
+extern const GLchar * ccPositionColorLengthTexture_frag;
+extern const GLchar * ccPositionColorLengthTexture_vert;
+
+#ifdef __cplusplus__
+}
+#endif // __cplusplus__

data/vendor/{Cocos2D/include → vendor-osx/cocos_2d/cocos_2d_include}/ccTypes.h

@@ -32,15 +32,9 @@
 #import <Foundation/Foundation.h>
 #import "ccMacros.h"
 
-#ifdef __CC_PLATFORM_IOS
-#import <CoreGraphics/CGGeometry.h>	// CGPoint
-#endif
-
 #import "Platforms/CCGL.h"
 
-/** RGB color composed of bytes 3 bytes
-@since v0.8
- */
+
 typedef struct _ccColor3B
 {
 	GLubyte	r;
@@ -55,7 +49,8 @@ ccc3(const GLubyte r, const GLubyte g, const GLubyte b)
 	ccColor3B c = {r, g, b};
 	return c;
 }
-//ccColor3B predefined colors
+
+	//ccColor3B predefined colors
 //! White color (255,255,255)
 static const ccColor3B ccWHITE = {255,255,255};
 //! Yellow color (255,255,0)
@@ -93,17 +88,15 @@ ccc4(const GLubyte r, const GLubyte g, const GLubyte b, const GLubyte o)
 	return c;
 }
 
-
 /** RGBA color composed of 4 floats
 @since v0.8
 */
-struct ccColor4F {
+typedef struct _ccColor4F {
 	GLfloat r;
 	GLfloat g;
 	GLfloat b;
 	GLfloat a;
-};
-typedef struct ccColor4F ccColor4F;
+} ccColor4F;
 
 //! helper that creates a ccColor4f type
 static inline ccColor4F ccc4f(const GLfloat r, const GLfloat g, const GLfloat b, const GLfloat a)
@@ -134,6 +127,12 @@ static inline BOOL ccc4FEqual(ccColor4F a, ccColor4F b)
 {
 	return a.r == b.r && a.g == b.g && a.b == b.b && a.a == b.a;
 }
+	
+static inline ccColor4B ccc4BFromccc4F(ccColor4F c)
+{
+	return (ccColor4B){(GLubyte)(c.r*255), (GLubyte)(c.g*255), (GLubyte)(c.b*255), (GLubyte)(c.a*255)};
+}
+
 
 /** A vertex composed of 2 GLfloats: x, y
  @since v0.8
@@ -188,21 +187,6 @@ typedef struct _ccQuad3 {
 	ccVertex3F		tr;
 } ccQuad3;
 
-//! A 2D grid size
-typedef struct _ccGridSize
-{
-	NSInteger	x;
-	NSInteger	y;
-} ccGridSize;
-
-//! helper function to create a ccGridSize
-static inline ccGridSize
-ccg(const NSInteger x, const NSInteger y)
-{
-	ccGridSize v = {x, y};
-	return v;
-}
-
 //! a Point with a vertex point, a tex coord point and a color 4B
 typedef struct _ccV2F_C4B_T2F
 {
@@ -264,7 +248,19 @@ typedef struct _ccV3F_C4B_T2F
 	ccTex2F			texCoords;			// 8 byts
 } ccV3F_C4B_T2F;
 
-//! 4 ccVertex2FTex2FColor4B Quad
+	
+//! A Triangle of ccV2F_C4B_T2F 
+typedef struct _ccV2F_C4B_T2F_Triangle
+{
+	//! Point A
+	ccV2F_C4B_T2F a;
+	//! Point B
+	ccV2F_C4B_T2F b;
+	//! Point B
+	ccV2F_C4B_T2F c;
+} ccV2F_C4B_T2F_Triangle;
+	
+//! A Quad of ccV2F_C4B_T2F
 typedef struct _ccV2F_C4B_T2F_Quad
 {
 	//! bottom left
@@ -312,16 +308,22 @@ typedef struct _ccBlendFunc
 	GLenum dst;
 } ccBlendFunc;
 
+static const ccBlendFunc kCCBlendFuncDisable = {GL_ONE, GL_ZERO};
+
 //! ccResolutionType
 typedef enum
 {
-	//! Unknonw resolution type
+	//! Unknown resolution type
 	kCCResolutionUnknown,
 #ifdef __CC_PLATFORM_IOS
 	//! iPhone resolution type
 	kCCResolutioniPhone,
-	//! RetinaDisplay resolution type
+	//! iPhone RetinaDisplay resolution type
 	kCCResolutioniPhoneRetinaDisplay,
+	//! iPhone5 resolution type
+	kCCResolutioniPhone5,
+	//! iPhone 5 RetinaDisplay resolution type
+	kCCResolutioniPhone5RetinaDisplay,
 	//! iPad resolution type
 	kCCResolutioniPad,
 	//! iPad Retina Display resolution type
@@ -331,13 +333,13 @@ typedef enum
 	//! Mac resolution type
 	kCCResolutionMac,
 
-	//! Mac RetinaDisplay resolution type (???)
+	//! Mac RetinaDisplay resolution type
 	kCCResolutionMacRetinaDisplay,
 #endif // platform
 
 } ccResolutionType;
 
-// XXX: If any of these enums are edited and/or reordered, udpate CCTexture2D.m
+// XXX: If any of these enums are edited and/or reordered, update CCTexture2D.m
 //! Vertical text alignment type
 typedef enum
 {
@@ -346,7 +348,7 @@ typedef enum
     kCCVerticalTextAlignmentBottom,
 } CCVerticalTextAlignment;
 
-// XXX: If any of these enums are edited and/or reordered, udpate CCTexture2D.m
+// XXX: If any of these enums are edited and/or reordered, update CCTexture2D.m
 //! Horizontal text alignment type
 typedef enum
 {
@@ -355,7 +357,7 @@ typedef enum
 	kCCTextAlignmentRight,
 } CCTextAlignment;
 
-// XXX: If any of these enums are edited and/or reordered, udpate CCTexture2D.m
+// XXX: If any of these enums are edited and/or reordered, update CCTexture2D.m
 //! Line break modes
 typedef enum {
 	kCCLineBreakModeWordWrap,
@@ -368,7 +370,9 @@ typedef enum {
 
 //! delta time type
 //! if you want more resolution redefine it as a double
-typedef float ccTime;
+typedef CGFloat ccTime;
 //typedef double ccTime;
 
 typedef float ccMat4[16];
+	
+