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