Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 3 commits
  • 5 files changed
  • 0 comments
  • 1 contributor
10  .gitignore
... ...
@@ -0,0 +1,10 @@
  1
+
  2
+.DS_Store
  3
+
  4
+EnterTheMatrix.xcodeproj/project.xcworkspace/xcuserdata/mark.xcuserdatad/UserInterfaceState.xcuserstate
  5
+
  6
+EnterTheMatrix.xcodeproj/xcuserdata/mark.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
  7
+
  8
+EnterTheMatrix.xcodeproj/xcuserdata/mark.xcuserdatad/xcschemes/EnterTheMatrix.xcscheme
  9
+
  10
+EnterTheMatrix.xcodeproj/xcuserdata/mark.xcuserdatad/xcschemes/xcschememanagement.plist
2  EnterTheMatrix.xcodeproj/project.pbxproj
@@ -184,7 +184,6 @@
184 184
 				4D6E91C61511042D00B7D1D1 /* Icon-Small-50.png */,
185 185
 				4D6E91CA151104D900B7D1D1 /* Icon-Small-50@2x.png */,
186 186
 				4D6E91CC1511077100B7D1D1 /* iTunesArtwork */,
187  
-				4DBE7B7814FD12C5008174E8 /* QuartzCore.framework */,
188 187
 				4DBE7B2B14FB9290008174E8 /* EnterTheMatrix */,
189 188
 				4DBE7B2414FB9290008174E8 /* Frameworks */,
190 189
 				4DBE7B2214FB9290008174E8 /* Products */,
@@ -202,6 +201,7 @@
202 201
 		4DBE7B2414FB9290008174E8 /* Frameworks */ = {
203 202
 			isa = PBXGroup;
204 203
 			children = (
  204
+				4DBE7B7814FD12C5008174E8 /* QuartzCore.framework */,
205 205
 				4DBE7B2514FB9290008174E8 /* UIKit.framework */,
206 206
 				4DBE7B2714FB9290008174E8 /* Foundation.framework */,
207 207
 				4DBE7B2914FB9290008174E8 /* CoreGraphics.framework */,
1  EnterTheMatrix/FoldViewController.h
@@ -17,7 +17,6 @@ typedef enum
17 17
 
18 18
 @interface FoldViewController : UIViewController<UIGestureRecognizerDelegate>
19 19
 
20  
-@property (weak, nonatomic) IBOutlet UIScrollView *scrollView;
21 20
 @property (weak, nonatomic) IBOutlet UIView *contentView;
22 21
 @property (weak, nonatomic) IBOutlet UIView *topBar;
23 22
 @property (weak, nonatomic) IBOutlet UIView *centerBar;
11  EnterTheMatrix/FoldViewController.m
@@ -12,8 +12,7 @@
12 12
 
13 13
 #define FOLD_HEIGHT	120.
14 14
 #define DEFAULT_DURATION 0.3
15  
-#define DEFAULT_SKEW	-(1. / 500.)
16  
-#define SKEW_ANGLE_OFFSET	7
  15
+#define DEFAULT_SKEW	-(1. / 280)
17 16
 
18 17
 @interface FoldViewController ()
19 18
 
@@ -30,7 +29,6 @@ @implementation FoldViewController
30 29
 @synthesize folding;
31 30
 @synthesize pinchStartGap;
32 31
 @synthesize lastProgress;
33  
-@synthesize scrollView;
34 32
 @synthesize contentView;
35 33
 @synthesize topBar;
36 34
 @synthesize centerBar;
@@ -68,7 +66,7 @@ - (void)viewDidLoad
68 66
 	// Add our tap gesture recognizer
69 67
 	UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap:)];
70 68
 	tapGesture.delegate = self;
71  
-	[self.scrollView addGestureRecognizer:tapGesture];
  69
+	[self.contentView addGestureRecognizer:tapGesture];
72 70
 	
73 71
 	// Add our pinch gesture recognizer
