fix Mixed/AR/iOS launcher

xamarin · Feb 22, 2018 · d795243 · d795243
1 parent cd4ad27
commit d795243
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 18 deletions.
diff --git a/Mixed/AR/UrhoAR.iOS/Info.plist b/Mixed/AR/UrhoAR.iOS/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleName</key>
 	<string>UrhoIOS</string>
 	<key>CFBundleIdentifier</key>
-	<string>demo.arkoxcode93</string>
+	<string>demo.arko</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -28,19 +28,17 @@
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
+		<string>arkit</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>

diff --git a/Mixed/AR/UrhoAR.iOS/UrhoAR.iOS.csproj b/Mixed/AR/UrhoAR.iOS/UrhoAR.iOS.csproj
@@ -69,14 +69,15 @@
     <MtouchDebug>true</MtouchDebug>
     <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
     <MtouchFastDev>true</MtouchFastDev>
-    <MtouchProfiling>true</MtouchProfiling>
+    <MtouchProfiling>false</MtouchProfiling>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <IOSDebuggerPort>33656</IOSDebuggerPort>
     <MtouchLink>SdkOnly</MtouchLink>
     <MtouchArch>ARM64</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <PlatformTarget>x86</PlatformTarget>
+    <OptimizePNGs>false</OptimizePNGs>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -87,14 +88,6 @@
     </Reference>
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
-  <ItemGroup>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\Contents.json">
-      <Visible>false</Visible>
-    </ImageAsset>
-  </ItemGroup>
   <ItemGroup />
   <ItemGroup>
     <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -115,11 +108,38 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="..\MyData\Materials\*.*">
-      <Link>Resources\MyData\Materials\%(Filename)%(Extension)</Link>
+    <BundleResource Include="..\MyData\Materials\Earth.xml">
+      <Link>Resources\MyData\Materials\Earth.xml</Link>
+    </BundleResource>
+    <BundleResource Include="..\MyData\Materials\Moon.xml">
+      <Link>Resources\MyData\Materials\Moon.xml</Link>
+    </BundleResource>
+    <BundleResource Include="..\MyData\Textures\Earth.jpg">
+      <Link>Resources\MyData\Textures\Earth.jpg</Link>
+    </BundleResource>
+    <BundleResource Include="..\MyData\Textures\Earth_Clouds.jpg">
+      <Link>Resources\MyData\Textures\Earth_Clouds.jpg</Link>
+    </BundleResource>
+    <BundleResource Include="..\MyData\Textures\Earth_Night.jpg">
+      <Link>Resources\MyData\Textures\Earth_Night.jpg</Link>
+    </BundleResource>
+    <BundleResource Include="..\MyData\Textures\Earth_NormalsMap.png">
+      <Link>Resources\MyData\Textures\Earth_NormalsMap.png</Link>
+    </BundleResource>
+    <BundleResource Include="..\MyData\Textures\Earth_SpecularMap.png">
+      <Link>Resources\MyData\Textures\Earth_SpecularMap.png</Link>
+    </BundleResource>
+    <BundleResource Include="..\MyData\Textures\License.txt">
+      <Link>Resources\MyData\Textures\License.txt</Link>
+    </BundleResource>
+    <BundleResource Include="..\MyData\Textures\Moon.jpg">
+      <Link>Resources\MyData\Textures\Moon.jpg</Link>
+    </BundleResource>
+    <BundleResource Include="..\MyData\Textures\Moon_NormalsMap.png">
+      <Link>Resources\MyData\Textures\Moon_NormalsMap.png</Link>
     </BundleResource>
-    <BundleResource Include="..\MyData\Textures\*.*">
-      <Link>Resources\MyData\Textures\%(Filename)%(Extension)</Link>
+    <BundleResource Include="..\MyData\Textures\Space.png">
+      <Link>Resources\MyData\Textures\Space.png</Link>
     </BundleResource>
   </ItemGroup>
   <Import Project="..\Shared\Shared.projitems" Label="Shared" />

diff --git 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<MyApp>(new Urho.ApplicationOptions("MyData"));
+			View.AddSubview(urhoSurface);
+			var app = await urhoSurface.Show<MyApp>(new Urho.ApplicationOptions("MyData") { 
+				Orientation = Urho.ApplicationOptions.OrientationType.Portrait,
+				DelayedStart = false,
+			});
 		}
 
 		public override void DidReceiveMemoryWarning()