Skip to content

Commit 8462cd8

Browse files
author
wuhao
committed
upgrade to 2.2
1 parent 5f1fc97 commit 8462cd8

File tree

192 files changed

+8927
-2448
lines changed

Some content is hidden

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

192 files changed

+8927
-2448
lines changed

‎Assets/DataMesh/ARModule/Anchor/Prefabs/AnchorMark.prefab

Lines changed: 98 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,24 @@ GameObject:
285285
m_NavMeshLayer: 0
286286
m_StaticEditorFlags: 0
287287
m_IsActive: 1
288+
--- !u!1 &1628877804624892
289+
GameObject:
290+
m_ObjectHideFlags: 1
291+
m_PrefabParentObject: {fileID: 0}
292+
m_PrefabInternal: {fileID: 100100000}
293+
serializedVersion: 5
294+
m_Component:
295+
- component: {fileID: 224020208185595180}
296+
- component: {fileID: 222369992647609838}
297+
- component: {fileID: 114885879484918592}
298+
- component: {fileID: 114593114087275174}
299+
m_Layer: 30
300+
m_Name: AnchorName
301+
m_TagString: Untagged
302+
m_Icon: {fileID: 0}
303+
m_NavMeshLayer: 0
304+
m_StaticEditorFlags: 0
305+
m_IsActive: 1
288306
--- !u!1 &1637960556409146
289307
GameObject:
290308
m_ObjectHideFlags: 1
@@ -588,7 +606,7 @@ MeshRenderer:
588606
m_AutoUVMaxDistance: 0.5
589607
m_AutoUVMaxAngle: 89
590608
m_LightmapParameters: {fileID: 0}
591-
m_SortingLayerID: -1132064917
609+
m_SortingLayerID: 0
592610
m_SortingOrder: 32000
593611
--- !u!23 &23329944157401810
594612
MeshRenderer:
@@ -619,7 +637,7 @@ MeshRenderer:
619637
m_AutoUVMaxDistance: 0.5
620638
m_AutoUVMaxAngle: 89
621639
m_LightmapParameters: {fileID: 0}
622-
m_SortingLayerID: -1132064917
640+
m_SortingLayerID: 0
623641
m_SortingOrder: 32000
624642
--- !u!23 &23641573679507334
625643
MeshRenderer:
@@ -650,7 +668,7 @@ MeshRenderer:
650668
m_AutoUVMaxDistance: 0.5
651669
m_AutoUVMaxAngle: 89
652670
m_LightmapParameters: {fileID: 0}
653-
m_SortingLayerID: -1132064917
671+
m_SortingLayerID: 0
654672
m_SortingOrder: 32000
655673
--- !u!23 &23666377146060052
656674
MeshRenderer:
@@ -681,7 +699,7 @@ MeshRenderer:
681699
m_AutoUVMaxDistance: 0.5
682700
m_AutoUVMaxAngle: 89
683701
m_LightmapParameters: {fileID: 0}
684-
m_SortingLayerID: -1132064917
702+
m_SortingLayerID: 0
685703
m_SortingOrder: 32000
686704
--- !u!33 &33013176823584286
687705
MeshFilter:
@@ -862,6 +880,7 @@ MonoBehaviour:
862880
buttonMove: {fileID: 114404760434048332}
863881
buttonRotate: {fileID: 114830731628063262}
864882
buttonFree: {fileID: 114595304503478410}
883+
anchorNameText: {fileID: 114885879484918592}
865884
moveAxis: {fileID: 1465272480834880}
866885
moveAxisX: {fileID: 1732523928399892}
867886
moveAxisY: {fileID: 1951264040755960}
@@ -1038,6 +1057,20 @@ MonoBehaviour:
10381057
m_FillAmount: 1
10391058
m_FillClockwise: 1
10401059
m_FillOrigin: 0
1060+
--- !u!114 &114593114087275174
1061+
MonoBehaviour:
1062+
m_ObjectHideFlags: 1
1063+
m_PrefabParentObject: {fileID: 0}
1064+
m_PrefabInternal: {fileID: 100100000}
1065+
m_GameObject: {fileID: 1628877804624892}
1066+
m_Enabled: 1
1067+
m_EditorHideFlags: 0
1068+
m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1069+
m_Name:
1070+
m_EditorClassIdentifier:
1071+
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
1072+
m_EffectDistance: {x: 1, y: -1}
1073+
m_UseGraphicAlpha: 1
10411074
--- !u!114 &114595304503478410
10421075
MonoBehaviour:
10431076
m_ObjectHideFlags: 1
@@ -1258,6 +1291,39 @@ MonoBehaviour:
12581291
m_FillAmount: 1
12591292
m_FillClockwise: 1
12601293
m_FillOrigin: 0
1294+
--- !u!114 &114885879484918592
1295+
MonoBehaviour:
1296+
m_ObjectHideFlags: 1
1297+
m_PrefabParentObject: {fileID: 0}
1298+
m_PrefabInternal: {fileID: 100100000}
1299+
m_GameObject: {fileID: 1628877804624892}
1300+
m_Enabled: 1
1301+
m_EditorHideFlags: 0
1302+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1303+
m_Name:
1304+
m_EditorClassIdentifier:
1305+
m_Material: {fileID: 0}
1306+
m_Color: {r: 1, g: 1, b: 1, a: 1}
1307+
m_RaycastTarget: 1
1308+
m_OnCullStateChanged:
1309+
m_PersistentCalls:
1310+
m_Calls: []
1311+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
1312+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1313+
m_FontData:
1314+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
1315+
m_FontSize: 16
1316+
m_FontStyle: 0
1317+
m_BestFit: 0
1318+
m_MinSize: 1
1319+
m_MaxSize: 40
1320+
m_Alignment: 4
1321+
m_AlignByGeometry: 0
1322+
m_RichText: 1
1323+
m_HorizontalOverflow: 0
1324+
m_VerticalOverflow: 0
1325+
m_LineSpacing: 1
1326+
m_Text: Anchor Name
12611327
--- !u!114 &114889402689569644
12621328
MonoBehaviour:
12631329
m_ObjectHideFlags: 1
@@ -1475,6 +1541,12 @@ CanvasRenderer:
14751541
m_PrefabParentObject: {fileID: 0}
14761542
m_PrefabInternal: {fileID: 100100000}
14771543
m_GameObject: {fileID: 1319663873741710}
1544+
--- !u!222 &222369992647609838
1545+
CanvasRenderer:
1546+
m_ObjectHideFlags: 1
1547+
m_PrefabParentObject: {fileID: 0}
1548+
m_PrefabInternal: {fileID: 100100000}
1549+
m_GameObject: {fileID: 1628877804624892}
14781550
--- !u!222 &222427661297746082
14791551
CanvasRenderer:
14801552
m_ObjectHideFlags: 1
@@ -1533,7 +1605,7 @@ Canvas:
15331605
m_OverrideSorting: 0
15341606
m_OverridePixelPerfect: 0
15351607
m_SortingBucketNormalizedSize: 0
1536-
m_SortingLayerID: -1132064917
1608+
m_SortingLayerID: 0
15371609
m_SortingOrder: 32000
15381610
m_TargetDisplay: 0
15391611
--- !u!223 &223669114647167732
@@ -1552,7 +1624,7 @@ Canvas:
15521624
m_OverrideSorting: 0
15531625
m_OverridePixelPerfect: 0
15541626
m_SortingBucketNormalizedSize: 0
1555-
m_SortingLayerID: -1132064917
1627+
m_SortingLayerID: 0
15561628
m_SortingOrder: 32000
15571629
m_TargetDisplay: 0
15581630
--- !u!223 &223697468174635366
@@ -1571,9 +1643,27 @@ Canvas:
15711643
m_OverrideSorting: 0
15721644
m_OverridePixelPerfect: 0
15731645
m_SortingBucketNormalizedSize: 0
1574-
m_SortingLayerID: -1132064917
1646+
m_SortingLayerID: 0
15751647
m_SortingOrder: 32000
15761648
m_TargetDisplay: 0
1649+
--- !u!224 &224020208185595180
1650+
RectTransform:
1651+
m_ObjectHideFlags: 1
1652+
m_PrefabParentObject: {fileID: 0}
1653+
m_PrefabInternal: {fileID: 100100000}
1654+
m_GameObject: {fileID: 1628877804624892}
1655+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1656+
m_LocalPosition: {x: 0, y: 0, z: 0}
1657+
m_LocalScale: {x: 1, y: 1, z: 1}
1658+
m_Children: []
1659+
m_Father: {fileID: 224558886966100578}
1660+
m_RootOrder: 4
1661+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1662+
m_AnchorMin: {x: 0.5, y: 0.5}
1663+
m_AnchorMax: {x: 0.5, y: 0.5}
1664+
m_AnchoredPosition: {x: -0.69999, y: 117.6}
1665+
m_SizeDelta: {x: 251.4, y: 22.8}
1666+
m_Pivot: {x: 0.5, y: 0.5}
15771667
--- !u!224 &224177942543723652
15781668
RectTransform:
15791669
m_ObjectHideFlags: 1
@@ -1795,6 +1885,7 @@ RectTransform:
17951885
- {fileID: 224177942543723652}
17961886
- {fileID: 224599248951555924}
17971887
- {fileID: 224397230002796950}
1888+
- {fileID: 224020208185595180}
17981889
m_Father: {fileID: 4608579681119134}
17991890
m_RootOrder: 1
18001891
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

