Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Arcore 1 42 0 #1437

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Arcore 1 42 0 #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80bf7fa
Merge pull request #1 from xamarin/main
softlion Dec 20, 2023
10c75ae
Merge branch 'xamarin:main' into main
softlion May 2, 2024
d501396
update to arcore v1.42.0
softlion May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Android/ARCore/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

var TARGET = Argument ("t", Argument ("target", "ci"));

var NUGET_VERSION = "1.29.0";
var NUGET_VERSION = "1.42.0";

var AAR_VERSION = "1.29.0";
var AAR_VERSION = "1.42.0";
var AAR_URL = string.Format("https://dl.google.com/dl/android/maven2/com/google/ar/core/{0}/core-{0}.aar", AAR_VERSION);
var OBJ_VERSION = "0.3.0";
var OBJ_VERSION = "0.4.0";
var OBJ_URL = string.Format("https://oss.sonatype.org/content/repositories/releases/de/javagl/obj/{0}/obj-{0}.jar", OBJ_VERSION);

Task ("externals")
Expand Down
16 changes: 16 additions & 0 deletions Android/ARCore/source/Additions/Additions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,20 @@ public partial class DepthPoint : Google.AR.Core.ITrackable {}
public partial class InstantPlacementPoint : Google.AR.Core.ITrackable {}
public partial class Plane : Google.AR.Core.ITrackable {}
public partial class Point : Google.AR.Core.ITrackable {}

public partial class Earth
{
~Earth()
{
InternalFinalize();
}
}

public partial class StreetscapeGeometry
{
~StreetscapeGeometry()
{
InternalFinalize();
}
}
}
42 changes: 29 additions & 13 deletions Android/ARCore/source/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<attr path="/api/package[@name='com.google.ar.core']/class[@name='ArImage']" name="extends">Android.Media.Image</attr>
<!-- ?? -->
<attr path="/api/package[@name='com.google.vr.dynamite.client']/class[@name='ObjectWrapper']" name="extends">Java.Lang.Object</attr>
<!--
<attr path="/api/package[@name='com.google.ar.core.services.downloads.aidl']" name="managedName">Google.AR.Core.Services.Downloads.AIDL</attr>
<attr path="/api/package[@name='com.google.ar.core.services.downloads.client']" name="managedName">Google.AR.Core.Services.Downloads.Client</attr>
-->

<!--
<attr path="/api/package[@name='com.google.ar.core.services.downloads.aidl']" name="managedName">Google.AR.Core.Services.Downloads.AIDL</attr>
<attr path="/api/package[@name='com.google.ar.core.services.downloads.client']" name="managedName">Google.AR.Core.Services.Downloads.Client</attr>
-->

<!-- Missing ITrackable inheritance
not supported, moved into additions
Expand All @@ -24,23 +24,23 @@
<attr path="/api/package[@name='com.google.ar.core']/class[@name='InstantPlacementPoint']/method[@name='getAnchors' and count(parameter)=0]" name="return">
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
</attr>

<attr path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedImage']/method[@name='getAnchors' and count(parameter)=0]" name="return">
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
</attr>

<attr path="/api/package[@name='com.google.ar.core']/class[@name='Plane']/method[@name='getAnchors' and count(parameter)=0]" name="return">
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
</attr>

<attr path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]" name="return">
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
</attr>

<attr path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedFace']/method[@name='getAnchors' and count(parameter)=0]" name="return">
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
</attr>

<attr path="/api/package[@name='com.google.ar.core']/class[@name='DepthPoint']/method[@name='getAnchors' and count(parameter)=0]" name="return">
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
</attr>
Expand All @@ -50,5 +50,21 @@
-->
<attr path="/api/package[@name='com.google.ar.core']/class[@name='InstallActivity']/method[@name='onDestroy' and count(parameter)=0]" name="managedOverride">override</attr>
<attr path="/api/package[@name='com.google.ar.core']/class[@name='InstallActivity']/method[@name='onDestroy' and count(parameter)=0]" name="visibility">protected</attr>

</metadata>

<!--
Implements a Java Finalizer. Instead implement a C# Destructor and call the finalize method.
The C# Destructor is in the partial class under the Addition folder.
-->
<attr path="/api/package[@name='com.google.ar.core']/class[@name='Earth']/method[@name='finalize' and count(parameter)=0]" name="managedName">InternalFinalize</attr>
<attr path="/api/package[@name='com.google.ar.core']/class[@name='Earth']/method[@name='finalize' and count(parameter)=0]" name="visibility">internal</attr>
<attr path="/api/package[@name='com.google.ar.core']/class[@name='StreetscapeGeometry']/method[@name='finalize' and count(parameter)=0]" name="managedName">InternalFinalize</attr>
<attr path="/api/package[@name='com.google.ar.core']/class[@name='StreetscapeGeometry']/method[@name='finalize' and count(parameter)=0]" name="visibility">internal</attr>

<!--
Duplicate method with a different return value
// Metadata.xml XPath method reference: path="/api/package[@name='com.google.ar.core']/class[@name='Earth']/method[@name='getAnchors' and count(parameter)=0]"
-->
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='TrackableBase']/method[@name='getAnchors' and count(parameter)=0]" />


</metadata>