From d795243d63a5710ae550cded5642aff9a8ab1a61 Mon Sep 17 00:00:00 2001 From: Egor Bogatov Date: Fri, 23 Feb 2018 02:26:06 +0300 Subject: [PATCH] fix Mixed/AR/iOS launcher --- Mixed/AR/UrhoAR.iOS/Info.plist | 6 ++-- Mixed/AR/UrhoAR.iOS/UrhoAR.iOS.csproj | 46 +++++++++++++++++++-------- Mixed/AR/UrhoAR.iOS/ViewController.cs | 6 +++- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/Mixed/AR/UrhoAR.iOS/Info.plist b/Mixed/AR/UrhoAR.iOS/Info.plist index 270bece..b428ea3 100644 --- a/Mixed/AR/UrhoAR.iOS/Info.plist +++ b/Mixed/AR/UrhoAR.iOS/Info.plist @@ -5,7 +5,7 @@ CFBundleName UrhoIOS CFBundleIdentifier - demo.arkoxcode93 + demo.arko CFBundleShortVersionString 1.0 CFBundleVersion @@ -28,19 +28,17 @@ UIRequiredDeviceCapabilities armv7 + arkit UISupportedInterfaceOrientations UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft UISupportedInterfaceOrientations~ipad UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight XSAppIconAssets Assets.xcassets/AppIcon.appiconset diff --git a/Mixed/AR/UrhoAR.iOS/UrhoAR.iOS.csproj b/Mixed/AR/UrhoAR.iOS/UrhoAR.iOS.csproj index 55fc185..d51bf32 100644 --- a/Mixed/AR/UrhoAR.iOS/UrhoAR.iOS.csproj +++ b/Mixed/AR/UrhoAR.iOS/UrhoAR.iOS.csproj @@ -69,7 +69,7 @@ true true true - true + false true Entitlements.plist 33656 @@ -77,6 +77,7 @@ ARM64 HttpClientHandler x86 + false @@ -87,14 +88,6 @@ - - - false - - - false - - @@ -115,11 +108,38 @@ - - Resources\MyData\Materials\%(Filename)%(Extension) + + Resources\MyData\Materials\Earth.xml + + + Resources\MyData\Materials\Moon.xml + + + Resources\MyData\Textures\Earth.jpg + + + Resources\MyData\Textures\Earth_Clouds.jpg + + + Resources\MyData\Textures\Earth_Night.jpg + + + Resources\MyData\Textures\Earth_NormalsMap.png + + + Resources\MyData\Textures\Earth_SpecularMap.png + + + Resources\MyData\Textures\License.txt + + + Resources\MyData\Textures\Moon.jpg + + + Resources\MyData\Textures\Moon_NormalsMap.png - - Resources\MyData\Textures\%(Filename)%(Extension) + + Resources\MyData\Textures\Space.png diff --git a/Mixed/AR/UrhoAR.iOS/ViewController.cs b/Mixed/AR/UrhoAR.iOS/ViewController.cs index 3a671c7..b99f7b0 100644 --- a/Mixed/AR/UrhoAR.iOS/ViewController.cs +++ b/Mixed/AR/UrhoAR.iOS/ViewController.cs @@ -16,7 +16,11 @@ public override async void ViewDidLoad() base.ViewDidLoad(); urhoSurface = new UrhoSurface(View.Bounds); - var app = await urhoSurface.Show(new Urho.ApplicationOptions("MyData")); + View.AddSubview(urhoSurface); + var app = await urhoSurface.Show(new Urho.ApplicationOptions("MyData") { + Orientation = Urho.ApplicationOptions.OrientationType.Portrait, + DelayedStart = false, + }); } public override void DidReceiveMemoryWarning()