adjust scrolling and fix some bugs

This commit is contained in:
Robert 2017-01-17 19:05:44 +05:00
parent 2a225c573f
commit 51968df11c
9 changed files with 157 additions and 281 deletions

View File

@ -10,6 +10,7 @@ import Foundation
import UIKit import UIKit
@UIApplicationMain @UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate { class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow? var window: UIWindow?

View File

@ -1,13 +0,0 @@
//
// CustomGLKView.h
// doublehitballs
//
// Created by vvv ооо on 15.07.12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
//
#import "include/Utils/IosApi/ObjC/GLKViewTemplate.h"
@interface CustomGLKView : GLKViewTemplate
@end

View File

@ -1,5 +0,0 @@
#import "CustomGLKView.h"
@implementation CustomGLKView
@end

View File

@ -10,15 +10,16 @@ import Foundation
import GLKit import GLKit
struct TTouchHashData { struct TTouchHashData {
var first: CGPoint! var first: CGPoint?
var second: Bool! var second: Bool?
var number: Int! var number: Int?
} }
class GLKViewTemplate: GLKView { class GLKViewTemplate: GLKView {
let xCoef: CGFloat = 480 / UIScreen.main.bounds.size.width
let yCoef: CGFloat = 320 / UIScreen.main.bounds.size.height
var touchDict: [UITouch: TTouchHashData] = [:] var touchDict: [UITouch: TTouchHashData] = [:]
override init(frame: CGRect) { override init(frame: CGRect) {
@ -59,28 +60,53 @@ class GLKViewTemplate: GLKView {
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) { override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
for touch in touches { for touch in touches {
let location = touch.location(in: self) let location = CGPoint(x: touch.location(in: self).x * xCoef, y: touch.location(in: self).y * yCoef)
let prevLocation = touch.previousLocation(in: self) addTouchToHash(touch: touch)
if abs(touchDict[touch]!.first!.x - location.x) > 10 || abs(touchDict[touch]!.first!.y - location.y) > 10 { guard let n = touchDict[touch]?.number else {
return
}
let number = Int32(n)
print(bounds.size.height * yCoef - location.y)
SE_AppOnTapDown(Int32(location.x), Int32(bounds.size.height * yCoef - location.y), number)
}
}
override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
for touch in touches {
let location = CGPoint(x: touch.location(in: self).x * xCoef, y: touch.location(in: self).y * yCoef)
let prevLocation = CGPoint(x: touch.previousLocation(in: self).x * xCoef, y: touch.previousLocation(in: self).y * yCoef)
guard let x = touchDict[touch]?.first?.x, let y = touchDict[touch]?.first?.y, let n = touchDict[touch]?.number else {
return
}
if abs(x - location.x) > 10 || abs(y - location.y) > 10 {
touchDict[touch]?.second = true touchDict[touch]?.second = true
} }
let number = Int32(touchDict[touch]!.number) let number = Int32(n)
SE_AppOnScroll(Int32(Float(prevLocation.x) - Float(location.x)), -Int32(Float(prevLocation.y) - Float(location.y)), number) SE_AppOnScroll(Int32(Float(prevLocation.x) - Float(location.x)), -Int32(Float(prevLocation.y) - Float(location.y)), number)
print("location is:\(location)!!!!")
} }
} }
override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) { override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
for touch in touches { for touch in touches {
let location = touch.location(in: self) let location = CGPoint(x: touch.location(in: self).x * xCoef, y: touch.location(in: self).y * yCoef)
let number = Int32(touchDict[touch]!.number) print("location is:\(location)!!!!")
guard let n = touchDict[touch]?.number else {
return
}
let number = Int32(n)
if touchDict[touch]!.second == true { if touchDict[touch]!.second == true {
SE_AppOnTapUpAfterMove(Int32(location.x), Int32(bounds.size.height - location.y), number) SE_AppOnTapUpAfterMove(Int32(location.x), Int32(bounds.size.height * yCoef - location.y), number)
} else { } else {
SE_AppOnTapUp(Int32(location.x), Int32(bounds.size.height - location.y), number) SE_AppOnTapUp(Int32(location.x), Int32(bounds.size.height * yCoef - location.y), number)
} }
touchDict.removeValue(forKey: touch) touchDict.removeValue(forKey: touch)
} }
@ -93,3 +119,9 @@ class GLKViewTemplate: GLKView {
} }
} }
class CustomGLKView: GLKViewTemplate {
required init?(coder aDecoder: NSCoder) {
super.init(frame: UIScreen.main.bounds)
}
}

