Skip to content

Commit 3aa3e62

Browse files
author
yangel.yan
committed
update to 1.4.0
1 parent 96efdde commit 3aa3e62

File tree

103 files changed

+19904
-476
lines changed

Some content is hidden

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

103 files changed

+19904
-476
lines changed

‎Editor/PICOFeatureEditor.cs‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public override void OnInspectorGUI()
1616
{
1717
PICOFeature picoFeature = (PICOFeature)target;
1818
PICOProjectSetting projectConfig = PICOProjectSetting.GetProjectConfig();
19-
EditorGUIUtility.labelWidth = 180;
19+
EditorGUIUtility.labelWidth = 200;
2020
//eye tracking
2121
GUIStyle firstLevelStyle = new GUIStyle(GUI.skin.label);
2222
firstLevelStyle.alignment = TextAnchor.UpperLeft;
@@ -35,6 +35,18 @@ public override void OnInspectorGUI()
3535
EditorGUILayout.EndVertical();
3636
}
3737
projectConfig.isHandTracking = EditorGUILayout.Toggle("Hand Tracking", projectConfig.isHandTracking);
38+
if (projectConfig.isHandTracking)
39+
{
40+
//hand tracking Support
41+
var handSupport = new GUIContent();
42+
handSupport.text = "Hand Tracking Support";
43+
projectConfig.handTrackingSupportType =(HandTrackingSupport)EditorGUILayout.EnumPopup(handSupport, projectConfig.handTrackingSupportType);
44+
//high frequency tracking
45+
var highfrequencytracking = new GUIContent();
46+
highfrequencytracking.text = "High Frequency Tracking(60Hz)";
47+
highfrequencytracking.tooltip = "If turned on, hand tracking will run at a higher tracking frequency, which will improve the smoothness of hand tracking, but the power consumption will increase.";
48+
projectConfig.highFrequencyHand = EditorGUILayout.Toggle(highfrequencytracking, projectConfig.highFrequencyHand);
49+
}
3850

3951
var displayFrequencyContent = new GUIContent();
4052
displayFrequencyContent.text = "Display Refresh Rates";
@@ -70,8 +82,7 @@ public override void OnInspectorGUI()
7082
}
7183
GUILayout.BeginHorizontal();
7284
guiContent.text = "System Splash Screen";
73-
guiContent.tooltip = "";
74-
EditorGUILayout.LabelField(guiContent, GUILayout.Width(165));
85+
EditorGUILayout.LabelField(guiContent, GUILayout.Width(185));
7586
projectConfig.systemSplashScreen = (Texture2D)EditorGUILayout.ObjectField(projectConfig.systemSplashScreen, typeof(Texture2D), true);
7687
GUILayout.EndHorizontal();
7788

‎Editor/PICOFeatureSet.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace Unity.XR.OpenXR.Features.PICOSupport
1717
PICOSpatialMesh.featureId,
1818
PICOSceneCapture.featureId,
1919
PICOSpatialAnchor.featureId,
20+
BodyTrackingFeature.featureId,
2021
},
2122
UiName = "PICO XR",
2223
Description = "Feature set for using PICO XR Features",

‎Editor/PICOModifyAndroidManifest.cs‎

Lines changed: 78 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
using System;
2+
using System.Collections.Generic;
23
using System.IO;
34
using System.Text;
45
using System.Xml;
6+
using Unity.XR.PXR;
57
using UnityEditor;
68
using UnityEditor.Build.Reporting;
79
using UnityEditor.XR.OpenXR.Features;
10+
#if UNITY_XR_HAND
11+
using UnityEngine.XR.Hands.OpenXR;
12+
#endif
813
using UnityEngine.XR.OpenXR;
914
using UnityEngine.XR.OpenXR.Features;
1015

