author | koda |
Fri, 16 Jul 2010 00:18:03 +0200 | |
changeset 3646 | a3271158d93b |
parent 3639 | b5cdbcc89b61 |
child 3647 | 0d0df215fb52 |
permissions | -rw-r--r-- |
3547 | 1 |
// |
2 |
// overlayViewController.m |
|
3 |
// HedgewarsMobile |
|
4 |
// |
|
5 |
// Created by Vittorio on 16/03/10. |
|
6 |
// Copyright 2010 __MyCompanyName__. All rights reserved. |
|
7 |
// |
|
8 |
||
9 |
#import "OverlayViewController.h" |
|
10 |
#import "SDL_uikitappdelegate.h" |
|
11 |
#import "PascalImports.h" |
|
12 |
#import "CGPointUtils.h" |
|
13 |
#import "SDL_mouse.h" |
|
14 |
#import "SDL_config_iphoneos.h" |
|
15 |
#import "PopoverMenuViewController.h" |
|
16 |
#import "CommodityFunctions.h" |
|
17 |
||
18 |
#define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7] |
|
19 |
#define HIDING_TIME_NEVER [NSDate dateWithTimeIntervalSinceNow:10000] |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
20 |
#define doDim() [dimTimer setFireDate:HIDING_TIME_DEFAULT] |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
21 |
#define doNotDim() [dimTimer setFireDate:HIDING_TIME_NEVER] |
3547 | 22 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
23 |
#define CONFIRMATION_TAG 5959 |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
24 |
#define ANIMATION_DURATION 0.25 |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
25 |
#define removeConfirmationInput() [[self.view viewWithTag:CONFIRMATION_TAG] removeFromSuperview]; |
3547 | 26 |
|
27 |
@implementation OverlayViewController |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
28 |
@synthesize popoverController, popupMenu; |
3547 | 29 |
|
30 |
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { |
|
31 |
return rotationManager(interfaceOrientation); |
|
32 |
} |
|
33 |
||
34 |
-(void) didRotate:(NSNotification *)notification { |
|
35 |
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation]; |
|
36 |
CGRect rect = [[UIScreen mainScreen] bounds]; |
|
37 |
CGRect usefulRect = CGRectMake(0, 0, rect.size.width, rect.size.height); |
|
38 |
UIView *sdlView = [[[UIApplication sharedApplication] keyWindow] viewWithTag:12345]; |
|
39 |
||
40 |
[UIView beginAnimations:@"rotation" context:NULL]; |
|
41 |
[UIView setAnimationDuration:0.8f]; |
|
42 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut]; |
|
43 |
switch (orientation) { |
|
44 |
case UIDeviceOrientationLandscapeLeft: |
|
45 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(0)); |
|
46 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(90)); |
|
47 |
[self chatDisappear]; |
|
48 |
HW_setLandscape(YES); |
|
49 |
break; |
|
50 |
case UIDeviceOrientationLandscapeRight: |
|
51 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(180)); |
|
52 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(-90)); |
|
53 |
[self chatDisappear]; |
|
54 |
HW_setLandscape(YES); |
|
55 |
break; |
|
3551 | 56 |
/* |
3547 | 57 |
case UIDeviceOrientationPortrait: |
58 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
59 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(270)); |
|
60 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(0)); |
|
61 |
[self chatAppear]; |
|
62 |
HW_setLandscape(NO); |
|
63 |
} |
|
64 |
break; |
|
65 |
case UIDeviceOrientationPortraitUpsideDown: |
|
66 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
67 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(90)); |
|
68 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(180)); |
|
69 |
[self chatAppear]; |
|
70 |
HW_setLandscape(NO); |
|
71 |
} |
|
72 |
break; |
|
3551 | 73 |
*/ |
3547 | 74 |
default: |
75 |
break; |
|
76 |
} |
|
77 |
self.view.frame = usefulRect; |
|
78 |
//sdlView.frame = usefulRect; |
|
79 |
[UIView commitAnimations]; |
|
80 |
} |
|
81 |
||
82 |
-(void) chatAppear { |
|
3617 | 83 |
/* |
3547 | 84 |
if (writeChatTextField == nil) { |
85 |
writeChatTextField = [[UITextField alloc] initWithFrame:CGRectMake(0, 100, 768, [UIFont systemFontSize]+8)]; |
|
86 |
writeChatTextField.textColor = [UIColor whiteColor]; |
|
87 |
writeChatTextField.backgroundColor = [UIColor blueColor]; |
|
88 |
writeChatTextField.autocapitalizationType = UITextAutocapitalizationTypeNone; |
|
89 |
writeChatTextField.autocorrectionType = UITextAutocorrectionTypeNo; |
|
90 |
writeChatTextField.enablesReturnKeyAutomatically = NO; |
|
91 |
writeChatTextField.keyboardAppearance = UIKeyboardAppearanceDefault; |
|
92 |
writeChatTextField.keyboardType = UIKeyboardTypeDefault; |
|
93 |
writeChatTextField.returnKeyType = UIReturnKeyDefault; |
|
94 |
writeChatTextField.secureTextEntry = NO; |
|
95 |
[self.view addSubview:writeChatTextField]; |
|
96 |
} |
|
97 |
writeChatTextField.alpha = 1; |
|
98 |
[self activateOverlay]; |
|
99 |
[dimTimer setFireDate:HIDING_TIME_NEVER]; |
|
3617 | 100 |
*/ |
3547 | 101 |
} |
102 |
||
103 |
-(void) chatDisappear { |
|
3617 | 104 |
/* |
3547 | 105 |
writeChatTextField.alpha = 0; |
106 |
[writeChatTextField resignFirstResponder]; |
|
107 |
[dimTimer setFireDate:HIDING_TIME_DEFAULT]; |
|
3617 | 108 |
*/ |
3547 | 109 |
} |
110 |
||
111 |
#pragma mark - |
|
112 |
#pragma mark View Management |
|
113 |
-(void) viewDidLoad { |
|
114 |
isPopoverVisible = NO; |
|
115 |
self.view.alpha = 0; |
|
116 |
self.view.center = CGPointMake(self.view.frame.size.height/2.0, self.view.frame.size.width/2.0); |
|
117 |
||
3627
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
118 |
// set initial orientation |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
119 |
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation]; |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
120 |
UIView *sdlView = [[[UIApplication sharedApplication] keyWindow] viewWithTag:12345]; |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
121 |
switch (orientation) { |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
122 |
case UIDeviceOrientationLandscapeLeft: |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
123 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(0)); |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
124 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(90)); |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
125 |
break; |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
126 |
case UIDeviceOrientationLandscapeRight: |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
127 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(180)); |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
128 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(-90)); |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
129 |
break; |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
130 |
} |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
131 |
CGRect rect = [[UIScreen mainScreen] bounds]; |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
132 |
self.view.frame = CGRectMake(0, 0, rect.size.width, rect.size.height); |
3547 | 133 |
|
134 |
dimTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:6] |
|
135 |
interval:1000 |
|
136 |
target:self |
|
137 |
selector:@selector(dimOverlay) |
|
138 |
userInfo:nil |
|
139 |
repeats:YES]; |
|
140 |
||
141 |
// add timer too runloop, otherwise it doesn't work |
|
142 |
[[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode]; |
|
143 |
||
144 |
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications]; |
|
145 |
[[NSNotificationCenter defaultCenter] addObserver:self |
|
146 |
selector:@selector(didRotate:) |
|
3598 | 147 |
name:UIDeviceOrientationDidChangeNotification |
3547 | 148 |
object:nil]; |
149 |
||
150 |
[UIView beginAnimations:@"showing overlay" context:NULL]; |
|
151 |
[UIView setAnimationDuration:1]; |
|
152 |
self.view.alpha = 1; |
|
153 |
[UIView commitAnimations]; |
|
154 |
} |
|
155 |
||
3626 | 156 |
/* these are causing problems at reloading so let's remove 'em |
3547 | 157 |
-(void) viewDidUnload { |
3617 | 158 |
[dimTimer invalidate]; |
3547 | 159 |
self.popoverController = nil; |
160 |
self.popupMenu = nil; |
|
161 |
[super viewDidUnload]; |
|
162 |
MSG_DIDUNLOAD(); |
|
163 |
} |
|
164 |
||
3626 | 165 |
-(void) didReceiveMemoryWarning { |
166 |
// Releases the view if it doesn't have a superview. |
|
167 |
[super didReceiveMemoryWarning]; |
|
168 |
// Release any cached data, images, etc that aren't in use. |
|
169 |
if (popupMenu.view.superview == nil) |
|
170 |
popupMenu = nil; |
|
171 |
MSG_MEMCLEAN(); |
|
172 |
} |
|
173 |
*/ |
|
174 |
||
3547 | 175 |
-(void) dealloc { |
176 |
[popupMenu release]; |
|
177 |
[popoverController release]; |
|
178 |
// dimTimer is autoreleased |
|
179 |
[super dealloc]; |
|
180 |
} |
|
181 |
||
182 |
#pragma mark - |
|
183 |
#pragma mark Overlay actions and members |
|
184 |
// nice transition for dimming, should be called only by the timer himself |
|
185 |
-(void) dimOverlay { |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
186 |
if (isGameRunning) { |
3547 | 187 |
[UIView beginAnimations:@"overlay dim" context:NULL]; |
188 |
[UIView setAnimationDuration:0.6]; |
|
189 |
self.view.alpha = 0.2; |
|
190 |
[UIView commitAnimations]; |
|
191 |
} |
|
192 |
} |
|
193 |
||
194 |
// set the overlay visible and put off the timer for enough time |
|
195 |
-(void) activateOverlay { |
|
196 |
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
|
197 |
doNotDim(); |
3547 | 198 |
} |
199 |
||
3626 | 200 |
// dim the overlay when there's no more input for a certain amount of time |
201 |
-(IBAction) buttonReleased:(id) sender { |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
202 |
if (!isGameRunning) |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
203 |
return; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
204 |
|
3626 | 205 |
UIButton *theButton = (UIButton *)sender; |
206 |
||
207 |
switch (theButton.tag) { |
|
208 |
case 0: |
|
209 |
case 1: |
|
210 |
case 2: |
|
211 |
case 3: |
|
212 |
HW_walkingKeysUp(); |
|
213 |
break; |
|
214 |
case 4: |
|
215 |
case 5: |
|
216 |
case 6: |
|
217 |
HW_otherKeysUp(); |
|
218 |
break; |
|
219 |
default: |
|
220 |
NSLog(@"Nope"); |
|
221 |
break; |
|
222 |
} |
|
223 |
||
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
224 |
doDim(); |
3626 | 225 |
} |
226 |
||
3547 | 227 |
// issue certain action based on the tag of the button |
228 |
-(IBAction) buttonPressed:(id) sender { |
|
229 |
[self activateOverlay]; |
|
230 |
if (isPopoverVisible) { |
|
231 |
[self dismissPopover]; |
|
232 |
} |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
233 |
|
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
234 |
if (!isGameRunning) |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
235 |
return; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
236 |
|
3547 | 237 |
UIButton *theButton = (UIButton *)sender; |
238 |
||
239 |
switch (theButton.tag) { |
|
240 |
case 0: |
|
241 |
HW_walkLeft(); |
|
242 |
break; |
|
243 |
case 1: |
|
244 |
HW_walkRight(); |
|
245 |
break; |
|
246 |
case 2: |
|
247 |
HW_aimUp(); |
|
248 |
break; |
|
249 |
case 3: |
|
250 |
HW_aimDown(); |
|
251 |
break; |
|
252 |
case 4: |
|
253 |
HW_shoot(); |
|
254 |
break; |
|
255 |
case 5: |
|
256 |
HW_jump(); |
|
257 |
break; |
|
258 |
case 6: |
|
259 |
HW_backjump(); |
|
260 |
break; |
|
261 |
case 7: |
|
262 |
HW_tab(); |
|
263 |
break; |
|
264 |
case 10: |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
265 |
removeConfirmationInput(); |
3547 | 266 |
[self showPopover]; |
267 |
break; |
|
3624 | 268 |
case 11: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
269 |
removeConfirmationInput(); |
3624 | 270 |
HW_ammoMenu(); |
271 |
break; |
|
3547 | 272 |
default: |
3626 | 273 |
DLog(@"Nope"); |
3547 | 274 |
break; |
275 |
} |
|
276 |
} |
|
277 |
||
278 |
// present a further check before closing game |
|
279 |
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { |
|
280 |
if ([actionSheet cancelButtonIndex] != buttonIndex) |
|
281 |
HW_terminate(NO); |
|
282 |
else |
|
283 |
HW_pause(); |
|
284 |
} |
|
285 |
||
286 |
// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize |
|
287 |
// on iphone instead just use the tableViewController directly (and implement manually all animations) |
|
288 |
-(IBAction) showPopover{ |
|
289 |
isPopoverVisible = YES; |
|
290 |
||
291 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
292 |
if (popupMenu == nil) |
|
293 |
popupMenu = [[PopoverMenuViewController alloc] initWithStyle:UITableViewStylePlain]; |
|
294 |
if (popoverController == nil) { |
|
295 |
popoverController = [[UIPopoverController alloc] initWithContentViewController:popupMenu]; |
|
296 |
[popoverController setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; |
|
297 |
[popoverController setPassthroughViews:[NSArray arrayWithObject:self.view]]; |
|
298 |
} |
|
3551 | 299 |
|
300 |
[popoverController presentPopoverFromRect:CGRectMake(1000, 0, 220, 32) |
|
3547 | 301 |
inView:self.view |
302 |
permittedArrowDirections:UIPopoverArrowDirectionUp |
|
303 |
animated:YES]; |
|
304 |
} else { |
|
305 |
if (popupMenu == nil) { |
|
306 |
popupMenu = [[PopoverMenuViewController alloc] initWithStyle:UITableViewStyleGrouped]; |
|
307 |
popupMenu.view.backgroundColor = [UIColor clearColor]; |
|
308 |
popupMenu.view.frame = CGRectMake(480, 0, 200, 170); |
|
309 |
} |
|
310 |
[self.view addSubview:popupMenu.view]; |
|
311 |
||
312 |
[UIView beginAnimations:@"showing popover" context:NULL]; |
|
313 |
[UIView setAnimationDuration:0.35]; |
|
314 |
popupMenu.view.frame = CGRectMake(280, 0, 200, 170); |
|
315 |
[UIView commitAnimations]; |
|
316 |
} |
|
317 |
popupMenu.tableView.scrollEnabled = NO; |
|
318 |
} |
|
319 |
||
320 |
// on ipad just dismiss it, on iphone transtion to the right |
|
321 |
-(void) dismissPopover { |
|
322 |
if (YES == isPopoverVisible) { |
|
323 |
isPopoverVisible = NO; |
|
324 |
||
325 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
326 |
[popoverController dismissPopoverAnimated:YES]; |
|
327 |
} else { |
|
328 |
[UIView beginAnimations:@"hiding popover" context:NULL]; |
|
329 |
[UIView setAnimationDuration:0.35]; |
|
330 |
popupMenu.view.frame = CGRectMake(480, 0, 200, 170); |
|
331 |
[UIView commitAnimations]; |
|
332 |
||
333 |
[popupMenu.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:0.35]; |
|
334 |
} |
|
335 |
[self buttonReleased:nil]; |
|
336 |
} |
|
337 |
} |
|
338 |
||
339 |
-(void) textFieldDoneEditing:(id) sender{ |
|
340 |
[sender resignFirstResponder]; |
|
341 |
} |
|
342 |
||
343 |
||
344 |
#pragma mark - |
|
345 |
#pragma mark Custom touch event handling |
|
346 |
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
347 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
348 |
UITouch *first, *second; |
3547 | 349 |
|
350 |
if (isPopoverVisible) { |
|
351 |
[self dismissPopover]; |
|
352 |
} |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
353 |
/* |
3547 | 354 |
if (writeChatTextField) { |
355 |
[self.writeChatTextField resignFirstResponder]; |
|
356 |
[dimTimer setFireDate:HIDING_TIME_DEFAULT]; |
|
357 |
} |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
358 |
*/ |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
359 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
360 |
// reset default dimming |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
361 |
doDim(); |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
362 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
363 |
switch ([allTouches count]) { |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
364 |
case 1: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
365 |
removeConfirmationInput(); |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
366 |
if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount]) |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
367 |
HW_zoomReset(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
368 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
369 |
case 2: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
370 |
// pinching |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
371 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
372 |
second = [[allTouches allObjects] objectAtIndex:1]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
373 |
initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
374 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
375 |
default: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
376 |
break; |
3547 | 377 |
} |
378 |
} |
|
379 |
||
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
380 |
//if (currentPosition.y < screen.size.width - 130 || (currentPosition.x > 130 && currentPosition.x < screen.size.height - 130)) { |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
381 |
|
3547 | 382 |
-(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
|
383 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
384 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
385 |
CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
386 |
|
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
387 |
switch ([allTouches count]) { |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
388 |
case 1: |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
389 |
// if we're in the menu we just click in the point |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
390 |
if (HW_isAmmoOpen()) { |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
391 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
392 |
// 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
|
393 |
HW_click(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
394 |
} else |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
395 |
// 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
|
396 |
if (HW_isWeaponRequiringClick()) { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
397 |
// 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
|
398 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
399 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
400 |
// 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
|
401 |
UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
402 |
tapAgain.frame = CGRectMake(currentPosition.x - 90, currentPosition.y + 15, 180, 30); |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
403 |
tapAgain.tag = CONFIRMATION_TAG; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
404 |
tapAgain.alpha = 0; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
405 |
[tapAgain addTarget:self action:@selector(sendHWClick) forControlEvents:UIControlEventTouchUpInside]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
406 |
[tapAgain setTitle:NSLocalizedString(@"Tap again to confirm",@"from the overlay") forState:UIControlStateNormal]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
407 |
[self.view addSubview:tapAgain]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
408 |
|
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
409 |
// animation ftw! |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
410 |
[UIView beginAnimations:@"inserting button" context:NULL]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
411 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
412 |
[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
|
413 |
[UIView commitAnimations]; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
414 |
|
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
415 |
// keep the overlay active, or the button will fade |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
416 |
doNotDim(); |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
417 |
} |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
418 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
419 |
case 2: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
420 |
HW_allKeysUp(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
421 |
break; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
422 |
default: |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
423 |
DLog(@"too many touches"); |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
424 |
break; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
425 |
} |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
426 |
|
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
|
427 |
initialDistanceForPinching = 0; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
428 |
} |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
429 |
|
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
430 |
-(void) sendHWClick { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
431 |
HW_click(); |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
432 |
removeConfirmationInput(); |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
433 |
doDim(); |
3547 | 434 |
} |
435 |
||
436 |
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { |
|
437 |
[self touchesEnded:touches withEvent:event]; |
|
438 |
} |
|
439 |
||
440 |
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3551 | 441 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
442 |
NSSet *allTouches = [event allTouches]; |
3547 | 443 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
444 |
UITouch *touch, *first, *second; |
3547 | 445 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
446 |
switch ([allTouches count]) { |
3551 | 447 |
case 1: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
448 |
touch = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
449 |
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
|
450 |
|
3551 | 451 |
if (HW_isAmmoOpen()) { |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
452 |
// moves the cursor around |
3551 | 453 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
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
|
454 |
} else { |
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
|
455 |
DLog(@"x: %f y: %f -> X:%d Y:%d", currentPosition.x, currentPosition.y, HWX(currentPosition.x), HWY(currentPosition.y)); |
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
|
456 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
3547 | 457 |
} |
3551 | 458 |
break; |
3547 | 459 |
case 2: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
460 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
461 |
second = [[allTouches allObjects] objectAtIndex:1]; |
3547 | 462 |
CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
463 |
const int pinchDelta = 40; |
|
464 |
||
465 |
if (0 != initialDistanceForPinching) { |
|
466 |
if (currentDistanceOfPinching - initialDistanceForPinching > pinchDelta) { |
|
467 |
HW_zoomIn(); |
|
468 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
469 |
} |
|
470 |
else if (initialDistanceForPinching - currentDistanceOfPinching > pinchDelta) { |
|
471 |
HW_zoomOut(); |
|
472 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
473 |
} |
|
474 |
} else |
|
475 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
476 |
||
477 |
break; |
|
478 |
default: |
|
479 |
break; |
|
480 |
} |
|
481 |
} |
|
482 |
||
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
483 |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
484 |
// called from AddProgress and FinishProgress (respectively) |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
485 |
void startSpinning() { |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
486 |
isGameRunning = NO; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
487 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
488 |
UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
489 |
indicator.tag = 987654; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
490 |
indicator.center = CGPointMake(screen.size.width/2 - 118, screen.size.height/2); |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
491 |
indicator.hidesWhenStopped = YES; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
492 |
[indicator startAnimating]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
493 |
[[[[UIApplication sharedApplication] keyWindow] viewWithTag:12345] addSubview:indicator]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
494 |
[indicator release]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
495 |
} |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
496 |
|
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
497 |
void stopSpinning() { |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
498 |
UIActivityIndicatorView *indicator = (UIActivityIndicatorView *)[[[[UIApplication sharedApplication] keyWindow] viewWithTag:12345] viewWithTag:987654]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
499 |
[indicator stopAnimating]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
500 |
isGameRunning = YES; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
501 |
} |
3547 | 502 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
503 |
void clearView() { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
504 |
UIWindow *theWindow = [[UIApplication sharedApplication] keyWindow]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
505 |
UIButton *theButton = (UIButton *)[theWindow viewWithTag:CONFIRMATION_TAG]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
506 |
[UIView beginAnimations:@"remove button" context:NULL]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
507 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
508 |
theButton.alpha = 0; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
509 |
[UIView commitAnimations]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
510 |
[theWindow performSelector:@selector(removeFromSuperview) withObject:theButton afterDelay:0.3]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
511 |
} |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
512 |
|
3547 | 513 |
@end |