Skip to content

Commit 9ffd9c3

Browse files
Bvallon-slBvallon-sl
committed
Merge branch 'gen3_by_default' into v5.2
2 parents 7a18d5e + 7adc19d commit 9ffd9c3

File tree

5 files changed

+96
-24
lines changed

5 files changed

+96
-24
lines changed

‎ZEDCamera/Assets/Prefabs/ZED_Rig_Mono.prefab‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ MonoBehaviour:
7070
enableTracking: 1
7171
enableSpatialMemory: 1
7272
pathSpatialMemory:
73-
positionalTrackingMode: 0
73+
positionalTrackingMode: 2
74+
enableLocalizationOnly: 0
75+
enable2DGroundMode: 0
7476
setFloorAsOrigin: 1
7577
trackingIsStatic: 0
7678
planeDetectionMaxDistanceThreshold: 0.15
@@ -258,6 +260,11 @@ MeshRenderer:
258260
m_ReflectionProbeUsage: 1
259261
m_RayTracingMode: 2
260262
m_RayTraceProcedural: 0
263+
m_RayTracingAccelStructBuildFlagsOverride: 0
264+
m_RayTracingAccelStructBuildFlags: 1
265+
m_SmallMeshCulling: 1
266+
m_ForceMeshLod: -1
267+
m_MeshLodSelectionBias: 0
261268
m_RenderingLayerMask: 4294967295
262269
m_RendererPriority: 0
263270
m_Materials:
@@ -279,9 +286,11 @@ MeshRenderer:
279286
m_AutoUVMaxDistance: 0.5
280287
m_AutoUVMaxAngle: 89
281288
m_LightmapParameters: {fileID: 0}
289+
m_GlobalIlluminationMeshLod: 0
282290
m_SortingLayerID: 0
283291
m_SortingLayer: 0
284292
m_SortingOrder: 0
293+
m_MaskInteraction: 0
285294
m_AdditionalVertexStreams: {fileID: 0}
286295
--- !u!114 &114589286496521468
287296
MonoBehaviour:

‎ZEDCamera/Assets/Prefabs/ZED_Rig_Stereo.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ MonoBehaviour:
635635
enableTracking: 1
636636
enableSpatialMemory: 1
637637
pathSpatialMemory:
638-
positionalTrackingMode: 0
638+
positionalTrackingMode: 2
639639
enableLocalizationOnly: 0
640640
enable2DGroundMode: 0
641641
setFloorAsOrigin: 1

‎ZEDCamera/Assets/SDK/Helpers/Scripts/ZEDManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public enum shaderType
297297
/// Positional tracking mode used. Can be used to improve accuracy in some type of scene at the cost of longer runtime.
298298
/// </summary>
299299
[HideInInspector]
300-
public sl.POSITIONAL_TRACKING_MODE positionalTrackingMode;
300+
public sl.POSITIONAL_TRACKING_MODE positionalTrackingMode = POSITIONAL_TRACKING_MODE.GEN_3;
301301

302302
/// <summary>
303303
/// Whether to enable the area mode in localize only mode.

