author | koda |
Tue, 19 Apr 2011 00:19:01 +0200 | |
changeset 5157 | a5a6ffc56141 |
parent 5156 | 641abe679bf0 |
child 5166 | d1eb1560b4d5 |
permissions | -rw-r--r-- |
3829 | 1 |
/* |
2 |
* Hedgewars-iOS, a Hedgewars port for iOS devices |
|
4976 | 3 |
* Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com> |
3829 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
16 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
|
17 |
* |
|
18 |
* File created on 16/03/2010. |
|
19 |
*/ |
|
20 |
||
3547 | 21 |
|
22 |
#import "OverlayViewController.h" |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
23 |
#import "InGameMenuViewController.h" |
3792 | 24 |
#import "HelpPageViewController.h" |
3924 | 25 |
#import "AmmoMenuViewController.h" |
3547 | 26 |
#import "PascalImports.h" |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
27 |
#import "CommodityFunctions.h" |
3547 | 28 |
#import "CGPointUtils.h" |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
29 |
#import "SDL_config_iphoneos.h" |
3547 | 30 |
#import "SDL_mouse.h" |
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
31 |
#import "ObjcExports.h" |
3547 | 32 |
|
33 |
#define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7] |
|
34 |
#define HIDING_TIME_NEVER [NSDate dateWithTimeIntervalSinceNow:10000] |
|
3941 | 35 |
#define doDim() [dimTimer setFireDate: (IS_DUALHEAD()) ? HIDING_TIME_NEVER : HIDING_TIME_DEFAULT] |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
36 |
#define doNotDim() [dimTimer setFireDate:HIDING_TIME_NEVER] |
3547 | 37 |
|
4855
2480ab325057
when multiple fingers are detected, remove all widgets in order to avoid accidental commands
koda
parents:
4541
diff
changeset
|
38 |
#define removeInputWidget() [[self.view viewWithTag:CONFIRMATION_TAG] removeFromSuperview]; \ |
2480ab325057
when multiple fingers are detected, remove all widgets in order to avoid accidental commands
koda
parents:
4541
diff
changeset
|
39 |
[[self.view viewWithTag:GRENADE_TAG] removeFromSuperview]; |
3547 | 40 |
|
41 |
@implementation OverlayViewController |
|
5154
851f36579ed4
initial refactoring for interfacing the game engine from the ios frontend (game doesn't run yet)
koda
parents:
5109
diff
changeset
|
42 |
@synthesize popoverController, popupMenu, helpPage, amvc, useClassicMenu, initialOrientation; |
3547 | 43 |
|
3976 | 44 |
#pragma mark - |
45 |
#pragma mark rotation |
|
5109
6d2e8a24277e
strangely enough, the new sdl rotation code is incompatible with our system... this is a workaround that should hold up until their code becomes more stable
koda
parents:
4976
diff
changeset
|
46 |
|
3547 | 47 |
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { |
4356 | 48 |
// don't rotate until the game is running for performance and synchronization with the sdlview |
49 |
if (isGameRunning() == NO) |
|
50 |
return (interfaceOrientation == (UIInterfaceOrientation) self.initialOrientation); |
|
3977 | 51 |
return rotationManager(interfaceOrientation); |
3547 | 52 |
} |
53 |
||
3976 | 54 |
// pause the game and remove objc menus so that animation is smoother |
55 |
-(void) willRotateToInterfaceOrientation:(UIInterfaceOrientation) toInterfaceOrientation duration:(NSTimeInterval) duration{ |
|
4356 | 56 |
if (isGameRunning() == NO) |
57 |
return; |
|
58 |
||
4454 | 59 |
HW_pause(); |
3976 | 60 |
[self dismissPopover]; |
4454 | 61 |
|
3976 | 62 |
if (self.amvc.isVisible && IS_DUALHEAD() == NO) { |
63 |
[self.amvc disappear]; |
|
64 |
wasVisible = YES; |
|
65 |
} else |
|
66 |
wasVisible = NO; |
|
67 |
||
68 |
[super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration]; |
|
4078 | 69 |
|
70 |
UIView *sdlView = [[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG]; |
|
71 |
switch (toInterfaceOrientation) { |
|
72 |
case UIDeviceOrientationLandscapeLeft: |
|
73 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(a)); |
|
74 |
break; |
|
75 |
case UIDeviceOrientationLandscapeRight: |
|
76 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(b)); |
|
77 |
break; |
|
78 |
default: |
|
79 |
// a debug log would spam too much |
|
80 |
break; |
|
81 |
} |
|
3976 | 82 |
} |
83 |
||
84 |
// now restore previous state |
|
85 |
-(void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation) fromInterfaceOrientation { |
|
4356 | 86 |
if (isGameRunning() == NO) |
87 |
return; |
|
88 |
||
3976 | 89 |
if (wasVisible || IS_DUALHEAD()) |
90 |
[self.amvc appearInView:self.view]; |
|
4454 | 91 |
HW_pauseToggle(); |
3976 | 92 |
|
93 |
[super didRotateFromInterfaceOrientation:fromInterfaceOrientation]; |
|
94 |
} |
|
95 |
||
4078 | 96 |
// while in dual head the above rotation functions are not called |
97 |
-(void) dualHeadRotation:(NSNotification *)notification { |
|
4356 | 98 |
if (isGameRunning() == NO) |
99 |
return; |
|
100 |
||
3547 | 101 |
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation]; |
5109
6d2e8a24277e
strangely enough, the new sdl rotation code is incompatible with our system... this is a workaround that should hold up until their code becomes more stable
koda
parents:
4976
diff
changeset
|
102 |
UIView *sdlView = [[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG]; |
6d2e8a24277e
strangely enough, the new sdl rotation code is incompatible with our system... this is a workaround that should hold up until their code becomes more stable
koda
parents:
4976
diff
changeset
|
103 |
|
3547 | 104 |
[UIView beginAnimations:@"rotation" context:NULL]; |
3976 | 105 |
[UIView setAnimationDuration:0.7]; |
3547 | 106 |
switch (orientation) { |
107 |
case UIDeviceOrientationLandscapeLeft: |
|
4078 | 108 |
self.view.frame = [[UIScreen mainScreen] bounds]; |
109 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(90)); |
|
5109
6d2e8a24277e
strangely enough, the new sdl rotation code is incompatible with our system... this is a workaround that should hold up until their code becomes more stable
koda
parents:
4976
diff
changeset
|
110 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(a)); |
3547 | 111 |
break; |
112 |
case UIDeviceOrientationLandscapeRight: |
|
4078 | 113 |
self.view.frame = [[UIScreen mainScreen] bounds]; |
114 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(-90)); |
|
5109
6d2e8a24277e
strangely enough, the new sdl rotation code is incompatible with our system... this is a workaround that should hold up until their code becomes more stable
koda
parents:
4976
diff
changeset
|
115 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(b)); |
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
116 |
break; |
3547 | 117 |
default: |
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
118 |
// a debug log would spam too much |
3547 | 119 |
break; |
120 |
} |
|
121 |
[UIView commitAnimations]; |
|
122 |
} |
|
123 |
||
124 |
#pragma mark - |
|
125 |
#pragma mark View Management |
|
3976 | 126 |
-(id) initWithCoder:(NSCoder *)aDecoder { |
127 |
if ((self = [super initWithCoder:aDecoder])) { |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
128 |
objcExportsInit(); |
3976 | 129 |
isAttacking = NO; |
130 |
wasVisible = NO; |
|
131 |
isPopoverVisible = NO; // it is called "popover" even on the iphone |
|
132 |
} |
|
133 |
return self; |
|
134 |
} |
|
3948
24daa33a3114
some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents:
3941
diff
changeset
|
135 |
|
3976 | 136 |
-(void) viewDidLoad { |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
137 |
CGRect screenRect = [[UIScreen mainScreen] bounds]; |
3977 | 138 |
self.view.frame = CGRectMake(0, 0, screenRect.size.height, screenRect.size.width); |
3976 | 139 |
self.view.center = CGPointMake(self.view.frame.size.height/2, self.view.frame.size.width/2); |
3978 | 140 |
self.view.alpha = 0; |
3697 | 141 |
|
3976 | 142 |
// detrmine the quanitiy and direction of the rotation |
143 |
if (self.interfaceOrientation == UIInterfaceOrientationLandscapeLeft) { |
|
144 |
a = 180; |
|
145 |
b = 0; |
|
146 |
} else { |
|
147 |
a = 0; |
|
148 |
b = 180; |
|
149 |
} |
|
150 |
||
3977 | 151 |
// get the number of screens to know the previous state whan a display is connected or detached |
4082 | 152 |
if ([UIScreen respondsToSelector:@selector(screens)]) |
153 |
initialScreenCount = [[UIScreen screens] count]; |
|
154 |
else |
|
155 |
initialScreenCount = 1; |
|
3977 | 156 |
|
157 |
// set initial orientation of the controller orientation |
|
158 |
switch (self.interfaceOrientation) { |
|
159 |
case UIDeviceOrientationLandscapeLeft: |
|
160 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(90)); |
|
161 |
break; |
|
162 |
case UIDeviceOrientationLandscapeRight: |
|
163 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(-90)); |
|
164 |
break; |
|
165 |
default: |
|
166 |
DLog(@"Nope"); |
|
167 |
break; |
|
168 |
} |
|
4078 | 169 |
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications]; |
170 |
[[NSNotificationCenter defaultCenter] addObserver:self |
|
171 |
selector:@selector(dualHeadRotation:) |
|
172 |
name:UIDeviceOrientationDidChangeNotification |
|
173 |
object:nil]; |
|
3977 | 174 |
|
3976 | 175 |
// the timer used to dim the overlay |
3941 | 176 |
dimTimer = [[NSTimer alloc] initWithFireDate:(IS_DUALHEAD()) ? HIDING_TIME_NEVER : [NSDate dateWithTimeIntervalSinceNow:6] |
3547 | 177 |
interval:1000 |
178 |
target:self |
|
179 |
selector:@selector(dimOverlay) |
|
180 |
userInfo:nil |
|
181 |
repeats:YES]; |
|
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
182 |
// add timer to runloop, otherwise it doesn't work |
3547 | 183 |
[[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode]; |
3697 | 184 |
|
4924 | 185 |
// display the help page, required by the popover on ipad |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
186 |
[[NSNotificationCenter defaultCenter] addObserver:self |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
187 |
selector:@selector(showHelp:) |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
188 |
name:@"show help ingame" |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
189 |
object:nil]; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
190 |
|
4098
40df542b5f62
i give up and disable rotation on the iphone; also fix smaller compilation issues
koda
parents:
4082
diff
changeset
|
191 |
// for iOS >= 3.2 |
4082 | 192 |
if ([UIScreen respondsToSelector:@selector(screens)]) { |
193 |
[[NSNotificationCenter defaultCenter] addObserver:self |
|
194 |
selector:@selector(numberOfScreensIncreased) |
|
195 |
name:UIScreenDidConnectNotification |
|
196 |
object:nil]; |
|
197 |
||
198 |
[[NSNotificationCenter defaultCenter] addObserver:self |
|
199 |
selector:@selector(numberOfScreensDecreased) |
|
200 |
name:UIScreenDidDisconnectNotification |
|
201 |
object:nil]; |
|
202 |
} |
|
4454 | 203 |
|
3976 | 204 |
// present the overlay |
3547 | 205 |
[UIView beginAnimations:@"showing overlay" context:NULL]; |
4098
40df542b5f62
i give up and disable rotation on the iphone; also fix smaller compilation issues
koda
parents:
4082
diff
changeset
|
206 |
[UIView setAnimationDuration:2]; |
3547 | 207 |
self.view.alpha = 1; |
208 |
[UIView commitAnimations]; |
|
209 |
} |
|
210 |
||
3941 | 211 |
-(void) numberOfScreensIncreased { |
212 |
if (initialScreenCount == 1) { |
|
213 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"New display detected" |
|
214 |
message:NSLocalizedString(@"Hedgewars supports multi-monitor configurations, but the screen has to be connected before launching the game.",@"") |
|
215 |
delegate:nil |
|
216 |
cancelButtonTitle:@"Ok" |
|
217 |
otherButtonTitles:nil]; |
|
218 |
[alert show]; |
|
219 |
[alert release]; |
|
4454 | 220 |
HW_pause(); |
3941 | 221 |
} |
222 |
} |
|
223 |
||
224 |
-(void) numberOfScreensDecreased { |
|
225 |
if (initialScreenCount == 2) { |
|
226 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Oh noes! Display disconnected" |
|
227 |
message:NSLocalizedString(@"A monitor has been disconnected while playing and this has ended the match! You need to restart the game if you wish to use the second display again.",@"") |
|
228 |
delegate:nil |
|
229 |
cancelButtonTitle:@"Ok" |
|
230 |
otherButtonTitles:nil]; |
|
231 |
[alert show]; |
|
232 |
[alert release]; |
|
4861
91f889289a47
(ios) perform a small change about how to close the game window, should hopefully save memory and avoid crashes (who am i kidding? that's the usual PR talk...)
koda
parents:
4856
diff
changeset
|
233 |
HW_terminate(NO); |
3941 | 234 |
} |
235 |
} |
|
236 |
||
237 |
||
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
238 |
-(void) showHelp:(id) sender { |
4144 | 239 |
if (self.helpPage == nil) { |
5155
f2165724605c
more refactoring, less warnings, less stuff kept around
koda
parents:
5154
diff
changeset
|
240 |
NSString *xibName = (IS_IPAD() ? @"HelpPageInGameViewController-iPad" : @"HelpPageInGameViewController-iPhone"); |
f2165724605c
more refactoring, less warnings, less stuff kept around
koda
parents:
5154
diff
changeset
|
241 |
self.helpPage = [[HelpPageViewController alloc] initWithNibName:xibName bundle:nil]; |
4144 | 242 |
} |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
243 |
self.helpPage.view.alpha = 0; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
244 |
[self.view addSubview:helpPage.view]; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
245 |
[UIView beginAnimations:@"helpingame" context:NULL]; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
246 |
self.helpPage.view.alpha = 1; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
247 |
[UIView commitAnimations]; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
248 |
doNotDim(); |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
249 |
} |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
250 |
|
5155
f2165724605c
more refactoring, less warnings, less stuff kept around
koda
parents:
5154
diff
changeset
|
251 |
-(void) removeOverlay { |
4924 | 252 |
[self.popupMenu performSelectorOnMainThread:@selector(dismiss) withObject:nil waitUntilDone:YES]; |
253 |
[self.popoverController performSelectorOnMainThread:@selector(dismissPopoverAnimated:) withObject:nil waitUntilDone:YES]; |
|
254 |
[self.view performSelectorOnMainThread:@selector(removeFromSuperview) withObject:nil waitUntilDone:YES]; |
|
255 |
} |
|
256 |
||
3783 | 257 |
-(void) didReceiveMemoryWarning { |
258 |
if (self.popupMenu.view.superview == nil) |
|
259 |
self.popupMenu = nil; |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
260 |
if (self.helpPage.view.superview == nil) |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
261 |
self.helpPage = nil; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
262 |
if (self.amvc.view.superview == nil) |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
263 |
self.amvc = nil; |
3996 | 264 |
if (IS_IPAD()) |
3971 | 265 |
if (((UIPopoverController *)self.popoverController).contentViewController.view.superview == nil) |
266 |
self.popoverController = nil; |
|
5156 | 267 |
|
3783 | 268 |
MSG_MEMCLEAN(); |
3971 | 269 |
[super didReceiveMemoryWarning]; |
3783 | 270 |
} |
271 |
||
3547 | 272 |
-(void) viewDidUnload { |
3783 | 273 |
// only objects initialized in viewDidLoad should be here |
4098
40df542b5f62
i give up and disable rotation on the iphone; also fix smaller compilation issues
koda
parents:
4082
diff
changeset
|
274 |
if (IS_DUALHEAD()) |
40df542b5f62
i give up and disable rotation on the iphone; also fix smaller compilation issues
koda
parents:
4082
diff
changeset
|
275 |
[[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications]; |
3783 | 276 |
[[NSNotificationCenter defaultCenter] removeObserver:self]; |
3978 | 277 |
[NSObject cancelPreviousPerformRequestsWithTarget:self |
278 |
selector:@selector(unsetPreciseStatus) |
|
279 |
object:nil]; |
|
3662
a44406f4369b
polish polish polish polish (also: panning horizontal fix, panning momentum, settings page reworked yet again, memory leaks, crashes, segfaults)
koda
parents:
3661
diff
changeset
|
280 |
dimTimer = nil; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
281 |
self.helpPage = nil; |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
282 |
[self dismissPopover]; |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
283 |
self.popoverController = nil; |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
284 |
self.amvc = nil; |
3662
a44406f4369b
polish polish polish polish (also: panning horizontal fix, panning momentum, settings page reworked yet again, memory leaks, crashes, segfaults)
koda
parents:
3661
diff
changeset
|
285 |
MSG_DIDUNLOAD(); |
3547 | 286 |
[super viewDidUnload]; |
287 |
} |
|
288 |
||
289 |
-(void) dealloc { |
|
290 |
[popupMenu release]; |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
291 |
[helpPage release]; |
3547 | 292 |
[popoverController release]; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
293 |
[amvc release]; |
3547 | 294 |
// dimTimer is autoreleased |
295 |
[super dealloc]; |
|
296 |
} |
|
297 |
||
298 |
#pragma mark - |
|
3976 | 299 |
#pragma mark overlay user interaction |
3547 | 300 |
// nice transition for dimming, should be called only by the timer himself |
301 |
-(void) dimOverlay { |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
302 |
if (isGameRunning()) { |
3547 | 303 |
[UIView beginAnimations:@"overlay dim" context:NULL]; |
304 |
[UIView setAnimationDuration:0.6]; |
|
305 |
self.view.alpha = 0.2; |
|
306 |
[UIView commitAnimations]; |
|
307 |
} |
|
308 |
} |
|
309 |
||
310 |
// set the overlay visible and put off the timer for enough time |
|
311 |
-(void) activateOverlay { |
|
312 |
self.view.alpha = 1; |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
313 |
doNotDim(); |
3547 | 314 |
} |
315 |
||
3626 | 316 |
// dim the overlay when there's no more input for a certain amount of time |
317 |
-(IBAction) buttonReleased:(id) sender { |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
318 |
if (isGameRunning() == NO) |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
319 |
return; |
3697 | 320 |
|
3626 | 321 |
UIButton *theButton = (UIButton *)sender; |
3697 | 322 |
|
3626 | 323 |
switch (theButton.tag) { |
324 |
case 0: |
|
325 |
case 1: |
|
326 |
case 2: |
|
327 |
case 3: |
|
3649 | 328 |
[NSObject cancelPreviousPerformRequestsWithTarget:self |
329 |
selector:@selector(unsetPreciseStatus) |
|
330 |
object:nil]; |
|
3626 | 331 |
HW_walkingKeysUp(); |
332 |
break; |
|
333 |
case 4: |
|
334 |
case 5: |
|
335 |
case 6: |
|
336 |
HW_otherKeysUp(); |
|
337 |
break; |
|
338 |
default: |
|
3660 | 339 |
DLog(@"Nope"); |
3626 | 340 |
break; |
341 |
} |
|
342 |
||
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
343 |
isAttacking = NO; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
344 |
doDim(); |
3626 | 345 |
} |
346 |
||
3697 | 347 |
// issue certain action based on the tag of the button |
3547 | 348 |
-(IBAction) buttonPressed:(id) sender { |
349 |
[self activateOverlay]; |
|
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
350 |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
351 |
if (isGameRunning() == NO) |
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
352 |
return; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
353 |
|
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
354 |
if (isPopoverVisible) |
3547 | 355 |
[self dismissPopover]; |
3779
3351a017d4ad
tap to dismiss 'get ready', add a toggle to enable/disable it
koda
parents:
3765
diff
changeset
|
356 |
|
3547 | 357 |
UIButton *theButton = (UIButton *)sender; |
358 |
switch (theButton.tag) { |
|
359 |
case 0: |
|
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
360 |
if (isAttacking == NO) |
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
361 |
HW_walkLeft(); |
3547 | 362 |
break; |
363 |
case 1: |
|
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
364 |
if (isAttacking == NO) |
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
365 |
HW_walkRight(); |
3547 | 366 |
break; |
367 |
case 2: |
|
3649 | 368 |
[self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8]; |
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
369 |
HW_preciseSet(!HW_isWeaponRope()); |
3547 | 370 |
HW_aimUp(); |
371 |
break; |
|
372 |
case 3: |
|
3649 | 373 |
[self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8]; |
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
374 |
HW_preciseSet(!HW_isWeaponRope()); |
3547 | 375 |
HW_aimDown(); |
376 |
break; |
|
377 |
case 4: |
|
378 |
HW_shoot(); |
|
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
379 |
isAttacking = YES; |
3547 | 380 |
break; |
381 |
case 5: |
|
382 |
HW_jump(); |
|
383 |
break; |
|
384 |
case 6: |
|
385 |
HW_backjump(); |
|
386 |
break; |
|
387 |
case 10: |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
388 |
playSound(@"clickSound"); |
4504
8906b2409d97
add the appirater class for getting more positive reviews
koda
parents:
4454
diff
changeset
|
389 |
clearView(); |
3667 | 390 |
HW_pause(); |
3941 | 391 |
if (self.amvc.isVisible && IS_DUALHEAD() == NO) { |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
392 |
doDim(); |
3935 | 393 |
[self.amvc disappear]; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
394 |
} |
4855
2480ab325057
when multiple fingers are detected, remove all widgets in order to avoid accidental commands
koda
parents:
4541
diff
changeset
|
395 |
removeInputWidget(); |
3547 | 396 |
[self showPopover]; |
397 |
break; |
|
3624 | 398 |
case 11: |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
399 |
playSound(@"clickSound"); |
4504
8906b2409d97
add the appirater class for getting more positive reviews
koda
parents:
4454
diff
changeset
|
400 |
clearView(); |
4855
2480ab325057
when multiple fingers are detected, remove all widgets in order to avoid accidental commands
koda
parents:
4541
diff
changeset
|
401 |
removeInputWidget(); |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
402 |
|
3941 | 403 |
if (IS_DUALHEAD() || self.useClassicMenu == NO) { |
3935 | 404 |
if (self.amvc == nil) |
405 |
self.amvc = [[AmmoMenuViewController alloc] init]; |
|
4362
8dae325dc625
added missing graphics and fixed some glitches/crashes/bugs
koda
parents:
4356
diff
changeset
|
406 |
setAmmoMenuInstance(amvc); |
3935 | 407 |
if (self.amvc.isVisible) { |
408 |
doDim(); |
|
409 |
[self.amvc disappear]; |
|
410 |
} else { |
|
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
411 |
if (HW_isAmmoMenuNotAllowed() == NO) { |
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
412 |
doNotDim(); |
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
413 |
[self.amvc appearInView:self.view]; |
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
414 |
} |
3935 | 415 |
} |
3941 | 416 |
} else { |
4362
8dae325dc625
added missing graphics and fixed some glitches/crashes/bugs
koda
parents:
4356
diff
changeset
|
417 |
setAmmoMenuInstance(nil); |
3941 | 418 |
HW_ammoMenu(); |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
419 |
} |
3624 | 420 |
break; |
3547 | 421 |
default: |
3626 | 422 |
DLog(@"Nope"); |
3547 | 423 |
break; |
424 |
} |
|
425 |
} |
|
426 |
||
3649 | 427 |
-(void) unsetPreciseStatus { |
428 |
HW_preciseSet(NO); |
|
429 |
} |
|
430 |
||
3976 | 431 |
-(void) sendHWClick { |
432 |
HW_click(); |
|
4855
2480ab325057
when multiple fingers are detected, remove all widgets in order to avoid accidental commands
koda
parents:
4541
diff
changeset
|
433 |
removeInputWidget(); |
3976 | 434 |
doDim(); |
435 |
} |
|
436 |
||
437 |
-(void) setGrenadeTime:(id) sender { |
|
438 |
UISegmentedControl *theSegment = (UISegmentedControl *)sender; |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
439 |
if (cachedGrenadeTime() != theSegment.selectedSegmentIndex) { |
3976 | 440 |
HW_setGrenadeTime(theSegment.selectedSegmentIndex + 1); |
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
441 |
setGrenadeTime(theSegment.selectedSegmentIndex); |
3976 | 442 |
} |
443 |
} |
|
444 |
||
445 |
#pragma mark - |
|
446 |
#pragma mark other menu |
|
3547 | 447 |
// present a further check before closing game |
448 |
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { |
|
449 |
if ([actionSheet cancelButtonIndex] != buttonIndex) |
|
4861
91f889289a47
(ios) perform a small change about how to close the game window, should hopefully save memory and avoid crashes (who am i kidding? that's the usual PR talk...)
koda
parents:
4856
diff
changeset
|
450 |
HW_terminate(NO); |
3547 | 451 |
else |
3697 | 452 |
HW_pause(); |
3547 | 453 |
} |
454 |
||
455 |
// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize |
|
456 |
// on iphone instead just use the tableViewController directly (and implement manually all animations) |
|
457 |
-(IBAction) showPopover{ |
|
3667 | 458 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3547 | 459 |
isPopoverVisible = YES; |
460 |
||
3996 | 461 |
if (IS_IPAD()) { |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
462 |
if (self.popupMenu == nil) |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
463 |
self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain]; |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
464 |
if (self.popoverController == nil) { |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
465 |
self.popoverController = [[UIPopoverController alloc] initWithContentViewController:self.popupMenu]; |
4935 | 466 |
[self.popoverController setPopoverContentSize:CGSizeMake(220, 200) animated:YES]; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
467 |
[self.popoverController setPassthroughViews:[NSArray arrayWithObject:self.view]]; |
3547 | 468 |
} |
3551 | 469 |
|
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
470 |
[self.popoverController presentPopoverFromRect:CGRectMake(screen.size.height / 2, screen.size.width / 2, 1, 1) |
3547 | 471 |
inView:self.view |
3667 | 472 |
permittedArrowDirections:UIPopoverArrowDirectionAny |
3547 | 473 |
animated:YES]; |
474 |
} else { |
|
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
475 |
if (self.popupMenu == nil) |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
476 |
self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStyleGrouped]; |
3697 | 477 |
|
3547 | 478 |
[self.view addSubview:popupMenu.view]; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
479 |
[self.popupMenu present]; |
3547 | 480 |
} |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
481 |
self.popupMenu.tableView.scrollEnabled = NO; |
3547 | 482 |
} |
483 |
||
484 |
// on ipad just dismiss it, on iphone transtion to the right |
|
485 |
-(void) dismissPopover { |
|
486 |
if (YES == isPopoverVisible) { |
|
487 |
isPopoverVisible = NO; |
|
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
488 |
if (HW_isPaused()) |
4454 | 489 |
HW_pauseToggle(); |
3697 | 490 |
|
4920 | 491 |
[self.popupMenu dismiss]; |
492 |
if (IS_IPAD()) |
|
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
493 |
[self.popoverController dismissPopoverAnimated:YES]; |
4920 | 494 |
|
3547 | 495 |
[self buttonReleased:nil]; |
496 |
} |
|
497 |
} |
|
498 |
||
499 |
#pragma mark - |
|
500 |
#pragma mark Custom touch event handling |
|
4541 | 501 |
-(BOOL) shouldIgnoreTouch:(NSSet *)allTouches { |
502 |
if (isGameRunning() == NO) |
|
503 |
return YES; |
|
504 |
||
505 |
// ignore activity near the dpad and buttons |
|
506 |
CGPoint touchPoint = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
|
507 |
CGSize screen = [[UIScreen mainScreen] bounds].size; |
|
508 |
||
509 |
if ((touchPoint.x < 160 && touchPoint.y > screen.width - 155 ) || |
|
510 |
(touchPoint.x > screen.height - 135 && touchPoint.y > screen.width - 140)) |
|
511 |
return YES; |
|
512 |
return NO; |
|
513 |
} |
|
514 |
||
3547 | 515 |
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
516 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
517 |
UITouch *first, *second; |
3697 | 518 |
|
4541 | 519 |
if ([self shouldIgnoreTouch:allTouches] == YES) |
3765
ebfe7c9b3085
set flake to non critical, no touches until game is starding, moved some variables to be initialized in the right place
koda
parents:
3739
diff
changeset
|
520 |
return; |
ebfe7c9b3085
set flake to non critical, no touches until game is starding, moved some variables to be initialized in the right place
koda
parents:
3739
diff
changeset
|
521 |
|
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
522 |
// hide in-game menu |
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
523 |
if (isPopoverVisible) |
3547 | 524 |
[self dismissPopover]; |
3697 | 525 |
|
3941 | 526 |
if (self.amvc.isVisible && IS_DUALHEAD() == NO) { |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
527 |
doDim(); |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
528 |
[self.amvc disappear]; |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
529 |
} |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
530 |
// reset default dimming |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
531 |
doDim(); |
3697 | 532 |
|
4855
2480ab325057
when multiple fingers are detected, remove all widgets in order to avoid accidental commands
koda
parents:
4541
diff
changeset
|
533 |
// remove other widgets |
2480ab325057
when multiple fingers are detected, remove all widgets in order to avoid accidental commands
koda
parents:
4541
diff
changeset
|
534 |
removeInputWidget(); |
2480ab325057
when multiple fingers are detected, remove all widgets in order to avoid accidental commands
koda
parents:
4541
diff
changeset
|
535 |
|
3668
3f7a95234d8a
tap to play piano notes, fix for audio and pause glitch
koda
parents:
3667
diff
changeset
|
536 |
HW_setPianoSound([allTouches count]); |
3697 | 537 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
538 |
switch ([allTouches count]) { |
3697 | 539 |
case 1: |
3651 | 540 |
startingPoint = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
541 |
if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount]) |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
542 |
HW_zoomReset(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
543 |
break; |
3697 | 544 |
case 2: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
545 |
// pinching |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
546 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
547 |
second = [[allTouches allObjects] objectAtIndex:1]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
548 |
initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
549 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
550 |
default: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
551 |
break; |
3547 | 552 |
} |
553 |
} |
|
554 |
||
555 |
-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3635
38d3e31556d3
improvements to touch interface (tap to select weap, don't move camera for spourious taps, ask for confirmation when using click-weapons)
koda
parents:
3629
diff
changeset
|
556 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
557 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
558 |
CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
3697 | 559 |
|
4541 | 560 |
if ([self shouldIgnoreTouch:allTouches] == YES) |
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
561 |
return; |
4541 | 562 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
563 |
switch ([allTouches count]) { |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
564 |
case 1: |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
565 |
// if we're in the menu we just click in the point |
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
566 |
if (HW_isAmmoMenuOpen()) { |
3680 | 567 |
HW_setCursor(HWXZ(currentPosition.x), HWYZ(currentPosition.y)); |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
568 |
// this click doesn't need any wrapping because the ammoMenu already limits the cursor |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
569 |
HW_click(); |
3697 | 570 |
} else |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
571 |
// if weapon requires a further click, ask for tapping again |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
572 |
if (HW_isWeaponRequiringClick()) { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
573 |
// here don't have to wrap thanks to isCursorVisible magic |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
574 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
3697 | 575 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
576 |
// draw the button at the last touched point (which is the current position) |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
577 |
UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect]; |
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
578 |
tapAgain.frame = CGRectMake(currentPosition.x - 75, currentPosition.y + 25, 150, 40); |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
579 |
tapAgain.tag = CONFIRMATION_TAG; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
580 |
tapAgain.alpha = 0; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
581 |
[tapAgain addTarget:self action:@selector(sendHWClick) forControlEvents:UIControlEventTouchUpInside]; |
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
582 |
[tapAgain setTitle:NSLocalizedString(@"Tap to set!",@"from the overlay") forState:UIControlStateNormal]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
583 |
[self.view addSubview:tapAgain]; |
3697 | 584 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
585 |
// animation ftw! |
3697 | 586 |
[UIView beginAnimations:@"inserting button" context:NULL]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
587 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
588 |
[self.view viewWithTag:CONFIRMATION_TAG].alpha = 1; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
589 |
[UIView commitAnimations]; |
3697 | 590 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
591 |
// keep the overlay active, or the button will fade |
3650 | 592 |
[self activateOverlay]; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
593 |
doNotDim(); |
3650 | 594 |
} else |
595 |
if (HW_isWeaponTimerable()) { |
|
596 |
if (isSegmentVisible) { |
|
597 |
UISegmentedControl *grenadeTime = (UISegmentedControl *)[self.view viewWithTag:GRENADE_TAG]; |
|
3697 | 598 |
|
3650 | 599 |
[UIView beginAnimations:@"removing segmented control" context:NULL]; |
600 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
601 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseIn]; |
|
602 |
grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50); |
|
603 |
[UIView commitAnimations]; |
|
3697 | 604 |
|
3650 | 605 |
[grenadeTime performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION]; |
606 |
} else { |
|
607 |
NSArray *items = [[NSArray alloc] initWithObjects:@"1",@"2",@"3",@"4",@"5",nil]; |
|
608 |
UISegmentedControl *grenadeTime = [[UISegmentedControl alloc] initWithItems:items]; |
|
609 |
[items release]; |
|
3697 | 610 |
|
3650 | 611 |
[grenadeTime addTarget:self action:@selector(setGrenadeTime:) forControlEvents:UIControlEventValueChanged]; |
612 |
grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50); |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
613 |
grenadeTime.selectedSegmentIndex = cachedGrenadeTime(); |
3650 | 614 |
grenadeTime.tag = GRENADE_TAG; |
615 |
[self.view addSubview:grenadeTime]; |
|
616 |
[grenadeTime release]; |
|
3697 | 617 |
|
3650 | 618 |
[UIView beginAnimations:@"inserting segmented control" context:NULL]; |
619 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
620 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseIn]; |
|
621 |
grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width - 100, 250, 50); |
|
622 |
[UIView commitAnimations]; |
|
3697 | 623 |
|
3650 | 624 |
[self activateOverlay]; |
625 |
doNotDim(); |
|
3697 | 626 |
} |
3650 | 627 |
isSegmentVisible = !isSegmentVisible; |
3661 | 628 |
} else |
629 |
if (HW_isWeaponSwitch()) |
|
630 |
HW_tab(); |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
631 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
632 |
case 2: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
633 |
HW_allKeysUp(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
634 |
break; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
635 |
default: |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
636 |
break; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
637 |
} |
3697 | 638 |
|
3635
38d3e31556d3
improvements to touch interface (tap to select weap, don't move camera for spourious taps, ask for confirmation when using click-weapons)
koda
parents:
3629
diff
changeset
|
639 |
initialDistanceForPinching = 0; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
640 |
} |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
641 |
|
3547 | 642 |
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { |
643 |
[self touchesEnded:touches withEvent:event]; |
|
644 |
} |
|
645 |
||
646 |
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3551 | 647 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
648 |
NSSet *allTouches = [event allTouches]; |
3662
a44406f4369b
polish polish polish polish (also: panning horizontal fix, panning momentum, settings page reworked yet again, memory leaks, crashes, segfaults)
koda
parents:
3661
diff
changeset
|
649 |
int x, y, dx, dy; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
650 |
UITouch *touch, *first, *second; |
3547 | 651 |
|
4541 | 652 |
if ([self shouldIgnoreTouch:allTouches] == YES) |
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
653 |
return; |
4541 | 654 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
655 |
switch ([allTouches count]) { |
3551 | 656 |
case 1: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
657 |
touch = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
658 |
CGPoint currentPosition = [touch locationInView:self.view]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
659 |
|
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
660 |
if (HW_isAmmoMenuOpen()) { |
3680 | 661 |
// no zoom consideration for this |
662 |
HW_setCursor(HWXZ(currentPosition.x), HWYZ(currentPosition.y)); |
|
663 |
} else |
|
664 |
if (HW_isWeaponRequiringClick()) { |
|
665 |
// moves the cursor around wrt zoom |
|
666 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
|
667 |
} else { |
|
668 |
// panning \o/ |
|
669 |
dx = startingPoint.x - currentPosition.x; |
|
670 |
dy = currentPosition.y - startingPoint.y; |
|
671 |
HW_getCursor(&x, &y); |
|
672 |
// momentum (or something like that) |
|
673 |
/*if (abs(dx) > 40) |
|
674 |
dx *= log(abs(dx)/4); |
|
675 |
if (abs(dy) > 40) |
|
676 |
dy *= log(abs(dy)/4);*/ |
|
677 |
HW_setCursor(x + dx/HW_zoomFactor(), y + dy/HW_zoomFactor()); |
|
678 |
startingPoint = currentPosition; |
|
679 |
} |
|
3551 | 680 |
break; |
3547 | 681 |
case 2: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
682 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
683 |
second = [[allTouches allObjects] objectAtIndex:1]; |
3547 | 684 |
CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
685 |
const int pinchDelta = 40; |
|
3697 | 686 |
|
3547 | 687 |
if (0 != initialDistanceForPinching) { |
688 |
if (currentDistanceOfPinching - initialDistanceForPinching > pinchDelta) { |
|
689 |
HW_zoomIn(); |
|
690 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
691 |
} |
|
692 |
else if (initialDistanceForPinching - currentDistanceOfPinching > pinchDelta) { |
|
693 |
HW_zoomOut(); |
|
694 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
695 |
} |
|
3697 | 696 |
} else |
3547 | 697 |
initialDistanceForPinching = currentDistanceOfPinching; |
698 |
break; |
|
699 |
default: |
|
3940
cc29628976cc
some optimizations to drawing and fetching data of new ammomenu
koda
parents:
3935
diff
changeset
|
700 |
DLog(@"Nope"); |
3547 | 701 |
break; |
702 |
} |
|
703 |
} |
|
704 |
||
705 |
@end |