project_files/HedgewarsMobile/Classes/OverlayViewController.m
author koda
Wed, 28 Mar 2012 00:42:57 +0200
changeset 6829 60b039d88dab
parent 6825 aca4a6807ecc
child 6830 d2df090453aa
permissions -rw-r--r--
ios: use notifications instead of class methods (maybe tidier)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3829
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     1
/*
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     2
 * Hedgewars-iOS, a Hedgewars port for iOS devices
6700
e04da46ee43c the most important commit of the year
koda
parents: 6666
diff changeset
     3
 * Copyright (c) 2009-2012 Vittorio Giovara <vittorio.giovara@gmail.com>
3829
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     4
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     8
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    12
 * GNU General Public License for more details.
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    13
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    14
 * You should have received a copy of the GNU General Public License
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    15
 * along with this program; if not, write to the Free Software
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    17
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    18
 * File created on 16/03/2010.
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    19
 */
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    20
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    21
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    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
dd9345e74b66 help page for lobby
koda
parents: 3791
diff changeset
    24
#import "HelpPageViewController.h"
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    25
#import "CGPointUtils.h"
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    26
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
    27
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    28
#define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7]
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    29
#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
    30
#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
    31
#define doNotDim()          [dimTimer setFireDate:HIDING_TIME_NEVER]
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    32
5174
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
    33
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    34
@implementation OverlayViewController
6825
aca4a6807ecc ios, one more grenade timer tweak
koda
parents: 6822
diff changeset
    35
@synthesize popoverController, popupMenu, helpPage, loadingIndicator, confirmButton, grenadeTimeSegment;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    36
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    37
#pragma mark -
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    38
#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
    39
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    40
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
3977
9df7b4812da9 optimizations to new ammomenu and overlay
koda
parents: 3976
diff changeset
    41
    return rotationManager(interfaceOrientation);
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    42
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    43
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    44
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    45
#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
    46
-(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
    47
    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    48
        isAttacking = NO;
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    49
        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
    50
        loadingIndicator = nil;
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    51
    }
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    52
    return self;
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    53
}
3948
24daa33a3114 some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents: 3941
diff changeset
    54
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    55
-(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
    56
    // fill all the screen available as sdlview disables autoresizing
6615
65602f1ef0f8 more ios pages supporting rotaiton
koda
parents: 6612
diff changeset
    57
    self.view.frame = [[UIScreen mainScreen] safeBounds];
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    58
    // 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
    59
    dimTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:6]
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    60
                                        interval:1000
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    61
                                          target:self
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    62
                                        selector:@selector(dimOverlay)
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    63
                                        userInfo:nil
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    64
                                         repeats:YES];
