Skip to content

Commit b2b7596

Browse files
author
Mark Fine
committed
ARCore Extensions SDK v1.45.0-arf4
1 parent 09f3de4 commit b2b7596

28 files changed

+11
-12794
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dependencies>
22
<iosPods>
3-
<iosPod name="ARCore/CloudAnchors" version="~> 1.44.0" minTargetSdk="12.0">
3+
<iosPod name="ARCore/CloudAnchors" version="~> 1.45.0" minTargetSdk="12.0">
44
</iosPod>
55
</iosPods>
66
</dependencies>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dependencies>
22
<iosPods>
3-
<iosPod name="ARCore/GARSession" version="~> 1.44.0" minTargetSdk="12.0">
3+
<iosPod name="ARCore/GARSession" version="~> 1.45.0" minTargetSdk="12.0">
44
</iosPod>
55
</iosPods>
66
</dependencies>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dependencies>
22
<iosPods>
3-
<iosPod name="ARCore/Geospatial" version="~> 1.44.0" minTargetSdk="12.0">
3+
<iosPod name="ARCore/Geospatial" version="~> 1.45.0" minTargetSdk="12.0">
44
</iosPod>
55
</iosPods>
66
</dependencies>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dependencies>
22
<iosPods>
3-
<iosPod name="ARCore/Semantics" version="~> 1.44.0" minTargetSdk="12.0">
3+
<iosPod name="ARCore/Semantics" version="~> 1.45.0" minTargetSdk="12.0">
44
</iosPod>
55
</iosPods>
66
</dependencies>

Editor/GeospatialCreator/Google.XR.ARCoreExtensions.GeospatialCreator.Editor.asmdef

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@
3030
"expression": "1.2.0",
3131
"define": "ARCORE_INTERNAL_USE_UNITY_MATH"
3232
},
33-
{
34-
"name": "com.unity.xr.arfoundation",
35-
"expression": "[5.0,6.0)",
36-
"define": "ARCORE_USE_ARF_4"
37-
},
38-
{
39-
"name": "com.unity.xr.arfoundation",
40-
"expression": "[4.0,5.0)",
41-
"define": "ARCORE_USE_ARF_4"
42-
},
4333
{
4434
"name": "org.khronos.unitygltf",
4535
"expression": "2.9.0-rc",

Editor/Google.XR.ARCoreExtensions.Editor.asmdef

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@
1717
"autoReferenced": true,
1818
"defineConstraints": [],
1919
"versionDefines": [
20-
{
21-
"name": "com.unity.xr.arfoundation",
22-
"expression": "[5.0,6.0)",
23-
"define": "ARCORE_USE_ARF_4"
24-
},
25-
{
26-
"name": "com.unity.xr.arfoundation",
27-
"expression": "[4.0,5.0)",
28-
"define": "ARCORE_USE_ARF_4"
29-
}
3020
],
3121
"noEngineReferences": false
3222
}

Runtime/GeospatialCreatorRuntime/Google.XR.ARCoreExtensions.GeospatialCreator.asmdef

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@
2525
"name": "com.unity.mathematics",
2626
"expression": "1.2.0",
2727
"define": "ARCORE_INTERNAL_USE_UNITY_MATH"
28-
},
29-
{
30-
"name": "com.unity.xr.arfoundation",
31-
"expression": "[5.0,6.0)",
32-
"define": "ARCORE_USE_ARF_4"
33-
},
34-
{
35-
"name": "com.unity.xr.arfoundation",
36-
"expression": "[4.0,5.0)",
37-
"define": "ARCORE_USE_ARF_4"
3828
}
3929
],
4030
"noEngineReferences": false

Runtime/GeospatialCreatorRuntime/Scripts/ARGeospatialCreatorAnchor.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,7 @@ private enum AnchorResolutionState
134134
/// <c>Awake()</c> message execution, as follows:
135135
/// <list type="bullet">
136136
/// <item>
137-
#if ARCORE_USE_ARF_5 // use ARF 5
138-
/// If the <c><see cref="XROrigin"/></c> has an <c><see cref="AnchorManager"/></c>
139-
#elif ARCORE_USE_ARF_4 // use ARF 4
140137
/// If the <c><see cref="ARSessionOrigin"/></c> has an <c><see cref="AnchorManager"/></c>
141-
#else // ARF error
142-
#error error must define ARCORE_USE_ARF_5 or ARCORE_USE_ARF_4
143-
#endif
144138
/// subcomponent, that <c><see cref="ARAnchorManager"/></c> will be used;
145139
/// </item>
146140
/// <item>
@@ -317,15 +311,8 @@ public AnchorAltitudeType AltitudeType
317311
private static ARAnchorManager FindDefaultAnchorManager()
318312
{
319313
// Use the AnchorManager assigned to the AR Session Origin, if it exists.
320-
#if ARCORE_USE_ARF_5 // use ARF 5
321-
ARAnchorManager sessionAnchorManager =
322-
ARCoreExtensions._instance?.Origin?.GetComponent<ARAnchorManager>();
323-
#elif ARCORE_USE_ARF_4 // use ARF 4
324314
ARAnchorManager sessionAnchorManager =
325315
ARCoreExtensions._instance?.SessionOrigin?.GetComponent<ARAnchorManager>();
326-
#else // ARF error
327-
#error error must define ARCORE_USE_ARF_5 or ARCORE_USE_ARF_4
328-
#endif
329316
if (sessionAnchorManager != null)
330317
{
331318
return sessionAnchorManager;
@@ -772,13 +759,7 @@ private IEnumerator ResolveTerrainAnchor()
772759
yield break;
773760
}
774761

775-
#if ARCORE_USE_ARF_5 // use ARF 5
776-
// Initiates asynchronous resolution of this anchor at (Latitude, Longitude) on the surface
777-
#elif ARCORE_USE_ARF_4 // use ARF 4
778762
// Initiates asynchronous resolution of this anchor at (Latitude, Longitude) on the surface
779-
#else // ARF error
780-
#error error must define ARCORE_USE_ARF_5 or ARCORE_USE_ARF_4
781-
#endif
782763
// of the local skyline. Assumes _anchorManager is not null and configured properly for
783764
// creating geospatial anchors.
784765
private IEnumerator ResolveRooftopAnchor()

Runtime/Google.XR.ARCoreExtensions.asmdef

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@
1919
"autoReferenced": true,
2020
"defineConstraints": [],
2121
"versionDefines": [
22-
{
23-
"name": "com.unity.xr.arfoundation",
24-
"expression": "[5.0,6.0)",
25-
"define": "ARCORE_USE_ARF_4"
26-
},
27-
{
28-
"name": "com.unity.xr.arfoundation",
29-
"expression": "[4.0,5.0)",
30-
"define": "ARCORE_USE_ARF_4"
31-
}
3222
],
3323
"noEngineReferences": false
3424
}

Runtime/Plugins/ARPresto.aar

5.26 KB
Binary file not shown.

0 commit comments

Comments
 (0)