salmon-engine-projects/tunnel
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ios stuff

Browse Source
This commit is contained in:
Vladislav Khorev 2013-02-04 09:20:51 +00:00
parent 98adb4ffda
commit ac98475101
6 changed files with 190 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iOS/AppDelegate.m
View File

@ -18,13 +18,16 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{ {
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
// Override point for customization after application launch. // Override point for customization after application launch.
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPhone" bundle:nil]; self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPhone" bundle:nil];
} else { } else {
self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPad" bundle:nil]; self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPad" bundle:nil];
} }
self.window.rootViewController = self.viewController; self.window.rootViewController = self.viewController;
[self.window makeKeyAndVisible]; [self.window makeKeyAndVisible];
return YES; return YES;
} }

3
iOS/ViewController.m
View File

@ -73,7 +73,8 @@ extern GLKView* defaultView;
} else { } else {
return YES; return YES;
}*/ }*/
return UIInterfaceOrientationIsLandscape(interfaceOrientation); //return UIInterfaceOrientationIsLandscape(interfaceOrientation);
return UIInterfaceOrientationIsPortrait(interfaceOrientation);
} }
- (void)setupGL - (void)setupGL

243
iOS/en.lproj/ViewController_iPhone.xib
View File

@ -1,111 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1296</int> <int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">11E53</string> <string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string> <string key="IBDocument.InterfaceBuilderVersion">2844</string>
<string key="IBDocument.AppKitVersion">1138.47</string> <string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string> <string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1181</string> <string key="NS.object.0">1930</string>
</object> </object>
<array key="IBDocument.IntegratedClassDependencies"> <array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string> <string>IBProxyObject</string>
<string>IBUIView</string> <string>IBUIView</string>
</array> </array>
<array key="IBDocument.PluginDependencies"> <array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array> </array>
<object class="NSMutableDictionary" key="IBDocument.Metadata"> <object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string> <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/> <integer value="1" key="NS.object.0"/>
</object> </object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="841351856"> <object class="IBProxyObject" id="841351856">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string> <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object> </object>
<object class="IBProxyObject" id="371349661"> <object class="IBProxyObject" id="371349661">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string> <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object> </object>
<object class="IBUIView" id="184854543"> <object class="IBUIView" id="184854543">
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">274</int> <int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 460}</string> <string key="NSFrameSize">{320, 480}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<object class="NSColor" key="IBUIBackgroundColor"> <reference key="NSWindow"/>
<int key="NSColorSpace">3</int> <reference key="NSNextKeyView"/>
<bytes key="NSWhite">MQA</bytes> <object class="NSColor" key="IBUIBackgroundColor">
<object class="NSColorSpace" key="NSCustomColorSpace"> <int key="NSColorSpace">3</int>
<int key="NSID">2</int> <bytes key="NSWhite">MQA</bytes>
</object> <object class="NSColorSpace" key="NSCustomColorSpace">
</object> <int key="NSID">2</int>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool> </object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> </object>
</object> <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
</array> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="IBObjectContainer" key="IBDocument.Objects"> </object>
<array class="NSMutableArray" key="connectionRecords"> </array>
<object class="IBConnectionRecord"> <object class="IBObjectContainer" key="IBDocument.Objects">
<object class="IBCocoaTouchOutletConnection" key="connection"> <array class="NSMutableArray" key="connectionRecords">
<string key="label">view</string> <object class="IBConnectionRecord">
<reference key="source" ref="841351856"/> <object class="IBCocoaTouchOutletConnection" key="connection">
<reference key="destination" ref="184854543"/> <string key="label">view</string>
</object> <reference key="source" ref="841351856"/>
<int key="connectionID">3</int> <reference key="destination" ref="184854543"/>
</object> </object>
</array> <int key="connectionID">3</int>
<object class="IBMutableOrderedSet" key="objectRecords"> </object>
<array key="orderedObjects"> </array>
<object class="IBObjectRecord"> <object class="IBMutableOrderedSet" key="objectRecords">
<int key="objectID">0</int> <array key="orderedObjects">
<array key="object" id="0"/> <object class="IBObjectRecord">
<reference key="children" ref="1000"/> <int key="objectID">0</int>
<nil key="parent"/> <array key="object" id="0"/>
</object> <reference key="children" ref="1000"/>
<object class="IBObjectRecord"> <nil key="parent"/>
<int key="objectID">-1</int> </object>
<reference key="object" ref="841351856"/> <object class="IBObjectRecord">
<reference key="parent" ref="0"/> <int key="objectID">-1</int>
<string key="objectName">File's Owner</string> <reference key="object" ref="841351856"/>
</object> <reference key="parent" ref="0"/>
<object class="IBObjectRecord"> <string key="objectName">File's Owner</string>
<int key="objectID">-2</int> </object>
<reference key="object" ref="371349661"/> <object class="IBObjectRecord">
<reference key="parent" ref="0"/> <int key="objectID">-2</int>
</object> <reference key="object" ref="371349661"/>
<object class="IBObjectRecord"> <reference key="parent" ref="0"/>
<int key="objectID">2</int> </object>
<reference key="object" ref="184854543"/> <object class="IBObjectRecord">
<reference key="parent" ref="0"/> <int key="objectID">2</int>
</object> <reference key="object" ref="184854543"/>
</array> <reference key="parent" ref="0"/>
</object> </object>
<dictionary class="NSMutableDictionary" key="flattenedProperties"> </array>
<string key="-1.CustomClassName">ViewController</string> </object>
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-2.CustomClassName">UIResponder</string> <string key="-1.CustomClassName">ViewController</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="2.CustomClassName">CustomGLKView</string> <string key="-2.CustomClassName">UIResponder</string>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary> <string key="2.CustomClassName">CustomGLKView</string>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<nil key="activeLocalization"/> </dictionary>
<dictionary class="NSMutableDictionary" key="localizations"/> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="sourceID"/> <nil key="activeLocalization"/>
<int key="maxID">4</int> <dictionary class="NSMutableDictionary" key="localizations"/>
</object> <nil key="sourceID"/>
<object class="IBClassDescriber" key="IBDocument.Classes"/> <int key="maxID">4</int>
<int key="IBDocument.localizationMode">0</int> </object>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> <object class="IBPartialClassDescription">
<real value="1296" key="NS.object.0"/> <string key="className">CustomGLKView</string>
</object> <string key="superclassName">GLKView</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<int key="IBDocument.defaultPropertyAccessControl">3</int> <string key="majorKey">IBProjectSource</string>
<string key="IBCocoaTouchPluginVersion">1181</string> <string key="minorKey">./Classes/CustomGLKView.h</string>
</data> </object>
</archive> </object>
<object class="IBPartialClassDescription">
<string key="className">ViewController</string>
<string key="superclassName">GLKViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ViewController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1536" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">1930</string>
</data>
</archive>