74 72
 	UIPinchGestureRecognizer *pinchGesture = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(handlePinch:)];
@@ -108,7 +106,6 @@ - (void)viewDidLoad
108 106
 
109 107
 - (void)viewDidUnload
110 108
 {
111  
-	[self setScrollView:nil];
112 109
 	[self setContentView:nil];
113 110
 	[self setTopBar:nil];
114 111
 	[self setCenterBar:nil];
@@ -148,13 +145,13 @@ - (CGFloat)skewAngle
148 145
 	switch ((SkewMode)[self.skewSegment selectedSegmentIndex])
149 146
 	{
150 147
 		case SkewModeIn:
151  
-			return 90 - SKEW_ANGLE_OFFSET;
  148
+			return degrees(atan(4.666666667));
152 149
 			
153 150
 		case SkewModeNone:
154 151
 			return 90;
155 152
 			
156 153
 		case SkewModeOut:
157  
-			return 90 + SKEW_ANGLE_OFFSET;
  154
+			return 90 + degrees(atan(1/4.666666667));
158 155
 	}
159 156
 }
160 157
 
97  EnterTheMatrix/en.lproj/MainStoryboard_iPad.storyboard
... ...
@@ -1,9 +1,9 @@
1 1
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2  
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2182" systemVersion="11D50b" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="4">
  2
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2182" systemVersion="11E53" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="4">
3 3
     <dependencies>
4 4
         <deployment defaultVersion="1296" identifier="iOS"/>
5 5
         <development defaultVersion="4200" identifier="xcode"/>
6  
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1179"/>
  6
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1181"/>
7 7
     </dependencies>
8 8
     <scenes>
9 9
         <!--Transform Table-->
@@ -869,62 +869,56 @@ www.glyphish.com</string>
869 869
                         <rect key="frame" x="0.0" y="20" width="768" height="955"/>
870 870
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
871 871
                         <subviews>
872  
-                            <scrollView multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" id="UUB-bw-J4g">
  872
+                            <view contentMode="scaleToFill" id="yzQ-zD-8xU">
873 873
                                 <rect key="frame" x="134" y="288" width="500" height="380"/>
874 874
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
875 875
                                 <subviews>
876  
-                                    <view contentMode="scaleToFill" id="yzQ-zD-8xU">
877  
-                                        <rect key="frame" x="0.0" y="0.0" width="500" height="380"/>
878  
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  876
+                                    <view contentMode="scaleToFill" id="Lzj-8D-b9W">
  877
+                                        <rect key="frame" x="0.0" y="0.0" width="500" height="130"/>
  878
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
879 879
                                         <subviews>
880  
-                                            <view contentMode="scaleToFill" id="Lzj-8D-b9W">
881  
-                                                <rect key="frame" x="0.0" y="0.0" width="500" height="130"/>
882  
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
883  
-                                                <subviews>
884  
-                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="top" image="matrix_02.png" id="hdi-ui-QMv">
885  
-                                                        <rect key="frame" x="10" y="10" width="480" height="119"/>
886  
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
887  
-                                                    </imageView>
888  
-                                                </subviews>
889  
-                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
890  
-                                            </view>
891  
-                                            <view contentMode="scaleToFill" id="5cB-eM-Nng">
892  
-                                                <rect key="frame" x="0.0" y="130" width="500" height="120"/>
893  
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
894  
-                                                <subviews>
895  
-                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" image="matrix_02.png" id="i56-So-N1H">
896  
-                                                        <rect key="frame" x="10" y="0.0" width="480" height="120"/>
897  
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
898  
-                                                    </imageView>
899  
-                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Enter the Matrix" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="ybk-eH-RJx">
900  
-                                                        <rect key="frame" x="10" y="10" width="480" height="100"/>
901  
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
902  
-                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
903  
-                                                        <fontDescription key="fontDescription" name="CourierNewPS-BoldMT" family="Courier New" pointSize="45"/>
904  
-                                                        <color key="textColor" cocoaTouchSystemColor="tableCellGroupedBackgroundColor"/>
905  
-                                                        <nil key="highlightedColor"/>
906  
-                                                        <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
907  
-                                                    </label>
908  
-                                                </subviews>
909  
-                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
910  
-                                            </view>
911  
-                                            <view contentMode="scaleToFill" id="G1Q-Lz-OQw">
912  
-                                                <rect key="frame" x="0.0" y="250" width="500" height="130"/>
913  
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
914  
-                                                <subviews>
915  
-                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="bottom" image="matrix_02.png" id="6sc-yr-EjQ">
916  
-                                                        <rect key="frame" x="10" y="1" width="480" height="119"/>
917  
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
918  
-                                                    </imageView>
919  
-                                                </subviews>
920  
-                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
921  
-                                            </view>
  880
