author | koda |
Wed, 06 Oct 2010 02:31:04 +0200 | |
changeset 3926 | 668b71f31e51 |
parent 3924 | 2a9ace189288 |
child 3933 | 1a873262f5dd |
permissions | -rw-r--r-- |
3829 | 1 |
/* |
2 |
* Hedgewars-iOS, a Hedgewars port for iOS devices |
|
3 |
* Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com> |
|
4 |
* |
|
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
16 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
|
17 |
* |
|
18 |
* File created on 16/03/2010. |
|
19 |
*/ |
|
20 |
||
3547 | 21 |
|
22 |
#import "OverlayViewController.h" |
|
23 |
#import "SDL_uikitappdelegate.h" |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
24 |
#import "InGameMenuViewController.h" |
3792 | 25 |
#import "HelpPageViewController.h" |
3924 | 26 |
#import "AmmoMenuViewController.h" |
3547 | 27 |
#import "PascalImports.h" |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
28 |
#import "CommodityFunctions.h" |
3547 | 29 |
#import "CGPointUtils.h" |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
30 |
#import "SDL_config_iphoneos.h" |
3547 | 31 |
#import "SDL_mouse.h" |
32 |
||
33 |
#define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7] |
|
34 |
#define HIDING_TIME_NEVER [NSDate dateWithTimeIntervalSinceNow:10000] |
|
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
35 |
#define doDim() [dimTimer setFireDate: ([[UIScreen screens] count] == 1) ? HIDING_TIME_DEFAULT : HIDING_TIME_NEVER] |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
36 |
#define doNotDim() [dimTimer setFireDate:HIDING_TIME_NEVER] |
3547 | 37 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
38 |
#define CONFIRMATION_TAG 5959 |
3650 | 39 |
#define GRENADE_TAG 9595 |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
40 |
#define REPLAYBLACKVIEW_TAG 9955 |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
41 |
#define ACTIVITYINDICATOR_TAG 987654 |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
42 |
#define ANIMATION_DURATION 0.25 |
3697 | 43 |
#define removeConfirmationInput() [[self.view viewWithTag:CONFIRMATION_TAG] removeFromSuperview]; |
3547 | 44 |
|
45 |
@implementation OverlayViewController |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
46 |
@synthesize popoverController, popupMenu, helpPage; |
3547 | 47 |
|
48 |
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { |
|
49 |
return rotationManager(interfaceOrientation); |
|
50 |
} |
|
51 |
||
3697 | 52 |
-(void) didRotate:(NSNotification *)notification { |
3547 | 53 |
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation]; |
54 |
CGRect rect = [[UIScreen mainScreen] bounds]; |
|
55 |
CGRect usefulRect = CGRectMake(0, 0, rect.size.width, rect.size.height); |
|
3648 | 56 |
UIView *sdlView = [[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG]; |
3697 | 57 |
|
3547 | 58 |
[UIView beginAnimations:@"rotation" context:NULL]; |
59 |
[UIView setAnimationDuration:0.8f]; |
|
60 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut]; |
|
61 |
switch (orientation) { |
|
62 |
case UIDeviceOrientationLandscapeLeft: |
|
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
63 |
if ([[UIScreen screens] count] == 1) |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
64 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(0)); |
3680 | 65 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(90)); |
3547 | 66 |
HW_setLandscape(YES); |
67 |
break; |
|
68 |
case UIDeviceOrientationLandscapeRight: |
|
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
69 |
if ([[UIScreen screens] count] == 1) |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
70 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(180)); |
3680 | 71 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(-90)); |
3547 | 72 |
HW_setLandscape(YES); |
73 |
break; |
|
3551 | 74 |
/* |
3547 | 75 |
case UIDeviceOrientationPortrait: |
76 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
77 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(270)); |
|
78 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(0)); |
|
79 |
[self chatAppear]; |
|
80 |
HW_setLandscape(NO); |
|
81 |
} |
|
82 |
break; |
|
83 |
case UIDeviceOrientationPortraitUpsideDown: |
|
84 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
85 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(90)); |
|
86 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(180)); |
|
87 |
[self chatAppear]; |
|
88 |
HW_setLandscape(NO); |
|
89 |
} |
|
90 |
break; |
|
3551 | 91 |
*/ |
3547 | 92 |
default: |
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
93 |
// a debug log would spam too much |
3547 | 94 |
break; |
95 |
} |
|
96 |
self.view.frame = usefulRect; |
|
97 |
//sdlView.frame = usefulRect; |
|
98 |
[UIView commitAnimations]; |
|
99 |
} |
|
100 |
||
101 |
#pragma mark - |
|
102 |
#pragma mark View Management |
|
103 |
-(void) viewDidLoad { |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
104 |
isGameRunning = NO; |
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
105 |
isReplay = NO; |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
106 |
cachedGrenadeTime = 2; |
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
107 |
isAttacking = NO; |
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
108 |
|
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
109 |
// i called it a popover even on the iphone |
3547 | 110 |
isPopoverVisible = NO; |
111 |
self.view.alpha = 0; |
|
112 |
self.view.center = CGPointMake(self.view.frame.size.height/2.0, self.view.frame.size.width/2.0); |
|
3697 | 113 |
|
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
114 |
// set initial orientation wrt the controller orientation |
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
115 |
UIDeviceOrientation orientation = self.interfaceOrientation; |
3650 | 116 |
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
|
117 |
switch (orientation) { |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
118 |
case UIDeviceOrientationLandscapeLeft: |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
119 |
if ([[UIScreen screens] count] == 1) |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
120 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(0)); |
3680 | 121 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(90)); |
3627
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
122 |
break; |
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
123 |
case UIDeviceOrientationLandscapeRight: |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
124 |
if ([[UIScreen screens] count] == 1) |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
125 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(180)); |
3680 | 126 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(-90)); |
3627
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
127 |
break; |
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
128 |
default: |
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
129 |
DLog(@"unknown orientation"); |
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
130 |
break; |
3627
f1da1d8fb56c
the game now respects the orientation of the frontend
koda
parents:
3626
diff
changeset
|
131 |
} |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
132 |
CGRect screenRect = [[UIScreen mainScreen] bounds]; |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
133 |
self.view.frame = CGRectMake(0, 0, screenRect.size.width, screenRect.size.height); |
3697 | 134 |
|
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
135 |
dimTimer = [[NSTimer alloc] initWithFireDate:([[UIScreen screens] count] == 1) ? [NSDate dateWithTimeIntervalSinceNow:6] : HIDING_TIME_NEVER |
3547 | 136 |
interval:1000 |
137 |
target:self |
|
138 |
selector:@selector(dimOverlay) |
|
139 |
userInfo:nil |
|
140 |
repeats:YES]; |
|
3697 | 141 |
|
3547 | 142 |
// add timer too runloop, otherwise it doesn't work |
143 |
[[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode]; |
|
3697 | 144 |
|
145 |
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications]; |
|
3547 | 146 |
[[NSNotificationCenter defaultCenter] addObserver:self |
147 |
selector:@selector(didRotate:) |
|
3598 | 148 |
name:UIDeviceOrientationDidChangeNotification |
3547 | 149 |
object:nil]; |
150 |
||
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
151 |
[[NSNotificationCenter defaultCenter] addObserver:self |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
152 |
selector:@selector(showHelp:) |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
153 |
name:@"show help ingame" |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
154 |
object:nil]; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
155 |
|
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
156 |
[[NSNotificationCenter defaultCenter] addObserver:self |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
157 |
selector:@selector(cleanup) |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
158 |
name:@"remove overlay" |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
159 |
object:nil]; |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
160 |
|
3547 | 161 |
[UIView beginAnimations:@"showing overlay" context:NULL]; |
162 |
[UIView setAnimationDuration:1]; |
|
163 |
self.view.alpha = 1; |
|
164 |
[UIView commitAnimations]; |
|
3924 | 165 |
|
166 |
AmmoMenuViewController *amvc = [[AmmoMenuViewController alloc] init]; |
|
167 |
amvc.view.center = self.view.center; |
|
168 |
[self.view addSubview:amvc.view]; |
|
3547 | 169 |
} |
170 |
||
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
171 |
-(void) showHelp:(id) sender { |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
172 |
if (self.helpPage == nil) |
3792 | 173 |
self.helpPage = [[HelpPageViewController alloc] initWithNibName:@"HelpPageInGameViewController" bundle:nil]; |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
174 |
self.helpPage.view.alpha = 0; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
175 |
[self.view addSubview:helpPage.view]; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
176 |
[UIView beginAnimations:@"helpingame" context:NULL]; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
177 |
self.helpPage.view.alpha = 1; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
178 |
[UIView commitAnimations]; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
179 |
doNotDim(); |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
180 |
} |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
181 |
|
3783 | 182 |
-(void) didReceiveMemoryWarning { |
183 |
[super didReceiveMemoryWarning]; |
|
184 |
if (self.popupMenu.view.superview == nil) |
|
185 |
self.popupMenu = nil; |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
186 |
if (self.helpPage.view.superview == nil) |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
187 |
self.helpPage = nil; |
3783 | 188 |
MSG_MEMCLEAN(); |
189 |
} |
|
190 |
||
3547 | 191 |
-(void) viewDidUnload { |
3783 | 192 |
// only objects initialized in viewDidLoad should be here |
193 |
[[NSNotificationCenter defaultCenter] removeObserver:self]; |
|
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
|
194 |
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
|
195 |
MSG_DIDUNLOAD(); |
3547 | 196 |
[super viewDidUnload]; |
197 |
} |
|
198 |
||
199 |
-(void) dealloc { |
|
200 |
[popupMenu release]; |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
201 |
[helpPage release]; |
3547 | 202 |
[popoverController release]; |
203 |
// dimTimer is autoreleased |
|
204 |
[super dealloc]; |
|
205 |
} |
|
206 |
||
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
207 |
-(void) cleanup { |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
208 |
[self dismissPopover]; |
3924 | 209 |
HW_terminate(NO); |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
210 |
[self.view removeFromSuperview]; |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
211 |
} |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
212 |
|
3547 | 213 |
#pragma mark - |
214 |
#pragma mark Overlay actions and members |
|
215 |
// nice transition for dimming, should be called only by the timer himself |
|
216 |
-(void) dimOverlay { |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
217 |
if (isGameRunning) { |
3547 | 218 |
[UIView beginAnimations:@"overlay dim" context:NULL]; |
219 |
[UIView setAnimationDuration:0.6]; |
|
220 |
self.view.alpha = 0.2; |
|
221 |
[UIView commitAnimations]; |
|
222 |
} |
|
223 |
} |
|
224 |
||
225 |
// set the overlay visible and put off the timer for enough time |
|
226 |
-(void) activateOverlay { |
|
227 |
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
|
228 |
doNotDim(); |
3547 | 229 |
} |
230 |
||
3626 | 231 |
// dim the overlay when there's no more input for a certain amount of time |
232 |
-(IBAction) buttonReleased:(id) sender { |
|
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
233 |
if (isGameRunning == NO) |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
234 |
return; |
3697 | 235 |
|
3626 | 236 |
UIButton *theButton = (UIButton *)sender; |
3697 | 237 |
|
3626 | 238 |
switch (theButton.tag) { |
239 |
case 0: |
|
240 |
case 1: |
|
241 |
case 2: |
|
242 |
case 3: |
|
3649 | 243 |
[NSObject cancelPreviousPerformRequestsWithTarget:self |
244 |
selector:@selector(unsetPreciseStatus) |
|
245 |
object:nil]; |
|
3626 | 246 |
HW_walkingKeysUp(); |
247 |
break; |
|
248 |
case 4: |
|
249 |
case 5: |
|
250 |
case 6: |
|
251 |
HW_otherKeysUp(); |
|
252 |
break; |
|
253 |
default: |
|
3660 | 254 |
DLog(@"Nope"); |
3626 | 255 |
break; |
256 |
} |
|
257 |
||
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
258 |
isAttacking = NO; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
259 |
doDim(); |
3626 | 260 |
} |
261 |
||
3697 | 262 |
// issue certain action based on the tag of the button |
3547 | 263 |
-(IBAction) buttonPressed:(id) sender { |
264 |
[self activateOverlay]; |
|
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
265 |
|
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
266 |
if (isGameRunning == NO) |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
267 |
return; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
268 |
|
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
269 |
if (isPopoverVisible) |
3547 | 270 |
[self dismissPopover]; |
3779
3351a017d4ad
tap to dismiss 'get ready', add a toggle to enable/disable it
koda
parents:
3765
diff
changeset
|
271 |
|
3547 | 272 |
UIButton *theButton = (UIButton *)sender; |
273 |
switch (theButton.tag) { |
|
274 |
case 0: |
|
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
275 |
if (isAttacking == NO) |
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
276 |
HW_walkLeft(); |
3547 | 277 |
break; |
278 |
case 1: |
|
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
279 |
if (isAttacking == NO) |
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
280 |
HW_walkRight(); |
3547 | 281 |
break; |
282 |
case 2: |
|
3649 | 283 |
[self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8]; |
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
284 |
HW_preciseSet(!HW_isWeaponRope()); |
3547 | 285 |
HW_aimUp(); |
286 |
break; |
|
287 |
case 3: |
|
3649 | 288 |
[self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8]; |
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
289 |
HW_preciseSet(!HW_isWeaponRope()); |
3547 | 290 |
HW_aimDown(); |
291 |
break; |
|
292 |
case 4: |
|
293 |
HW_shoot(); |
|
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
294 |
isAttacking = YES; |
3547 | 295 |
break; |
296 |
case 5: |
|
297 |
HW_jump(); |
|
298 |
break; |
|
299 |
case 6: |
|
300 |
HW_backjump(); |
|
301 |
break; |
|
302 |
case 10: |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
303 |
playSound(@"clickSound"); |
3667 | 304 |
HW_pause(); |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
305 |
removeConfirmationInput(); |
3547 | 306 |
[self showPopover]; |
307 |
break; |
|
3624 | 308 |
case 11: |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
309 |
playSound(@"clickSound"); |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
310 |
removeConfirmationInput(); |
3624 | 311 |
HW_ammoMenu(); |
312 |
break; |
|
3547 | 313 |
default: |
3626 | 314 |
DLog(@"Nope"); |
3547 | 315 |
break; |
316 |
} |
|
317 |
} |
|
318 |
||
3649 | 319 |
-(void) unsetPreciseStatus { |
320 |
HW_preciseSet(NO); |
|
321 |
} |
|
322 |
||
3547 | 323 |
// present a further check before closing game |
324 |
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { |
|
325 |
if ([actionSheet cancelButtonIndex] != buttonIndex) |
|
3924 | 326 |
[self cleanup]; |
3547 | 327 |
else |
3697 | 328 |
HW_pause(); |
3547 | 329 |
} |
330 |
||
331 |
// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize |
|
332 |
// on iphone instead just use the tableViewController directly (and implement manually all animations) |
|
333 |
-(IBAction) showPopover{ |
|
3667 | 334 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3547 | 335 |
isPopoverVisible = YES; |
336 |
||
337 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
|
3697 | 338 |
if (popupMenu == nil) |
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
339 |
popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain]; |
3547 | 340 |
if (popoverController == nil) { |
341 |
popoverController = [[UIPopoverController alloc] initWithContentViewController:popupMenu]; |
|
342 |
[popoverController setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; |
|
343 |
[popoverController setPassthroughViews:[NSArray arrayWithObject:self.view]]; |
|
344 |
} |
|
3551 | 345 |
|
3667 | 346 |
[popoverController presentPopoverFromRect:CGRectMake(screen.size.height / 2, screen.size.width / 2, 1, 1) |
3547 | 347 |
inView:self.view |
3667 | 348 |
permittedArrowDirections:UIPopoverArrowDirectionAny |
3547 | 349 |
animated:YES]; |
350 |
} else { |
|
3648 | 351 |
if (popupMenu == nil) |
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
352 |
popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStyleGrouped]; |
3697 | 353 |
|
3547 | 354 |
[self.view addSubview:popupMenu.view]; |
3648 | 355 |
[popupMenu present]; |
3547 | 356 |
} |
357 |
popupMenu.tableView.scrollEnabled = NO; |
|
358 |
} |
|
359 |
||
360 |
// on ipad just dismiss it, on iphone transtion to the right |
|
361 |
-(void) dismissPopover { |
|
362 |
if (YES == isPopoverVisible) { |
|
363 |
isPopoverVisible = NO; |
|
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
364 |
if (HW_isPaused()) |
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
365 |
HW_pause(); |
3697 | 366 |
|
3547 | 367 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
3648 | 368 |
[(InGameMenuViewController *)popoverController.contentViewController removeChat]; |
3547 | 369 |
[popoverController dismissPopoverAnimated:YES]; |
370 |
} else { |
|
3648 | 371 |
[popupMenu dismiss]; |
3547 | 372 |
} |
373 |
[self buttonReleased:nil]; |
|
374 |
} |
|
375 |
} |
|
376 |
||
377 |
#pragma mark - |
|
378 |
#pragma mark Custom touch event handling |
|
379 |
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
380 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
381 |
UITouch *first, *second; |
3697 | 382 |
|
3765
ebfe7c9b3085
set flake to non critical, no touches until game is starding, moved some variables to be initialized in the right place
koda
parents:
3739
diff
changeset
|
383 |
if (isGameRunning == NO) |
ebfe7c9b3085
set flake to non critical, no touches until game is starding, moved some variables to be initialized in the right place
koda
parents:
3739
diff
changeset
|
384 |
return; |
ebfe7c9b3085
set flake to non critical, no touches until game is starding, moved some variables to be initialized in the right place
koda
parents:
3739
diff
changeset
|
385 |
|
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
386 |
// hide in-game menu |
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
387 |
if (isPopoverVisible) |
3547 | 388 |
[self dismissPopover]; |
3697 | 389 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
390 |
// reset default dimming |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
391 |
doDim(); |
3697 | 392 |
|
3668
3f7a95234d8a
tap to play piano notes, fix for audio and pause glitch
koda
parents:
3667
diff
changeset
|
393 |
HW_setPianoSound([allTouches count]); |
3697 | 394 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
395 |
switch ([allTouches count]) { |
3697 | 396 |
case 1: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
397 |
removeConfirmationInput(); |
3651 | 398 |
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
|
399 |
if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount]) |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
400 |
HW_zoomReset(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
401 |
break; |
3697 | 402 |
case 2: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
403 |
// pinching |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
404 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
405 |
second = [[allTouches allObjects] objectAtIndex:1]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
406 |
initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
407 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
408 |
default: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
409 |
break; |
3547 | 410 |
} |
411 |
} |
|
412 |
||
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
413 |
//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
|
414 |
|
3547 | 415 |
-(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
|
416 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
417 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
418 |
CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
3697 | 419 |
|
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
420 |
if (isGameRunning == NO) |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
421 |
return; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
422 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
423 |
switch ([allTouches count]) { |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
424 |
case 1: |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
425 |
// 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
|
426 |
if (HW_isAmmoOpen()) { |
3680 | 427 |
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
|
428 |
// 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
|
429 |
HW_click(); |
3697 | 430 |
} else |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
431 |
// 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
|
432 |
if (HW_isWeaponRequiringClick()) { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
433 |
// 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
|
434 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
3697 | 435 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
436 |
// 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
|
437 |
UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect]; |
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
438 |
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
|
439 |
tapAgain.tag = CONFIRMATION_TAG; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
440 |
tapAgain.alpha = 0; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
441 |
[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
|
442 |
[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
|
443 |
[self.view addSubview:tapAgain]; |
3697 | 444 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
445 |
// animation ftw! |
3697 | 446 |
[UIView beginAnimations:@"inserting button" context:NULL]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
447 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
448 |
[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
|
449 |
[UIView commitAnimations]; |
3697 | 450 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
451 |
// keep the overlay active, or the button will fade |
3650 | 452 |
[self activateOverlay]; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
453 |
doNotDim(); |
3650 | 454 |
} else |
455 |
if (HW_isWeaponTimerable()) { |
|
456 |
if (isSegmentVisible) { |
|
457 |
UISegmentedControl *grenadeTime = (UISegmentedControl *)[self.view viewWithTag:GRENADE_TAG]; |
|
3697 | 458 |
|
3650 | 459 |
[UIView beginAnimations:@"removing segmented control" context:NULL]; |
460 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
461 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseIn]; |
|
462 |
grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50); |
|
463 |
[UIView commitAnimations]; |
|
3697 | 464 |
|
3650 | 465 |
[grenadeTime performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION]; |
466 |
} else { |
|
467 |
NSArray *items = [[NSArray alloc] initWithObjects:@"1",@"2",@"3",@"4",@"5",nil]; |
|
468 |
UISegmentedControl *grenadeTime = [[UISegmentedControl alloc] initWithItems:items]; |
|
469 |
[items release]; |
|
3697 | 470 |
|
3650 | 471 |
[grenadeTime addTarget:self action:@selector(setGrenadeTime:) forControlEvents:UIControlEventValueChanged]; |
472 |
grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50); |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
473 |
grenadeTime.selectedSegmentIndex = cachedGrenadeTime; |
3650 | 474 |
grenadeTime.tag = GRENADE_TAG; |
475 |
[self.view addSubview:grenadeTime]; |
|
476 |
[grenadeTime release]; |
|
3697 | 477 |
|
3650 | 478 |
[UIView beginAnimations:@"inserting segmented control" context:NULL]; |
479 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
480 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseIn]; |
|
481 |
grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width - 100, 250, 50); |
|
482 |
[UIView commitAnimations]; |
|
3697 | 483 |
|
3650 | 484 |
[self activateOverlay]; |
485 |
doNotDim(); |
|
3697 | 486 |
} |
3650 | 487 |
isSegmentVisible = !isSegmentVisible; |
3661 | 488 |
} else |
489 |
if (HW_isWeaponSwitch()) |
|
490 |
HW_tab(); |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
491 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
492 |
case 2: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
493 |
HW_allKeysUp(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
494 |
break; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
495 |
default: |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
496 |
break; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
497 |
} |
3697 | 498 |
|
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
|
499 |
initialDistanceForPinching = 0; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
500 |
} |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
501 |
|
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
502 |
-(void) sendHWClick { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
503 |
HW_click(); |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
504 |
removeConfirmationInput(); |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
505 |
doDim(); |
3547 | 506 |
} |
507 |
||
3650 | 508 |
-(void) setGrenadeTime:(id) sender { |
509 |
UISegmentedControl *theSegment = (UISegmentedControl *)sender; |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
510 |
if (cachedGrenadeTime != theSegment.selectedSegmentIndex) { |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
511 |
HW_setGrenadeTime(theSegment.selectedSegmentIndex + 1); |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
512 |
cachedGrenadeTime = theSegment.selectedSegmentIndex; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
513 |
} |
3650 | 514 |
} |
515 |
||
3547 | 516 |
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { |
517 |
[self touchesEnded:touches withEvent:event]; |
|
518 |
} |
|
519 |
||
520 |
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3551 | 521 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
522 |
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
|
523 |
int x, y, dx, dy; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
524 |
UITouch *touch, *first, *second; |
3547 | 525 |
|
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
526 |
if (isGameRunning == NO) |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
527 |
return; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
528 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
529 |
switch ([allTouches count]) { |
3551 | 530 |
case 1: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
531 |
touch = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
532 |
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
|
533 |
|
3680 | 534 |
if (HW_isAmmoOpen()) { |
535 |
// no zoom consideration for this |
|
536 |
HW_setCursor(HWXZ(currentPosition.x), HWYZ(currentPosition.y)); |
|
537 |
} else |
|
538 |
if (HW_isWeaponRequiringClick()) { |
|
539 |
// moves the cursor around wrt zoom |
|
540 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
|
541 |
} else { |
|
542 |
// panning \o/ |
|
543 |
dx = startingPoint.x - currentPosition.x; |
|
544 |
dy = currentPosition.y - startingPoint.y; |
|
545 |
HW_getCursor(&x, &y); |
|
546 |
// momentum (or something like that) |
|
547 |
/*if (abs(dx) > 40) |
|
548 |
dx *= log(abs(dx)/4); |
|
549 |
if (abs(dy) > 40) |
|
550 |
dy *= log(abs(dy)/4);*/ |
|
551 |
HW_setCursor(x + dx/HW_zoomFactor(), y + dy/HW_zoomFactor()); |
|
552 |
startingPoint = currentPosition; |
|
553 |
} |
|
3551 | 554 |
break; |
3547 | 555 |
case 2: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
556 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
557 |
second = [[allTouches allObjects] objectAtIndex:1]; |
3547 | 558 |
CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
559 |
const int pinchDelta = 40; |
|
3697 | 560 |
|
3547 | 561 |
if (0 != initialDistanceForPinching) { |
562 |
if (currentDistanceOfPinching - initialDistanceForPinching > pinchDelta) { |
|
563 |
HW_zoomIn(); |
|
564 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
565 |
} |
|
566 |
else if (initialDistanceForPinching - currentDistanceOfPinching > pinchDelta) { |
|
567 |
HW_zoomOut(); |
|
568 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
569 |
} |
|
3697 | 570 |
} else |
3547 | 571 |
initialDistanceForPinching = currentDistanceOfPinching; |
3697 | 572 |
|
3547 | 573 |
break; |
574 |
default: |
|
575 |
break; |
|
576 |
} |
|
577 |
} |
|
578 |
||
3650 | 579 |
#pragma mark - |
580 |
#pragma mark Functions called by pascal |
|
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
581 |
void setGameRunning(BOOL value) { |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
582 |
isGameRunning = value; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
583 |
} |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
584 |
|
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
585 |
// called by uStore from AddProgress |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
586 |
void startSpinning() { |
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
587 |
setGameRunning(NO); |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
588 |
UIWindow *theWindow = [[UIApplication sharedApplication] keyWindow]; |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
589 |
UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
590 |
indicator.tag = ACTIVITYINDICATOR_TAG; |
3926
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3924
diff
changeset
|
591 |
int offset; |
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3924
diff
changeset
|
592 |
if ([[UIDevice currentDevice] orientation] == UIDeviceOrientationLandscapeLeft) |
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3924
diff
changeset
|
593 |
offset = -120; |
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3924
diff
changeset
|
594 |
else |
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3924
diff
changeset
|
595 |
offset = 120; |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
596 |
if ([[UIScreen screens] count] > 1) |
3926
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3924
diff
changeset
|
597 |
indicator.center = CGPointMake(theWindow.frame.size.width/2, theWindow.frame.size.height/2 + offset); |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
598 |
else |
3926
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3924
diff
changeset
|
599 |
indicator.center = CGPointMake(theWindow.frame.size.width/2 + offset, theWindow.frame.size.height/2); |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
600 |
indicator.hidesWhenStopped = YES; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
601 |
[indicator startAnimating]; |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
602 |
[theWindow addSubview:indicator]; |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
603 |
[indicator release]; |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
604 |
} |
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
605 |
|
3906 | 606 |
// called by uStore from FinishProgress and by OverlayViewController by replayBegan |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
607 |
void stopSpinning() { |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
608 |
UIWindow *theWindow = [[UIApplication sharedApplication] keyWindow]; |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
609 |
UIActivityIndicatorView *indicator = (UIActivityIndicatorView *)[theWindow viewWithTag:ACTIVITYINDICATOR_TAG]; |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
610 |
[indicator stopAnimating]; |
3737
2ba6ac8a114b
reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents:
3701
diff
changeset
|
611 |
HW_zoomSet(1.7); |
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
612 |
if (isReplay == NO) |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
613 |
setGameRunning(YES); |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
614 |
} |
3547 | 615 |
|
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
616 |
// called by CCHandlers from chNextTurn |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
617 |
void clearView() { |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
618 |
UIWindow *theWindow = ([[UIScreen screens] count] == 1) ? [[UIApplication sharedApplication] keyWindow] : [SDLUIKitDelegate sharedAppDelegate].uiwindow; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
619 |
UIButton *theButton = (UIButton *)[theWindow viewWithTag:CONFIRMATION_TAG]; |
3650 | 620 |
UISegmentedControl *theSegment = (UISegmentedControl *)[theWindow viewWithTag:GRENADE_TAG]; |
3697 | 621 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
622 |
[UIView beginAnimations:@"remove button" context:NULL]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
623 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
624 |
theButton.alpha = 0; |
3650 | 625 |
theSegment.alpha = 0; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
626 |
[UIView commitAnimations]; |
3697 | 627 |
|
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
628 |
[theWindow performSelector:@selector(removeFromSuperview) withObject:theButton afterDelay:ANIMATION_DURATION]; |
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
629 |
[theWindow performSelector:@selector(removeFromSuperview) withObject:theSegment afterDelay:ANIMATION_DURATION]; |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
630 |
|
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
631 |
cachedGrenadeTime = 2; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
632 |
} |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
633 |
|
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
634 |
// called by hwengine |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
635 |
void replayBegan() { |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
636 |
UIWindow *theWindow = [[UIApplication sharedApplication] keyWindow]; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
637 |
UIView *blackView = [[UIView alloc] initWithFrame:theWindow.frame]; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
638 |
blackView.backgroundColor = [UIColor blackColor]; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
639 |
blackView.alpha = 0.6; |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
640 |
blackView.tag = REPLAYBLACKVIEW_TAG; |
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
641 |
blackView.exclusiveTouch = NO; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
642 |
blackView.multipleTouchEnabled = NO; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
643 |
blackView.userInteractionEnabled = NO; |
3906 | 644 |
UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; |
645 |
indicator.center = theWindow.center; |
|
646 |
[indicator startAnimating]; |
|
647 |
[blackView addSubview:indicator]; |
|
648 |
[indicator release]; |
|
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
649 |
[theWindow addSubview:blackView]; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
650 |
[blackView release]; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
651 |
isReplay = YES; |
3906 | 652 |
stopSpinning(); |
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
653 |
} |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
654 |
|
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
655 |
// called by uGame |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
656 |
void replayFinished() { |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
657 |
UIWindow *theWindow = [[UIApplication sharedApplication] keyWindow]; |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
658 |
UIView *blackView = (UIView *)[theWindow viewWithTag:REPLAYBLACKVIEW_TAG]; |
3904
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
659 |
|
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
660 |
[UIView beginAnimations:@"removing black" context:NULL]; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
661 |
[UIView setAnimationDuration:1]; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
662 |
blackView.alpha = 0; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
663 |
[UIView commitAnimations]; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
664 |
[theWindow performSelector:@selector(removeFromSuperview) withObject:blackView afterDelay:1]; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
665 |
|
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
666 |
setGameRunning(YES); |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
667 |
isReplay = NO; |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
668 |
} |
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
669 |
|
3547 | 670 |
@end |