UVCXR/Studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

팝업창 Canvas_Popup로 통일

Browse Source
This commit is contained in:
jmaniuvc
2025-03-20 16:24:11 +09:00
parent 8d4eeca78e
commit 1cb4038fea
7 changed files with 246 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

495
Assets/Scenes/0.22.7.unity
View File

File diff suppressed because it is too large Load Diff

8
Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs
View File

@@ -45,10 +45,10 @@ namespace XED.Asset
} }
void Start() void Start()
{ {
assetScrollRect = FindSingle<Canvas_Windows>().panel_assetlibrary.scrollRect; assetScrollRect = FindSingle<Canvas_Popup>().panel_assetlibrary.scrollRect;
assetScrollView = FindSingle<Canvas_Windows>().panel_assetlibrary.scrollView; assetScrollView = FindSingle<Canvas_Popup>().panel_assetlibrary.scrollView;
componentScrollView = FindSingle<Canvas_Windows>().panel_componentlibrary.scrollView; componentScrollView = FindSingle<Canvas_Popup>().panel_componentlibrary.scrollView;
InterworkingDataScrollView = FindSingle<Canvas_Windows>().panel_interworkingdatalist.scrollView; InterworkingDataScrollView = FindSingle<Canvas_Popup>().panel_interworkingdatalist.scrollView;
renderObjectPrefab = Resources.Load<GameObject>("Prefabs/PRF_RenderObject"); renderObjectPrefab = Resources.Load<GameObject>("Prefabs/PRF_RenderObject");
assetScrollRect.onDragBegin.AddListener(OnAssetSelected); assetScrollRect.onDragBegin.AddListener(OnAssetSelected);

29
Assets/Scripts/Studio/Managers/EventConnector.cs
View File

@@ -21,7 +21,6 @@ namespace XED.Manage
var canvas_static = FindSingle<Canvas_Static>(); var canvas_static = FindSingle<Canvas_Static>();
var canvas_Popup = FindSingle<Canvas_Popup>(); var canvas_Popup = FindSingle<Canvas_Popup>();
var canvas_Windows = FindSingle<Canvas_Windows>();
var canvas_DragArea = FindSingle<Canvas_DragArea>(); var canvas_DragArea = FindSingle<Canvas_DragArea>();
var agvManager = FindSingle<AGV_Manager>(); var agvManager = FindSingle<AGV_Manager>();
@@ -33,9 +32,9 @@ namespace XED.Manage
var customAssetConnector = FindSingle<CustomAssetConnector>(); var customAssetConnector = FindSingle<CustomAssetConnector>();
var renderObjectHandler = FindFirstObjectByType<RenderObjectHandler>(); var renderObjectHandler = FindFirstObjectByType<RenderObjectHandler>();
GameObject assetWindow = canvas_Windows.panel_assetlibrary.gameObject; GameObject assetWindow = canvas_Popup.panel_assetlibrary.gameObject;
SaveLoadFBXData saveLoadFBXData = customAssetConnector.saveLoadFBXData; SaveLoadFBXData saveLoadFBXData = customAssetConnector.saveLoadFBXData;
GameObject componentWindow = canvas_Windows.panel_componentlibrary.gameObject; GameObject componentWindow = canvas_Popup.panel_componentlibrary.gameObject;
UIConnection(); UIConnection();
StatusConnection(); StatusConnection();
@@ -45,22 +44,22 @@ namespace XED.Manage
void ManagerConnection() void ManagerConnection()
{ {
customAssetConnector.onRemoveObjects += renderObjectHandler.DeselectAll; customAssetConnector.onRemoveObjects += renderObjectHandler.DeselectAll;
customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Windows.panel_objectinfo.gameObject.SetActive(true); }); customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Popup.panel_objectinfo.gameObject.SetActive(true); });
customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Windows.panel_objectalign.gameObject.SetActive(true); }); customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Popup.panel_objectalign.gameObject.SetActive(true); });
customAssetConnector.onSelectObjects += canvas_Windows.panel_objectinfo.SetObjectInfo; customAssetConnector.onSelectObjects += canvas_Popup.panel_objectinfo.SetObjectInfo;
customAssetConnector.onRemoveObjects += canvas_Windows.panel_objectinfo.ResetObjectInfo; customAssetConnector.onRemoveObjects += canvas_Popup.panel_objectinfo.ResetObjectInfo;
customAssetConnector.onDeselectObjects += (() => { canvas_Windows.panel_objectinfo.gameObject.SetActive(false); }); customAssetConnector.onDeselectObjects += (() => { canvas_Popup.panel_objectinfo.gameObject.SetActive(false); });
customAssetConnector.onDeselectObjects += (() => { canvas_Windows.panel_objectalign.gameObject.SetActive(false); }); customAssetConnector.onDeselectObjects += (() => { canvas_Popup.panel_objectalign.gameObject.SetActive(false); });
//customAssetConnector.onAssetDropped += (() => componentWindow.SetActive(true)); //customAssetConnector.onAssetDropped += (() => componentWindow.SetActive(true));
renderObjectHandler.onDeselectAll += canvas_Windows.panel_objectinfo.ResetObjectInfo; renderObjectHandler.onDeselectAll += canvas_Popup.panel_objectinfo.ResetObjectInfo;
renderObjectHandler.onTransformChanged += canvas_Windows.panel_objectinfo.OnTransformChanged; renderObjectHandler.onTransformChanged += canvas_Popup.panel_objectinfo.OnTransformChanged;
renderObjectHandler.onDragBegin += canvas_DragArea.panel_draghandler.OnBeginDrag; renderObjectHandler.onDragBegin += canvas_DragArea.panel_draghandler.OnBeginDrag;
renderObjectHandler.onDragEnd += canvas_DragArea.panel_draghandler.OnEndDrag; renderObjectHandler.onDragEnd += canvas_DragArea.panel_draghandler.OnEndDrag;
renderObjectHandler.onDragForceEnd += canvas_DragArea.panel_draghandler.ForceEndDrag; renderObjectHandler.onDragForceEnd += canvas_DragArea.panel_draghandler.ForceEndDrag;
saveLoadFBXData.onBeginLoadAsset += (() => assetWindow.SetActive(true)); saveLoadFBXData.onBeginLoadAsset += (() => assetWindow.SetActive(true));
canvas_Windows.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged; canvas_Popup.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged;
agvNodeManager.onNodeConnectionAdded += agvNodeLinkManager.AddLine; agvNodeManager.onNodeConnectionAdded += agvNodeLinkManager.AddLine;
agvNodeManager.onNodeConnectionUpdated += agvNodeLinkManager.UpdateLine; agvNodeManager.onNodeConnectionUpdated += agvNodeLinkManager.UpdateLine;
@@ -115,9 +114,9 @@ namespace XED.Manage
canvas_static.panel_toolbar.onClickAGVMode += () => statusPanel.SetMode(ModePanel.ProgramMode.AGVPathDrawing); canvas_static.panel_toolbar.onClickAGVMode += () => statusPanel.SetMode(ModePanel.ProgramMode.AGVPathDrawing);
canvas_static.panel_toolbar.onClickStartDrawWall += ()=>statusPanel.SetMode(ModePanel.ProgramMode.WallDrawing); canvas_static.panel_toolbar.onClickStartDrawWall += ()=>statusPanel.SetMode(ModePanel.ProgramMode.WallDrawing);
canvas_Windows.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_Windows.panel_assetproperties.Open); canvas_Popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_Popup.panel_assetproperties.Open);
canvas_Windows.panel_assetproperties.onClickPreview += canvas_Windows.panel_predefinedtype.Open; canvas_Popup.panel_assetproperties.onClickPreview += canvas_Popup.panel_predefinedtype.Open;
canvas_Windows.panel_assetproperties.onOpen += saveLoadFBXData.GetCustomAssetData; canvas_Popup.panel_assetproperties.onOpen += saveLoadFBXData.GetCustomAssetData;
} }
void StatusConnection() void StatusConnection()