View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C68" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina5_5" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="G55-ta-yst">
<objects>
<viewController id="c1T-2p-CH2" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="UNt-Ao-m27"/>
<viewControllerLayoutGuide type="bottom" id="MBA-1n-hbW"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="m8M-iA-xT9">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Splash-landscape.png" translatesAutoresizingMaskIntoConstraints="NO" id="bIF-S4-uHb">
<rect key="frame" x="0.0" y="20" width="414" height="716"/>
</imageView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="bIF-S4-uHb" firstAttribute="top" secondItem="UNt-Ao-m27" secondAttribute="bottom" id="B1Y-lh-2VB"/>
<constraint firstItem="bIF-S4-uHb" firstAttribute="leading" secondItem="m8M-iA-xT9" secondAttribute="leading" id="XTa-pd-aNE"/>
<constraint firstAttribute="trailing" secondItem="bIF-S4-uHb" secondAttribute="trailing" id="fSt-6b-n1n"/>
<constraint firstItem="MBA-1n-hbW" firstAttribute="top" secondItem="bIF-S4-uHb" secondAttribute="bottom" id="xxv-CM-o3Y"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ra6-vZ-gzs" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="34" y="167"/>
</scene>
</scenes>
<resources>
<image name="Splash-landscape.png" width="320" height="480"/>
</resources>
</document>

View File

@ -1,133 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="11762" systemVersion="16C68" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES">
<data> <device id="ipad9_7" orientation="portrait">
<int key="IBDocument.SystemTarget">1296</int> <adaptation id="fullscreen"/>
<string key="IBDocument.SystemVersion">11E53</string> </device>
<string key="IBDocument.InterfaceBuilderVersion">2182</string> <dependencies>
<string key="IBDocument.AppKitVersion">1138.47</string> <deployment identifier="iOS"/>
<string key="IBDocument.HIToolboxVersion">569.00</string> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </dependencies>
<string key="NS.object.0">1181</string> <objects>
</object> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ViewController">
<array key="IBDocument.IntegratedClassDependencies"> <connections>
<string>IBProxyObject</string> <outlet property="view" destination="1" id="3"/>
<string>IBUIView</string> </connections>
</array> </placeholder>
<array key="IBDocument.PluginDependencies"> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <view contentMode="scaleToFill" id="1" customClass="CustomGLKView" customModule="salmontemplate" customModuleProvider="target">
</array> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<object class="NSMutableDictionary" key="IBDocument.Metadata"> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<string key="NS.key.0">PluginDependencyRecalculationVersion</string> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<integer value="1" key="NS.object.0"/> </view>
</object> </objects>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <simulatedMetricsContainer key="defaultSimulatedMetrics">
<object class="IBProxyObject" id="372490531"> <simulatedStatusBarMetrics key="statusBar"/>
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string> <simulatedOrientationMetrics key="orientation"/>
<string key="targetRuntimeIdentifier">IBIPadFramework</string> <simulatedScreenMetrics key="destination"/>
</object> </simulatedMetricsContainer>
<object class="IBProxyObject" id="975951072"> </document>
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUIView" id="191373211">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
</object>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
<int key="IBUIStatusBarStyle">2</int>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="191373211"/>
</object>
<int key="connectionID">3</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="372490531"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">ViewController</string>
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.CustomClassName">CustomGLKView</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">3</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">CustomGLKView</string>
<string key="superclassName">GLKView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/CustomGLKView.h</string>
</object>
</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">IBIPadFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>

