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

마우스 클릭 이벤트 살리기

Browse Source
This commit is contained in:
geondo55
2025-04-08 17:34:30 +09:00
parent d5ea8b03c5
commit 57fa1f08b6
2 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,10 +58,10 @@ namespace XED.Manage
canvas_Popup.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged; canvas_Popup.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged;
canvas_DragArea.panel_draghandler.onDragBoxSelect += customAssetConnector.assetEventHandler.OnDragBoxSelect; canvas_DragArea.panel_draghandler.onDragBoxSelect += customAssetConnector.assetEventHandler.OnDragBoxSelect;
//statusPanel.AddController(renderObjectHandler); statusPanel.AddController(renderObjectHandler);
//statusPanel.AddController(wallBuilder); statusPanel.AddController(wallBuilder);
//statusPanel.AddModeEnterEvent(ModePanel.ProgramMode.AGVPathDrawing, canvas_Popup.agvnodemodepopup.Open); statusPanel.AddModeEnterEvent(ModePanel.ProgramMode.AGVPathDrawing, canvas_Popup.agvnodemodepopup.Open);
//statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout); statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout);
var commandHandler = CommandInvoker.instance.GetInputHandler(); var commandHandler = CommandInvoker.instance.GetInputHandler();
userInputManager.SetHandler(GetDefaultInputHandler()); userInputManager.SetHandler(GetDefaultInputHandler());
userInputManager.SetHandler(commandHandler); userInputManager.SetHandler(commandHandler);

77
Assets/Scripts/Studio/Managers/UserInputManager.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using XRLib; using XRLib;
@@ -103,55 +104,63 @@ namespace XED.Manage
} }
updateLoop += handler.updateLoop; updateLoop += handler.updateLoop;
} }
void Update() IEnumerator UpdateCoroutine()
{ {
while (true)
foreach (var key in downKeyActionTable.Keys)
{ {
if (Input.GetKeyDown(key)) foreach (var key in downKeyActionTable.Keys)
{ {
downKeyActionTable[key]?.Invoke(); if (Input.GetKeyDown(key))
}
}
foreach (var key in getKeyActionTable.Keys)
{
if (Input.GetKey(key))
{
getKeyActionTable[key]?.Invoke();
}
}
foreach (var key in upKeyActionTable.Keys)
{
if (Input.GetKeyUp(key))
{
upKeyActionTable[key]?.Invoke();
}
}
foreach (var key in shortCutActionTable.Keys)
{
if (Input.GetKey(key))
{
if (shortCutActionTable.TryGetValue(key, out var kk))
{ {
foreach (var k in kk) Debug.Log("1");
downKeyActionTable[key]?.Invoke();
}
}
foreach (var key in getKeyActionTable.Keys)
{
if (Input.GetKey(key))
{
Debug.Log("2");
getKeyActionTable[key]?.Invoke();
}
}
foreach (var key in upKeyActionTable.Keys)
{
if (Input.GetKeyUp(key))
{
Debug.Log("3");
upKeyActionTable[key]?.Invoke();
}
}
foreach (var key in shortCutActionTable.Keys)
{
if (Input.GetKey(key))
{
Debug.Log("4");
if (shortCutActionTable.TryGetValue(key, out var kk))
{ {
if (Input.GetKeyDown(k.Key)) foreach (var k in kk)
{ {
k.Value?.Invoke(); if (Input.GetKeyDown(k.Key))
{
k.Value?.Invoke();
}
} }
} }
} }
} }
}
updateLoop?.Invoke(); updateLoop?.Invoke();
yield return null;
}
} }
public override void Init() public override void Init()
{ {
CoroutineRunner.instance.StartCoroutine(UpdateCoroutine());
} }
} }
} }