9
Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs
View File

@@ -9,6 +9,15 @@ namespace XED
{ {
public class Canvas_Popup : CanvasBase public class Canvas_Popup : CanvasBase
{ {
public Panel_AccessibilitySettings panel_accessibilitysettings;
public Panel_ColorPicker panel_colorpicker;
public Panel_ComponentLibrary panel_componentlibrary;
public Panel_AssetLibrary panel_assetlibrary;
public Panel_InterworkingDataList panel_interworkingdatalist;
public Panel_AssetProperties panel_assetproperties;
public Panel_PredefinedType panel_predefinedtype;
public Panel_ObjectInfo panel_objectinfo;
public Panel_ObjectAlign panel_objectalign;
public AGVNodePopup agvnodepopup; public AGVNodePopup agvnodepopup;
public AGVNodeModePopup agvnodemodepopup; public AGVNodeModePopup agvnodemodepopup;
public Panel_Tooltip panel_tooltip; public Panel_Tooltip panel_tooltip;

19
Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs
View File

@@ -1,19 +0,0 @@
using UnityEngine;
using XRLib;
using XRLib.UI;
namespace XED.UI
{
public class Canvas_Windows : CanvasBase
{
public Panel_AccessibilitySettings panel_accessibilitysettings;
public Panel_ColorPicker panel_colorpicker;
public Panel_ComponentLibrary panel_componentlibrary;
public Panel_AssetLibrary panel_assetlibrary;
public Panel_InterworkingDataList panel_interworkingdatalist;
public Panel_AssetProperties panel_assetproperties;
public Panel_PredefinedType panel_predefinedtype;
public Panel_ObjectInfo panel_objectinfo;
public Panel_ObjectAlign panel_objectalign;
}
}

2
Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs.meta
View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 79743f1c37d29b54b9bf38654b053cec

2
Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs
View File

@@ -37,7 +37,7 @@ namespace XED.UI
var customAssetConnector = FindSingle<CustomAssetConnector>(); var customAssetConnector = FindSingle<CustomAssetConnector>();
btnExport.onClick.AddListener(customAssetConnector.assetDataHandler.SaveSelectedAssetDatasToLocal); btnExport.onClick.AddListener(customAssetConnector.assetDataHandler.SaveSelectedAssetDatasToLocal);
btnImport.onClick.AddListener(customAssetConnector.assetDataHandler.LoadLocalAssetDatas); btnImport.onClick.AddListener(customAssetConnector.assetDataHandler.LoadLocalAssetDatas);
scrollRect = FindSingle<Canvas_Windows>().panel_assetlibrary.scrollRect; scrollRect = FindSingle<Canvas_Popup>().panel_assetlibrary.scrollRect;
scrollRect.menuPopup = gameObject; scrollRect.menuPopup = gameObject;
SetActive(false); SetActive(false);
} }