joybox 0.0.5 → 0.0.6

data/vendor/vendor-ios/cocos_2d/include/Platforms/Mac/CCEventDispatcher.h

@@ -0,0 +1,343 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2010 Ricardo Quesada
+ * Copyright (c) 2011 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.
+ */
+
+// Only compile this code on Mac. These files should not be included on your iOS project.
+// But in case they are included, it won't be compiled.
+#import "../../ccMacros.h"
+#ifdef __CC_PLATFORM_MAC
+
+#import <Cocoa/Cocoa.h>
+
+#import "CCGLView.h"
+#import "../../Support/uthash.h"	// hack: uthash needs to be imported before utlist to prevent warning
+#import "../../Support/utlist.h"
+#import "../../ccConfig.h"
+
+#pragma mark -
+#pragma mark CCMouseEventDelegate
+
+/** CCMouseEventDelegate protocol.
+ Implement it in your node to receive any of mouse events
+ */
+@protocol CCMouseEventDelegate <NSObject>
+@optional
+
+//
+// left
+//
+/** called when the "mouseDown" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccMouseDown:(NSEvent*)event;
+
+/** called when the "mouseDragged" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccMouseDragged:(NSEvent*)event;
+
+/** called when the "mouseMoved" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ By default, "mouseMoved" is disabled. To enable it, send the "setAcceptsMouseMovedEvents:YES" message to the main window.
+ */
+-(BOOL) ccMouseMoved:(NSEvent*)event;
+
+/** called when the "mouseUp" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccMouseUp:(NSEvent*)event;
+
+
+//
+// right
+//
+
+/** called when the "rightMouseDown" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccRightMouseDown:(NSEvent*)event;
+
+/** called when the "rightMouseDragged" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccRightMouseDragged:(NSEvent*)event;
+
+/** called when the "rightMouseUp" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccRightMouseUp:(NSEvent*)event;
+
+//
+// other
+//
+
+/** called when the "otherMouseDown" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccOtherMouseDown:(NSEvent*)event;
+
+/** called when the "otherMouseDragged" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccOtherMouseDragged:(NSEvent*)event;
+
+/** called when the "otherMouseUp" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccOtherMouseUp:(NSEvent*)event;
+
+//
+// scroll wheel
+//
+
+/** called when the "scrollWheel" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccScrollWheel:(NSEvent *)theEvent;
+
+
+//
+// enter / exit
+//
+
+/** called when the "mouseEntered" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (void)ccMouseEntered:(NSEvent *)theEvent;
+
+/** called when the "mouseExited" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (void)ccMouseExited:(NSEvent *)theEvent;
+
+@end
+
+#pragma mark -
+#pragma mark CCKeyboardEventDelegate
+
+/** CCKeyboardEventDelegate protocol.
+ Implement it in your node to receive any of keyboard events
+ */
+@protocol CCKeyboardEventDelegate <NSObject>
+@optional
+/** called when the "keyUp" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccKeyUp:(NSEvent*)event;
+
+/** called when the "keyDown" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccKeyDown:(NSEvent*)event;
+/** called when the "flagsChanged" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+-(BOOL) ccFlagsChanged:(NSEvent*)event;
+@end
+
+#pragma mark -
+#pragma mark CCTouchEventDelegate
+
+/** CCTouchEventDelegate protocol.
+ Implement it in your node to receive any of touch events
+ */
+@protocol CCTouchEventDelegate <NSObject>
+@optional
+/** called when the "touchesBegan" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccTouchesBeganWithEvent:(NSEvent *)event;
+
+/** called when the "touchesMoved" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccTouchesMovedWithEvent:(NSEvent *)event;
+
+/** called when the "touchesEnded" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccTouchesEndedWithEvent:(NSEvent *)event;
+
+/** called when the "touchesCancelled" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccTouchesCancelledWithEvent:(NSEvent *)event;
+
+@end
+
+#pragma mark -
+#pragma mark CCGestureEventDelegate
+
+/** CCGestureEventDelegate protocol.
+ Implement it in your node to receive any of gesture events
+ */
+@protocol CCGestureEventDelegate <NSObject>
+@optional
+
+/** called when the "beginGesture" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccBeginGestureWithEvent:(NSEvent *)event;
+
+/** called when the "magnify" gesture event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccMagnifyWithEvent:(NSEvent *)event;
+
+/** called when the "smartMagnify" gesture event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccSmartMagnifyWithEvent:(NSEvent *)event;
+
+/** called when the "rotate" gesture event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccRotateWithEvent:(NSEvent *)event;
+
+/** called when the "swipe" gesture event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccSwipeWithEvent:(NSEvent *)event;
+
+/** called when the "endGesture" event is received.
+ Return YES to avoid propagating the event to other delegates.
+ */
+- (BOOL)ccEndGestureWithEvent:(NSEvent *)event;
+
+@end
+
+#pragma mark - CCEventObject
+
+@interface CCEventObject : NSObject
+{
+@public
+	NSEvent		*event;
+	SEL			selector;
+}
+@end
+
+#pragma mark - CCEventDispatcher
+
+struct _listEntry;
+struct _listDeletedEntry;
+struct _listAddedEntry;
+
+/** CCEventDispatcher
+
+ This is object is responsible for dispatching the events:
+	- Mouse events
+	- Keyboard events
+	- Touch events
+
+ Only available on Mac
+ */
+@interface CCEventDispatcher : NSObject <CCEventDelegate>
+{
+	BOOL					_dispatchEvents;
+	BOOL					_locked;
+
+	struct	_listEntry		*_keyboardDelegates;
+	struct	_listEntry		*_mouseDelegates;
+	struct	_listEntry		*_touchDelegates;
+	struct	_listEntry		*_gestureDelegates;
+	
+	struct	_listDeletedEntry	*_delegatesToBeRemoved;
+	struct	_listAddedEntry		*_delegatesToBeAdded;
+	
+}
+
+@property (nonatomic, readwrite) BOOL dispatchEvents;
+
+#pragma mark CCEventDispatcher - Mouse
+
+/** Adds a mouse delegate to the dispatcher's list.
+ Delegates with a lower priority value will be called before higher priority values.
+ All the events will be propagated to all the delegates, unless the one delegate returns YES.
+
+ IMPORTANT: The delegate will be retained.
+ */
+-(void) addMouseDelegate:(id<CCMouseEventDelegate>) delegate priority:(NSInteger)priority;
+
+/** removes a mouse delegate */
+-(void) removeMouseDelegate:(id) delegate;
+
+/** Removes all mouse delegates, releasing all the delegates */
+-(void) removeAllMouseDelegates;
+
+#pragma mark CCEventDispatcher - Keyboard
+
+/** Adds a Keyboard delegate to the dispatcher's list.
+ Delegates with a lower priority value will be called before higher priority values.
+ All the events will be propagated to all the delegates, unless the one delegate returns YES.
+
+ IMPORTANT: The delegate will be retained.
+ */
+-(void) addKeyboardDelegate:(id<CCKeyboardEventDelegate>) delegate priority:(NSInteger)priority;
+
+/** removes a mouse delegate */
+-(void) removeKeyboardDelegate:(id) delegate;
+
+/** Removes all mouse delegates, releasing all the delegates */
+-(void) removeAllKeyboardDelegates;
+
+#pragma mark CCEventDispatcher - Touches
+
+/** Adds a Touch delegate to the dispatcher's list.
+ Delegates with a lower priority value will be called before higher priority values.
+ All the events will be propagated to all the delegates, unless the one delegate returns YES.
+
+ IMPORTANT: The delegate will be retained.
+ */
+- (void)addTouchDelegate:(id<CCTouchEventDelegate>)delegate priority:(NSInteger)priority;
+
+/** Removes a touch delegate */
+- (void)removeTouchDelegate:(id) delegate;
+
+/** Removes all touch delegates, releasing all the delegates */
+- (void)removeAllTouchDelegates;
+
+#pragma mark CCEventDispatcher - Gesture
+
+/** Adds a gesture delegate to the dispatcher's list.
+ Delegates with a lower priority value will be called before higher priority values.
+ All the events will be propagated to all the delegates, unless the one delegate returns YES.
+ 
+ IMPORTANT: The delegate will be retained.
+ */
+- (void)addGestureDelegate:(id<CCGestureEventDelegate>)delegate priority:(NSInteger)priority;
+
+/** Removes a gesture delegate */
+- (void)removeGestureDelegate:(id) delegate;
+
+/** Removes all gesture delegates, releasing all the delegates */
+- (void)removeAllGestureDelegates;
+
+#pragma mark CCEventDispatcher - Dispatch
+
+-(void) dispatchEvent:(CCEventObject*)event;
+
+@end
+
+
+#endif // __CC_PLATFORM_MAC

