kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated KRObjView to match Kraken engine changes

Browse Source 
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%40218
This commit is contained in:
kearwood
2013-01-13 08:09:45 +00:00
parent 11f6955150
commit 9abc02965f
8 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
objview/Assets/Storyboard.storyboard Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2519" systemVersion="12A206j" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1856"/>
</dependencies>
<scenes/>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>

6
objview/Classes/KRObjViewAppDelegate.mm
View File

@@ -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"];

2
objview/Classes/KRObjViewGLView.mm
View File

@@ -78,7 +78,7 @@
}
// Initialize KREngine
_engine = [[KREngine alloc] initForWidth: backingWidth Height: backingHeight];
_engine = [[KREngine alloc] init];
[self loadObjects];
}
return self;

3
objview/Classes/KRObjViewViewController.h
View File

@@ -37,8 +37,6 @@
@interface KRObjViewViewController : UIViewController {
CALayer *overlayLayer;
KRObjViewGLView *glView;
float heading;
@@ -70,7 +68,6 @@
}
@property (nonatomic, retain) IBOutlet CALayer *overlayLayer;
@property (readonly) KRObjViewGLView *glView;
// OpenGL ES 2.0 setup methods

1
objview/Classes/KRObjViewViewController.mm
View File

@@ -37,7 +37,6 @@
@implementation KRObjViewViewController
@synthesize overlayLayer;
@synthesize glView;
// Handle Touch Events

10
objview/KRObjView-Info.plist
View File

@@ -24,12 +24,14 @@
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>
<string>MainWindow</string>
<key>NSMainNibFile~ipad</key>
<string>MainWindow-iPad</string>
<key>UIFileSharingEnabled</key>
<true/>
<key>UIMainStoryboardFile</key>
<string>Storyboard</string>
<key>UIMainStoryboardFile~ipad</key>
<string>Storyboard-ipad</string>
<key>UIStatusBarHidden</key>
<false/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>

8
objview/KRObjView.xcodeproj/project.pbxproj
View File

@@ -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 = "<group>"; };
E4A9DEC2154128F0009DF363 /* light_point.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point.fsh; path = ../KREngine/KREngine/Shaders/light_point.fsh; sourceTree = "<group>"; };
E4A9DEC515412906009DF363 /* light_point.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point.vsh; path = ../KREngine/KREngine/Shaders/light_point.vsh; sourceTree = "<group>"; };
E4BDF9691614D7D500E24C10 /* Storyboard-ipad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = "Storyboard-ipad.storyboard"; path = "iPad/Storyboard-ipad.storyboard"; sourceTree = "<group>"; };
E4BDF96B1614D7EB00E24C10 /* Storyboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Storyboard.storyboard; path = Assets/Storyboard.storyboard; sourceTree = "<group>"; };
E4CE184915FEEE8500F80870 /* font.pvr */ = {isa = PBXFileReference; lastKnownFileType = file; name = font.pvr; path = ../KREngine/KREngine/Shaders/font.pvr; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
@@ -166,6 +170,8 @@
E400687C1373AB6400B3D28B /* Assets */,
28AD733E0D9D9553002E5188 /* MainWindow.xib */,
8D1107310486CEB800E47090 /* KRObjView-Info.plist */,
E4BDF9691614D7D500E24C10 /* Storyboard-ipad.storyboard */,
E4BDF96B1614D7EB00E24C10 /* Storyboard.storyboard */,
);
name = Resources;
sourceTree = "<group>";
@@ -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;
};

27
objview/iPad/Storyboard-ipad.storyboard Normal file
View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2840" systemVersion="12C54" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="4VG-F8-Txr">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1926"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="j7w-fA-HG6">
<objects>
<viewController id="4VG-F8-Txr" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="wkY-Tm-gBw">
<rect key="frame" x="0.0" y="20" width="768" height="1004"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="i2k-zS-EZt" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="31" y="-282"/>
</scene>
</scenes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
</document>