3
iOS/ios_api.cpp
View File

@ -7,7 +7,8 @@ TMyApplication App;
extern "C" void AppInit() extern "C" void AppInit()
{ {
App.OuterInit(480, 320, 480, 320); App.OuterInit(320, 480, 320, 480);
//App.OuterInit(480, 320, 480, 320);
} }

100
iOS/template-Info.plist
View File

@ -1,50 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>Salmon Universal Template</string> <string>Salmon Universal Template</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string> <string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Icon.png</string> <string>Icon.png</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>fishrungames.template</string> <string>fishrungames.template</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>${PRODUCT_NAME}</string> <string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0</string> <string>1.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0</string> <string>1.0</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>UILaunchImageFile</key> <key>UILaunchImageFile</key>
<string>Splash-landscape.png</string> <string>Splash-landscape.png</string>
<key>UIPrerenderedIcon</key> <key>UIPrerenderedIcon</key>
<true/> <true/>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>
<array> <array>
<string>armv7</string> <string>armv7</string>
</array> </array>
<key>UIStatusBarHidden</key> <key>UIStatusBarHidden</key>
<true/> <true/>
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
<array> <array>
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationPortraitUpsideDown</string>
</array> </array>
<key>UISupportedInterfaceOrientations~ipad</key> <key>UISupportedInterfaceOrientations~ipad</key>
<array> <array>
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationPortraitUpsideDown</string>
</array> </array>
</dict> </dict>
</plist> </plist>

2
jni/main_code.cpp
View File

@ -282,7 +282,7 @@ void TMyApplication::InnerOnMove(vec2 shift)
vec3 rotation = Normalize(vec3(RotateShift, 0)); //Inverse vec3 rotation = Normalize(vec3(RotateShift, 0)); //Inverse
rotation.v[1] =-rotation.v[1]; //Inverse //rotation.v[1] =-rotation.v[1]; //Inverse
vec3 z = vec3(0,0,-1); vec3 z = vec3(0,0,-1);