‎Assets/DataMesh/ARModule/Anchor/Scripts/AnchorMark.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ public class AnchorMark : MonoBehaviour
2424
public AnchorAdjestButton buttonRotate;
2525
public AnchorAdjestButton buttonFree;
2626

27+
public Text anchorNameText;
28+
2729
private SceneAnchorController controller;
2830

2931
public GameObject moveAxis;
@@ -44,7 +46,7 @@ public class AnchorMark : MonoBehaviour
4446

4547
private AnchorAdjestType adjustType = AnchorAdjestType.None;
4648

47-
49+
[HideInInspector]
4850
public Transform rootObjectTransform;
4951
//public bool followRoot = true;
5052

@@ -74,6 +76,8 @@ public void Init(string name, AnchorObjectInfo info)
7476
anchorName = name;
7577
this.info = info;
7678

79+
anchorNameText.text = anchorName;
80+
7781
controller = SceneAnchorController.Instance;
7882
buttonMove.Init(this);
7983
buttonRotate.Init(this);

‎Assets/DataMesh/ARModule/Anchor/Scripts/AnchorShared.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ private async void ToUploadAnchor(byte[] anchor)
246246
{
247247
api = new AnchorApi("http://" + serverHost, serverPort);
248248

249-
Debug.Log("Upload Anchor! app=" + appId + " room=" + roomId + " ip=" + api.host + " port=" + api.port);
249+
//Debug.Log("Upload Anchor! app=" + appId + " room=" + roomId + " ip=" + api.host + " port=" + api.port);
250250

251251
var responseUpload = await api.UploadAnchor(appId, roomId, anchorFileName, anchor, 300);
252252
}
@@ -307,7 +307,7 @@ private async void downloadAnchor()
307307
{
308308
api = new AnchorApi("http://" + serverHost, serverPort);
309309

310-
Debug.Log("Download Anchor! app=" + appId + " room=" + roomId + " ip=" + api.host + " port=" + api.port);
310+
//Debug.Log("Download Anchor! app=" + appId + " room=" + roomId + " ip=" + api.host + " port=" + api.port);
311311

312312
importedData = await api.DownloadAnchor(appId, roomId);
313313
}