data/vendor/vendor-ios/cocos_2d/include/Platforms/Mac/CCGLView.h

@@ -0,0 +1,103 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2010 Ricardo Quesada
+ * Copyright (c) 2011 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.
+ */
+
+// Only compile this code on Mac. These files should not be included on your iOS project.
+// But in case they are included, it won't be compiled.
+#import "../../ccMacros.h"
+#ifdef __CC_PLATFORM_MAC
+
+#import <Cocoa/Cocoa.h>
+
+#import "../../ccConfig.h"
+
+//PROTOCOLS:
+
+@protocol CCEventDelegate <NSObject>
+// Mouse
+- (void)mouseDown:(NSEvent *)theEvent;
+- (void)mouseUp:(NSEvent *)theEvent;
+- (void)mouseMoved:(NSEvent *)theEvent;
+- (void)mouseDragged:(NSEvent *)theEvent;
+- (void)rightMouseDown:(NSEvent*)event;
+- (void)rightMouseDragged:(NSEvent*)event;
+- (void)rightMouseUp:(NSEvent*)event;
+- (void)otherMouseDown:(NSEvent*)event;
+- (void)otherMouseDragged:(NSEvent*)event;
+- (void)otherMouseUp:(NSEvent*)event;
+- (void)scrollWheel:(NSEvent *)theEvent;
+- (void)mouseEntered:(NSEvent *)theEvent;
+- (void)mouseExited:(NSEvent *)theEvent;
+
+
+// Keyboard
+- (void)keyDown:(NSEvent *)theEvent;
+- (void)keyUp:(NSEvent *)theEvent;
+- (void)flagsChanged:(NSEvent *)theEvent;
+
+// Touches
+- (void)touchesBeganWithEvent:(NSEvent *)event;
+- (void)touchesMovedWithEvent:(NSEvent *)event;
+- (void)touchesEndedWithEvent:(NSEvent *)event;
+- (void)touchesCancelledWithEvent:(NSEvent *)event;
+
+// Gestures
+- (void)beginGestureWithEvent:(NSEvent *)event;
+- (void)magnifyWithEvent:(NSEvent *)event;
+- (void)smartMagnifyWithEvent:(NSEvent *)event;
+- (void)rotateWithEvent:(NSEvent *)event;
+- (void)swipeWithEvent:(NSEvent *)event;
+- (void)endGestureWithEvent:(NSEvent *)event;
+
+@end
+
+/** CCGLView
+
+ Only available for Mac OS X
+ */
+@interface CCGLView : NSOpenGLView {
+	id<CCEventDelegate> _eventDelegate;
+}
+
+/** Event delegate */
+@property (nonatomic, readwrite, assign) id<CCEventDelegate> eventDelegate;
+
+/** initializes the CCGLView with a frame rect and an OpenGL context */
+- (id) initWithFrame:(NSRect)frameRect shareContext:(NSOpenGLContext*)context;
+
+/** uses and locks the OpenGL context */
+-(void) lockOpenGLContext;
+
+/** unlocks the openGL context */
+-(void) unlockOpenGLContext;
+
+/** returns the depth format of the view in BPP */
+- (NSUInteger) depthFormat;
+
+// private
++(void) load_;
+@end
+
+#endif // __CC_PLATFORM_MAC
+

