author | koda |
Sat, 18 Feb 2012 19:33:04 +0100 | |
changeset 6713 | 3a02e9c25ac5 |
parent 6700 | e04da46ee43c |
child 6822 | 206db098f8c5 |
permissions | -rw-r--r-- |
3829 | 1 |
/* |
2 |
* Hedgewars-iOS, a Hedgewars port for iOS devices |
|
6700 | 3 |
* Copyright (c) 2009-2012 Vittorio Giovara <vittorio.giovara@gmail.com> |
3829 | 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" |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
23 |
#import "InGameMenuViewController.h" |
3792 | 24 |
#import "HelpPageViewController.h" |
3547 | 25 |
#import "CGPointUtils.h" |
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
26 |
#import "ObjcExports.h" |
3547 | 27 |
|
6078
8c0cc07731e5
headers cleanup, converted some function-only sources into proper class method files, more use of OOP power, removed some 'respondsToSelector' calls, moved defines into their own header, more use of objc categories
koda
parents:
6018
diff
changeset
|
28 |
|
3547 | 29 |
#define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7] |
30 |
#define HIDING_TIME_NEVER [NSDate dateWithTimeIntervalSinceNow:10000] |
|
6624
e049b5bb0ad1
BUUUUURN OBJC AMMOMENU BUUUURNhg diff! (on a separate note, this reduces the codesize by ~37k)
koda
parents:
6615
diff
changeset
|
31 |
#define doDim() [dimTimer setFireDate:HIDING_TIME_DEFAULT] |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
32 |
#define doNotDim() [dimTimer setFireDate:HIDING_TIME_NEVER] |
3547 | 33 |
|
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
34 |
|
6018
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
35 |
static OverlayViewController *mainOverlay; |
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
36 |
|
3547 | 37 |
@implementation OverlayViewController |
6624
e049b5bb0ad1
BUUUUURN OBJC AMMOMENU BUUUURNhg diff! (on a separate note, this reduces the codesize by ~37k)
koda
parents:
6615
diff
changeset
|
38 |
@synthesize popoverController, popupMenu, helpPage, loadingIndicator, confirmButton, grenadeTimeSegment; |
3547 | 39 |
|
3976 | 40 |
#pragma mark - |
41 |
#pragma mark rotation |
|
5109
6d2e8a24277e
strangely enough, the new sdl rotation code is incompatible with our system... this is a workaround that should hold up until their code becomes more stable
koda
parents:
4976
diff
changeset
|
42 |
|
3547 | 43 |
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { |
3977 | 44 |
return rotationManager(interfaceOrientation); |
3547 | 45 |
} |
46 |
||
47 |
#pragma mark - |
|
48 |
#pragma mark View Management |
|
6018
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
49 |
-(id) initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { |
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
50 |
if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { |
3976 | 51 |
isAttacking = NO; |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
52 |
isPopoverVisible = NO; |
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
53 |
loadingIndicator = nil; |
6018
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
54 |
mainOverlay = self; |
3976 | 55 |
} |
56 |
return self; |
|
57 |
} |
|
3948
24daa33a3114
some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents:
3941
diff
changeset
|
58 |
|
6018
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
59 |
+(OverlayViewController *)mainOverlay { |
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
60 |
return mainOverlay; |
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
61 |
} |
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
62 |
|
3976 | 63 |
-(void) viewDidLoad { |
5662
99083392cd4f
FREE AT LAST!!! SDL came around a (mostly) sane way for implementing rotation events, so we can scrap all the workaround code that has been added to workaround it!! Also this allows us to use proper (internal) multitasking handling and can simplify optional settings and other yet unexplored features. Yay!
koda
parents:
5208
diff
changeset
|
64 |
// fill all the screen available as sdlview disables autoresizing |
6615 | 65 |
self.view.frame = [[UIScreen mainScreen] safeBounds]; |
3976 | 66 |
// the timer used to dim the overlay |
6624
e049b5bb0ad1
BUUUUURN OBJC AMMOMENU BUUUURNhg diff! (on a separate note, this reduces the codesize by ~37k)
koda
parents:
6615
diff
changeset
|
67 |
dimTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:6] |
3547 | 68 |
interval:1000 |
69 |
target:self |
|
70 |
selector:@selector(dimOverlay) |
|
71 |
userInfo:nil |
|
72 |
repeats:YES]; |
|
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
73 |
// add timer to runloop, otherwise it doesn't work |
3547 | 74 |
[[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode]; |
3697 | 75 |
|
4924 | 76 |
// display the help page, required by the popover on ipad |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
77 |
[[NSNotificationCenter defaultCenter] addObserver:self |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
78 |
selector:@selector(showHelp:) |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
79 |
name:@"show help ingame" |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
80 |
object:nil]; |
4454 | 81 |
|
3976 | 82 |
// present the overlay |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
83 |
self.view.alpha = 0; |
3547 | 84 |
[UIView beginAnimations:@"showing overlay" context:NULL]; |
4098
40df542b5f62
i give up and disable rotation on the iphone; also fix smaller compilation issues
koda
parents:
4082
diff
changeset
|
85 |
[UIView setAnimationDuration:2]; |
3547 | 86 |
self.view.alpha = 1; |
87 |
[UIView commitAnimations]; |
|
88 |
} |
|
89 |
||
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
90 |
-(void) viewDidUnload { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
91 |
[[NSNotificationCenter defaultCenter] removeObserver:self]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
92 |
|
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
93 |
[NSObject cancelPreviousPerformRequestsWithTarget:self |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
94 |
selector:@selector(unsetPreciseStatus) |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
95 |
object:nil]; |
3941 | 96 |
|
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
97 |
// only objects initialized in viewDidLoad should be here |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
98 |
dimTimer = nil; |
6018
3b86826f6665
add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents:
6000
diff
changeset
|
99 |
mainOverlay = nil; |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
100 |
self.helpPage = nil; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
101 |
[self dismissPopover]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
102 |
self.popoverController = nil; |
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
103 |
self.loadingIndicator = nil; |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
104 |
MSG_DIDUNLOAD(); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
105 |
[super viewDidUnload]; |
4924 | 106 |
} |
107 |
||
3783 | 108 |
-(void) didReceiveMemoryWarning { |
109 |
if (self.popupMenu.view.superview == nil) |
|
110 |
self.popupMenu = nil; |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
111 |
if (self.helpPage.view.superview == nil) |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
112 |
self.helpPage = nil; |
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
113 |
if (self.loadingIndicator.superview == nil) |
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
114 |
self.loadingIndicator = nil; |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
115 |
if (self.confirmButton.superview == nil) |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
116 |
self.confirmButton = nil; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
117 |
if (self.grenadeTimeSegment.superview == nil) |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
118 |
self.grenadeTimeSegment = nil; |
3996 | 119 |
if (IS_IPAD()) |
3971 | 120 |
if (((UIPopoverController *)self.popoverController).contentViewController.view.superview == nil) |
121 |
self.popoverController = nil; |
|
5156 | 122 |
|
3783 | 123 |
MSG_MEMCLEAN(); |
3971 | 124 |
[super didReceiveMemoryWarning]; |
3783 | 125 |
} |
126 |
||
3547 | 127 |
-(void) dealloc { |
5208 | 128 |
releaseAndNil(popupMenu); |
129 |
releaseAndNil(helpPage); |
|
130 |
releaseAndNil(popoverController); |
|
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
131 |
releaseAndNil(loadingIndicator); |
5208 | 132 |
releaseAndNil(confirmButton); |
133 |
releaseAndNil(grenadeTimeSegment); |
|
3547 | 134 |
// dimTimer is autoreleased |
135 |
[super dealloc]; |
|
136 |
} |
|
137 |
||
138 |
#pragma mark - |
|
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
139 |
#pragma mark overlay appearance |
3547 | 140 |
// nice transition for dimming, should be called only by the timer himself |
141 |
-(void) dimOverlay { |
|
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
142 |
if ([HWUtils isGameRunning]) { |
3547 | 143 |
[UIView beginAnimations:@"overlay dim" context:NULL]; |
144 |
[UIView setAnimationDuration:0.6]; |
|
145 |
self.view.alpha = 0.2; |
|
146 |
[UIView commitAnimations]; |
|
147 |
} |
|
148 |
} |
|
149 |
||
150 |
// set the overlay visible and put off the timer for enough time |
|
151 |
-(void) activateOverlay { |
|
152 |
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
|
153 |
doNotDim(); |
3547 | 154 |
} |
155 |
||
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
156 |
-(void) removeOverlay { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
157 |
[self.popupMenu performSelectorOnMainThread:@selector(dismiss) withObject:nil waitUntilDone:YES]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
158 |
[self.popoverController performSelectorOnMainThread:@selector(dismissPopoverAnimated:) withObject:nil waitUntilDone:YES]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
159 |
[self.view performSelectorOnMainThread:@selector(removeFromSuperview) withObject:nil waitUntilDone:YES]; |
6259
02765411a912
move objc overlay creation after sdlwindow has been created
koda
parents:
6247
diff
changeset
|
160 |
[self performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:YES]; |
6260 | 161 |
mainOverlay = nil; |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
162 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
163 |
|
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
164 |
#pragma mark - |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
165 |
#pragma mark overlay user interaction |
3626 | 166 |
// dim the overlay when there's no more input for a certain amount of time |
167 |
-(IBAction) buttonReleased:(id) sender { |
|
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
168 |
if ([HWUtils isGameRunning] == NO) |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3628
diff
changeset
|
169 |
return; |
3697 | 170 |
|
3626 | 171 |
UIButton *theButton = (UIButton *)sender; |
3697 | 172 |
|
3626 | 173 |
switch (theButton.tag) { |
174 |
case 0: |
|
175 |
case 1: |
|
176 |
case 2: |
|
177 |
case 3: |
|
3649 | 178 |
[NSObject cancelPreviousPerformRequestsWithTarget:self |
179 |
selector:@selector(unsetPreciseStatus) |
|
180 |
object:nil]; |
|
3626 | 181 |
HW_walkingKeysUp(); |
182 |
break; |
|
183 |
case 4: |
|
184 |
case 5: |
|
185 |
case 6: |
|
186 |
HW_otherKeysUp(); |
|
187 |
break; |
|
188 |
default: |
|
3660 | 189 |
DLog(@"Nope"); |
3626 | 190 |
break; |
191 |
} |
|
192 |
||
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
|
193 |
isAttacking = NO; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
194 |
doDim(); |
3626 | 195 |
} |
196 |
||
3697 | 197 |
// issue certain action based on the tag of the button |
3547 | 198 |
-(IBAction) buttonPressed:(id) sender { |
199 |
[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
|
200 |
|
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
201 |
if ([HWUtils 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
|
202 |
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
|
203 |
|
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
204 |
if (isPopoverVisible) |
3547 | 205 |
[self dismissPopover]; |
3779
3351a017d4ad
tap to dismiss 'get ready', add a toggle to enable/disable it
koda
parents:
3765
diff
changeset
|
206 |
|
3547 | 207 |
UIButton *theButton = (UIButton *)sender; |
208 |
switch (theButton.tag) { |
|
209 |
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
|
210 |
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
|
211 |
HW_walkLeft(); |
3547 | 212 |
break; |
213 |
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
|
214 |
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
|
215 |
HW_walkRight(); |
3547 | 216 |
break; |
217 |
case 2: |
|
3649 | 218 |
[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
|
219 |
HW_preciseSet(!HW_isWeaponRope()); |
3547 | 220 |
HW_aimUp(); |
221 |
break; |
|
222 |
case 3: |
|
3649 | 223 |
[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
|
224 |
HW_preciseSet(!HW_isWeaponRope()); |
3547 | 225 |
HW_aimDown(); |
226 |
break; |
|
227 |
case 4: |
|
228 |
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
|
229 |
isAttacking = YES; |
3547 | 230 |
break; |
231 |
case 5: |
|
232 |
HW_jump(); |
|
233 |
break; |
|
234 |
case 6: |
|
235 |
HW_backjump(); |
|
236 |
break; |
|
237 |
case 10: |
|
6000
dbcebcd3d79f
ios frontend: sounds and music have their own class now (with caching\!) instead of being spread here and there (exploiting class methods like a true oop pro)
koda
parents:
5662
diff
changeset
|
238 |
[AudioManagerController playClickSound]; |
3667 | 239 |
HW_pause(); |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
240 |
clearView(); |
3547 | 241 |
[self showPopover]; |
242 |
break; |
|
3624 | 243 |
case 11: |
6000
dbcebcd3d79f
ios frontend: sounds and music have their own class now (with caching\!) instead of being spread here and there (exploiting class methods like a true oop pro)
koda
parents:
5662
diff
changeset
|
244 |
[AudioManagerController playClickSound]; |
4504
8906b2409d97
add the appirater class for getting more positive reviews
koda
parents:
4454
diff
changeset
|
245 |
clearView(); |
6624
e049b5bb0ad1
BUUUUURN OBJC AMMOMENU BUUUURNhg diff! (on a separate note, this reduces the codesize by ~37k)
koda
parents:
6615
diff
changeset
|
246 |
HW_ammoMenu(); |
3624 | 247 |
break; |
3547 | 248 |
default: |
3626 | 249 |
DLog(@"Nope"); |
3547 | 250 |
break; |
251 |
} |
|
252 |
} |
|
253 |
||
3649 | 254 |
-(void) unsetPreciseStatus { |
255 |
HW_preciseSet(NO); |
|
256 |
} |
|
257 |
||
3976 | 258 |
-(void) sendHWClick { |
259 |
HW_click(); |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
260 |
clearView(); |
3976 | 261 |
doDim(); |
262 |
} |
|
263 |
||
264 |
-(void) setGrenadeTime:(id) sender { |
|
265 |
UISegmentedControl *theSegment = (UISegmentedControl *)sender; |
|
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
266 |
if ([ObjcExports grenadeTime] != theSegment.selectedSegmentIndex) { |
3976 | 267 |
HW_setGrenadeTime(theSegment.selectedSegmentIndex + 1); |
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
268 |
[ObjcExports setGrenadeTime:theSegment.selectedSegmentIndex]; |
3976 | 269 |
} |
270 |
} |
|
271 |
||
272 |
#pragma mark - |
|
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
273 |
#pragma mark in-game menu and help page |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
274 |
-(void) showHelp:(id) sender { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
275 |
if (self.helpPage == nil) { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
276 |
NSString *xibName = (IS_IPAD() ? @"HelpPageInGameViewController-iPad" : @"HelpPageInGameViewController-iPhone"); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
277 |
self.helpPage = [[HelpPageViewController alloc] initWithNibName:xibName bundle:nil]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
278 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
279 |
self.helpPage.view.alpha = 0; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
280 |
[self.view addSubview:helpPage.view]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
281 |
[UIView beginAnimations:@"helpingame" context:NULL]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
282 |
self.helpPage.view.alpha = 1; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
283 |
[UIView commitAnimations]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
284 |
doNotDim(); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
285 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
286 |
|
3547 | 287 |
// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize |
288 |
// on iphone instead just use the tableViewController directly (and implement manually all animations) |
|
289 |
-(IBAction) showPopover{ |
|
6666 | 290 |
CGRect screen = [[UIScreen mainScreen] safeBounds]; |
3547 | 291 |
isPopoverVisible = YES; |
292 |
||
3996 | 293 |
if (IS_IPAD()) { |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
294 |
if (self.popupMenu == nil) |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
295 |
self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain]; |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
296 |
if (self.popoverController == nil) { |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
297 |
self.popoverController = [[UIPopoverController alloc] initWithContentViewController:self.popupMenu]; |
4935 | 298 |
[self.popoverController setPopoverContentSize:CGSizeMake(220, 200) animated:YES]; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
299 |
[self.popoverController setPassthroughViews:[NSArray arrayWithObject:self.view]]; |
3547 | 300 |
} |
3551 | 301 |
|
6666 | 302 |
[self.popoverController presentPopoverFromRect:CGRectMake(screen.size.width / 2, screen.size.height / 2, 1, 1) |
3547 | 303 |
inView:self.view |
3667 | 304 |
permittedArrowDirections:UIPopoverArrowDirectionAny |
3547 | 305 |
animated:YES]; |
306 |
} else { |
|
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
307 |
if (self.popupMenu == nil) |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
308 |
self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStyleGrouped]; |
3697 | 309 |
|
3547 | 310 |
[self.view addSubview:popupMenu.view]; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
311 |
[self.popupMenu present]; |
3547 | 312 |
} |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
313 |
self.popupMenu.tableView.scrollEnabled = NO; |
3547 | 314 |
} |
315 |
||
316 |
// on ipad just dismiss it, on iphone transtion to the right |
|
317 |
-(void) dismissPopover { |
|
318 |
if (YES == isPopoverVisible) { |
|
319 |
isPopoverVisible = NO; |
|
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
320 |
if (HW_isPaused()) |
4454 | 321 |
HW_pauseToggle(); |
3697 | 322 |
|
4920 | 323 |
[self.popupMenu dismiss]; |
324 |
if (IS_IPAD()) |
|
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
325 |
[self.popoverController dismissPopoverAnimated:YES]; |
4920 | 326 |
|
3547 | 327 |
[self buttonReleased:nil]; |
328 |
} |
|
329 |
} |
|
330 |
||
331 |
#pragma mark - |
|
332 |
#pragma mark Custom touch event handling |
|
4541 | 333 |
-(BOOL) shouldIgnoreTouch:(NSSet *)allTouches { |
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
334 |
if ([HWUtils isGameRunning] == NO) |
4541 | 335 |
return YES; |
336 |
||
337 |
// ignore activity near the dpad and buttons |
|
338 |
CGPoint touchPoint = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
|
6666 | 339 |
CGSize screen = [[UIScreen mainScreen] safeBounds].size; |
4541 | 340 |
|
6666 | 341 |
if ((touchPoint.x < 160 && touchPoint.y > screen.height - 155 ) || |
342 |
(touchPoint.x > screen.width - 135 && touchPoint.y > screen.height - 140)) |
|
4541 | 343 |
return YES; |
344 |
return NO; |
|
345 |
} |
|
346 |
||
3547 | 347 |
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
348 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
349 |
UITouch *first, *second; |
3697 | 350 |
|
4541 | 351 |
if ([self shouldIgnoreTouch:allTouches] == YES) |
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
|
352 |
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
|
353 |
|
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
354 |
// hide in-game menu |
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
355 |
if (isPopoverVisible) |
3547 | 356 |
[self dismissPopover]; |
3697 | 357 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
358 |
// reset default dimming |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
359 |
doDim(); |
3697 | 360 |
|
3668
3f7a95234d8a
tap to play piano notes, fix for audio and pause glitch
koda
parents:
3667
diff
changeset
|
361 |
HW_setPianoSound([allTouches count]); |
3697 | 362 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
363 |
switch ([allTouches count]) { |
3697 | 364 |
case 1: |
3651 | 365 |
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
|
366 |
if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount]) |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
367 |
HW_zoomReset(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
368 |
break; |
3697 | 369 |
case 2: |
6268
d773867f93db
double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents:
6260
diff
changeset
|
370 |
if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount]) |
d773867f93db
double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents:
6260
diff
changeset
|
371 |
HW_screenshot(); |
d773867f93db
double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents:
6260
diff
changeset
|
372 |
else { |
d773867f93db
double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents:
6260
diff
changeset
|
373 |
// pinching |
d773867f93db
double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents:
6260
diff
changeset
|
374 |
first = [[allTouches allObjects] objectAtIndex:0]; |
d773867f93db
double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents:
6260
diff
changeset
|
375 |
second = [[allTouches allObjects] objectAtIndex:1]; |
d773867f93db
double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents:
6260
diff
changeset
|
376 |
initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
d773867f93db
double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents:
6260
diff
changeset
|
377 |
} |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
378 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
379 |
default: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
380 |
break; |
3547 | 381 |
} |
382 |
} |
|
383 |
||
384 |
-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
385 |
NSSet *allTouches = [event allTouches]; |
4541 | 386 |
if ([self shouldIgnoreTouch:allTouches] == YES) |
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
|
387 |
return; |
4541 | 388 |
|
6666 | 389 |
CGRect screen = [[UIScreen mainScreen] safeBounds]; |
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
390 |
CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
391 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
392 |
switch ([allTouches count]) { |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
393 |
case 1: |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
394 |
// if we're in the menu we just click in the point |
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
395 |
if (HW_isAmmoMenuOpen()) { |
6666 | 396 |
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
|
397 |
// 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
|
398 |
HW_click(); |
3697 | 399 |
} else |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
400 |
// 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
|
401 |
if (HW_isWeaponRequiringClick()) { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
402 |
// 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
|
403 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
3697 | 404 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
405 |
// draw the button at the last touched point (which is the current position) |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
406 |
if (self.confirmButton == nil) { |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
407 |
UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
408 |
[tapAgain addTarget:self action:@selector(sendHWClick) forControlEvents:UIControlEventTouchUpInside]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
409 |
[tapAgain setTitle:NSLocalizedString(@"Set!",@"on the overlay") forState:UIControlStateNormal]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
410 |
self.confirmButton = tapAgain; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
411 |
} |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
412 |
self.confirmButton.alpha = 0; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
413 |
self.confirmButton.frame = CGRectMake(currentPosition.x - 75, currentPosition.y + 25, 150, 40); |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
414 |
[self.view addSubview:self.confirmButton]; |
3697 | 415 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
416 |
// animation ftw! |
3697 | 417 |
[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
|
418 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
419 |
self.confirmButton.alpha = 1; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
420 |
[UIView commitAnimations]; |
3697 | 421 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
422 |
// keep the overlay active, or the button will fade |
3650 | 423 |
[self activateOverlay]; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
424 |
doNotDim(); |
3650 | 425 |
} else |
426 |
if (HW_isWeaponTimerable()) { |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
427 |
if (self.grenadeTimeSegment.tag != 0) { |
3650 | 428 |
[UIView beginAnimations:@"removing segmented control" context:NULL]; |
429 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
430 |
self.grenadeTimeSegment.alpha = 0; |
3650 | 431 |
[UIView commitAnimations]; |
3697 | 432 |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
433 |
[self.grenadeTimeSegment performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
434 |
self.grenadeTimeSegment.tag = 0; |
3650 | 435 |
} else { |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
436 |
if (self.grenadeTimeSegment == nil) { |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
437 |
NSArray *items = [[NSArray alloc] initWithObjects:@"1",@"2",@"3",@"4",@"5",nil]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
438 |
UISegmentedControl *grenadeSegment = [[UISegmentedControl alloc] initWithItems:items]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
439 |
[items release]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
440 |
[grenadeSegment addTarget:self action:@selector(setGrenadeTime:) forControlEvents:UIControlEventValueChanged]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
441 |
self.grenadeTimeSegment = grenadeSegment; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
442 |
[grenadeSegment release]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
443 |
} |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
444 |
self.grenadeTimeSegment.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50); |
6247
6dfad55fd71c
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents:
6078
diff
changeset
|
445 |
self.grenadeTimeSegment.selectedSegmentIndex = [ObjcExports grenadeTime]; |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
446 |
self.grenadeTimeSegment.alpha = 1; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
447 |
[self.view addSubview:self.grenadeTimeSegment]; |
3697 | 448 |
|
3650 | 449 |
[UIView beginAnimations:@"inserting segmented control" context:NULL]; |
450 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
451 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseIn]; |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
452 |
self.grenadeTimeSegment.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width - 100, 250, 50); |
3650 | 453 |
[UIView commitAnimations]; |
3697 | 454 |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
455 |
self.grenadeTimeSegment.tag++; |
3650 | 456 |
[self activateOverlay]; |
457 |
doNotDim(); |
|
3697 | 458 |
} |
3661 | 459 |
} else |
460 |
if (HW_isWeaponSwitch()) |
|
461 |
HW_tab(); |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
462 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
463 |
case 2: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
464 |
HW_allKeysUp(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
465 |
break; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
466 |
default: |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
467 |
break; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
468 |
} |
3697 | 469 |
|
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
|
470 |
initialDistanceForPinching = 0; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
471 |
} |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
472 |
|
3547 | 473 |
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { |
474 |
[self touchesEnded:touches withEvent:event]; |
|
475 |
} |
|
476 |
||
477 |
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { |
|
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
478 |
NSSet *allTouches = [event allTouches]; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
479 |
if ([self shouldIgnoreTouch:allTouches] == YES) |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
480 |
return; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
481 |
|
6666 | 482 |
CGRect screen = [[UIScreen mainScreen] safeBounds]; |
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
|
483 |
int x, y, dx, dy; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
484 |
UITouch *touch, *first, *second; |
3547 | 485 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
486 |
switch ([allTouches count]) { |
3551 | 487 |
case 1: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
488 |
touch = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
489 |
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
|
490 |
|
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
491 |
if (HW_isAmmoMenuOpen()) { |
3680 | 492 |
// no zoom consideration for this |
493 |
HW_setCursor(HWXZ(currentPosition.x), HWYZ(currentPosition.y)); |
|
494 |
} else |
|
495 |
if (HW_isWeaponRequiringClick()) { |
|
496 |
// moves the cursor around wrt zoom |
|
497 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
|
498 |
} else { |
|
499 |
// panning \o/ |
|
500 |
dx = startingPoint.x - currentPosition.x; |
|
501 |
dy = currentPosition.y - startingPoint.y; |
|
502 |
HW_getCursor(&x, &y); |
|
503 |
// momentum (or something like that) |
|
504 |
/*if (abs(dx) > 40) |
|
505 |
dx *= log(abs(dx)/4); |
|
506 |
if (abs(dy) > 40) |
|
507 |
dy *= log(abs(dy)/4);*/ |
|
508 |
HW_setCursor(x + dx/HW_zoomFactor(), y + dy/HW_zoomFactor()); |
|
509 |
startingPoint = currentPosition; |
|
510 |
} |
|
3551 | 511 |
break; |
3547 | 512 |
case 2: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
513 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
514 |
second = [[allTouches allObjects] objectAtIndex:1]; |
3547 | 515 |
CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
516 |
const int pinchDelta = 40; |
|
3697 | 517 |
|
3547 | 518 |
if (0 != initialDistanceForPinching) { |
519 |
if (currentDistanceOfPinching - initialDistanceForPinching > pinchDelta) { |
|
520 |
HW_zoomIn(); |
|
521 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
522 |
} |
|
523 |
else if (initialDistanceForPinching - currentDistanceOfPinching > pinchDelta) { |
|
524 |
HW_zoomOut(); |
|
525 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
526 |
} |
|
3697 | 527 |
} else |
3547 | 528 |
initialDistanceForPinching = currentDistanceOfPinching; |
529 |
break; |
|
530 |
default: |
|
531 |
break; |
|
532 |
} |
|
533 |
} |
|
534 |
||
535 |
@end |