‎Assets/DataMesh/ARModule/Anchor/Scripts/SceneAnchorController.cs

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,24 @@ public AnchorObjectStatus anchorStatusSummary
198198
/// <summary>
199199
/// 对anchor操作全部完成后触发的回调，以便通知使用者，操作已经完成
200200
/// </summary>
201-
[HideInInspector]
202201
private System.Action cbAnchorControlFinish;
203202
public void AddCallbackFinish(System.Action cb) { cbAnchorControlFinish += cb; }
204203
public void RemoveCallbackFinish(System.Action cb) { cbAnchorControlFinish -= cb; }
205204

205+
/// <summary>
206+
/// 开启调整时的回调
207+
/// </summary>
208+
private System.Action cbTurnOn;
209+
public void AddCallbackTurnOn(System.Action cb) { cbTurnOn += cb; }
210+
public void RemoveCallbackTurnOn(System.Action cb) { cbTurnOn -= cb; }
211+
212+
/// <summary>
213+
/// 关闭调正时的回调
214+
/// </summary>
215+
private System.Action cbTurnOff;
216+
public void AddCallbackTurnOff(System.Action cb) { cbTurnOff += cb; }
217+
public void RemoveCallbackTurnOff(System.Action cb) { cbTurnOff -= cb; }
218+
206219
protected WorldAnchorStore anchorStore;
207220
protected SpatialMappingManager spatialMappingManager;
208221
protected MeshSurfaceObserver meshObserver;
@@ -222,7 +235,6 @@ public AnchorObjectStatus anchorStatusSummary
222235
private int originInputLayer;
223236
private bool originNeedAssistKey;
224237