@@ -162,44 +167,31 @@ internal void AddPICOMetaData(string path)
162167
{
163168
CreateOrUpdateAndroidMetaData("pvr.app.type", "vr");
164169
CreateOrUpdateAndroidMetaData("pvr.sdk.version", "Unity OpenXR "+PICOFeature.SDKVersion);
165-
CreateOrUpdateAndroidMetaData("pxr.sdk.version_code", "5800");
166-
167-
if (PICOProjectSetting.GetProjectConfig().isHandTracking)
168-
{
169-
CreateOrUpdateAndroidPermissionData("com.picovr.permission.HAND_TRACKING");
170-
CreateOrUpdateAndroidMetaData("handtracking", "1");
171-
}
172-
else
173-
{
174-
DeleteAndroidPermissionData("com.picovr.permission.HAND_TRACKING");
175-
DeleteAndroidMetaData("handtracking");
176-
}
177-
178-
if (PICOProjectSetting.GetProjectConfig().isEyeTracking)
179-
{
180-
CreateOrUpdateAndroidPermissionData("com.picovr.permission.EYE_TRACKING");
181-
CreateOrUpdateAndroidMetaData("picovr.software.eye_tracking", "1");
182-
CreateOrUpdateAndroidMetaData("eyetracking_calibration", PICOProjectSetting.GetProjectConfig().isEyeTrackingCalibration ? "true" : "false");
183-
}
184-
else
185-
{
186-
DeleteAndroidPermissionData("com.picovr.permission.EYE_TRACKING");
187-
DeleteAndroidMetaData("picovr.software.eye_tracking");
188-
DeleteAndroidMetaData("eyetracking_calibration");
189-
}
190-
170+
CreateOrUpdateAndroidMetaData("pxr.sdk.version_code", "5110");
191171
var settings = OpenXRSettings.GetSettingsForBuildTargetGroup(BuildTargetGroup.Android);
192172
bool mrPermission = false;
193-
173+
194174
foreach (var feature in settings.GetFeatures<OpenXRFeature>())
195175
{
176+
if (feature is BodyTrackingFeature)
177+
{
178+
if (feature.enabled)
179+
{
180+
CreateOrUpdateAndroidMetaData("PICO.swift.feature", "1");
196181

182+
mrPermission = true;
183+
}
184+
else
185+
{
186+
DeleteAndroidMetaData("enable_scene_anchor");
187+
}
188+
}
197189
if (feature is PICOSceneCapture)
198190
{
199191
if (feature.enabled)
200192
{
201193
CreateOrUpdateAndroidMetaData("enable_scene_anchor", "1");
202-
194+
203195
mrPermission = true;
204196
}
205197
else
@@ -233,8 +225,66 @@ internal void AddPICOMetaData(string path)
233225
DeleteAndroidMetaData("enable_mesh_anchor");
234226
}
235227
}
228+
#if UNITY_XR_HAND
229+
if (feature is HandTracking)
230+
{
231+
if (feature.enabled)
232+
{
233+
if (PICOProjectSetting.GetProjectConfig().isHandTracking)
234+
{
235+
CreateOrUpdateAndroidPermissionData("com.picovr.permission.HAND_TRACKING");
236+
CreateOrUpdateAndroidMetaData("handtracking", "1");
237+
if (PICOProjectSetting.GetProjectConfig().handTrackingSupportType == HandTrackingSupport.HandsOnly)
238+
{
239+
CreateOrUpdateAndroidMetaData("handtracking", "1");
240+
DeleteAndroidMetaData("controller");
241+
242+
}
243+
else
244+
{
245+
CreateOrUpdateAndroidMetaData("handtracking", "1");
246+
CreateOrUpdateAndroidMetaData("controller", "1");
247+
}
248+
CreateOrUpdateAndroidMetaData("Hand_Tracking_HighFrequency", PICOProjectSetting.GetProjectConfig().highFrequencyHand ? "1" : "0");
249+
}
250+
else
251+
{
252+
DeleteAndroidPermissionData("com.picovr.permission.HAND_TRACKING");
253+
DeleteAndroidMetaData("handtracking");
254+
DeleteAndroidMetaData("Hand_Tracking_HighFrequency");
255+
CreateOrUpdateAndroidMetaData("controller", "1");
256+
}
257+
}
258+
else
259+
{
260+
DeleteAndroidPermissionData("com.picovr.permission.HAND_TRACKING");
261+
DeleteAndroidMetaData("handtracking");
262+
DeleteAndroidMetaData("Hand_Tracking_HighFrequency");
263+
CreateOrUpdateAndroidMetaData("controller", "1");
264+
}
265+
}
266+
}
267+
#else
268+
}
236269