View File

@ -1,111 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C68" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
<data> <device id="retina4_7" orientation="portrait">
<int key="IBDocument.SystemTarget">1296</int> <adaptation id="fullscreen"/>
<string key="IBDocument.SystemVersion">11E53</string> </device>
<string key="IBDocument.InterfaceBuilderVersion">2182</string> <dependencies>
<string key="IBDocument.AppKitVersion">1138.47</string> <deployment identifier="iOS"/>
<string key="IBDocument.HIToolboxVersion">569.00</string> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </dependencies>
<string key="NS.object.0">1181</string> <objects>
</object> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ViewController">
<array key="IBDocument.IntegratedClassDependencies"> <connections>
<string>IBProxyObject</string> <outlet property="view" destination="2" id="3"/>
<string>IBUIView</string> </connections>
</array> </placeholder>
<array key="IBDocument.PluginDependencies"> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="2" customClass="CustomGLKView" customModule="salmontemplate" customModuleProvider="target">
</array> <rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
<object class="NSMutableDictionary" key="IBDocument.Metadata"> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<string key="NS.key.0">PluginDependencyRecalculationVersion</string> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<integer value="1" key="NS.object.0"/> <nil key="simulatedStatusBarMetrics"/>
</object> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> </view>
<object class="IBProxyObject" id="841351856"> </objects>
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string> <simulatedMetricsContainer key="defaultSimulatedMetrics">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <simulatedStatusBarMetrics key="statusBar"/>
</object> <simulatedOrientationMetrics key="orientation"/>
<object class="IBProxyObject" id="371349661"> <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string> </simulatedMetricsContainer>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> </document>
</object>
<object class="IBUIView" id="184854543">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="184854543"/>
</object>
<int key="connectionID">3</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="841351856"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="371349661"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2</int>
<reference key="object" ref="184854543"/>
<reference key="parent" ref="0"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">ViewController</string>
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="2.CustomClassName">CustomGLKView</string>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">4</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<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="1296" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>

View File

