diff --git a/.cursorignore b/.cursorignore new file mode 100644 index 00000000..773ee4f5 --- /dev/null +++ b/.cursorignore @@ -0,0 +1,71 @@ +# Unity 생성 디렉토리 +/[Ll]ibrary/ +/[Tt]emp/ +/[Oo]bj/ +/[Bb]uild/ +/[Bb]uilds/ +/[Ll]ogs/ +/[Uu]ser[Ss]ettings/ + +# Unity 자동 생성 파일 +*.pidb.meta +*.pdb.meta +*.mdb.meta + +# Unity3D 충돌 파일 +sysinfo.txt + +# 빌드 결과물 +*.apk +*.aab +*.unitypackage +*.app + +# VS/VS Code 설정 +.vs/ +.vscode/ +*.csproj +*.sln +*.suo +*.tmp +*.user +*.userprefs +*.lock +*.ide +*.ide-shm +*.ide-wal + +# OS 생성 파일 +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# 로그 파일 +*.log + +# 임시 파일 +*.tmp +*.temp +*~ + +# Unity 에셋 파일 +*.fbx +*.obj +*.max +*.blend +*.dae +*.mb +*.ma + +# 프로젝트 특정 설정 +/Assets/SpecialAssets/ +/Assets/Plugins/ThirdParty/ +/Assets/StreamingAssets/Config/ + +# 임시 작업 디렉토리 +_temp/ +_backup/ \ No newline at end of file diff --git a/Assets/Scripts/Studio/Managers/EventConnector.cs b/Assets/Scripts/Studio/Managers/EventConnector.cs index e55bffbb..4a7bcd9a 100644 --- a/Assets/Scripts/Studio/Managers/EventConnector.cs +++ b/Assets/Scripts/Studio/Managers/EventConnector.cs @@ -38,43 +38,11 @@ namespace XED.Manage public void Init() { - var rayCaster = FindAnyObjectByType(); - var statusPanel = FindAnyObjectByType(); - - var canvas_static = FindAnyObjectByType(); - var canvas_Popup = FindAnyObjectByType(); - var canvas_DragArea = FindAnyObjectByType(); - - var wallBuilder = FindAnyObjectByType(); var userInputManager = ManagerHub.instance.Get(); - var customAssetConnector = ManagerHub.instance.Get(); - var renderObjectHandler = ManagerHub.instance.Get(); - var projectManager = ManagerHub.instance.Get(); - var interferedObjectManager = ManagerHub.instance.Get(); - FBXFileManager fbxFileManager = ManagerHub.instance.Get(); - GameObject componentWindow = canvas_Popup.panel_hierarchy.gameObject; - GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject; - - canvas_Popup.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged; - - canvas_DragArea.panel_draghandler.onDragBoxSelect += customAssetConnector.assetEventHandler.OnDragBoxSelect; - statusPanel.AddController(renderObjectHandler); - statusPanel.AddController(wallBuilder); - statusPanel.AddModeEnterEvent(ModePanel.ProgramMode.AGVPathDrawing, canvas_Popup.agvnodemodepopup.Open); - statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout); var commandHandler = CommandInvoker.instance.GetInputHandler(); userInputManager.SetHandler(GetDefaultInputHandler()); userInputManager.SetHandler(commandHandler); - canvas_static.panel_modecontrol.onClickObjectMode += () => statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout); - //canvas_static.panel_modecontrol.onClickPropertyMode += () => statusPanel.SetMode(ModePanel.ProgramMode.None); - - rayCaster.onUIHoverEvent += canvas_Popup.panel_tooltip.ActivateTooltip; - rayCaster.onUIHoverExitEvent += canvas_Popup.panel_tooltip.DeactivateTooltip; - //rayCaster.AddEvent(Raycaster.EventType.FirstRightClickOnly, typeof(TwinObject), canvas_Popup.panel_propertyviewer.Activate); - - interferedObjectManager.OnAddInterferedPair += canvas_Popup.panel_interferedobjectlist.CreateContentButton; - interferedObjectManager.OnRemoveInterferedPair += canvas_Popup.panel_interferedobjectlist.RemoveContentButton; } InputHandler defaultInputHandler; diff --git a/Assets/Scripts/Studio/Managers/InterferedObjectManager.cs b/Assets/Scripts/Studio/Managers/InterferedObjectManager.cs index def1f0af..156eda56 100644 --- a/Assets/Scripts/Studio/Managers/InterferedObjectManager.cs +++ b/Assets/Scripts/Studio/Managers/InterferedObjectManager.cs @@ -14,9 +14,13 @@ namespace XED.Manage public event Action<(TwinObject, TwinObject)> OnAddInterferedPair; public event Action<(TwinObject, TwinObject)> OnRemoveInterferedPair; + + public override void Init() { - + var canvas_Popup = EventConnector.instance.GetCanvas(); + OnAddInterferedPair += canvas_Popup.panel_interferedobjectlist.CreateContentButton; + OnRemoveInterferedPair += canvas_Popup.panel_interferedobjectlist.RemoveContentButton; } public void AddInterferedPair(TwinObject obj1, TwinObject obj2) diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs index 786f8f5c..fd1e0013 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs @@ -1,4 +1,6 @@ using UnityEngine; +using XED.Asset; +using XED.Manage; using XED.UI; using XRLib.UI; @@ -10,6 +12,7 @@ namespace XED public override void AfterAwake() { GetComponent().sortingOrder = 1; + panel_draghandler.onDragBoxSelect += ManagerHub.instance.Get().assetEventHandler.OnDragBoxSelect; } } } diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index 0f91dc23..4a7d7c52 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -5,6 +5,7 @@ using XRLib.UI; using XED.UI; using XED.VirtualFactory; using XED.Manage; +using XED.Util; namespace XED { @@ -29,14 +30,16 @@ namespace XED public Panel_Thumbnail panel_thumbnail; public Panel_ObjectDistance panel_objectdistance; - void Awake() - { - } - public override void AfterAwake() { canvasHandler = new PopupCanvasHandler(this); GetComponent().sortingOrder = 1; + var renderObjectHandler = ManagerHub.instance.Get(); + panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged; + + var raycaster = FindAnyObjectByType(); + raycaster.onUIHoverEvent += panel_tooltip.ActivateTooltip; + raycaster.onUIHoverExitEvent += panel_tooltip.DeactivateTooltip; foreach (var panel in GetComponentsInChildren(true)) { diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs index 03c22fd0..f31134bc 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs @@ -16,5 +16,9 @@ namespace XED.UI { canvasHandler = new StaticCanvasHandler(this); } + + public override void AfterAwake() + { + } } }