data/vendor/vendor-ios/cocos_2d/include/Platforms/Mac/CCWindow.h

@@ -0,0 +1,41 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2010 Ricardo Quesada
+ *
+ * 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.
+ */
+
+// Only compile this code on Mac. These files should not be included on your iOS project.
+// But in case they are included, it won't be compiled.
+#import "../../ccMacros.h"
+#ifdef __CC_PLATFORM_MAC
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface CCWindow : NSWindow
+{
+}
+- (id) initWithFrame:(NSRect)frame fullscreen:(BOOL)fullscreen;
+
+@end
+
+
+#endif // __CC_PLATFORM_MAC

data/vendor/{Cocos2D/include → vendor-ios/cocos_2d/include/Platforms/iOS}/CCDirectorIOS.h

@@ -55,13 +55,16 @@
  It will enable Retina Display on iPhone4 and iPod Touch 4.
  It will return YES, if it could enabled it, otherwise it will return NO.
 
- This is the recommened way to enable Retina Display.
+ This is the recommended way to enable Retina Display.
  @since v0.99.5
  */
 -(BOOL) enableRetinaDisplay:(BOOL)enableRetina;
 
 /** returns the content scale factor */
 -(CGFloat) contentScaleFactor;
+
+/** converts a UITouch to a GL point */
+-(CGPoint)convertTouchToGL:(UITouch*)touch;
 @end
 
 #pragma mark -