3952
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3948
diff changeset
    65
    // add timer to runloop, otherwise it doesn't work
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    66
    [[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
    67
4924
616b618814b5 show dual head mode some love
koda
parents: 4920
diff changeset
    68
    // 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
    69
    [[NSNotificationCenter defaultCenter] addObserver:self
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
    70
                                             selector:@selector(showHelp:)
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
    71
                                                 name:@"show help ingame"
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
    72
                                               object:nil];
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
    73
    
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    74
    // present the overlay
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    75
    self.view.alpha = 0;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    76
    [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
    77
    [UIView setAnimationDuration:2];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    78
    self.view.alpha = 1;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    79
    [UIView commitAnimations];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    80
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    81
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    82
-(void) viewDidUnload {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    83
    [[NSNotificationCenter defaultCenter] removeObserver:self];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    84
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    85
    [NSObject cancelPreviousPerformRequestsWithTarget:self
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    86
                                             selector:@selector(unsetPreciseStatus)
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    87
                                               object:nil];
3941
017b2b31e1c6 integrate nicely with external display
koda
parents: 3940
diff changeset
    88
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    89
    // only objects initialized in viewDidLoad should be here
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    90
    dimTimer = nil;
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    91
    self.helpPage = nil;
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    92
    [self dismissPopover];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    93
    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
    94
    self.loadingIndicator = nil;
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    95
    MSG_DIDUNLOAD();
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    96
    [super viewDidUnload];
4924
616b618814b5 show dual head mode some love
koda
parents: 4920
diff changeset
    97
}
616b618814b5 show dual head mode some love
koda
parents: 4920
diff changeset
    98
3783
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
    99
-(void) didReceiveMemoryWarning {
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   100
    if (self.popupMenu.view.superview == nil)
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   101
        self.popupMenu = nil;
3791
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
   102
    if (self.helpPage.view.superview == nil)
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
   103
        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
   104
    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
   105
        self.loadingIndicator = nil;
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   106
    if (self.confirmButton.superview == nil)
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   107
        self.confirmButton = nil;
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   108
    if (self.grenadeTimeSegment.superview == nil)
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   109
        self.grenadeTimeSegment = nil;
3996
eb549fd864a5 the ios port is also iphone compatible
koda
parents: 3978
diff changeset
   110
    if (IS_IPAD())
3971
5c82ee165ed5 minor stuff
koda
parents: 3952
diff changeset
   111
        if (((UIPopoverController *)self.popoverController).contentViewController.view.superview == nil)
5c82ee165ed5 minor stuff
koda
parents: 3952
diff changeset
   112
            self.popoverController = nil;
5156
641abe679bf0 work in progress yet again (can run some games now)
koda
parents: 5155
diff changeset
   113
3783
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   114
    MSG_MEMCLEAN();
3971
5c82ee165ed5 minor stuff
koda
parents: 3952
diff changeset
   115
    [super didReceiveMemoryWarning];
3783
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   116
}
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   117
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   118
-(void) dealloc {
5208
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   119
    releaseAndNil(popupMenu);
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   120
    releaseAndNil(helpPage);
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   121
    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
   122
    releaseAndNil(loadingIndicator);
5208
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   123
    releaseAndNil(confirmButton);
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   124
    releaseAndNil(grenadeTimeSegment);
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   125
    // dimTimer is autoreleased
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   126
    [super dealloc];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   127
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   128
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   129
#pragma mark -
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   130
#pragma mark overlay appearance
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   131
// nice transition for dimming, should be called only by the timer himself
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   132
-(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
   133
    if ([HWUtils isGameRunning]) {
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   134
        [UIView beginAnimations:@"overlay dim" context:NULL];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   135
        [UIView setAnimationDuration:0.6];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   136
        self.view.alpha = 0.2;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   137
        [UIView commitAnimations];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   138
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   139
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   140
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   141
// set the overlay visible and put off the timer for enough time
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   142
-(void) activateOverlay {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   143
    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
   144
    doNotDim();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   145
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   146
6822
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   147
-(void) clearOverlay {
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   148
    [UIView beginAnimations:@"remove button" context:NULL];
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   149
    [UIView setAnimationDuration:ANIMATION_DURATION];
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   150
    self.confirmButton.alpha = 0;
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   151
    self.grenadeTimeSegment.alpha = 0;
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   152
    [UIView commitAnimations];
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   153
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   154
    if (self.confirmButton)
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   155
        [self.confirmButton performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION];
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   156
    if (self.grenadeTimeSegment)
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   157
        [self.grenadeTimeSegment performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION];
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   158
}
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   159
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   160
#pragma mark -
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   161
#pragma mark overlay user interaction
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   162
// dim the overlay when there's no more input for a certain amount of time
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   163
-(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
   164
    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
   165
        return;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   166
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   167
    UIButton *theButton = (UIButton *)sender;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   168
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   169
    switch (theButton.tag) {
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   170
        case 0:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   171
        case 1:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   172
        case 2:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   173
        case 3:
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   174
            [NSObject cancelPreviousPerformRequestsWithTarget:self
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   175
                                                     selector:@selector(unsetPreciseStatus)
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   176
                                                       object:nil];
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   177
            HW_walkingKeysUp();
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   178
            break;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   179
        case 4:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   180
        case 5:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   181
        case 6:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   182
            HW_otherKeysUp();
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   183
            break;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   184
        default:
3660
bc125bea5849 complete settings page rework
koda
parents: 3651
diff changeset
   185
            DLog(@"Nope");
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   186
            break;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   187
    }
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   188
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
   189
    isAttacking = NO;
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   190
    doDim();
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   191
}
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   192
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   193
// issue certain action based on the tag of the button
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   194
-(IBAction) buttonPressed:(id) sender {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   195
    [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
   196
    
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
   197
    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
   198
        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
   199
    
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
    if (isPopoverVisible)
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   201
        [self dismissPopover];
3779
3351a017d4ad tap to dismiss 'get ready', add a toggle to enable/disable it
koda
parents: 3765
diff changeset
   202
    
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   203
    UIButton *theButton = (UIButton *)sender;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   204
    switch (theButton.tag) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   205
        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
   206
            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
   207
                HW_walkLeft();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   208
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   209
        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
   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_walkRight();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   212
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   213
        case 2:
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   214
            [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
   215
            HW_preciseSet(!HW_isWeaponRope());
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   216
            HW_aimUp();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   217
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   218
        case 3:
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   219
            [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
   220
            HW_preciseSet(!HW_isWeaponRope());
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   221
            HW_aimDown();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   222
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   223
        case 4:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   224
            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
   225
            isAttacking = YES;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   226
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   227
        case 5:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   228
            HW_jump();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   229
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   230
        case 6:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   231
            HW_backjump();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   232
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   233
        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
   234
            [AudioManagerController playClickSound];
3667
9359a70df013 use external libs more consistently
koda
parents: 3662
diff changeset
   235
            HW_pause();
6822
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   236
            [self clearOverlay];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   237
            [self showPopover];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   238
            break;
3624
304c6d32383a button to open ammomenu
koda
parents: 3617
diff changeset
   239
        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
   240
            [AudioManagerController playClickSound];
6822
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   241
            [self clearOverlay];
6624
e049b5bb0ad1 BUUUUURN OBJC AMMOMENU BUUUURNhg diff! (on a separate note, this reduces the codesize by ~37k)
koda
parents: 6615
diff changeset
   242
            HW_ammoMenu();
3624
304c6d32383a button to open ammomenu
koda
parents: 3617
diff changeset
   243
            break;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   244
        default:
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   245
            DLog(@"Nope");
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   246
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   247
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   248
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   249
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   250
-(void) unsetPreciseStatus {
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   251
    HW_preciseSet(NO);
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   252
}
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   253
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   254
-(void) sendHWClick {
6822
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   255
    [self clearOverlay];
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   256
    HW_click();
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   257
    doDim();
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   258
}
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   259
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   260
-(void) setGrenadeTime:(id) sender {
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   261
    UISegmentedControl *theSegment = (UISegmentedControl *)sender;
6825
aca4a6807ecc ios, one more grenade timer tweak
koda
parents: 6822
diff changeset
   262
    NSInteger timeIndex = theSegment.selectedSegmentIndex + 1;
aca4a6807ecc ios, one more grenade timer tweak
koda
parents: 6822
diff changeset
   263
    if (HW_getGrenadeTime() != timeIndex)
aca4a6807ecc ios, one more grenade timer tweak
koda
parents: 6822
diff changeset
   264
        HW_setGrenadeTime(timeIndex);
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   265
}
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   266
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   267
#pragma mark -
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   268
#pragma mark in-game menu and help page
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   269
-(void) showHelp:(id) sender {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   270
    if (self.helpPage == nil) {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   271
        NSString *xibName = (IS_IPAD() ? @"HelpPageInGameViewController-iPad" : @"HelpPageInGameViewController-iPhone");
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   272
        self.helpPage = [[HelpPageViewController alloc] initWithNibName:xibName bundle:nil];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   273
    }
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   274
    self.helpPage.view.alpha = 0;
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   275
    [self.view addSubview:helpPage.view];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   276
    [UIView beginAnimations:@"helpingame" context:NULL];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   277
    self.helpPage.view.alpha = 1;
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   278
    [UIView commitAnimations];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   279
    doNotDim();
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   280
}
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   281
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   282
// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   283
// on iphone instead just use the tableViewController directly (and implement manually all animations)
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   284
-(IBAction) showPopover{
6666
0e2f5b81cbf2 fix coordinate system on ios overlay
koda
parents: 6624
diff changeset
   285
    CGRect screen = [[UIScreen mainScreen] safeBounds];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   286
    isPopoverVisible = YES;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   287
3996
eb549fd864a5 the ios port is also iphone compatible
koda
parents: 3978
diff changeset
   288
    if (IS_IPAD()) {
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   289
        if (self.popupMenu == nil)
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   290
            self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain];
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   291
        if (self.popoverController == nil) {
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   292
            self.popoverController = [[UIPopoverController alloc] initWithContentViewController:self.popupMenu];
4935
27fb500dd6b1 screenshots 4 ios
koda
parents: 4924
diff changeset
   293
            [self.popoverController setPopoverContentSize:CGSizeMake(220, 200) animated:YES];
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   294
            [self.popoverController setPassthroughViews:[NSArray arrayWithObject:self.view]];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   295
        }
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   296
6666
0e2f5b81cbf2 fix coordinate system on ios overlay
koda
parents: 6624
diff changeset
   297
        [self.popoverController presentPopoverFromRect:CGRectMake(screen.size.width / 2, screen.size.height / 2, 1, 1)
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   298
                                           inView:self.view
3667
9359a70df013 use external libs more consistently
koda
parents: 3662
diff changeset
   299
                         permittedArrowDirections:UIPopoverArrowDirectionAny
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   300
                                         animated:YES];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   301
    } else {
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   302
        if (self.popupMenu == nil)
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   303
            self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStyleGrouped];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   304
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   305
        [self.view addSubview:popupMenu.view];
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   306
        [self.popupMenu present];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   307
    }
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   308
    self.popupMenu.tableView.scrollEnabled = NO;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   309
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   310
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   311
// on ipad just dismiss it, on iphone transtion to the right
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   312
-(void) dismissPopover {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   313
    if (YES == isPopoverVisible) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   314
        isPopoverVisible = NO;
3672
f225b94a4411 shrink confirmation button, double tap resets zoom and centers hog
koda
parents: 3668
diff changeset
   315
        if (HW_isPaused())
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   316
            HW_pauseToggle();
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   317
4920
bc3c077e15a2 cleaning up how chat is handled on idevices
koda
parents: 4861
diff changeset
   318
        [self.popupMenu dismiss];
bc3c077e15a2 cleaning up how chat is handled on idevices
koda
parents: 4861
diff changeset
   319
        if (IS_IPAD())
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   320
            [self.popoverController dismissPopoverAnimated:YES];
4920
bc3c077e15a2 cleaning up how chat is handled on idevices
koda
parents: 4861
diff changeset
   321
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   322
        [self buttonReleased:nil];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   323
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   324
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   325
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   326
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   327
#pragma mark Custom touch event handling
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   328
-(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
   329
    if ([HWUtils isGameRunning] == NO)
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   330
        return YES;
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   331
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   332
    // ignore activity near the dpad and buttons
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   333
    CGPoint touchPoint = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view];
6666
0e2f5b81cbf2 fix coordinate system on ios overlay
koda
parents: 6624
diff changeset
   334
    CGSize screen = [[UIScreen mainScreen] safeBounds].size;
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   335
6666
0e2f5b81cbf2 fix coordinate system on ios overlay
koda
parents: 6624
diff changeset
   336
    if ((touchPoint.x < 160 && touchPoint.y > screen.height - 155 ) ||
0e2f5b81cbf2 fix coordinate system on ios overlay
koda
parents: 6624
diff changeset
   337
        (touchPoint.x > screen.width - 135 && touchPoint.y > screen.height - 140))
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   338
        return YES;
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   339
    return NO;
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   340
}
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   341
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   342
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   343
    NSSet *allTouches = [event allTouches];
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   344
    UITouch *first, *second;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   345
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   346
    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
   347
        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
   348
3647
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   349
    // hide in-game menu
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   350
    if (isPopoverVisible)
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   351
        [self dismissPopover];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   352
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   353
    // reset default dimming
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   354
    doDim();
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   355
3668
3f7a95234d8a tap to play piano notes, fix for audio and pause glitch
koda
parents: 3667
diff changeset
   356
    HW_setPianoSound([allTouches count]);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   357
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   358
    switch ([allTouches count]) {
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   359
        case 1:
3651
7058ca178f3b switching hogs now works
koda
parents: 3650
diff changeset
   360
            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
   361
            if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount])
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   362
                HW_zoomReset();
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   363
            break;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   364
        case 2:
6268
d773867f93db double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents: 6260
diff changeset
   365
            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
   366
                HW_screenshot();
d773867f93db double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents: 6260
diff changeset
   367
            else {
d773867f93db double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents: 6260
diff changeset
   368
                // pinching
d773867f93db double two finger tap to make screenshot on ios (though folder is not yet accessible)
koda
parents: 6260
diff changeset
   369
                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
   370
                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
   371
                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
   372
            }
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   373
            break;
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   374
        default:
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   375
            break;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   376
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   377
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   378
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   379
-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   380
    NSSet *allTouches = [event allTouches];
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   381
    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
   382
        return;
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   383
6666
0e2f5b81cbf2 fix coordinate system on ios overlay
koda
parents: 6624
diff changeset
   384
    CGRect screen = [[UIScreen mainScreen] safeBounds];
5174
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   385
    CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view];
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   386
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   387
    switch ([allTouches count]) {
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   388
        case 1:
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   389
            // 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
   390
            if (HW_isAmmoMenuOpen()) {
6666
0e2f5b81cbf2 fix coordinate system on ios overlay
koda
parents: 6624
diff changeset
   391
                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
   392
                // 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
   393
                HW_click();
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   394
            } else
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   395
                // 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
   396
                if (HW_isWeaponRequiringClick()) {
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   397
                    // 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
   398
                    HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   399
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   400
                    // 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
   401
                    if (self.confirmButton == nil) {
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   402
                        UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   403
                        [tapAgain addTarget:self action:@selector(sendHWClick) forControlEvents:UIControlEventTouchUpInside];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   404
                        [tapAgain setTitle:NSLocalizedString(@"Set!",@"on the overlay") forState:UIControlStateNormal];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   405
                        self.confirmButton = tapAgain;
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   406
                    }
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   407
                    self.confirmButton.alpha = 0;
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   408
                    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
   409
                    [self.view addSubview:self.confirmButton];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   410
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   411
                    // animation ftw!
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   412
                    [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
   413
                    [UIView setAnimationDuration:ANIMATION_DURATION];
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   414
                    self.confirmButton.alpha = 1;
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   415
                    [UIView commitAnimations];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   416
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   417
                    // keep the overlay active, or the button will fade
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   418
                    [self activateOverlay];
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   419
                    doNotDim();
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   420
                } else
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   421
                    if (HW_isWeaponTimerable()) {
6822
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   422
                        if (self.grenadeTimeSegment.superview != nil) {
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   423
                            [UIView beginAnimations:@"removing segmented control" context:NULL];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   424
                            [UIView setAnimationDuration:ANIMATION_DURATION];
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   425
                            self.grenadeTimeSegment.alpha = 0;
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   426
                            [UIView commitAnimations];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   427
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   428
                            [self.grenadeTimeSegment performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION];
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   429
                        } else {
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   430
                            if (self.grenadeTimeSegment == nil) {
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   431
                                NSArray *items = [[NSArray alloc] initWithObjects:@"1",@"2",@"3",@"4",@"5",nil];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   432
                                UISegmentedControl *grenadeSegment = [[UISegmentedControl alloc] initWithItems:items];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   433
                                [items release];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   434
                                [grenadeSegment addTarget:self action:@selector(setGrenadeTime:) forControlEvents:UIControlEventValueChanged];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   435
                                self.grenadeTimeSegment = grenadeSegment;
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   436
                                [grenadeSegment release];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   437
                            }
6822
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   438
                            self.grenadeTimeSegment.frame = CGRectMake(screen.size.width / 2 - 125, screen.size.height, 250, 50);
6825
aca4a6807ecc ios, one more grenade timer tweak
koda
parents: 6822
diff changeset
   439
                            self.grenadeTimeSegment.selectedSegmentIndex = HW_getGrenadeTime() - 1;
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   440
                            self.grenadeTimeSegment.alpha = 1;
6822
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   441
                            self.grenadeTimeSegment.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin |
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   442
                                                                       UIViewAutoresizingFlexibleRightMargin |
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   443
                                                                       UIViewAutoresizingFlexibleTopMargin;
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   444
                            [self.view addSubview:self.grenadeTimeSegment];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   445
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   446
                            [UIView beginAnimations:@"inserting segmented control" context:NULL];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   447
                            [UIView setAnimationDuration:ANIMATION_DURATION];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   448
                            [UIView setAnimationCurve:UIViewAnimationCurveEaseIn];
6822
206db098f8c5 ios headers cleanup, with tweaks to +randomPort and grenade timer handling in overlay
koda
parents: 6700
diff changeset
   449
                            self.grenadeTimeSegment.frame = CGRectMake(screen.size.width / 2 - 125, screen.size.height - 100, 250, 50);
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   450
                            [UIView commitAnimations];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   451
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   452
                            [self activateOverlay];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   453
                            doNotDim();
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   454
                        }
3661
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   455
                    } else
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   456
                        if (HW_isWeaponSwitch())
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   457
                            HW_tab();
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   458
            break;
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   459
        case 2:
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   460
            HW_allKeysUp();
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   461
            break;
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   462
        default:
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   463
            break;
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   464
    }
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   465
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
   466
    initialDistanceForPinching = 0;
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   467
}
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   468
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   469
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   470
    [self touchesEnded:touches withEvent:event];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   471
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   472
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   473
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
5174
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   474
    NSSet *allTouches = [event allTouches];
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   475
    if ([self shouldIgnoreTouch:allTouches] == YES)
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   476
        return;
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   477
6666
0e2f5b81cbf2 fix coordinate system on ios overlay
koda
parents: 6624
diff changeset
   478
    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
   479
    int x, y, dx, dy;
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   480
    UITouch *touch, *first, *second;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   481
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   482
    switch ([allTouches count]) {
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   483
        case 1:
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   484
            touch = [[allTouches allObjects] objectAtIndex:0];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   485
            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
   486
3952
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3948
diff changeset
   487
            if (HW_isAmmoMenuOpen()) {
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   488
                // no zoom consideration for this
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   489
                HW_setCursor(HWXZ(currentPosition.x), HWYZ(currentPosition.y));
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   490
            } else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   491
                if (HW_isWeaponRequiringClick()) {
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   492
                    // moves the cursor around wrt zoom
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   493
                    HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   494
                } else {
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   495
                    // panning \o/
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   496
                    dx = startingPoint.x - currentPosition.x;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   497
                    dy = currentPosition.y - startingPoint.y;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   498
                    HW_getCursor(&x, &y);
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   499
                    // momentum (or something like that)
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   500
                    /*if (abs(dx) > 40)
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   501
                        dx *= log(abs(dx)/4);
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   502
                    if (abs(dy) > 40)
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   503
                        dy *= log(abs(dy)/4);*/
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   504
                    HW_setCursor(x + dx/HW_zoomFactor(), y + dy/HW_zoomFactor());
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   505
                    startingPoint = currentPosition;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   506
                }
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   507
            break;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   508
        case 2:
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   509
            first = [[allTouches allObjects] objectAtIndex:0];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   510
            second = [[allTouches allObjects] objectAtIndex:1];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   511
            CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   512
            const int pinchDelta = 40;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   513
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   514
            if (0 != initialDistanceForPinching) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   515
                if (currentDistanceOfPinching - initialDistanceForPinching > pinchDelta) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   516
                    HW_zoomIn();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   517
                    initialDistanceForPinching = currentDistanceOfPinching;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   518
                }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   519
                else if (initialDistanceForPinching - currentDistanceOfPinching > pinchDelta) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   520
                    HW_zoomOut();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   521
                    initialDistanceForPinching = currentDistanceOfPinching;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   522
                }
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   523
            } else
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   524
                initialDistanceForPinching = currentDistanceOfPinching;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   525
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   526
        default:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   527
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   528
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   529
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   530
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   531
@end