@ -21,7 +21,6 @@
4C77831815BABE26003D5142 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831415BABD8B003D5142 /* AudioToolbox.framework */; }; 4C77831815BABE26003D5142 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831415BABD8B003D5142 /* AudioToolbox.framework */; };
4C77831915BABE26003D5142 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831515BABD8B003D5142 /* OpenAL.framework */; }; 4C77831915BABE26003D5142 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831515BABD8B003D5142 /* OpenAL.framework */; };
4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7AD44B15B1D77700A599F6 /* ios_api.cpp */; }; 4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7AD44B15B1D77700A599F6 /* ios_api.cpp */; };
4CCC0ECC15B30D6B005432FB /* CustomGLKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */; };
4CE6A9D215B2F979006A3965 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 4CE6A9D115B2F979006A3965 /* assets */; }; 4CE6A9D215B2F979006A3965 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 4CE6A9D115B2F979006A3965 /* assets */; };
74AC9EBD1E2CE407003C9749 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74AC9EBC1E2CE407003C9749 /* ViewController.swift */; }; 74AC9EBD1E2CE407003C9749 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74AC9EBC1E2CE407003C9749 /* ViewController.swift */; };
74AC9EC11E2CF533003C9749 /* SENamespaceWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74AC9EBF1E2CF533003C9749 /* SENamespaceWrapper.cpp */; }; 74AC9EC11E2CF533003C9749 /* SENamespaceWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74AC9EBF1E2CF533003C9749 /* SENamespaceWrapper.cpp */; };
@ -29,6 +28,7 @@
74C3AE2F1E2E2A40003C07F2 /* gamecode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74C3AE281E2E2A40003C07F2 /* gamecode.cpp */; }; 74C3AE2F1E2E2A40003C07F2 /* gamecode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74C3AE281E2E2A40003C07F2 /* gamecode.cpp */; };
74C3AE301E2E2A40003C07F2 /* loadingcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74C3AE2A1E2E2A40003C07F2 /* loadingcode.cpp */; }; 74C3AE301E2E2A40003C07F2 /* loadingcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74C3AE2A1E2E2A40003C07F2 /* loadingcode.cpp */; };
74C3AE311E2E2A40003C07F2 /* menucode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74C3AE2C1E2E2A40003C07F2 /* menucode.cpp */; }; 74C3AE311E2E2A40003C07F2 /* menucode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74C3AE2C1E2E2A40003C07F2 /* menucode.cpp */; };
74C3AE4D1E2E4194003C07F2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74C3AE4C1E2E4194003C07F2 /* LaunchScreen.storyboard */; };
74EEBAEF1E2D13A6004C6C65 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74EEBAEE1E2D13A6004C6C65 /* AppDelegate.swift */; }; 74EEBAEF1E2D13A6004C6C65 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74EEBAEE1E2D13A6004C6C65 /* AppDelegate.swift */; };
74EEBAF11E2D1C7C004C6C65 /* CustomGLKView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */; }; 74EEBAF11E2D1C7C004C6C65 /* CustomGLKView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */; };
84D0FEBE1E274DDD00EC3FE5 /* libSalmon Engine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C902A7815C5735700FBC901 /* libSalmon Engine.a */; }; 84D0FEBE1E274DDD00EC3FE5 /* libSalmon Engine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C902A7815C5735700FBC901 /* libSalmon Engine.a */; };
@ -86,8 +86,6 @@
4C77831515BABD8B003D5142 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 4C77831515BABD8B003D5142 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
4C7AD44B15B1D77700A599F6 /* ios_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ios_api.cpp; sourceTree = "<group>"; }; 4C7AD44B15B1D77700A599F6 /* ios_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ios_api.cpp; sourceTree = "<group>"; };
4C902A7015C5735500FBC901 /* Salmon Engine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Salmon Engine.xcodeproj"; path = "../../Engine/iOS/Salmon Engine/Salmon Engine.xcodeproj"; sourceTree = "<group>"; }; 4C902A7015C5735500FBC901 /* Salmon Engine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Salmon Engine.xcodeproj"; path = "../../Engine/iOS/Salmon Engine/Salmon Engine.xcodeproj"; sourceTree = "<group>"; };
4CCC0ECA15B30D6A005432FB /* CustomGLKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomGLKView.h; sourceTree = "<group>"; };
4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomGLKView.mm; sourceTree = "<group>"; };
4CCC0ECD15B310FB005432FB /* ios_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios_api.h; sourceTree = "<group>"; }; 4CCC0ECD15B310FB005432FB /* ios_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios_api.h; sourceTree = "<group>"; };
4CE6A9D115B2F979006A3965 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../assets; sourceTree = "<group>"; }; 4CE6A9D115B2F979006A3965 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../assets; sourceTree = "<group>"; };
74AC9EBB1E2CE407003C9749 /* salmontemplate-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "salmontemplate-Bridging-Header.h"; sourceTree = "<group>"; }; 74AC9EBB1E2CE407003C9749 /* salmontemplate-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "salmontemplate-Bridging-Header.h"; sourceTree = "<group>"; };
@ -103,6 +101,7 @@
74C3AE2B1E2E2A40003C07F2 /* loadingcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = loadingcode.h; path = ../game/loadingcode.h; sourceTree = "<group>"; }; 74C3AE2B1E2E2A40003C07F2 /* loadingcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = loadingcode.h; path = ../game/loadingcode.h; sourceTree = "<group>"; };
74C3AE2C1E2E2A40003C07F2 /* menucode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = menucode.cpp; path = ../game/menucode.cpp; sourceTree = "<group>"; }; 74C3AE2C1E2E2A40003C07F2 /* menucode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = menucode.cpp; path = ../game/menucode.cpp; sourceTree = "<group>"; };
74C3AE2D1E2E2A40003C07F2 /* menucode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = menucode.h; path = ../game/menucode.h; sourceTree = "<group>"; }; 74C3AE2D1E2E2A40003C07F2 /* menucode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = menucode.h; path = ../game/menucode.h; sourceTree = "<group>"; };
74C3AE4C1E2E4194003C07F2 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
74EEBAEE1E2D13A6004C6C65 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 74EEBAEE1E2D13A6004C6C65 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomGLKView.swift; sourceTree = "<group>"; }; 74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomGLKView.swift; sourceTree = "<group>"; };
84D0FEC11E274E3700EC3FE5 /* vorbis-tremor-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "vorbis-tremor-ios.xcodeproj"; path = "../../libs/vorbis-tremor-ios/vorbis-tremor-ios.xcodeproj"; sourceTree = "<group>"; }; 84D0FEC11E274E3700EC3FE5 /* vorbis-tremor-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "vorbis-tremor-ios.xcodeproj"; path = "../../libs/vorbis-tremor-ios/vorbis-tremor-ios.xcodeproj"; sourceTree = "<group>"; };
@ -176,9 +175,8 @@
74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */, 74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */,
4C49B2DA15B0991B003512CD /* ViewController_iPhone.xib */, 4C49B2DA15B0991B003512CD /* ViewController_iPhone.xib */,
4C49B2DD15B0991B003512CD /* ViewController_iPad.xib */, 4C49B2DD15B0991B003512CD /* ViewController_iPad.xib */,
74C3AE4C1E2E4194003C07F2 /* LaunchScreen.storyboard */,
4C49B2C815B0991B003512CD /* Supporting Files */, 4C49B2C815B0991B003512CD /* Supporting Files */,
4CCC0ECA15B30D6A005432FB /* CustomGLKView.h */,
4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */,
); );
name = Sources; name = Sources;
sourceTree = "<group>"; sourceTree = "<group>";
@ -334,6 +332,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
4C49B2CC15B0991B003512CD /* InfoPlist.strings in Resources */, 4C49B2CC15B0991B003512CD /* InfoPlist.strings in Resources */,
74C3AE4D1E2E4194003C07F2 /* LaunchScreen.storyboard in Resources */,
4C49B2DC15B0991B003512CD /* ViewController_iPhone.xib in Resources */, 4C49B2DC15B0991B003512CD /* ViewController_iPhone.xib in Resources */,
4C49B2DF15B0991B003512CD /* ViewController_iPad.xib in Resources */, 4C49B2DF15B0991B003512CD /* ViewController_iPad.xib in Resources */,
4CE6A9D215B2F979006A3965 /* assets in Resources */, 4CE6A9D215B2F979006A3965 /* assets in Resources */,
@ -360,7 +359,6 @@
74AC9EC11E2CF533003C9749 /* SENamespaceWrapper.cpp in Sources */, 74AC9EC11E2CF533003C9749 /* SENamespaceWrapper.cpp in Sources */,
74C3AE311E2E2A40003C07F2 /* menucode.cpp in Sources */, 74C3AE311E2E2A40003C07F2 /* menucode.cpp in Sources */,
4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */, 4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */,
4CCC0ECC15B30D6B005432FB /* CustomGLKView.mm in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

View File

@ -28,6 +28,8 @@
<true/> <true/>
<key>UILaunchImageFile</key> <key>UILaunchImageFile</key>
<string>Splash-landscape.png</string> <string>Splash-landscape.png</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIPrerenderedIcon</key> <key>UIPrerenderedIcon</key>
<true/> <true/>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>