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