+                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="top" image="matrix_02.png" id="hdi-ui-QMv">
  881
+                                                <rect key="frame" x="10" y="10" width="480" height="119"/>
  882
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  883
+                                            </imageView>
922 884
                                         </subviews>
923  
-                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
924  
-                                        <gestureRecognizers/>
  885
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
  886
+                                    </view>
  887
+                                    <view contentMode="scaleToFill" id="5cB-eM-Nng">
  888
+                                        <rect key="frame" x="0.0" y="130" width="500" height="120"/>
  889
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
  890
+                                        <subviews>
  891
+                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" image="matrix_02.png" id="i56-So-N1H">
  892
+                                                <rect key="frame" x="10" y="0.0" width="480" height="120"/>
  893
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  894
+                                            </imageView>
  895
+                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Enter the Matrix" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="ybk-eH-RJx">
  896
+                                                <rect key="frame" x="10" y="10" width="480" height="100"/>
  897
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  898
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
  899
+                                                <fontDescription key="fontDescription" name="CourierNewPS-BoldMT" family="Courier New" pointSize="45"/>
  900
+                                                <color key="textColor" cocoaTouchSystemColor="tableCellGroupedBackgroundColor"/>
  901
+                                                <nil key="highlightedColor"/>
  902
+                                                <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
  903
+                                            </label>
  904
+                                        </subviews>
  905
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
  906
+                                    </view>
  907
+                                    <view contentMode="scaleToFill" id="G1Q-Lz-OQw">
  908
+                                        <rect key="frame" x="0.0" y="250" width="500" height="130"/>
  909
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
  910
+                                        <subviews>
  911
+                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="bottom" image="matrix_02.png" id="6sc-yr-EjQ">
  912
+                                                <rect key="frame" x="10" y="1" width="480" height="119"/>
  913
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  914
+                                            </imageView>
  915
+                                        </subviews>
  916
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
925 917
                                     </view>
926 918
                                 </subviews>
927  
-                            </scrollView>
  919
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
  920
+                                <gestureRecognizers/>
  921
+                            </view>
928 922
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Pinch anywhere" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="7gR-fZ-7d4">
929 923
                                 <rect key="frame" x="0.0" y="780" width="768" height="75"/>
930 924
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
@@ -965,7 +959,6 @@ www.glyphish.com</string>
965 959
                         <outlet property="centerBar" destination="5cB-eM-Nng" id="Bkb-mX-p9x"/>
966 960
                         <outlet property="contentView" destination="yzQ-zD-8xU" id="dhs-jH-QVv"/>
967 961
                         <outlet property="controlFrame" destination="UOG-po-r2B" id="Kzy-Ay-2ET"/>
968  
-                        <outlet property="scrollView" destination="UUB-bw-J4g" id="AVe-zm-4KS"/>
969 962
                         <outlet property="skewSegment" destination="X9S-IX-LvT" id="JgT-zk-LcB"/>
970 963
                         <outlet property="topBar" destination="Lzj-8D-b9W" id="Zhz-AX-zNT"/>
971 964
                     </connections>

No commit comments for this range

Something went wrong with that request. Please try again.