‎ZEDCamera/Packages/manifest.json‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "2.5.2",
4-
"com.unity.ide.rider": "3.0.31",
5-
"com.unity.ide.visualstudio": "2.0.22",
6-
"com.unity.memoryprofiler": "1.1.3",
7-
"com.unity.shadergraph": "17.0.3",
8-
"com.unity.timeline": "1.8.7",
3+
"com.unity.ai.navigation": "2.0.9",
4+
"com.unity.collab-proxy": "2.10.2",
5+
"com.unity.device-simulator.devices": "1.0.1",
6+
"com.unity.ide.rider": "3.0.38",
7+
"com.unity.ide.visualstudio": "2.0.25",
8+
"com.unity.memoryprofiler": "1.1.9",
9+
"com.unity.multiplayer.center": "1.0.1",
10+
"com.unity.shadergraph": "17.3.0",
11+
"com.unity.timeline": "1.8.9",
912
"com.unity.ugui": "2.0.0",
10-
"com.unity.xr.management": "4.5.0",
11-
"com.unity.xr.oculus": "4.4.0",
12-
"com.unity.xr.openxr": "1.13.1",
13+
"com.unity.xr.interaction.toolkit": "3.3.0",
14+
"com.unity.xr.management": "4.5.3",
15+
"com.unity.xr.oculus": "4.5.2",
16+
"com.unity.xr.openxr": "1.16.0",
17+
"com.unity.modules.accessibility": "1.0.0",
18+
"com.unity.modules.adaptiveperformance": "1.0.0",
1319
"com.unity.modules.ai": "1.0.0",
1420
"com.unity.modules.androidjni": "1.0.0",
1521
"com.unity.modules.animation": "1.0.0",
@@ -36,6 +42,7 @@
3642
"com.unity.modules.unitywebrequestaudio": "1.0.0",
3743
"com.unity.modules.unitywebrequesttexture": "1.0.0",
3844
"com.unity.modules.unitywebrequestwww": "1.0.0",
45+
"com.unity.modules.vectorgraphics": "1.0.0",
3946
"com.unity.modules.vehicles": "1.0.0",
4047
"com.unity.modules.video": "1.0.0",
4148
"com.unity.modules.vr": "1.0.0",

‎ZEDCamera/Packages/packages-lock.json‎

