summaryrefslogtreecommitdiffstats
path: root/Common/NativeApp/Apple/Data/iOS
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-03-30 18:52:35 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-03-30 18:52:35 +0000
commit2992642a3ca94bf52b066eed18bcc1df631ec67e (patch)
tree6bdc4fd27c0d83245a3b43d9086cc1d1d9bd7be2 /Common/NativeApp/Apple/Data/iOS
parentUpdated core & native app cmake (diff)
downloadDiligentEngine-2992642a3ca94bf52b066eed18bcc1df631ec67e.tar.gz
DiligentEngine-2992642a3ca94bf52b066eed18bcc1df631ec67e.zip
Enabled Vulkan mode on iOS (close https://github.com/DiligentGraphics/DiligentCore/issues/46)
Diffstat (limited to 'Common/NativeApp/Apple/Data/iOS')
-rw-r--r--Common/NativeApp/Apple/Data/iOS/Base.lproj/LaunchScreen.xib21
-rw-r--r--Common/NativeApp/Apple/Data/iOS/Base.lproj/Main.storyboard79
-rwxr-xr-xCommon/NativeApp/Apple/Data/iOS/Images.xcassets/opengles-logo.pngbin0 -> 39013 bytes
-rw-r--r--Common/NativeApp/Apple/Data/iOS/Images.xcassets/vulkan-logo.pngbin0 -> 35692 bytes
4 files changed, 83 insertions, 17 deletions
diff --git a/Common/NativeApp/Apple/Data/iOS/Base.lproj/LaunchScreen.xib b/Common/NativeApp/Apple/Data/iOS/Base.lproj/LaunchScreen.xib
index 5569812..42589b0 100644
--- a/Common/NativeApp/Apple/Data/iOS/Base.lproj/LaunchScreen.xib
+++ b/Common/NativeApp/Apple/Data/iOS/Base.lproj/LaunchScreen.xib
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8121.20" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+ <device id="retina5_9" orientation="portrait">
+ <adaptation id="fullscreen"/>
+ </device>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8101.16"/>
- <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -12,20 +15,20 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright © 2015-2019 Diligent Graphics." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text=" Copyright © 2015-2019 Diligent Graphics." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Diligent Engine" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Diligent Engine" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
diff --git a/Common/NativeApp/Apple/Data/iOS/Base.lproj/Main.storyboard b/Common/NativeApp/Apple/Data/iOS/Base.lproj/Main.storyboard
index 0dc87c1..026129a 100644
--- a/Common/NativeApp/Apple/Data/iOS/Base.lproj/Main.storyboard
+++ b/Common/NativeApp/Apple/Data/iOS/Base.lproj/Main.storyboard
@@ -1,26 +1,89 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8121.20" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="XIi-06-RrN">
+ <device id="retina5_9" orientation="portrait">
+ <adaptation id="fullscreen"/>
+ </device>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8101.16"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
- <!--View Controller-->
+ <!--Mode Selection View Controller-->
+ <scene sceneID="zOR-Fi-Gze">
+ <objects>
+ <viewController id="XIi-06-RrN" customClass="ModeSelectionViewController" sceneMemberID="viewController">
+ <layoutGuides>
+ <viewControllerLayoutGuide type="top" id="xws-yS-Cpz"/>
+ <viewControllerLayoutGuide type="bottom" id="eBA-xl-v26"/>
+ </layoutGuides>
+ <view key="view" contentMode="scaleToFill" id="bQn-Ig-dl7" customClass="BaseView">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CtC-44-7bh" userLabel="OpenGLES">
+ <rect key="frame" x="43" y="270" width="289" height="119"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <state key="normal" title="Button" image="opengles-logo.png"/>
+ <connections>
+ <action selector="goOpenGLES:" destination="XIi-06-RrN" eventType="touchUpInside" id="Mad-GE-H0I"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Exn-mx-E3B" userLabel="Vulkan">
+ <rect key="frame" x="36" y="425" width="302" height="120"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <state key="normal" title="Button" image="vulkan-logo.png"/>
+ <connections>
+ <action selector="goVulkan:" destination="XIi-06-RrN" eventType="touchUpInside" id="jsv-Uc-EF5"/>
+ </connections>
+ </button>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="voS-RJ-rQF" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="-1458.4000000000001" y="73.891625615763544"/>
+ </scene>
+ <!--Metal View Controller-->
+ <scene sceneID="sxp-To-dZO">
+ <objects>
+ <viewController storyboardIdentifier="MetalViewControllerID" id="2n5-tG-bFt" userLabel="Metal View Controller" sceneMemberID="viewController">
+ <layoutGuides>
+ <viewControllerLayoutGuide type="top" id="X8x-0E-yac"/>
+ <viewControllerLayoutGuide type="bottom" id="6Gz-x2-Owi"/>
+ </layoutGuides>
+ <view key="view" contentMode="scaleToFill" id="fUr-Le-qAJ" customClass="MetalView">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="xSS-Vf-fsO" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="-570" y="74"/>
+ </scene>
+ <!--EAGL View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
- <viewController id="BYZ-38-t0r" sceneMemberID="viewController">
+ <viewController storyboardIdentifier="EAGLViewControllerID" title="EAGL View Controller" id="BYZ-38-t0r" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
- <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC" customClass="EAGLView">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC" userLabel="EAGL View" customClass="EAGLView">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
+ <point key="canvasLocation" x="214" y="74"/>
</scene>
</scenes>
+ <resources>
+ <image name="opengles-logo.png" width="1500" height="500"/>
+ <image name="vulkan-logo.png" width="1300" height="500"/>
+ </resources>
</document>
diff --git a/Common/NativeApp/Apple/Data/iOS/Images.xcassets/opengles-logo.png b/Common/NativeApp/Apple/Data/iOS/Images.xcassets/opengles-logo.png
new file mode 100755
index 0000000..88b6983
--- /dev/null
+++ b/Common/NativeApp/Apple/Data/iOS/Images.xcassets/opengles-logo.png
Binary files differ
diff --git a/Common/NativeApp/Apple/Data/iOS/Images.xcassets/vulkan-logo.png b/Common/NativeApp/Apple/Data/iOS/Images.xcassets/vulkan-logo.png
new file mode 100644
index 0000000..8a15b9e
--- /dev/null
+++ b/Common/NativeApp/Apple/Data/iOS/Images.xcassets/vulkan-logo.png
Binary files differ