author | koda |
Sat, 31 Jul 2010 10:39:20 +0200 | |
changeset 3680 | aaf832c6fbd7 |
parent 3672 | f225b94a4411 |
child 3697 | d5b30d6373fc |
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 |
3650 | 24 |
#define GRENADE_TAG 9595 |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
25 |
#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
|
26 |
#define removeConfirmationInput() [[self.view viewWithTag:CONFIRMATION_TAG] removeFromSuperview]; |
3547 | 27 |
|
28 |
@implementation OverlayViewController |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
29 |
@synthesize popoverController, popupMenu; |
3547 | 30 |
|
31 |
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { |
|
32 |
return rotationManager(interfaceOrientation); |
|
33 |
} |
|
34 |
||
35 |
-(void) didRotate:(NSNotification *)notification { |
|
36 |
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation]; |
|
37 |
CGRect rect = [[UIScreen mainScreen] bounds]; |
|
38 |
CGRect usefulRect = CGRectMake(0, 0, rect.size.width, rect.size.height); |
|
3648 | 39 |
UIView *sdlView = [[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG]; |
3547 | 40 |
|
41 |
[UIView beginAnimations:@"rotation" context:NULL]; |
|
42 |
[UIView setAnimationDuration:0.8f]; |
|
43 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut]; |
|
44 |
switch (orientation) { |
|
45 |
case UIDeviceOrientationLandscapeLeft: |
|
3680 | 46 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(0)); |
47 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(90)); |
|
3547 | 48 |
HW_setLandscape(YES); |
49 |
break; |
|
50 |
case UIDeviceOrientationLandscapeRight: |
|
3680 | 51 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(180)); |
52 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(-90)); |
|
3547 | 53 |
HW_setLandscape(YES); |
54 |
break; |
|
3551 | 55 |
/* |
3547 | 56 |
case UIDeviceOrientationPortrait: |
57 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
58 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(270)); |
|
59 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(0)); |
|
60 |
[self chatAppear]; |
|
61 |
HW_setLandscape(NO); |
|
62 |
} |
|
63 |
break; |
|
64 |
case UIDeviceOrientationPortraitUpsideDown: |
|
65 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
66 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(90)); |
|
67 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(180)); |
|
68 |
[self chatAppear]; |
|
69 |
HW_setLandscape(NO); |
|
70 |
} |
|
71 |
break; |
|
3551 | 72 |
*/ |
3547 | 73 |
default: |
74 |
break; |
|
75 |
} |
|
76 |
self.view.frame = usefulRect; |
|
77 |
//sdlView.frame = usefulRect; |
|
78 |
[UIView commitAnimations]; |
|
79 |
} |
|
80 |
||
81 |
#pragma mark - |
|
82 |
#pragma mark View Management |
|
83 |
-(void) viewDidLoad { |
|
84 |
isPopoverVisible = NO; |
|
85 |
self.view.alpha = 0; |
|
86 |
self.view.center = CGPointMake(self.view.frame.size.height/2.0, self.view.frame.size.width/2.0); |
|
87 |
||
3627
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
88 |
// set initial orientation |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
89 |
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation]; |
3650 | 90 |
UIView *sdlView = [[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG]; |
3627
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
91 |
switch (orientation) { |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
92 |
case UIDeviceOrientationLandscapeLeft: |
3680 | 93 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(0)); |
94 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(90)); |
|
3627
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
95 |
break; |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
96 |
case UIDeviceOrientationLandscapeRight: |
3680 | 97 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(180)); |
98 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(-90)); |
|
3627
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
99 |
break; |
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
100 |
default: |
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
101 |
break; |
3627
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
102 |
} |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
103 |
CGRect rect = [[UIScreen mainScreen] bounds]; |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
104 |
self.view.frame = CGRectMake(0, 0, rect.size.width, rect.size.height); |
3547 | 105 |
|
106 |
dimTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:6] |
|
107 |
interval:1000 |
|
108 |
target:self |
|
109 |
selector:@selector(dimOverlay) |
|
110 |
userInfo:nil |
|
111 |
repeats:YES]; |
|
112 |
||
113 |
// add timer too runloop, otherwise it doesn't work |
|
114 |
[[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode]; |
|
115 |
||
116 |
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications]; |
|
117 |
[[NSNotificationCenter defaultCenter] addObserver:self |
|
118 |
selector:@selector(didRotate:) |
|
3598 | 119 |
name:UIDeviceOrientationDidChangeNotification |
3547 | 120 |
object:nil]; |
121 |
||
122 |
[UIView beginAnimations:@"showing overlay" context:NULL]; |
|
123 |
[UIView setAnimationDuration:1]; |
|
124 |
self.view.alpha = 1; |
|
125 |
[UIView commitAnimations]; |
|
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
126 |
|
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
127 |
// find the sdl window we're on |
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
128 |
SDL_VideoDevice *_this = SDL_GetVideoDevice(); |
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
129 |
SDL_VideoDisplay *display = &_this->displays[0]; |
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
130 |
sdlwindow = display->windows; |
3547 | 131 |
} |
132 |
||
133 |
-(void) viewDidUnload { |
|
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
|
134 |
// only object initialized in viewDidLoad should be here |
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
|
135 |
dimTimer = nil; |
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
|
136 |
MSG_DIDUNLOAD(); |
3547 | 137 |
[super viewDidUnload]; |
138 |
} |
|
139 |
||
3626 | 140 |
-(void) didReceiveMemoryWarning { |
141 |
// Releases the view if it doesn't have a superview. |
|
142 |
[super didReceiveMemoryWarning]; |
|
143 |
// Release any cached data, images, etc that aren't in use. |
|
144 |
if (popupMenu.view.superview == nil) |
|
145 |
popupMenu = nil; |
|
146 |
MSG_MEMCLEAN(); |
|
147 |
} |
|
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
|
148 |
|
3626 | 149 |
|
3547 | 150 |
-(void) dealloc { |
151 |
[popupMenu release]; |
|
152 |
[popoverController release]; |
|
153 |
// dimTimer is autoreleased |
|
154 |
[super dealloc]; |
|
155 |
} |
|
156 |
||
157 |
#pragma mark - |
|
158 |
#pragma mark Overlay actions and members |
|
159 |
// nice transition for dimming, should be called only by the timer himself |
|
160 |
-(void) dimOverlay { |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
161 |
if (isGameRunning) { |
3547 | 162 |
[UIView beginAnimations:@"overlay dim" context:NULL]; |
163 |
[UIView setAnimationDuration:0.6]; |
|
164 |
self.view.alpha = 0.2; |
|
165 |
[UIView commitAnimations]; |
|
166 |
} |
|
167 |
} |
|
168 |
||
169 |
// set the overlay visible and put off the timer for enough time |
|
170 |
-(void) activateOverlay { |
|
171 |
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
|
172 |
doNotDim(); |
3547 | 173 |
} |
174 |
||
3626 | 175 |
// dim the overlay when there's no more input for a certain amount of time |
176 |
-(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
|
177 |
if (!isGameRunning) |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
178 |
return; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
179 |
|
3626 | 180 |
UIButton *theButton = (UIButton *)sender; |
181 |
||
182 |
switch (theButton.tag) { |
|
183 |
case 0: |
|
184 |
case 1: |
|
185 |
case 2: |
|
186 |
case 3: |
|
3649 | 187 |
[NSObject cancelPreviousPerformRequestsWithTarget:self |
188 |
selector:@selector(unsetPreciseStatus) |
|
189 |
object:nil]; |
|
3626 | 190 |
HW_walkingKeysUp(); |
191 |
break; |
|
192 |
case 4: |
|
193 |
case 5: |
|
194 |
case 6: |
|
195 |
HW_otherKeysUp(); |
|
196 |
break; |
|
197 |
default: |
|
3660 | 198 |
DLog(@"Nope"); |
3626 | 199 |
break; |
200 |
} |
|
201 |
||
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
202 |
doDim(); |
3626 | 203 |
} |
204 |
||
3547 | 205 |
// issue certain action based on the tag of the button |
206 |
-(IBAction) buttonPressed:(id) sender { |
|
207 |
[self activateOverlay]; |
|
208 |
if (isPopoverVisible) { |
|
209 |
[self dismissPopover]; |
|
210 |
} |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
211 |
|
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
212 |
if (!isGameRunning) |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
213 |
return; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
214 |
|
3547 | 215 |
UIButton *theButton = (UIButton *)sender; |
216 |
||
217 |
switch (theButton.tag) { |
|
218 |
case 0: |
|
219 |
HW_walkLeft(); |
|
220 |
break; |
|
221 |
case 1: |
|
222 |
HW_walkRight(); |
|
223 |
break; |
|
224 |
case 2: |
|
3649 | 225 |
[self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8]; |
226 |
HW_preciseSet(YES); |
|
3547 | 227 |
HW_aimUp(); |
228 |
break; |
|
229 |
case 3: |
|
3649 | 230 |
[self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8]; |
231 |
HW_preciseSet(YES); |
|
3547 | 232 |
HW_aimDown(); |
233 |
break; |
|
234 |
case 4: |
|
235 |
HW_shoot(); |
|
236 |
break; |
|
237 |
case 5: |
|
238 |
HW_jump(); |
|
239 |
break; |
|
240 |
case 6: |
|
241 |
HW_backjump(); |
|
242 |
break; |
|
243 |
case 7: |
|
244 |
HW_tab(); |
|
245 |
break; |
|
246 |
case 10: |
|
3667 | 247 |
HW_pause(); |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
248 |
removeConfirmationInput(); |
3547 | 249 |
[self showPopover]; |
250 |
break; |
|
3624 | 251 |
case 11: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
252 |
removeConfirmationInput(); |
3624 | 253 |
HW_ammoMenu(); |
254 |
break; |
|
3547 | 255 |
default: |
3626 | 256 |
DLog(@"Nope"); |
3547 | 257 |
break; |
258 |
} |
|
259 |
} |
|
260 |
||
3649 | 261 |
-(void) unsetPreciseStatus { |
262 |
HW_preciseSet(NO); |
|
263 |
} |
|
264 |
||
3547 | 265 |
// present a further check before closing game |
266 |
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { |
|
267 |
if ([actionSheet cancelButtonIndex] != buttonIndex) |
|
268 |
HW_terminate(NO); |
|
269 |
else |
|
270 |
HW_pause(); |
|
271 |
} |
|
272 |
||
273 |
// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize |
|
274 |
// on iphone instead just use the tableViewController directly (and implement manually all animations) |
|
275 |
-(IBAction) showPopover{ |
|
3667 | 276 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3547 | 277 |
isPopoverVisible = YES; |
278 |
||
279 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
280 |
if (popupMenu == nil) |
|
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
281 |
popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain]; |
3547 | 282 |
if (popoverController == nil) { |
283 |
popoverController = [[UIPopoverController alloc] initWithContentViewController:popupMenu]; |
|
284 |
[popoverController setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; |
|
285 |
[popoverController setPassthroughViews:[NSArray arrayWithObject:self.view]]; |
|
286 |
} |
|
3551 | 287 |
|
3667 | 288 |
[popoverController presentPopoverFromRect:CGRectMake(screen.size.height / 2, screen.size.width / 2, 1, 1) |
3547 | 289 |
inView:self.view |
3667 | 290 |
permittedArrowDirections:UIPopoverArrowDirectionAny |
3547 | 291 |
animated:YES]; |
292 |
} else { |
|
3648 | 293 |
if (popupMenu == nil) |
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
294 |
popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStyleGrouped]; |
3648 | 295 |
|
3547 | 296 |
[self.view addSubview:popupMenu.view]; |
3648 | 297 |
[popupMenu present]; |
3547 | 298 |
} |
299 |
popupMenu.tableView.scrollEnabled = NO; |
|
300 |
} |
|
301 |
||
302 |
// on ipad just dismiss it, on iphone transtion to the right |
|
303 |
-(void) dismissPopover { |
|
304 |
if (YES == isPopoverVisible) { |
|
305 |
isPopoverVisible = NO; |
|
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
306 |
if (HW_isPaused()) |
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
307 |
HW_pause(); |
3547 | 308 |
|
309 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
3648 | 310 |
[(InGameMenuViewController *)popoverController.contentViewController removeChat]; |
3547 | 311 |
[popoverController dismissPopoverAnimated:YES]; |
312 |
} else { |
|
3648 | 313 |
[popupMenu dismiss]; |
3547 | 314 |
} |
315 |
[self buttonReleased:nil]; |
|
316 |
} |
|
317 |
} |
|
318 |
||
319 |
#pragma mark - |
|
320 |
#pragma mark Custom touch event handling |
|
321 |
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
322 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
323 |
UITouch *first, *second; |
3547 | 324 |
|
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
325 |
// hide in-game menu |
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
326 |
if (isPopoverVisible) |
3547 | 327 |
[self dismissPopover]; |
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
328 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
329 |
// reset default dimming |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
330 |
doDim(); |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
331 |
|
3668
3f7a95234d8a
tap to play piano notes, fix for audio and pause glitch
koda
parents:
3667
diff
changeset
|
332 |
HW_setPianoSound([allTouches count]); |
3f7a95234d8a
tap to play piano notes, fix for audio and pause glitch
koda
parents:
3667
diff
changeset
|
333 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
334 |
switch ([allTouches count]) { |
3651 | 335 |
case 1: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
336 |
removeConfirmationInput(); |
3651 | 337 |
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
|
338 |
if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount]) |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
339 |
HW_zoomReset(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
340 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
341 |
case 2: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
342 |
// pinching |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
343 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
344 |
second = [[allTouches allObjects] objectAtIndex:1]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
345 |
initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
346 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
347 |
default: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
348 |
break; |
3547 | 349 |
} |
350 |
} |
|
351 |
||
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
352 |
//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
|
353 |
|
3547 | 354 |
-(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
|
355 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
356 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
357 |
CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
358 |
|
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
359 |
switch ([allTouches count]) { |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
360 |
case 1: |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
361 |
// 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
|
362 |
if (HW_isAmmoOpen()) { |
3680 | 363 |
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
|
364 |
// 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
|
365 |
HW_click(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
366 |
} else |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
367 |
// 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
|
368 |
if (HW_isWeaponRequiringClick()) { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
369 |
// 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
|
370 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
371 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
372 |
// 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
|
373 |
UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect]; |
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
374 |
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
|
375 |
tapAgain.tag = CONFIRMATION_TAG; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
376 |
tapAgain.alpha = 0; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
377 |
[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
|
378 |
[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
|
379 |
[self.view addSubview:tapAgain]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
380 |
|
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
381 |
// animation ftw! |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
382 |
[UIView beginAnimations:@"inserting button" context:NULL]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
383 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
384 |
[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
|
385 |
[UIView commitAnimations]; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
386 |
|
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
387 |
// keep the overlay active, or the button will fade |
3650 | 388 |
[self activateOverlay]; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
389 |
doNotDim(); |
3650 | 390 |
} else |
391 |
if (HW_isWeaponTimerable()) { |
|
392 |
if (isSegmentVisible) { |
|
393 |
UISegmentedControl *grenadeTime = (UISegmentedControl *)[self.view viewWithTag:GRENADE_TAG]; |
|
394 |
||
395 |
[UIView beginAnimations:@"removing segmented control" context:NULL]; |
|
396 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
397 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseIn]; |
|
398 |
grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50); |
|
399 |
[UIView commitAnimations]; |
|
400 |
||
401 |
[grenadeTime performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION]; |
|
402 |
} else { |
|
403 |
NSArray *items = [[NSArray alloc] initWithObjects:@"1",@"2",@"3",@"4",@"5",nil]; |
|
404 |
UISegmentedControl *grenadeTime = [[UISegmentedControl alloc] initWithItems:items]; |
|
405 |
[items release]; |
|
406 |
||
407 |
[grenadeTime addTarget:self action:@selector(setGrenadeTime:) forControlEvents:UIControlEventValueChanged]; |
|
408 |
grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50); |
|
409 |
grenadeTime.selectedSegmentIndex = 2; |
|
410 |
grenadeTime.tag = GRENADE_TAG; |
|
411 |
[self.view addSubview:grenadeTime]; |
|
412 |
[grenadeTime release]; |
|
413 |
||
414 |
[UIView beginAnimations:@"inserting segmented control" context:NULL]; |
|
415 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
416 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseIn]; |
|
417 |
grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width - 100, 250, 50); |
|
418 |
[UIView commitAnimations]; |
|
419 |
||
420 |
[self activateOverlay]; |
|
421 |
doNotDim(); |
|
3661 | 422 |
} |
3650 | 423 |
isSegmentVisible = !isSegmentVisible; |
3661 | 424 |
} else |
425 |
if (HW_isWeaponSwitch()) |
|
426 |
HW_tab(); |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
427 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
428 |
case 2: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
429 |
HW_allKeysUp(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
430 |
break; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
431 |
default: |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
432 |
break; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
433 |
} |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
434 |
|
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
|
435 |
initialDistanceForPinching = 0; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
436 |
} |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
437 |
|
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
438 |
-(void) sendHWClick { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
439 |
HW_click(); |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
440 |
removeConfirmationInput(); |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
441 |
doDim(); |
3547 | 442 |
} |
443 |
||
3650 | 444 |
-(void) setGrenadeTime:(id) sender { |
445 |
UISegmentedControl *theSegment = (UISegmentedControl *)sender; |
|
446 |
HW_setGrenadeTime(theSegment.selectedSegmentIndex + 1); |
|
447 |
} |
|
448 |
||
3547 | 449 |
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { |
450 |
[self touchesEnded:touches withEvent:event]; |
|
451 |
} |
|
452 |
||
453 |
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3551 | 454 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
455 |
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
|
456 |
int x, y, dx, dy; |
3547 | 457 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
458 |
UITouch *touch, *first, *second; |
3547 | 459 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
460 |
switch ([allTouches count]) { |
3551 | 461 |
case 1: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
462 |
touch = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
463 |
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
|
464 |
|
3680 | 465 |
if (HW_isAmmoOpen()) { |
466 |
// no zoom consideration for this |
|
467 |
HW_setCursor(HWXZ(currentPosition.x), HWYZ(currentPosition.y)); |
|
468 |
} else |
|
469 |
if (HW_isWeaponRequiringClick()) { |
|
470 |
// moves the cursor around wrt zoom |
|
471 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
|
472 |
} else { |
|
473 |
// panning \o/ |
|
474 |
dx = startingPoint.x - currentPosition.x; |
|
475 |
dy = currentPosition.y - startingPoint.y; |
|
476 |
HW_getCursor(&x, &y); |
|
477 |
// momentum (or something like that) |
|
478 |
/*if (abs(dx) > 40) |
|
479 |
dx *= log(abs(dx)/4); |
|
480 |
if (abs(dy) > 40) |
|
481 |
dy *= log(abs(dy)/4);*/ |
|
482 |
HW_setCursor(x + dx/HW_zoomFactor(), y + dy/HW_zoomFactor()); |
|
483 |
startingPoint = currentPosition; |
|
484 |
} |
|
3551 | 485 |
break; |
3547 | 486 |
case 2: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
487 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
488 |
second = [[allTouches allObjects] objectAtIndex:1]; |
3547 | 489 |
CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
490 |
const int pinchDelta = 40; |
|
491 |
||
492 |
if (0 != initialDistanceForPinching) { |
|
493 |
if (currentDistanceOfPinching - initialDistanceForPinching > pinchDelta) { |
|
494 |
HW_zoomIn(); |
|
495 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
496 |
} |
|
497 |
else if (initialDistanceForPinching - currentDistanceOfPinching > pinchDelta) { |
|
498 |
HW_zoomOut(); |
|
499 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
500 |
} |
|
501 |
} else |
|
502 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
503 |
||
504 |
break; |
|
505 |
default: |
|
506 |
break; |
|
507 |
} |
|
508 |
} |
|
509 |
||
3650 | 510 |
#pragma mark - |
511 |
#pragma mark Functions called by pascal |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
512 |
// 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
|
513 |
void startSpinning() { |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
514 |
isGameRunning = NO; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
515 |
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
|
516 |
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
|
517 |
indicator.tag = 987654; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
518 |
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
|
519 |
indicator.hidesWhenStopped = YES; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
520 |
[indicator startAnimating]; |
3650 | 521 |
[[[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG] addSubview:indicator]; |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
522 |
[indicator release]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
523 |
} |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
524 |
|
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
525 |
void stopSpinning() { |
3650 | 526 |
UIActivityIndicatorView *indicator = (UIActivityIndicatorView *)[[[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG] viewWithTag:987654]; |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
527 |
[indicator stopAnimating]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
528 |
isGameRunning = YES; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
529 |
} |
3547 | 530 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
531 |
void clearView() { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
532 |
UIWindow *theWindow = [[UIApplication sharedApplication] keyWindow]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
533 |
UIButton *theButton = (UIButton *)[theWindow viewWithTag:CONFIRMATION_TAG]; |
3650 | 534 |
UISegmentedControl *theSegment = (UISegmentedControl *)[theWindow viewWithTag:GRENADE_TAG]; |
535 |
||
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
536 |
[UIView beginAnimations:@"remove button" context:NULL]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
537 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
538 |
theButton.alpha = 0; |
3650 | 539 |
theSegment.alpha = 0; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
540 |
[UIView commitAnimations]; |
3650 | 541 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
542 |
[theWindow performSelector:@selector(removeFromSuperview) withObject:theButton afterDelay:0.3]; |
3650 | 543 |
[theWindow performSelector:@selector(removeFromSuperview) withObject:theSegment afterDelay:0.3]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
544 |
} |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
545 |
|
3547 | 546 |
@end |