author | koda |
Mon, 01 Aug 2011 00:48:38 +0200 | |
changeset 5486 | e75f7c3c6275 |
parent 5208 | 878e551f0b4a |
child 5662 | 99083392cd4f |
permissions | -rw-r--r-- |
3829 | 1 |
/* |
2 |
* Hedgewars-iOS, a Hedgewars port for iOS devices |
|
4976 | 3 |
* Copyright (c) 2009-2011 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" |
3924 | 25 |
#import "AmmoMenuViewController.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" |
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
29 |
#import "ObjcExports.h" |
3547 | 30 |
|
31 |
#define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7] |
|
32 |
#define HIDING_TIME_NEVER [NSDate dateWithTimeIntervalSinceNow:10000] |
|
3941 | 33 |
#define doDim() [dimTimer setFireDate: (IS_DUALHEAD()) ? HIDING_TIME_NEVER : 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
|
34 |
#define doNotDim() [dimTimer setFireDate:HIDING_TIME_NEVER] |
3547 | 35 |
|
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
36 |
|
3547 | 37 |
@implementation OverlayViewController |
5206 | 38 |
@synthesize popoverController, popupMenu, helpPage, amvc, initialScreenCount, initialOrientation, |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
39 |
lowerIndicator, savesIndicator, confirmButton, grenadeTimeSegment; |
3547 | 40 |
|
3976 | 41 |
#pragma mark - |
42 |
#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
|
43 |
|
3547 | 44 |
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { |
3977 | 45 |
return rotationManager(interfaceOrientation); |
3547 | 46 |
} |
47 |
||
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
48 |
// while in dual head the above rotation functions are not called |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
49 |
-(void) handleRotationEvent:(NSNotification *)notification { |
4356 | 50 |
if (isGameRunning() == NO) |
51 |
return; |
|
52 |
||
5177 | 53 |
UIView *sdlView = nil; |
54 |
for (UIView *oneView in [[[UIApplication sharedApplication] keyWindow] subviews]) |
|
55 |
if ([oneView isMemberOfClass:[SDL_uikitopenglview class]]) { |
|
56 |
sdlView = (UIView *)oneView; |
|
57 |
break; |
|
58 |
} |
|
59 |
||
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
60 |
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
61 |
NSInteger angle_left = (self.initialOrientation == UIInterfaceOrientationLandscapeLeft) ? 180 : 0; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
62 |
NSInteger angle_right = (self.initialOrientation == UIInterfaceOrientationLandscapeLeft) ? 0 : 180; |
4454 | 63 |
|
5207
4c9ae0f484da
some general tweaks (more intelligent use of macros and more caching)
koda
parents:
5206
diff
changeset
|
64 |
NSString *model = getModelType(); |
4c9ae0f484da
some general tweaks (more intelligent use of macros and more caching)
koda
parents:
5206
diff
changeset
|
65 |
if (IS_VERY_POWERFUL(model)) { |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
66 |
[UIView beginAnimations:@"overlay rotation" context:NULL]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
67 |
[UIView setAnimationDuration:0.7]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
68 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
69 |
switch (orientation) { |
4078 | 70 |
case UIDeviceOrientationLandscapeLeft: |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
71 |
self.view.frame = [[UIScreen mainScreen] bounds]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
72 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(90)); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
73 |
if (IS_DUALHEAD() == NO) |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
74 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(angle_left)); |
4078 | 75 |
break; |
76 |
case UIDeviceOrientationLandscapeRight: |
|
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
77 |
self.view.frame = [[UIScreen mainScreen] bounds]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
78 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(-90)); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
79 |
if (IS_DUALHEAD() == NO) |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
80 |
sdlView.transform = CGAffineTransformMakeRotation(degreesToRadians(angle_right)); |
4078 | 81 |
break; |
82 |
default: |
|
83 |
// a debug log would spam too much |
|
84 |
break; |
|
85 |
} |
|
5207
4c9ae0f484da
some general tweaks (more intelligent use of macros and more caching)
koda
parents:
5206
diff
changeset
|
86 |
if (IS_VERY_POWERFUL(model)) |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
87 |
[UIView commitAnimations]; |
3547 | 88 |
} |
89 |
||
90 |
#pragma mark - |
|
91 |
#pragma mark View Management |
|
3976 | 92 |
-(id) initWithCoder:(NSCoder *)aDecoder { |
93 |
if ((self = [super initWithCoder:aDecoder])) { |
|
94 |
isAttacking = NO; |
|
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
95 |
isPopoverVisible = NO; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
96 |
initialScreenCount = (IS_DUALHEAD() ? 2 : 1); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
97 |
initialOrientation = 0; |
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
98 |
lowerIndicator = nil; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
99 |
savesIndicator = nil; |
3976 | 100 |
} |
101 |
return self; |
|
102 |
} |
|
3948
24daa33a3114
some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents:
3941
diff
changeset
|
103 |
|
3976 | 104 |
-(void) viewDidLoad { |
3922
44804043b691
iPad Video Out support (+less warnings +code update for latest SDL)
koda
parents:
3906
diff
changeset
|
105 |
CGRect screenRect = [[UIScreen mainScreen] bounds]; |
3977 | 106 |
self.view.frame = CGRectMake(0, 0, screenRect.size.height, screenRect.size.width); |
3976 | 107 |
self.view.center = CGPointMake(self.view.frame.size.height/2, self.view.frame.size.width/2); |
3977 | 108 |
|
109 |
// set initial orientation of the controller orientation |
|
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
110 |
switch (self.interfaceOrientation) { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
111 |
case UIDeviceOrientationLandscapeLeft: |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
112 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(90)); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
113 |
break; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
114 |
case UIDeviceOrientationLandscapeRight: |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
115 |
self.view.transform = CGAffineTransformMakeRotation(degreesToRadians(-90)); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
116 |
break; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
117 |
default: |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
118 |
break; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
119 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
120 |
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
121 |
[[NSNotificationCenter defaultCenter] addObserver:self |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
122 |
selector:@selector(handleRotationEvent:) |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
123 |
name:UIDeviceOrientationDidChangeNotification |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
124 |
object:nil]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
125 |
|
3976 | 126 |
// the timer used to dim the overlay |
3941 | 127 |
dimTimer = [[NSTimer alloc] initWithFireDate:(IS_DUALHEAD()) ? HIDING_TIME_NEVER : [NSDate dateWithTimeIntervalSinceNow:6] |
3547 | 128 |
interval:1000 |
129 |
target:self |
|
130 |
selector:@selector(dimOverlay) |
|
131 |
userInfo:nil |
|
132 |
repeats:YES]; |
|
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
133 |
// add timer to runloop, otherwise it doesn't work |
3547 | 134 |
[[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode]; |
3697 | 135 |
|
4924 | 136 |
// 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
|
137 |
[[NSNotificationCenter defaultCenter] addObserver:self |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
138 |
selector:@selector(showHelp:) |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
139 |
name:@"show help ingame" |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
140 |
object:nil]; |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
141 |
|
4098
40df542b5f62
i give up and disable rotation on the iphone; also fix smaller compilation issues
koda
parents:
4082
diff
changeset
|
142 |
// for iOS >= 3.2 |
4082 | 143 |
if ([UIScreen respondsToSelector:@selector(screens)]) { |
144 |
[[NSNotificationCenter defaultCenter] addObserver:self |
|
145 |
selector:@selector(numberOfScreensIncreased) |
|
146 |
name:UIScreenDidConnectNotification |
|
147 |
object:nil]; |
|
148 |
||
149 |
[[NSNotificationCenter defaultCenter] addObserver:self |
|
150 |
selector:@selector(numberOfScreensDecreased) |
|
151 |
name:UIScreenDidDisconnectNotification |
|
152 |
object:nil]; |
|
153 |
} |
|
4454 | 154 |
|
3976 | 155 |
// present the overlay |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
156 |
self.view.alpha = 0; |
3547 | 157 |
[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
|
158 |
[UIView setAnimationDuration:2]; |
3547 | 159 |
self.view.alpha = 1; |
160 |
[UIView commitAnimations]; |
|
161 |
} |
|
162 |
||
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
163 |
-(void) viewDidUnload { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
164 |
[[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
165 |
[[NSNotificationCenter defaultCenter] removeObserver:self]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
166 |
|
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
167 |
[NSObject cancelPreviousPerformRequestsWithTarget:self |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
168 |
selector:@selector(unsetPreciseStatus) |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
169 |
object:nil]; |
3941 | 170 |
|
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
171 |
// only objects initialized in viewDidLoad should be here |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
172 |
dimTimer = nil; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
173 |
self.helpPage = nil; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
174 |
[self dismissPopover]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
175 |
self.popoverController = nil; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
176 |
self.amvc = nil; |
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
177 |
self.lowerIndicator = nil; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
178 |
self.savesIndicator = nil; |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
179 |
MSG_DIDUNLOAD(); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
180 |
[super viewDidUnload]; |
4924 | 181 |
} |
182 |
||
3783 | 183 |
-(void) didReceiveMemoryWarning { |
184 |
if (self.popupMenu.view.superview == nil) |
|
185 |
self.popupMenu = nil; |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
186 |
if (self.helpPage.view.superview == nil) |
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
187 |
self.helpPage = nil; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
188 |
if (self.amvc.view.superview == nil) |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
189 |
self.amvc = nil; |
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
190 |
if (self.lowerIndicator.superview == nil) |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
191 |
self.lowerIndicator = nil; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
192 |
if (self.savesIndicator.superview == nil) |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
193 |
self.savesIndicator = nil; |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
194 |
if (self.confirmButton.superview == nil) |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
195 |
self.confirmButton = nil; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
196 |
if (self.grenadeTimeSegment.superview == nil) |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
197 |
self.grenadeTimeSegment = nil; |
3996 | 198 |
if (IS_IPAD()) |
3971 | 199 |
if (((UIPopoverController *)self.popoverController).contentViewController.view.superview == nil) |
200 |
self.popoverController = nil; |
|
5156 | 201 |
|
3783 | 202 |
MSG_MEMCLEAN(); |
3971 | 203 |
[super didReceiveMemoryWarning]; |
3783 | 204 |
} |
205 |
||
3547 | 206 |
-(void) dealloc { |
5208 | 207 |
releaseAndNil(popupMenu); |
208 |
releaseAndNil(helpPage); |
|
209 |
releaseAndNil(popoverController); |
|
210 |
releaseAndNil(amvc); |
|
211 |
releaseAndNil(lowerIndicator); |
|
212 |
releaseAndNil(savesIndicator); |
|
213 |
releaseAndNil(confirmButton); |
|
214 |
releaseAndNil(grenadeTimeSegment); |
|
3547 | 215 |
// dimTimer is autoreleased |
216 |
[super dealloc]; |
|
217 |
} |
|
218 |
||
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
219 |
-(void) numberOfScreensIncreased { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
220 |
if (self.initialScreenCount == 1) { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
221 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"New display detected" |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
222 |
message:NSLocalizedString(@"Hedgewars supports multi-monitor configurations, but the screen has to be connected before launching the game.",@"") |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
223 |
delegate:nil |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
224 |
cancelButtonTitle:@"Ok" |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
225 |
otherButtonTitles:nil]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
226 |
[alert show]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
227 |
[alert release]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
228 |
HW_pause(); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
229 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
230 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
231 |
|
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
232 |
-(void) numberOfScreensDecreased { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
233 |
if (self.initialScreenCount == 2) { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
234 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Oh noes! Display disconnected" |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
235 |
message:NSLocalizedString(@"A monitor has been disconnected while playing and this has ended the match! You need to restart the game if you wish to use the second display again.",@"") |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
236 |
delegate:nil |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
237 |
cancelButtonTitle:@"Ok" |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
238 |
otherButtonTitles:nil]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
239 |
[alert show]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
240 |
[alert release]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
241 |
HW_terminate(NO); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
242 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
243 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
244 |
|
3547 | 245 |
#pragma mark - |
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
246 |
#pragma mark overlay appearance |
3547 | 247 |
// nice transition for dimming, should be called only by the timer himself |
248 |
-(void) dimOverlay { |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
249 |
if (isGameRunning()) { |
3547 | 250 |
[UIView beginAnimations:@"overlay dim" context:NULL]; |
251 |
[UIView setAnimationDuration:0.6]; |
|
252 |
self.view.alpha = 0.2; |
|
253 |
[UIView commitAnimations]; |
|
254 |
} |
|
255 |
} |
|
256 |
||
257 |
// set the overlay visible and put off the timer for enough time |
|
258 |
-(void) activateOverlay { |
|
259 |
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
|
260 |
doNotDim(); |
3547 | 261 |
} |
262 |
||
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
263 |
-(void) removeOverlay { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
264 |
[self.popupMenu performSelectorOnMainThread:@selector(dismiss) withObject:nil waitUntilDone:YES]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
265 |
[self.popoverController performSelectorOnMainThread:@selector(dismissPopoverAnimated:) withObject:nil waitUntilDone:YES]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
266 |
[self.view performSelectorOnMainThread:@selector(removeFromSuperview) withObject:nil waitUntilDone:YES]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
267 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
268 |
|
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
269 |
#pragma mark - |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
270 |
#pragma mark overlay user interaction |
3626 | 271 |
// dim the overlay when there's no more input for a certain amount of time |
272 |
-(IBAction) buttonReleased:(id) sender { |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
273 |
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
|
274 |
return; |
3697 | 275 |
|
3626 | 276 |
UIButton *theButton = (UIButton *)sender; |
3697 | 277 |
|
3626 | 278 |
switch (theButton.tag) { |
279 |
case 0: |
|
280 |
case 1: |
|
281 |
case 2: |
|
282 |
case 3: |
|
3649 | 283 |
[NSObject cancelPreviousPerformRequestsWithTarget:self |
284 |
selector:@selector(unsetPreciseStatus) |
|
285 |
object:nil]; |
|
3626 | 286 |
HW_walkingKeysUp(); |
287 |
break; |
|
288 |
case 4: |
|
289 |
case 5: |
|
290 |
case 6: |
|
291 |
HW_otherKeysUp(); |
|
292 |
break; |
|
293 |
default: |
|
3660 | 294 |
DLog(@"Nope"); |
3626 | 295 |
break; |
296 |
} |
|
297 |
||
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
|
298 |
isAttacking = NO; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
299 |
doDim(); |
3626 | 300 |
} |
301 |
||
3697 | 302 |
// issue certain action based on the tag of the button |
3547 | 303 |
-(IBAction) buttonPressed:(id) sender { |
304 |
[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
|
305 |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
306 |
if (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
|
307 |
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
|
308 |
|
22e4d74240e5
finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents:
3829
diff
changeset
|
309 |
if (isPopoverVisible) |
3547 | 310 |
[self dismissPopover]; |
3779
3351a017d4ad
tap to dismiss 'get ready', add a toggle to enable/disable it
koda
parents:
3765
diff
changeset
|
311 |
|
3547 | 312 |
UIButton *theButton = (UIButton *)sender; |
313 |
switch (theButton.tag) { |
|
314 |
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
|
315 |
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
|
316 |
HW_walkLeft(); |
3547 | 317 |
break; |
318 |
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
|
319 |
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
|
320 |
HW_walkRight(); |
3547 | 321 |
break; |
322 |
case 2: |
|
3649 | 323 |
[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
|
324 |
HW_preciseSet(!HW_isWeaponRope()); |
3547 | 325 |
HW_aimUp(); |
326 |
break; |
|
327 |
case 3: |
|
3649 | 328 |
[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
|
329 |
HW_preciseSet(!HW_isWeaponRope()); |
3547 | 330 |
HW_aimDown(); |
331 |
break; |
|
332 |
case 4: |
|
333 |
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
|
334 |
isAttacking = YES; |
3547 | 335 |
break; |
336 |
case 5: |
|
337 |
HW_jump(); |
|
338 |
break; |
|
339 |
case 6: |
|
340 |
HW_backjump(); |
|
341 |
break; |
|
342 |
case 10: |
|
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
343 |
playSound(@"clickSound"); |
4504
8906b2409d97
add the appirater class for getting more positive reviews
koda
parents:
4454
diff
changeset
|
344 |
clearView(); |
3667 | 345 |
HW_pause(); |
3941 | 346 |
if (self.amvc.isVisible && IS_DUALHEAD() == NO) { |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
347 |
doDim(); |
3935 | 348 |
[self.amvc disappear]; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
349 |
} |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
350 |
clearView(); |
3547 | 351 |
[self showPopover]; |
352 |
break; |
|
3624 | 353 |
case 11: |
3791
98072b3871c1
help page for ingame, some other fixes here and there
koda
parents:
3789
diff
changeset
|
354 |
playSound(@"clickSound"); |
4504
8906b2409d97
add the appirater class for getting more positive reviews
koda
parents:
4454
diff
changeset
|
355 |
clearView(); |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
356 |
|
5206 | 357 |
if (IS_DUALHEAD() || [[[NSUserDefaults standardUserDefaults] objectForKey:@"classic_menu"] boolValue] == NO) { |
3935 | 358 |
if (self.amvc == nil) |
359 |
self.amvc = [[AmmoMenuViewController alloc] init]; |
|
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
360 |
|
3935 | 361 |
if (self.amvc.isVisible) { |
362 |
doDim(); |
|
363 |
[self.amvc disappear]; |
|
364 |
} else { |
|
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
365 |
if (HW_isAmmoMenuNotAllowed() == NO) { |
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
366 |
doNotDim(); |
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
367 |
[self.amvc appearInView:self.view]; |
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
368 |
} |
3935 | 369 |
} |
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
370 |
} else |
3941 | 371 |
HW_ammoMenu(); |
3624 | 372 |
break; |
3547 | 373 |
default: |
3626 | 374 |
DLog(@"Nope"); |
3547 | 375 |
break; |
376 |
} |
|
377 |
} |
|
378 |
||
3649 | 379 |
-(void) unsetPreciseStatus { |
380 |
HW_preciseSet(NO); |
|
381 |
} |
|
382 |
||
3976 | 383 |
-(void) sendHWClick { |
384 |
HW_click(); |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
385 |
clearView(); |
3976 | 386 |
doDim(); |
387 |
} |
|
388 |
||
389 |
-(void) setGrenadeTime:(id) sender { |
|
390 |
UISegmentedControl *theSegment = (UISegmentedControl *)sender; |
|
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
391 |
if (cachedGrenadeTime() != theSegment.selectedSegmentIndex) { |
3976 | 392 |
HW_setGrenadeTime(theSegment.selectedSegmentIndex + 1); |
4028
eb371ada631d
move functions called by pascal code outside controller
koda
parents:
3996
diff
changeset
|
393 |
setGrenadeTime(theSegment.selectedSegmentIndex); |
3976 | 394 |
} |
395 |
} |
|
396 |
||
397 |
#pragma mark - |
|
5166
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
398 |
#pragma mark in-game menu and help page |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
399 |
-(void) showHelp:(id) sender { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
400 |
if (self.helpPage == nil) { |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
401 |
NSString *xibName = (IS_IPAD() ? @"HelpPageInGameViewController-iPad" : @"HelpPageInGameViewController-iPhone"); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
402 |
self.helpPage = [[HelpPageViewController alloc] initWithNibName:xibName bundle:nil]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
403 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
404 |
self.helpPage.view.alpha = 0; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
405 |
[self.view addSubview:helpPage.view]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
406 |
[UIView beginAnimations:@"helpingame" context:NULL]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
407 |
self.helpPage.view.alpha = 1; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
408 |
[UIView commitAnimations]; |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
409 |
doNotDim(); |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
410 |
} |
d1eb1560b4d5
and now for something completely different, overlay refactoring!
koda
parents:
5156
diff
changeset
|
411 |
|
3547 | 412 |
// present a further check before closing game |
413 |
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { |
|
414 |
if ([actionSheet cancelButtonIndex] != buttonIndex) |
|
4861
91f889289a47
(ios) perform a small change about how to close the game window, should hopefully save memory and avoid crashes (who am i kidding? that's the usual PR talk...)
koda
parents:
4856
diff
changeset
|
415 |
HW_terminate(NO); |
3547 | 416 |
else |
3697 | 417 |
HW_pause(); |
3547 | 418 |
} |
419 |
||
420 |
// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize |
|
421 |
// on iphone instead just use the tableViewController directly (and implement manually all animations) |
|
422 |
-(IBAction) showPopover{ |
|
3667 | 423 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
3547 | 424 |
isPopoverVisible = YES; |
425 |
||
3996 | 426 |
if (IS_IPAD()) { |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
427 |
if (self.popupMenu == nil) |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
428 |
self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain]; |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
429 |
if (self.popoverController == nil) { |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
430 |
self.popoverController = [[UIPopoverController alloc] initWithContentViewController:self.popupMenu]; |
4935 | 431 |
[self.popoverController setPopoverContentSize:CGSizeMake(220, 200) animated:YES]; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
432 |
[self.popoverController setPassthroughViews:[NSArray arrayWithObject:self.view]]; |
3547 | 433 |
} |
3551 | 434 |
|
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
435 |
[self.popoverController presentPopoverFromRect:CGRectMake(screen.size.height / 2, screen.size.width / 2, 1, 1) |
3547 | 436 |
inView:self.view |
3667 | 437 |
permittedArrowDirections:UIPopoverArrowDirectionAny |
3547 | 438 |
animated:YES]; |
439 |
} else { |
|
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
440 |
if (self.popupMenu == nil) |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
441 |
self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStyleGrouped]; |
3697 | 442 |
|
3547 | 443 |
[self.view addSubview:popupMenu.view]; |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
444 |
[self.popupMenu present]; |
3547 | 445 |
} |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
446 |
self.popupMenu.tableView.scrollEnabled = NO; |
3547 | 447 |
} |
448 |
||
449 |
// on ipad just dismiss it, on iphone transtion to the right |
|
450 |
-(void) dismissPopover { |
|
451 |
if (YES == isPopoverVisible) { |
|
452 |
isPopoverVisible = NO; |
|
3672
f225b94a4411
shrink confirmation button, double tap resets zoom and centers hog
koda
parents:
3668
diff
changeset
|
453 |
if (HW_isPaused()) |
4454 | 454 |
HW_pauseToggle(); |
3697 | 455 |
|
4920 | 456 |
[self.popupMenu dismiss]; |
457 |
if (IS_IPAD()) |
|
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
458 |
[self.popoverController dismissPopoverAnimated:YES]; |
4920 | 459 |
|
3547 | 460 |
[self buttonReleased:nil]; |
461 |
} |
|
462 |
} |
|
463 |
||
464 |
#pragma mark - |
|
465 |
#pragma mark Custom touch event handling |
|
4541 | 466 |
-(BOOL) shouldIgnoreTouch:(NSSet *)allTouches { |
467 |
if (isGameRunning() == NO) |
|
468 |
return YES; |
|
469 |
||
470 |
// ignore activity near the dpad and buttons |
|
471 |
CGPoint touchPoint = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
|
472 |
CGSize screen = [[UIScreen mainScreen] bounds].size; |
|
473 |
||
474 |
if ((touchPoint.x < 160 && touchPoint.y > screen.width - 155 ) || |
|
475 |
(touchPoint.x > screen.height - 135 && touchPoint.y > screen.width - 140)) |
|
476 |
return YES; |
|
477 |
return NO; |
|
478 |
} |
|
479 |
||
3547 | 480 |
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
481 |
NSSet *allTouches = [event allTouches]; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
482 |
UITouch *first, *second; |
3697 | 483 |
|
4541 | 484 |
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
|
485 |
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
|
486 |
|
3647
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
487 |
// hide in-game menu |
0d0df215fb52
making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents:
3646
diff
changeset
|
488 |
if (isPopoverVisible) |
3547 | 489 |
[self dismissPopover]; |
3697 | 490 |
|
3941 | 491 |
if (self.amvc.isVisible && IS_DUALHEAD() == NO) { |
3933
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
492 |
doDim(); |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
493 |
[self.amvc disappear]; |
1a873262f5dd
polishing the cocoa ammomenu a little, still requires work
koda
parents:
3926
diff
changeset
|
494 |
} |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
495 |
// reset default dimming |
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
496 |
doDim(); |
3697 | 497 |
|
3668
3f7a95234d8a
tap to play piano notes, fix for audio and pause glitch
koda
parents:
3667
diff
changeset
|
498 |
HW_setPianoSound([allTouches count]); |
3697 | 499 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
500 |
switch ([allTouches count]) { |
3697 | 501 |
case 1: |
3651 | 502 |
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
|
503 |
if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount]) |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
504 |
HW_zoomReset(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
505 |
break; |
3697 | 506 |
case 2: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
507 |
// pinching |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
508 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
509 |
second = [[allTouches allObjects] objectAtIndex:1]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
510 |
initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
511 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
512 |
default: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
513 |
break; |
3547 | 514 |
} |
515 |
} |
|
516 |
||
517 |
-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
518 |
NSSet *allTouches = [event allTouches]; |
4541 | 519 |
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
|
520 |
return; |
4541 | 521 |
|
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
522 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
523 |
CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view]; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
524 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
525 |
switch ([allTouches count]) { |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
526 |
case 1: |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
527 |
// 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
|
528 |
if (HW_isAmmoMenuOpen()) { |
3680 | 529 |
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
|
530 |
// 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
|
531 |
HW_click(); |
3697 | 532 |
} else |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
533 |
// 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
|
534 |
if (HW_isWeaponRequiringClick()) { |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
535 |
// 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
|
536 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
3697 | 537 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
538 |
// 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
|
539 |
if (self.confirmButton == nil) { |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
540 |
UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
541 |
[tapAgain addTarget:self action:@selector(sendHWClick) forControlEvents:UIControlEventTouchUpInside]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
542 |
[tapAgain setTitle:NSLocalizedString(@"Set!",@"on the overlay") forState:UIControlStateNormal]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
543 |
self.confirmButton = tapAgain; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
544 |
} |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
545 |
self.confirmButton.alpha = 0; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
546 |
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
|
547 |
[self.view addSubview:self.confirmButton]; |
3697 | 548 |
|
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
549 |
// animation ftw! |
3697 | 550 |
[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
|
551 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
552 |
self.confirmButton.alpha = 1; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
553 |
[UIView commitAnimations]; |
3697 | 554 |
|
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
555 |
// keep the overlay active, or the button will fade |
3650 | 556 |
[self activateOverlay]; |
3646
a3271158d93b
don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents:
3639
diff
changeset
|
557 |
doNotDim(); |
3650 | 558 |
} else |
559 |
if (HW_isWeaponTimerable()) { |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
560 |
if (self.grenadeTimeSegment.tag != 0) { |
3650 | 561 |
[UIView beginAnimations:@"removing segmented control" context:NULL]; |
562 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
563 |
self.grenadeTimeSegment.alpha = 0; |
3650 | 564 |
[UIView commitAnimations]; |
3697 | 565 |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
566 |
[self.grenadeTimeSegment performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
567 |
self.grenadeTimeSegment.tag = 0; |
3650 | 568 |
} else { |
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
569 |
if (self.grenadeTimeSegment == nil) { |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
570 |
NSArray *items = [[NSArray alloc] initWithObjects:@"1",@"2",@"3",@"4",@"5",nil]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
571 |
UISegmentedControl *grenadeSegment = [[UISegmentedControl alloc] initWithItems:items]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
572 |
[items release]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
573 |
[grenadeSegment addTarget:self action:@selector(setGrenadeTime:) forControlEvents:UIControlEventValueChanged]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
574 |
self.grenadeTimeSegment = grenadeSegment; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
575 |
[grenadeSegment release]; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
576 |
} |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
577 |
self.grenadeTimeSegment.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50); |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
578 |
self.grenadeTimeSegment.selectedSegmentIndex = cachedGrenadeTime(); |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
579 |
self.grenadeTimeSegment.alpha = 1; |
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
580 |
[self.view addSubview:self.grenadeTimeSegment]; |
3697 | 581 |
|
3650 | 582 |
[UIView beginAnimations:@"inserting segmented control" context:NULL]; |
583 |
[UIView setAnimationDuration:ANIMATION_DURATION]; |
|
584 |
[UIView setAnimationCurve:UIViewAnimationCurveEaseIn]; |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
585 |
self.grenadeTimeSegment.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width - 100, 250, 50); |
3650 | 586 |
[UIView commitAnimations]; |
3697 | 587 |
|
5175
a3da220dbb3f
finish overlay refactoring and some leak annihilation
koda
parents:
5174
diff
changeset
|
588 |
self.grenadeTimeSegment.tag++; |
3650 | 589 |
[self activateOverlay]; |
590 |
doNotDim(); |
|
3697 | 591 |
} |
3661 | 592 |
} else |
593 |
if (HW_isWeaponSwitch()) |
|
594 |
HW_tab(); |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
595 |
break; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
596 |
case 2: |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
597 |
HW_allKeysUp(); |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
598 |
break; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
599 |
default: |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
600 |
break; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
601 |
} |
3697 | 602 |
|
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
|
603 |
initialDistanceForPinching = 0; |
3639
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
604 |
} |
b5cdbcc89b61
use a button instead of label and simplify a lot touch interaction
koda
parents:
3638
diff
changeset
|
605 |
|
3547 | 606 |
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { |
607 |
[self touchesEnded:touches withEvent:event]; |
|
608 |
} |
|
609 |
||
610 |
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { |
|
5174
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
611 |
NSSet *allTouches = [event allTouches]; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
612 |
if ([self shouldIgnoreTouch:allTouches] == YES) |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
613 |
return; |
f5294509783e
initial refactoring of ObjcExports and OverlayViewController
koda
parents:
5166
diff
changeset
|
614 |
|
3551 | 615 |
CGRect screen = [[UIScreen mainScreen] bounds]; |
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
|
616 |
int x, y, dx, dy; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
617 |
UITouch *touch, *first, *second; |
3547 | 618 |
|
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
619 |
switch ([allTouches count]) { |
3551 | 620 |
case 1: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
621 |
touch = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
622 |
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
|
623 |
|
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3948
diff
changeset
|
624 |
if (HW_isAmmoMenuOpen()) { |
3680 | 625 |
// no zoom consideration for this |
626 |
HW_setCursor(HWXZ(currentPosition.x), HWYZ(currentPosition.y)); |
|
627 |
} else |
|
628 |
if (HW_isWeaponRequiringClick()) { |
|
629 |
// moves the cursor around wrt zoom |
|
630 |
HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
|
631 |
} else { |
|
632 |
// panning \o/ |
|
633 |
dx = startingPoint.x - currentPosition.x; |
|
634 |
dy = currentPosition.y - startingPoint.y; |
|
635 |
HW_getCursor(&x, &y); |
|
636 |
// momentum (or something like that) |
|
637 |
/*if (abs(dx) > 40) |
|
638 |
dx *= log(abs(dx)/4); |
|
639 |
if (abs(dy) > 40) |
|
640 |
dy *= log(abs(dy)/4);*/ |
|
641 |
HW_setCursor(x + dx/HW_zoomFactor(), y + dy/HW_zoomFactor()); |
|
642 |
startingPoint = currentPosition; |
|
643 |
} |
|
3551 | 644 |
break; |
3547 | 645 |
case 2: |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
646 |
first = [[allTouches allObjects] objectAtIndex:0]; |
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3637
diff
changeset
|
647 |
second = [[allTouches allObjects] objectAtIndex:1]; |
3547 | 648 |
CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
649 |
const int pinchDelta = 40; |
|
3697 | 650 |
|
3547 | 651 |
if (0 != initialDistanceForPinching) { |
652 |
if (currentDistanceOfPinching - initialDistanceForPinching > pinchDelta) { |
|
653 |
HW_zoomIn(); |
|
654 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
655 |
} |
|
656 |
else if (initialDistanceForPinching - currentDistanceOfPinching > pinchDelta) { |
|
657 |
HW_zoomOut(); |
|
658 |
initialDistanceForPinching = currentDistanceOfPinching; |
|
659 |
} |
|
3697 | 660 |
} else |
3547 | 661 |
initialDistanceForPinching = currentDistanceOfPinching; |
662 |
break; |
|
663 |
default: |
|
664 |
break; |
|
665 |
} |
|
666 |
} |
|
667 |
||
668 |
@end |