diff -r d4c395f25db2 -r bad2a30d5d6c cocoaTouch/SDL_uikitview.h --- a/cocoaTouch/SDL_uikitview.h Thu Jan 07 19:50:40 2010 +0000 +++ b/cocoaTouch/SDL_uikitview.h Thu Jan 07 22:49:25 2010 +0000 @@ -1,24 +1,24 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga, mods for Hedgewars by Vittorio Giovara - slouken@libsdl.org, vittorio.giovara@gmail.com -*/ + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2009 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga, mods for Hedgewars by Vittorio Giovara + slouken@libsdl.org, vittorio.giovara@gmail.com + */ #import #include "SDL_stdinc.h" @@ -36,29 +36,32 @@ // constants for telling which input has been received #define kMinimumPinchDelta 100 -#define kMinimumGestureLength 25 -#define kMaximumVariance 5 +#define kMinimumGestureLength 20 +#define kMaximumVariance 4 /* *INDENT-OFF* */ -#if SDL_IPHONE_KEYBOARD -@interface SDL_uikitview : UIView { -#else +//#if SDL_IPHONE_KEYBOARD +//@interface SDL_uikitview : UIView { +//#else @interface SDL_uikitview : UIView { -#endif - +//#endif SDL_Mouse mice[MAX_SIMULTANEOUS_TOUCHES]; CGFloat initialDistance; CGPoint gestureStartPoint; - + #if SDL_IPHONE_KEYBOARD UITextField *textField; BOOL keyboardVisible; #endif } -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; -- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; -- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event; +-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; +-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; +-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event; + +// see initWithFrame for why "+" ++(void) attackButtonPressed; ++(void) attackButtonReleased; @property CGFloat initialDistance; @property CGPoint gestureStartPoint; @@ -69,6 +72,6 @@ - (void)initializeKeyboard; @property (readonly) BOOL keyboardVisible; #endif - + @end /* *INDENT-ON* */