Lines changed: 68 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{
22
"dependencies": {
3+
"com.unity.ai.navigation": {
4+
"version": "2.0.9",
5+
"depth": 0,
6+
"source": "registry",
7+
"dependencies": {
8+
"com.unity.modules.ai": "1.0.0"
9+
},
10+
"url": "https://packages.unity.com"
11+
},
312
"com.unity.burst": {
413
"version": "1.8.26",
514
"depth": 1,
@@ -11,7 +20,7 @@
1120
"url": "https://packages.unity.com"
1221
},
1322
"com.unity.collab-proxy": {
14-
"version": "2.5.2",
23+
"version": "2.10.2",
1524
"depth": 0,
1625
"source": "registry",
1726
"dependencies": {},
@@ -30,6 +39,13 @@
3039
},
3140
"url": "https://packages.unity.com"
3241
},
42+
"com.unity.device-simulator.devices": {
43+
"version": "1.0.1",
44+
"depth": 0,
45+
"source": "registry",
46+
"dependencies": {},
47+
"url": "https://packages.unity.com"
48+
},
3349
"com.unity.editorcoroutines": {
3450
"version": "1.0.1",
3551
"depth": 1,
@@ -44,7 +60,7 @@
4460
"dependencies": {}
4561
},
4662
"com.unity.ide.rider": {
47-
"version": "3.0.31",
63+
"version": "3.0.38",
4864
"depth": 0,
4965
"source": "registry",
5066
"dependencies": {
@@ -53,11 +69,11 @@
5369
"url": "https://packages.unity.com"
5470
},
5571
"com.unity.ide.visualstudio": {
56-
"version": "2.0.22",
72+
"version": "2.0.25",
5773
"depth": 0,
5874
"source": "registry",
5975
"dependencies": {
60-
"com.unity.test-framework": "1.1.9"
76+
"com.unity.test-framework": "1.1.31"
6177
},
6278
"url": "https://packages.unity.com"
6379
},
@@ -78,7 +94,7 @@
7894
"url": "https://packages.unity.com"
7995
},
8096
"com.unity.memoryprofiler": {
81-
"version": "1.1.3",
97+
"version": "1.1.9",
8298
"depth": 0,
8399
"source": "registry",
84100
"dependencies": {
@@ -155,7 +171,7 @@
155171
"url": "https://packages.unity.com"
156172
},
157173
"com.unity.timeline": {
158-
"version": "1.8.7",
174+
"version": "1.8.9",
159175
"depth": 0,
160176
"source": "registry",
161177
"dependencies": {
@@ -184,6 +200,22 @@
184200
},
185201
"url": "https://packages.unity.com"
186202
},
203+
"com.unity.xr.interaction.toolkit": {
204+
"version": "3.3.0",
205+
"depth": 0,
206+
"source": "registry",
207+
"dependencies": {
208+
"com.unity.ugui": "1.0.0",
209+
"com.unity.modules.xr": "1.0.0",
210+
"com.unity.inputsystem": "1.8.1",
211+
"com.unity.mathematics": "1.2.6",
212+
"com.unity.modules.audio": "1.0.0",
213+
"com.unity.modules.imgui": "1.0.0",
214+
"com.unity.xr.core-utils": "2.4.0",
215+
"com.unity.modules.physics": "1.0.0"
216+
},
217+
"url": "https://packages.unity.com"
218+
},
187219
"com.unity.xr.legacyinputhelpers": {
188220
"version": "2.1.13",
189221
"depth": 1,
@@ -195,19 +227,19 @@
195227
"url": "https://packages.unity.com"
196228
},
197229
"com.unity.xr.management": {
198-
"version": "4.5.0",
230+
"version": "4.5.3",
199231
"depth": 0,
200232
"source": "registry",
201233
"dependencies": {
202-
"com.unity.modules.vr": "1.0.0",
203234
"com.unity.modules.xr": "1.0.0",
235+
"com.unity.xr.core-utils": "2.2.1",
204236
"com.unity.modules.subsystems": "1.0.0",
205-
"com.unity.xr.legacyinputhelpers": "2.1.7"
237+
"com.unity.xr.legacyinputhelpers": "2.1.11"
206238
},
207239
"url": "https://packages.unity.com"
208240
},
209241
"com.unity.xr.oculus": {
210-
"version": "4.4.0",
242+
"version": "4.5.2",
211243
"depth": 0,
212244
"source": "registry",
213245
"dependencies": {
@@ -216,17 +248,31 @@
216248
"url": "https://packages.unity.com"
217249
},
218250
"com.unity.xr.openxr": {
219-
"version": "1.13.1",
251+
"version": "1.16.0",
220252
"depth": 0,
221253
"source": "registry",
222254
"dependencies": {
223255
"com.unity.inputsystem": "1.6.3",
224-
"com.unity.xr.core-utils": "2.1.1",
256+
"com.unity.xr.core-utils": "2.3.0",
225257
"com.unity.xr.management": "4.4.0",
226258
"com.unity.xr.legacyinputhelpers": "2.1.2"
227259
},
228260
"url": "https://packages.unity.com"
229261
},
262+
"com.unity.modules.accessibility": {
263+
"version": "1.0.0",
264+
"depth": 0,
265+
"source": "builtin",
266+
"dependencies": {}
267+
},
268+
"com.unity.modules.adaptiveperformance": {
269+
"version": "1.0.0",
270+
"depth": 0,
271+
"source": "builtin",
272+
"dependencies": {
273+
"com.unity.modules.subsystems": "1.0.0"
274+
}
275+
},
230276
"com.unity.modules.ai": {
231277
"version": "1.0.0",
232278
"depth": 0,
@@ -434,6 +480,16 @@
434480
"com.unity.modules.imageconversion": "1.0.0"
435481
}
436482
},
483+
"com.unity.modules.vectorgraphics": {
484+
"version": "1.0.0",
485+
"depth": 0,
486+
"source": "builtin",
487+
"dependencies": {
488+
"com.unity.modules.uielements": "1.0.0",
489+
"com.unity.modules.imageconversion": "1.0.0",
490+
"com.unity.modules.imgui": "1.0.0"
491+
}
492+
},
437493
"com.unity.modules.vehicles": {
438494
"version": "1.0.0",
439495
"depth": 0,

0 commit comments

Comments
 (0)