From aa99e41b2e67f922dafb58adfb0a4003f7313afb Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 27 May 2025 19:44:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Run,=20Stop=20=EB=B6=84=EA=B8=B0=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs | 3 +-- Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs | 3 +-- Assets/Scripts/Studio/Managers/RunManager.cs | 4 ++++ Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index ba49c1f2..7f09ff82 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -125,7 +125,6 @@ namespace Studio.AssetTool public GameObject CreateAsset(string name) { AssetLibraryItem item = assetScrollView.FindItem(name, AssetLibraryItemType.file); - OnAssetSelected(item); GameObject obj = selectRenderObject.gameObject; OnAssetDropped(item); @@ -281,7 +280,7 @@ namespace Studio.AssetTool } internal void OnSelectObjects(string name, List selectedObjects) { - if (selectedObjects.Count == 0) + if (selectedObjects.Count == 0) return; var canvas_Popup = CanvasManager.instance.GetCanvas(); if (ManagerHub.instance.Get().curState == RunManager.EState.Run) diff --git a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs index 0fbd5cfa..adc9180f 100644 --- a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs @@ -141,7 +141,6 @@ namespace Studio.AssetTool CommandInvoker.instance.Invoke(new ResetGizmoCommand()); DeselectAll(); } - CanvasManager.instance.GetCanvas().panel_draghandler.ForceEndDrag(); } public void DeselectAll() @@ -429,7 +428,7 @@ namespace Studio.AssetTool #else shortcutTable.Add(KeyCode.LeftControl, new Dictionary()); shortcutTable[KeyCode.LeftControl].Add(KeyCode.C, SaveItemsToCopy); - shortcutTable[KeyCode.LeftShift].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand())); + shortcutTable[KeyCode.LeftControl].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand())); #endif var handler = new InputHandler(getKeyActions, downKeyActions, upKeyActions, shortcutTable); diff --git a/Assets/Scripts/Studio/Managers/RunManager.cs b/Assets/Scripts/Studio/Managers/RunManager.cs index 2bf47940..1f3faf20 100644 --- a/Assets/Scripts/Studio/Managers/RunManager.cs +++ b/Assets/Scripts/Studio/Managers/RunManager.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using Studio.AssetTool; using Studio.Conifg; using Studio.Manage; using Studio.Util; @@ -26,7 +27,10 @@ namespace Studio.Manage { StudioService.instance.Init(); onRun += Dynamic.M.AGVManager.instance.OnPlayStart; + onRun += ManagerHub.instance.Get().rtgController.InitGizmo; + onRun += ManagerHub.instance.Get().OnDeselectAll; onStop += StudioService.instance.DisConnectMQTT; + onStop += ManagerHub.instance.Get().OnDeselectAll; } public void ChangeState() diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs index f6200578..f50c4514 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs @@ -6,6 +6,7 @@ using Studio.Util; using XRLib; using XRLib.UI; using Studio.AssetTool; +using Studio.Manage; namespace Studio.UI { @@ -44,7 +45,7 @@ namespace Studio.UI private void Update() { - if (selectedObject == null || selectedObject.isCollided) + if (selectedObject == null || selectedObject.isCollided || ManagerHub.instance.Get().curState == RunManager.EState.Run) { DeactivateAll(); return; From 9c607e3e751e8100cb19a57f79b4adc14d7e956c Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Wed, 28 May 2025 09:52:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/ExternalAssets/Gizmo/RTGController.cs | 10 +++++++++- Assets/Scripts/Studio/Managers/RunManager.cs | 7 +++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/ExternalAssets/Gizmo/RTGController.cs b/Assets/Scripts/ExternalAssets/Gizmo/RTGController.cs index 8a24a0b7..326c2401 100644 --- a/Assets/Scripts/ExternalAssets/Gizmo/RTGController.cs +++ b/Assets/Scripts/ExternalAssets/Gizmo/RTGController.cs @@ -61,7 +61,9 @@ namespace Studio.RuntimeGizmo workGizmoId = GizmoId.None; } public void SetWorkGizmoId(GizmoId gizmoId) - { + { + if (ManagerHub.instance.Get().curState == RunManager.EState.Run) + return; objectMoveGizmo.Gizmo.SetEnabled(false); objectRotationGizmo.Gizmo.SetEnabled(false); objectScaleGizmo.Gizmo.SetEnabled(false); @@ -102,6 +104,8 @@ namespace Studio.RuntimeGizmo } public void SetGizmoTargetObjects(List objects) { + if (ManagerHub.instance.Get().curState == RunManager.EState.Run) + return; selectedObjects.Clear(); selectedObjects.AddRange(objects); objectMoveGizmo.SetTargetObjects(selectedObjects); @@ -111,6 +115,10 @@ namespace Studio.RuntimeGizmo workGizmo.Gizmo.SetEnabled(selectedObjects.Count != 0); } + public void ResetGizmo() + { + SetGizmoTargetObjects(new List()); + } private void OnGizmoDragBegin(Gizmo gizmo, int t) { onTransformBegin?.Invoke(); diff --git a/Assets/Scripts/Studio/Managers/RunManager.cs b/Assets/Scripts/Studio/Managers/RunManager.cs index 1f3faf20..18831fee 100644 --- a/Assets/Scripts/Studio/Managers/RunManager.cs +++ b/Assets/Scripts/Studio/Managers/RunManager.cs @@ -27,16 +27,15 @@ namespace Studio.Manage { StudioService.instance.Init(); onRun += Dynamic.M.AGVManager.instance.OnPlayStart; - onRun += ManagerHub.instance.Get().rtgController.InitGizmo; - onRun += ManagerHub.instance.Get().OnDeselectAll; onStop += StudioService.instance.DisConnectMQTT; - onStop += ManagerHub.instance.Get().OnDeselectAll; } public void ChangeState() { + ManagerHub.instance.Get().rtgController.ResetGizmo(); + ManagerHub.instance.Get().OnDeselectAll(); + curState = curState == EState.Stop ? EState.Run : EState.Stop; - Debug.Log("curState " + curState); switch (curState) { case EState.Run: