Skip to content

Commit 9aee7a1

Browse files
author
koichi Mori
committed
ARDK UPM 3.13.0
1 parent d2589e2 commit 9aee7a1

File tree

369 files changed

+2188
-966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

369 files changed

+2188
-966
lines changed

Assets/Shaders/OcclusionMesh.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Shader "Lightship/OcclusionMesh"
106106
float4 fusedDepthUV = mul(_FusedDepthTransform, float4(uv.x, 1.0f - uv.y, 1.0f, 1.0f));
107107

108108
// Sample fused depth
109-
const float eps = 0.1f;
109+
const float eps = 0.01f;
110110
float fused_depth_linear_eye =
111111
tex2Dlod(_FusedDepth, float4(fusedDepthUV.x / fusedDepthUV.z, fusedDepthUV.y / fusedDepthUV.z, 0, 0)) + eps;
112112

Assets/Shaders/ZBufferOcclusion.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Shader "Lightship/ZBufferOcclusion"
168168
float frameDepth = ConvertDistanceToDepth(frameDepthLinearEye);
169169

170170
// Sample non-linear fused depth
171-
const float eps = 0.1f;
171+
const float eps = 0.01f;
172172
float fusedDepthLinearEye = tex2D(_FusedDepth, i.vertex_uv) + eps;
173173
float fusedDepth = EyeDepthToNonLinear(fusedDepthLinearEye, _ZBufferParams);
174174

Editor/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2024 Niantic.
1+
// Copyright 2022-2025 Niantic.
22

33
using System.Runtime.CompilerServices;
44
using UnityEngine.Scripting;

Editor/BuildUtilities/ArdkPostGenerateAndroidManifest.cs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2024 Niantic.
1+
// Copyright 2022-2025 Niantic.
22
using System.IO;
33
using System.Text;
44
using System.Text.RegularExpressions;
@@ -204,6 +204,16 @@ public AndroidManifest(string path)
204204
internal bool AddQuery(string packageName)
205205
{
206206
bool changed = false;
207+
208+
// Ignore adding the ARCore package on MagicLeap
209+
#if MAGICLEAP
210+
if (packageName == ArdkPostGenerateAndroidManifest.ARCoreNameString)
211+
{
212+
Log.Info("ArdkPostGenerateAndroidManifest.AddQuery skipped adding ARCore on MagicLeap");
213+
return changed;
214+
}
215+
#endif
216+
207217
var queryNodes = SelectNodes
208218
($"/manifest/queries/package[@android:name='{packageName}']", nsMgr);
209219

@@ -285,6 +295,13 @@ internal bool AddNativeLibrary(string libraryName, bool required = false)
285295
internal bool AddARCoreInstallActivity()
286296
{
287297
bool changed = false;
298+
299+
// Ignore the ARCore checks for MagicLeap, since that uses OpenXR
300+
#if MAGICLEAP
301+
Log.Info("ArdkPostGenerateAndroidManifest.AddARCoreInstallActivity skipped on MagicLeap");
302+
return changed;
303+
#endif
304+
288305
var installActivityBlock = SelectNodes
289306
(
290307
$"/manifest/application/activity[@android:name='{ArdkPostGenerateAndroidManifest.ARCoreInstallActivityString}']",

Editor/BuildUtilities/Gradle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2024 Niantic.
1+
// Copyright 2022-2025 Niantic.
22
using System;
33
using System.IO;
44
using System.Linq;

Editor/BuildUtilities/LightshipBuildProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2024 Niantic.
1+
// Copyright 2022-2025 Niantic.
22
using System;
33
using System.Collections;
44
using System.Collections.Generic;

Editor/JavaUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2024 Niantic.
1+
// Copyright 2022-2025 Niantic.
22
using System;
33
using System.IO;
44
using UnityEditor.Android;

Editor/LightshipEditorUtilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2024 Niantic.
1+
// Copyright 2022-2025 Niantic.
22

33
using System;
44
using System.Linq;

Editor/LightshipPackageMetadata.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2024 Niantic.
1+
// Copyright 2022-2025 Niantic.
22
using System.Collections.Generic;
33
using Niantic.Lightship.AR.Utilities.Logging;
44
using Niantic.Lightship.AR.Loader;

0 commit comments

Comments
 (0)