diff --git a/objview/Assets/Storyboard.storyboard b/objview/Assets/Storyboard.storyboard
new file mode 100644
index 0000000..46fabf8
--- /dev/null
+++ b/objview/Assets/Storyboard.storyboard
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/objview/Classes/KRObjViewAppDelegate.mm b/objview/Classes/KRObjViewAppDelegate.mm
index d057cdf..828d284 100644
--- a/objview/Classes/KRObjViewAppDelegate.mm
+++ b/objview/Classes/KRObjViewAppDelegate.mm
@@ -41,9 +41,9 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Add the view controller's view to the window and display.
- [[UIApplication sharedApplication] setStatusBarHidden:YES withAnimation:UIStatusBarAnimationFade];
- [self.window addSubview:viewController.view];
- [self.window makeKeyAndVisible];
+// [[UIApplication sharedApplication] setStatusBarHidden:YES withAnimation:UIStatusBarAnimationFade];
+// [self.window addSubview:viewController.view];
+// [self.window makeKeyAndVisible];
//[TestFlight takeOff:@"bee30f66de8a537484b210b6ac8fa118_NDA5MTIyMDExLTExLTE0IDE1OjUxOjQwLjA0MzM4MA"];
diff --git a/objview/Classes/KRObjViewGLView.mm b/objview/Classes/KRObjViewGLView.mm
index 88b11d2..3cead60 100644
--- a/objview/Classes/KRObjViewGLView.mm
+++ b/objview/Classes/KRObjViewGLView.mm
@@ -78,7 +78,7 @@
}
// Initialize KREngine
- _engine = [[KREngine alloc] initForWidth: backingWidth Height: backingHeight];
+ _engine = [[KREngine alloc] init];
[self loadObjects];
}
return self;
diff --git a/objview/Classes/KRObjViewViewController.h b/objview/Classes/KRObjViewViewController.h
index 3d61d01..21a2876 100644
--- a/objview/Classes/KRObjViewViewController.h
+++ b/objview/Classes/KRObjViewViewController.h
@@ -36,8 +36,6 @@
#import
@interface KRObjViewViewController : UIViewController {
-
- CALayer *overlayLayer;
KRObjViewGLView *glView;
@@ -70,7 +68,6 @@
}
-@property (nonatomic, retain) IBOutlet CALayer *overlayLayer;
@property (readonly) KRObjViewGLView *glView;
// OpenGL ES 2.0 setup methods
diff --git a/objview/Classes/KRObjViewViewController.mm b/objview/Classes/KRObjViewViewController.mm
index e7544f0..0775ffe 100644
--- a/objview/Classes/KRObjViewViewController.mm
+++ b/objview/Classes/KRObjViewViewController.mm
@@ -37,7 +37,6 @@
@implementation KRObjViewViewController
-@synthesize overlayLayer;
@synthesize glView;
// Handle Touch Events
diff --git a/objview/KRObjView-Info.plist b/objview/KRObjView-Info.plist
index 9c7b5cf..9c6fc87 100644
--- a/objview/KRObjView-Info.plist
+++ b/objview/KRObjView-Info.plist
@@ -24,12 +24,14 @@
1.0
LSRequiresIPhoneOS
- NSMainNibFile
- MainWindow
- NSMainNibFile~ipad
- MainWindow-iPad
UIFileSharingEnabled
+ UIMainStoryboardFile
+ Storyboard
+ UIMainStoryboardFile~ipad
+ Storyboard-ipad
+ UIStatusBarHidden
+
UISupportedInterfaceOrientations
UIInterfaceOrientationLandscapeLeft
diff --git a/objview/KRObjView.xcodeproj/project.pbxproj b/objview/KRObjView.xcodeproj/project.pbxproj
index 2fd571c..f23ac39 100644
--- a/objview/KRObjView.xcodeproj/project.pbxproj
+++ b/objview/KRObjView.xcodeproj/project.pbxproj
@@ -39,6 +39,8 @@
E49EB29C13806C5D00A4E727 /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = E49EB29B13806C5D00A4E727 /* MainWindow-iPad.xib */; };
E4A9DEC715412923009DF363 /* light_point.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E4A9DEC2154128F0009DF363 /* light_point.fsh */; };
E4A9DEC815412923009DF363 /* light_point.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E4A9DEC515412906009DF363 /* light_point.vsh */; };
+ E4BDF96A1614D7D500E24C10 /* Storyboard-ipad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E4BDF9691614D7D500E24C10 /* Storyboard-ipad.storyboard */; };
+ E4BDF96C1614D7EB00E24C10 /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E4BDF96B1614D7EB00E24C10 /* Storyboard.storyboard */; };
E4CE184A15FEEE8500F80870 /* font.pvr in Resources */ = {isa = PBXBuildFile; fileRef = E4CE184915FEEE8500F80870 /* font.pvr */; };
E4CE185415FF12B700F80870 /* light_point_inside.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E4CE185015FF12A700F80870 /* light_point_inside.fsh */; };
E4CE185515FF12B700F80870 /* light_point_inside.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E4CE185115FF12A700F80870 /* light_point_inside.vsh */; };
@@ -86,6 +88,8 @@
E49EB29B13806C5D00A4E727 /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-iPad.xib"; path = "iPad/MainWindow-iPad.xib"; sourceTree = ""; };
E4A9DEC2154128F0009DF363 /* light_point.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point.fsh; path = ../KREngine/KREngine/Shaders/light_point.fsh; sourceTree = ""; };
E4A9DEC515412906009DF363 /* light_point.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point.vsh; path = ../KREngine/KREngine/Shaders/light_point.vsh; sourceTree = ""; };
+ E4BDF9691614D7D500E24C10 /* Storyboard-ipad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = "Storyboard-ipad.storyboard"; path = "iPad/Storyboard-ipad.storyboard"; sourceTree = ""; };
+ E4BDF96B1614D7EB00E24C10 /* Storyboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Storyboard.storyboard; path = Assets/Storyboard.storyboard; sourceTree = ""; };
E4CE184915FEEE8500F80870 /* font.pvr */ = {isa = PBXFileReference; lastKnownFileType = file; name = font.pvr; path = ../KREngine/KREngine/Shaders/font.pvr; sourceTree = ""; };
E4CE185015FF12A700F80870 /* light_point_inside.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point_inside.fsh; path = ../KREngine/KREngine/Shaders/light_point_inside.fsh; sourceTree = ""; };
E4CE185115FF12A700F80870 /* light_point_inside.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point_inside.vsh; path = ../KREngine/KREngine/Shaders/light_point_inside.vsh; sourceTree = ""; };
@@ -166,6 +170,8 @@
E400687C1373AB6400B3D28B /* Assets */,
28AD733E0D9D9553002E5188 /* MainWindow.xib */,
8D1107310486CEB800E47090 /* KRObjView-Info.plist */,
+ E4BDF9691614D7D500E24C10 /* Storyboard-ipad.storyboard */,
+ E4BDF96B1614D7EB00E24C10 /* Storyboard.storyboard */,
);
name = Resources;
sourceTree = "";
@@ -321,6 +327,8 @@
E4CE184A15FEEE8500F80870 /* font.pvr in Resources */,
E48BB5F9160AEF16008477A6 /* README.md in Resources */,
E48BB5FA160AEF16008477A6 /* release_notes.md in Resources */,
+ E4BDF96A1614D7D500E24C10 /* Storyboard-ipad.storyboard in Resources */,
+ E4BDF96C1614D7EB00E24C10 /* Storyboard.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/objview/iPad/Storyboard-ipad.storyboard b/objview/iPad/Storyboard-ipad.storyboard
new file mode 100644
index 0000000..cfeecf4
--- /dev/null
+++ b/objview/iPad/Storyboard-ipad.storyboard
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file