# HG changeset patch # User John Tsiombikas # Date 1442895227 -10800 # Node ID 6a39b89127520721fb39dcdf91c64e3cdcb2609e # Parent d4fed8aac9a6786e8f7a892164b26308229bbb4a fuck the UIKit widgets, I'll do my own widgets, with blackjack, and hookers diff -r d4fed8aac9a6 -r 6a39b8912752 src/ios/viewctl.m --- a/src/ios/viewctl.m Mon Sep 21 21:12:36 2015 +0300 +++ b/src/ios/viewctl.m Tue Sep 22 07:13:47 2015 +0300 @@ -7,6 +7,7 @@ EAGLContext *ctx; float pixel_scale; + GLKView *glview; ADBannerView *ad; BOOL ad_visible; } @@ -32,13 +33,13 @@ NSLog(@"Failed to create OpenGL ES 2.0 context"); } - GLKView *view = (GLKView*)self.view; - view.context = self->ctx; - view.drawableDepthFormat = GLKViewDrawableDepthFormat24; + glview = (GLKView*)self.view; + glview.context = self->ctx; + glview.drawableDepthFormat = GLKViewDrawableDepthFormat24; - if([view respondsToSelector: NSSelectorFromString(@"contentScaleFactor")]) { + if([glview respondsToSelector: NSSelectorFromString(@"contentScaleFactor")]) { pixel_scale = [[UIScreen mainScreen] scale]; - view.contentScaleFactor = pixel_scale; + glview.contentScaleFactor = pixel_scale; printf("pixel scale: %g\n", pixel_scale); } else { pixel_scale = 1.0f; @@ -98,7 +99,7 @@ [ad setAutoresizingMask: UIViewAutoresizingFlexibleWidth]; ad_visible = YES; [self hide_ad]; - [self.view addSubview: ad]; + [glview addSubview: ad]; ad.delegate = self; } diff -r d4fed8aac9a6 -r 6a39b8912752 src/ui.h --- a/src/ui.h Mon Sep 21 21:12:36 2015 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* -Stereoscopic tunnel for iOS. -Copyright (C) 2011 John Tsiombikas - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - - -/* UI and shit */ - -#import - -@interface UI : UIViewController { - IBOutlet UISwitch *sw_stereo; - IBOutlet UISlider *slider_split; - IBOutlet UISegmentedControl *grp_mode; - IBOutlet UIButton *bn_done; -} - -@property (nonatomic, retain) IBOutlet UISwitch *sw_stereo; -@property (nonatomic, retain) IBOutlet UISlider *slider_split; -@property (nonatomic, retain) IBOutlet UISegmentedControl *grp_mode; -@property (nonatomic, retain) IBOutlet UIButton *bn_done; - --(IBAction) done_clicked: (id) sender; --(IBAction) split_changed: (id) sender; --(IBAction) stereo_changed: (id) sender; --(IBAction) mode_changed: (id) sender; - -@end diff -r d4fed8aac9a6 -r 6a39b8912752 src/ui.xib --- a/src/ui.xib Mon Sep 21 21:12:36 2015 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,778 +0,0 @@ - - - - 1056 - 10K549 - 851 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 141 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 278 - - YES - - - 292 - {{366, 20}, {94, 27}} - - NO - IBCocoaTouchFramework - 0 - 0 - YES - - - - 292 - {{172, 55}, {288, 44}} - - NO - IBCocoaTouchFramework - 2 - 0 - - YES - Simple - Bump-mapped - - - YES - - - - - YES - - - - - YES - {0, 0} - {0, 0} - - - YES - - - - - - - 292 - {{182, 23}, {176, 21}} - - NO - YES - 7 - NO - IBCocoaTouchFramework - Stereoscopic rendering - - 3 - MQA - - - 1 - 10 - - - - 292 - {{64, 66}, {100, 21}} - - NO - YES - 7 - NO - IBCocoaTouchFramework - Tunnel mode - - - 1 - 10 - - - - 292 - {{200, 106}, {262, 23}} - - NO - IBCocoaTouchFramework - 0 - 0 - 0.5 - - - - 292 - {{20, 106}, {174, 21}} - - NO - YES - 7 - NO - IBCocoaTouchFramework - Screen divider position - - - 1 - 10 - - - - 292 - {{350, 263}, {110, 37}} - - NO - IBCocoaTouchFramework - 0 - 0 - - Helvetica-Bold - 15 - 16 - - 1 - Done - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - - {480, 320} - - - 1 - MCAwIDAgMC41AA - - NO - 6 - - 3 - - IBCocoaTouchFramework - - - - - YES - - - view - - - - 3 - - - - sw_stereo - - - - 10 - - - - grp_mode - - - - 11 - - - - slider_split - - - - 12 - - - - bn_done - - - - 15 - - - - done_clicked: - - - 7 - - 16 - - - - split_changed: - - - 13 - - 17 - - - - mode_changed: - - - 13 - - 18 - - - - stereo_changed: - - - 13 - - 19 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - 5 - - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 13 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 13.IBPluginDependency - 13.IBViewBoundsToFrameTransform - 4.IBPluginDependency - 4.IBViewBoundsToFrameTransform - 5.IBPluginDependency - 5.IBViewBoundsToFrameTransform - 6.IBPluginDependency - 6.IBViewBoundsToFrameTransform - 7.IBPluginDependency - 7.IBViewBoundsToFrameTransform - 8.IBPluginDependency - 8.IBViewBoundsToFrameTransform - 9.IBPluginDependency - 9.IBViewBoundsToFrameTransform - - - YES - UI - UIResponder - {{403, 352}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDrwAAwysAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDtwAAwxgAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDLAAAw0wAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDNgAAwigAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABCZAAAw0AAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDSAAAw2oAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABBoAAAw2gAAA - - - - - YES - - - YES - - - - - YES - - - YES - - - - 19 - - - - YES - - UI - UIViewController - - YES - - YES - done_clicked: - mode_changed: - split_changed: - stereo_changed: - - - YES - id - id - id - id - - - - YES - - YES - done_clicked: - mode_changed: - split_changed: - stereo_changed: - - - YES - - done_clicked: - id - - - mode_changed: - id - - - split_changed: - id - - - stereo_changed: - id - - - - - YES - - YES - bn_done - grp_mode - slider_split - sw_stereo - - - YES - UIButton - UISegmentedControl - UISlider - UISwitch - - - - YES - - YES - bn_done - grp_mode - slider_split - sw_stereo - - - YES - - bn_done - UIButton - - - grp_mode - UISegmentedControl - - - slider_split - UISlider - - - sw_stereo - UISwitch - - - - - IBProjectSource - src/ui.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIButton - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIButton.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UILabel - UIView - - IBFrameworkSource - UIKit.framework/Headers/UILabel.h - - - - UIResponder - NSObject - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UISegmentedControl - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UISegmentedControl.h - - - - UISlider - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UISlider.h - - - - UISwitch - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UISwitch.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIPrintFormatter.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../istereo.xcodeproj - 3 - 141 - -