eventConnector 정리
This commit is contained in:
@@ -38,43 +38,11 @@ namespace XED.Manage
|
||||
|
||||
public void Init()
|
||||
{
|
||||
var rayCaster = FindAnyObjectByType<Raycaster>();
|
||||
var statusPanel = FindAnyObjectByType<ModePanel>();
|
||||
|
||||
var canvas_static = FindAnyObjectByType<Canvas_Static>();
|
||||
var canvas_Popup = FindAnyObjectByType<Canvas_Popup>();
|
||||
var canvas_DragArea = FindAnyObjectByType<Canvas_DragArea>();
|
||||
|
||||
var wallBuilder = FindAnyObjectByType<WallBuilder>();
|
||||
var userInputManager = ManagerHub.instance.Get<UserInputManager>();
|
||||
var customAssetConnector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
var projectManager = ManagerHub.instance.Get<ProjectManager>();
|
||||
var interferedObjectManager = ManagerHub.instance.Get<InterferedObjectManager>();
|
||||
|
||||
FBXFileManager fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||
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;
|
||||
|
||||
@@ -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<Canvas_Popup>();
|
||||
OnAddInterferedPair += canvas_Popup.panel_interferedobjectlist.CreateContentButton;
|
||||
OnRemoveInterferedPair += canvas_Popup.panel_interferedobjectlist.RemoveContentButton;
|
||||
}
|
||||
|
||||
public void AddInterferedPair(TwinObject obj1, TwinObject obj2)
|
||||
|
||||
@@ -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<Canvas>().sortingOrder = 1;
|
||||
panel_draghandler.onDragBoxSelect += ManagerHub.instance.Get<CustomAssetConnector>().assetEventHandler.OnDragBoxSelect;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<Canvas>().sortingOrder = 1;
|
||||
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged;
|
||||
|
||||
var raycaster = FindAnyObjectByType<Raycaster>();
|
||||
raycaster.onUIHoverEvent += panel_tooltip.ActivateTooltip;
|
||||
raycaster.onUIHoverExitEvent += panel_tooltip.DeactivateTooltip;
|
||||
|
||||
foreach (var panel in GetComponentsInChildren<PanelBase>(true))
|
||||
{
|
||||
|
||||
@@ -16,5 +16,9 @@ namespace XED.UI
|
||||
{
|
||||
canvasHandler = new StaticCanvasHandler(this);
|
||||
}
|
||||
|
||||
public override void AfterAwake()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user