Skip to content
This repository has been archived by the owner on May 5, 2021. It is now read-only.

Commit

Permalink
update samples to 1.8.71
Browse files Browse the repository at this point in the history
  • Loading branch information
@EgorBo
EgorBo committed Feb 27, 2018
1 parent 417919e commit 24cc426
Show file tree
Hide file tree
Showing 64 changed files with 565 additions and 508 deletions.
18 changes: 10 additions & 8 deletions ARCore/ARCore/ARCore.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -66,16 +66,16 @@
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Urho, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UrhoSharp.1.8.51\lib\MonoAndroid\Urho.dll</HintPath>
<HintPath>..\packages\UrhoSharp.1.8.71\lib\MonoAndroid\Urho.dll</HintPath>
</Reference>
<Reference Include="Urho.Droid.CoreAR, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UrhoSharp.ARCore.1.8.51\lib\monoandroid80\Urho.Droid.CoreAR.dll</HintPath>
<HintPath>..\packages\UrhoSharp.ARCore.1.8.71\lib\monoandroid80\Urho.Droid.CoreAR.dll</HintPath>
</Reference>
<Reference Include="Urho.Droid.SdlBinding, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UrhoSharp.1.8.51\lib\MonoAndroid\Urho.Droid.SdlBinding.dll</HintPath>
<HintPath>..\packages\UrhoSharp.1.8.71\lib\MonoAndroid\Urho.Droid.SdlBinding.dll</HintPath>
</Reference>
<Reference Include="Urho.Extensions.Droid.ARCore, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UrhoSharp.ARCore.1.8.51\lib\monoandroid80\Urho.Extensions.Droid.ARCore.dll</HintPath>
<HintPath>..\packages\UrhoSharp.ARCore.1.8.71\lib\monoandroid80\Urho.Extensions.Droid.ARCore.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Arch.Core.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\lib\MonoAndroid80\Xamarin.Android.Arch.Core.Common.dll</HintPath>
Expand Down Expand Up @@ -122,7 +122,9 @@
<AndroidAsset Include="Assets\MutantData\Shaders\GLSL\MyGammaCorrection.glsl" />
<None Include="packages.config" />
<None Include="Resources\AboutResources.txt" />
<None Include="Properties\AndroidManifest.xml" />
<None Include="Properties\AndroidManifest.xml">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\Main.axml">
Expand Down Expand Up @@ -163,14 +165,14 @@
<Error Condition="!Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.Android.Support.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Compat.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Compat.targets'))" />
<Error Condition="!Exists('..\packages\UrhoSharp.1.8.51\build\MonoAndroid\UrhoSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UrhoSharp.1.8.51\build\MonoAndroid\UrhoSharp.targets'))" />
<Error Condition="!Exists('..\packages\UrhoSharp.1.8.71\build\MonoAndroid\UrhoSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UrhoSharp.1.8.71\build\MonoAndroid\UrhoSharp.targets'))" />
</Target>
<Import Project="..\packages\Xamarin.Android.Support.Annotations.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
<Import Project="..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets')" />
<Import Project="..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
<Import Project="..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Compat.targets')" />
<Import Project="..\packages\UrhoSharp.1.8.51\build\MonoAndroid\UrhoSharp.targets" Condition="Exists('..\packages\UrhoSharp.1.8.51\build\MonoAndroid\UrhoSharp.targets')" />
<Import Project="..\packages\UrhoSharp.1.8.71\build\MonoAndroid\UrhoSharp.targets" Condition="Exists('..\packages\UrhoSharp.1.8.71\build\MonoAndroid\UrhoSharp.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
5 changes: 2 additions & 3 deletions ARCore/ARCore/MyGame.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,10 @@ protected override void Start()
Renderer.SetViewport(0, viewport);

// ARCore component
ArCore = new ARCoreComponent();
ArCore = scene.CreateComponent<ARCoreComponent>();
ArCore.ARFrameUpdated += OnARFrameUpdated;
ArCore.ConfigRequested += ArCore_ConfigRequested;
ArCore.Camera = camera;
scene.AddComponent(ArCore);
ArCore.Run();

// Mutant
mutantNode = scene.CreateChild();
Expand Down
115 changes: 71 additions & 44 deletions ARCore/ARCore/Resources/Resource.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ARCore/ARCore/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="UrhoSharp" version="1.8.51" targetFramework="monoandroid80" />
<package id="UrhoSharp.ARCore" version="1.8.51" targetFramework="monoandroid80" />
<package id="UrhoSharp" version="1.8.71" targetFramework="monoandroid80" />
<package id="UrhoSharp.ARCore" version="1.8.71" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.0.0" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.1" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.0" targetFramework="monoandroid80" />
Expand Down
16 changes: 10 additions & 6 deletions ARKit/ARKitXamarinDemo/ARKitXamarinDemo.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -29,8 +29,8 @@
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
<PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
<OptimizePNGs>false</OptimizePNGs>
<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
<OptimizePNGs>false</OptimizePNGs>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>pdbonly</DebugType>
Expand Down Expand Up @@ -94,12 +94,16 @@
<Reference Include="Xamarin.iOS" />
<Reference Include="MonoTouch.Dialog-1" />
<Reference Include="Urho">
<HintPath>..\packages\UrhoSharp.1.8.51\lib\Xamarin.iOS10\Urho.dll</HintPath>
<HintPath>..\packages\UrhoSharp.1.8.71\lib\Xamarin.iOS10\Urho.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
<ImageAsset Include="Assets.xcassets\Contents.json" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\Contents.json">
<Visible>false</Visible>
</ImageAsset>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
Expand Down
Loading

0 comments on commit 24cc426

Please sign in to comment.