270+
DeleteAndroidPermissionData("com.picovr.permission.HAND_TRACKING");
271+
DeleteAndroidMetaData("handtracking");
272+
CreateOrUpdateAndroidMetaData("controller", "1");
273+
#endif
274+
if (PICOProjectSetting.GetProjectConfig().isEyeTracking)
275+
{
276+
CreateOrUpdateAndroidPermissionData("com.picovr.permission.EYE_TRACKING");
277+
CreateOrUpdateAndroidMetaData("picovr.software.eye_tracking", "1");
278+
CreateOrUpdateAndroidMetaData("eyetracking_calibration", PICOProjectSetting.GetProjectConfig().isEyeTrackingCalibration ? "true" : "false");
279+
}
280+
else
281+
{
282+
DeleteAndroidPermissionData("com.picovr.permission.EYE_TRACKING");
283+
DeleteAndroidMetaData("picovr.software.eye_tracking");
284+
DeleteAndroidMetaData("eyetracking_calibration");
237285
}
286+
287+
238288
if (PICOProjectSetting.GetProjectConfig().MRSafeguard)
239289
{
240290
CreateOrUpdateAndroidMetaData("enable_mr_safeguard", PICOProjectSetting.GetProjectConfig().MRSafeguard ? "1" : "0");

‎Editor/Unity.XR.OpenXR.Features.PICOSupport.Editor.asmdef‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"references": [
55
"GUID:96aa6ba065960476598f8f643e7252b6",
66
"GUID:4847341ff46394e83bb78fbd0652937e",
7-
"GUID:d1451cc2aec4ed743adcac8be3b46381"
7+
"GUID:d1451cc2aec4ed743adcac8be3b46381",
8+
"GUID:ce522b6ed64c8be4c989a1d26d0e3275"
89
],
910
"includePlatforms": [
1011
"Editor"
@@ -18,8 +19,18 @@
1819
"versionDefines": [
1920
{
2021
"name": "com.unity.xr.arfoundation",
21-
"expression": "5.1.2",
22-
"define": "AR_FOUNDATION"
22+
"expression": "[5.1.2,6.0.0]",
23+
"define": "AR_FOUNDATION_5"
24+
},
25+
{
26+
"name": "com.unity.xr.arfoundation",
27+
"expression": "6.0.0",
28+
"define": "AR_FOUNDATION_6"
29+
},
30+
{
31+
"name": "com.unity.xr.hands",
32+
"expression": "",
33+
"define": "UNITY_XR_HAND"
2334
}
2435
],
2536
"noEngineReferences": false

‎Enterprise/Materials.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Enterprise/Materials/Blue.mat‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: Blue
11+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
16+
m_LightmapFlags: 4
17+
m_EnableInstancingVariants: 0
18+
m_DoubleSidedGI: 0
19+
m_CustomRenderQueue: -1
20+
stringTagMap: {}
21+
disabledShaderPasses: []
22+
m_LockedProperties:
23+
m_SavedProperties:
24+
serializedVersion: 3
25+
m_TexEnvs:
26+
- _BumpMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailAlbedoMap:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailMask:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _DetailNormalMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _EmissionMap:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MainTex:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _MetallicGlossMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _OcclusionMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _ParallaxMap:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
m_Ints: []
63+
m_Floats:
64+
- _BumpScale: 1
65+
- _Cutoff: 0.5
66+
- _DetailNormalMapScale: 1
67+
- _DstBlend: 0
68+
- _GlossMapScale: 1
69+
- _Glossiness: 0.5
70+
- _GlossyReflections: 1
71+
- _Metallic: 0
72+
- _Mode: 0
73+
- _OcclusionStrength: 1
74+
- _Parallax: 0.02
75+
- _SmoothnessTextureChannel: 0
76+
- _SpecularHighlights: 1
77+
- _SrcBlend: 1
78+
- _UVSec: 0
79+
- _ZWrite: 1
80+
m_Colors:
81+
- _Color: {r: 0.024258733, g: 0.21611828, b: 1, a: 0.30588236}
82+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
83+
m_BuildTextureStacks: []

‎Enterprise/Materials/Blue.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)