@@ -73,10 +76,14 @@
 @interface CCDirectorIOS : CCDirector
 {
 	/* contentScaleFactor could be simulated */
-	BOOL	isContentScaleSupported_;
+	BOOL	_isContentScaleSupported;
 	
-	CCTouchDispatcher	*touchDispatcher_;
+	CCTouchDispatcher	*_touchDispatcher;
 }
+
+// XXX: At least one method is needed for BridgeSupport
+- (void) drawScene;
+
 @end
 
 /** DisplayLinkDirector is a Director that synchronizes timers with the refresh rate of the display.
@@ -92,8 +99,8 @@
  */
 @interface CCDirectorDisplayLink : CCDirectorIOS
 {
-	CADisplayLink	*displayLink_;
-	CFTimeInterval	lastDisplayTime_;
+	CADisplayLink	*_displayLink;
+	CFTimeInterval	_lastDisplayTime;
 }
 -(void) mainLoop:(id)sender;
 @end

data/vendor/{Cocos2D/include → vendor-ios/cocos_2d/include/Platforms/iOS}/CCES2Renderer.h

@@ -39,26 +39,26 @@
 @interface CCES2Renderer : NSObject <CCESRenderer>
 {
     // The pixel dimensions of the CAEAGLLayer
-    GLint backingWidth_;
-    GLint backingHeight_;
+    GLint _backingWidth;
+    GLint _backingHeight;
 
-	unsigned int	samplesToUse_;
-	BOOL			multiSampling_;
+	unsigned int	_samplesToUse;
+	BOOL			_multiSampling;
 
-	unsigned int	depthFormat_;
-	unsigned int	pixelFormat_;
+	unsigned int	_depthFormat;
+	unsigned int	_pixelFormat;
 
 	// The OpenGL ES names for the framebuffer and renderbuffer used to render to this view
-    GLuint defaultFramebuffer_;
-	GLuint colorRenderbuffer_;
-	GLuint depthBuffer_;
+	GLuint _defaultFramebuffer;
+	GLuint _colorRenderbuffer;
+	GLuint _depthBuffer;
 
 
 	//buffers for MSAA
-	GLuint msaaFramebuffer_;
-	GLuint msaaColorbuffer_;
+	GLuint _msaaFramebuffer;
+	GLuint _msaaColorbuffer;
 
-	EAGLContext *context_;
+	EAGLContext *_context;
 }
 
 /** Color Renderbuffer */

data/vendor/{Cocos2D/include → vendor-ios/cocos_2d/include/Platforms/iOS}/CCGLView.h