225-
226238
public Camera markCamera;
227239
//private GameObject markCameraObj;
228240

@@ -352,6 +364,7 @@ private void FitCamera()
352364
/// </summary>
353365
protected override void _TurnOn()
354366
{
367+
Debug.Log("Turn On anchor!!!");
355368

356369
FitCamera();
357370

@@ -360,7 +373,8 @@ protected override void _TurnOn()
360373

361374
markCamera.gameObject.SetActive(true);
362375

363-
376+
if (cbTurnOn != null)
377+
cbTurnOn();
364378

365379
}
366380

@@ -373,6 +387,9 @@ protected override void _TurnOff()
373387
BindGazeManager(false);
374388

375389
markCamera.gameObject.SetActive(false);
390+
391+
if (cbTurnOff != null)
392+
cbTurnOff();
376393
}
377394

378395
/// <summary>
@@ -858,7 +875,7 @@ void Update()
858875
////////////////////////////////////////////
859876

860877
private float moveSpeed = 1f;
861-
private float rotateSpeed = 0.3f;
878+
private float rotateSpeed = 60f;
862879
private Vector3 manipulationStartPos;
863880
private bool isFitting = false;
864881
private bool isNav = false;
@@ -1185,7 +1202,7 @@ private void OnNavigationUpdate(Vector3 delta)
11851202
Vector3 deltaRot = new Vector3(delta.z, -delta.x, -delta.y);
11861203

11871204

1188-
currentAnchorInfo.Rotate(deltaRot * rotateSpeed, Space.Self);
1205+
currentAnchorInfo.Rotate(deltaRot * rotateSpeed * Time.deltaTime, Space.Self);
11891206
}
11901207
}
11911208
}

‎Assets/DataMesh/ARModule/Build/Editor/BuildApp.cs

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -10,58 +10,6 @@ public class BuildApp
1010
{
1111

1212

13-
[MenuItem("Assets/DataMesh/Build Water Mark")]
14-
public static void BuildWaterMark()
15-
{
16-
if (Selection.objects.Length != 1)
17-
{
18-
Debug.LogError("Please select objects!");
19-
return;
20-
}
21-
22-
var sel = Selection.objects[0];
23-
if (!(sel is Texture2D))
24-
{
25-
Debug.LogError("Please select a pic");
26-
return;
27-
}
28-
29-
string assetPath = AssetDatabase.GetAssetOrScenePath(sel);
30-
Debug.Log(assetPath);
31-
32-
if (!assetPath.EndsWith(".png"))
33-
{
34-
Debug.LogError("Please select a PNG file!");
35-
return;
36-
}
37-
38-
byte[] bt = File.ReadAllBytes(assetPath);
39-
40-
Debug.Log("length=" + bt.Length);
41-
42-
string str = System.Convert.ToBase64String(bt);
43-
44-
Debug.Log("base64 length=" + str.Length);
45-
46-
string destFile = assetPath.Substring(0, assetPath.Length - 4);
47-
destFile += ".txt";
48-
File.WriteAllText(destFile, str);
49-
50-
Debug.Log("Create Success!");
51-
}
52-
53-
/*
54-
[MenuItem("Assets/DataMesh/Test Water Mark")]
55-
public static void TestWaterMark()
56-
{
57-
byte[] waterMarkPic = System.Convert.FromBase64String(DataMesh.AR.SpectatorView.Png.png);
58-
Debug.Log(waterMarkPic.Length);
59-
60-
File.WriteAllBytes(Application.dataPath + "/" + "test.png", waterMarkPic);
61-
Debug.Log(Application.dataPath + "/" + "test.png");
62-
}
63-
*/
64-
6513
public static void Test()
6614
{
6715
Debug.Log("old:" + EditorUserBuildSettings.GetPlatformSettings("", "metroPackageVersion"));

0 commit comments

Comments
 (0)