@@ -90,26 +90,41 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
 //CLASS INTERFACE:
 
 /** CCGLView Class.
- * This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass.
- * The view content is basically an EAGL surface you render your OpenGL scene into.
- * Note that setting the view non-opaque will only work if the EAGL surface has an alpha channel.
+ This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass.
+ The view content is basically an EAGL surface you render your OpenGL scene into.
+ Note that setting the view non-opaque will only work if the EAGL surface has an alpha channel.
+
+ Parameters:
+
+ - viewWithFrame: size of the OpenGL view. For full screen use [_window bounds]
+	- Possible values: any CGRect
+ - pixelFormat: Format of the render buffer. Use RGBA8 for better color precision (eg: gradients). But it takes more memory and it is slower
+	- Possible values: kEAGLColorFormatRGBA8, kEAGLColorFormatRGB565
+ - depthFormat: Use stencil if you plan to use CCClippingNode. Use Depth if you plan to use 3D effects, like CCCamera or CCNode#vertexZ
+	- Possible values: 0, GL_DEPTH_COMPONENT24_OES, GL_DEPTH24_STENCIL8_OES
+ - sharegroup: OpenGL sharegroup. Useful if you want to share the same OpenGL context between different threads
+	- Possible values: nil, or any valid EAGLSharegroup group
+ - multiSampling: Whether or not to enable multisampling
+	- Possible values: YES, NO
+ - numberOfSamples: Only valid if multisampling is enabled
+	- Possible values: 0 to glGetIntegerv(GL_MAX_SAMPLES_APPLE)
  */
 @interface CCGLView : UIView
 {
-    id<CCESRenderer>		renderer_;
-	EAGLContext				*context_; // weak ref
+    id<CCESRenderer>		_renderer;
+	EAGLContext				*_context; // weak ref
 
-	NSString				*pixelformat_;
-	GLuint					depthFormat_;
-	BOOL					preserveBackbuffer_;
+	NSString				*_pixelformat;
+	GLuint					_depthFormat;
+	BOOL					_preserveBackbuffer;
 
-	CGSize					size_;
-	BOOL					discardFramebufferSupported_;
-	id<CCTouchDelegate>		touchDelegate_;
+	CGSize					_size;
+	BOOL					_discardFramebufferSupported;
+	id<CCTouchDelegate>		_touchDelegate;
 
 	//fsaa addition
-	BOOL					multisampling_;
-	unsigned int			requestedSamples_;
+	BOOL					_multisampling;
+	unsigned int			_requestedSamples;
 }
 
 /** creates an initializes an CCGLView with a frame and 0-bit depth buffer, and a RGB565 color buffer. */

data/vendor/{Cocos2D/include → vendor-ios/cocos_2d/include/Platforms/iOS}/CCTouchDelegateProtocol.h

@@ -31,7 +31,7 @@
 #import <UIKit/UIKit.h>
 
 /**
- CCTargetedTouchDelegate.
+ CCTouchOneByOneDelegate.
 
  Using this type of delegate results in two benefits:
  1. You don't need to deal with NSSets, the dispatcher does the job of splitting
@@ -45,7 +45,7 @@
  handler, without bothering the other handlers.)
  @since v0.8
  */
-@protocol CCTargetedTouchDelegate <NSObject>
+@protocol CCTouchOneByOneDelegate <NSObject>
 
 /** Return YES to claim the touch.
  @since v0.8
@@ -59,12 +59,12 @@
 @end
 
 /**
- CCStandardTouchDelegate.
+ CCTouchAllAtOnceDelegate.
 
  This type of delegate is the same one used by CocoaTouch. You will receive all the events (Began,Moved,Ended,Cancelled).
  @since v0.8
 */
-@protocol CCStandardTouchDelegate <NSObject>
+@protocol CCTouchAllAtOnceDelegate <NSObject>
 @optional
 - (void)ccTouchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
 - (void)ccTouchesMoved:(NSSet *)touches withEvent:(UIEvent *)event;

data/vendor/{Cocos2D/include → vendor-ios/cocos_2d/include/Platforms/iOS}/CCTouchDispatcher.h

@@ -98,12 +98,12 @@ struct ccTouchHandlerHelperData {
  See StandardTouchDelegate description.
  IMPORTANT: The delegate will be retained.
  */
--(void) addStandardDelegate:(id<CCStandardTouchDelegate>) delegate priority:(int)priority;
+-(void) addStandardDelegate:(id<CCTouchAllAtOnceDelegate>) delegate priority:(int)priority;
 /** Adds a targeted touch delegate to the dispatcher's list.
  See TargetedTouchDelegate description.
  IMPORTANT: The delegate will be retained.
  */
--(void) addTargetedDelegate:(id<CCTargetedTouchDelegate>) delegate priority:(int)priority swallowsTouches:(BOOL)swallowsTouches;
+-(void) addTargetedDelegate:(id<CCTouchOneByOneDelegate>) delegate priority:(int)priority swallowsTouches:(BOOL)swallowsTouches;
 /** Removes a touch delegate.
  The delegate will be released
  */