UVCXR/OCTOPUS_TWIN-Demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo

Browse Source
This commit is contained in:
njh
2026-02-10 20:53:00 +09:00
parent 7ba313b54c e25d240e9b
commit 38b4af45a8
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/DownloadAssets/XRLib/Scripts/UVC/Manager/GizmoController.cs
View File

@@ -1,4 +1,4 @@
#nullable enable #nullable enable
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using RTGLite; using RTGLite;
@@ -84,7 +84,7 @@ namespace UVC.Studio.Manager
Debug.Log("[GizmoController] 기즈모가 초기화되었습니다."); Debug.Log("[GizmoController] 기즈모가 초기화되었습니다.");
} }
#endregion #endregion
#region Target Management #region Target Management

7
Assets/DownloadAssets/XRLib/Scripts/UVC/Manager/SelectionInputHandler.cs
View File

@@ -36,18 +36,21 @@ namespace UVC.Studio.Manager
/// </summary> /// </summary>
private StageObjectManager.StageObject? _lastClickedStageObject; private StageObjectManager.StageObject? _lastClickedStageObject;
protected async void Start() protected async void Start()
{ {
// InjectorSceneContext 초기화 대기 // InjectorSceneContext 초기화 대기
//await InjectorSceneContext.Instance.WaitForInitializationAsync(); //await InjectorSceneContext.Instance.WaitForInitializationAsync();
_selectionManager = InjectorAppContext.Instance.Get<SelectionManager>(); _selectionManager = InjectorAppContext.Instance.Get<SelectionManager>();
_selectionManager.Gizmo.Initialize(); _selectionManager.Gizmo.Initialize();
_stageObjectManager = InjectorAppContext.Instance.Get<StageObjectManager>(); _stageObjectManager = InjectorAppContext.Instance.Get<StageObjectManager>();
if (_selectionManager == null) if (_selectionManager == null)
{ {
Debug.LogWarning("[SelectionInputHandler] SelectionManager not found."); Debug.LogWarning("[SelectionInputHandler] targetScene not found.");
} }
if (_stageObjectManager == null) if (_stageObjectManager == null)
@@ -64,7 +67,7 @@ namespace UVC.Studio.Manager
{ {
HandleClick(); HandleClick();
} }
if (IsDraggingGizmo()) if (IsDraggingGizmo())
{ {
_selectionManager?.TickPropertyWindow(); _selectionManager?.TickPropertyWindow();

6
Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tab/SideTabBarAccordion.cs
View File

@@ -16,6 +16,8 @@ using ChunilENG;
using UVC.Config; using UVC.Config;
using KEPCO; using KEPCO;
using System; using System;
using UnityEngine.SceneManagement;
using OCTOPUS_TWIN;
namespace UVC.Tab namespace UVC.Tab
{ {
@@ -173,7 +175,9 @@ namespace UVC.Tab
//객체 Y값 올리기 //객체 Y값 올리기
// 프리뷰를 실제 객체로 전환 // 프리뷰를 실제 객체로 전환
dragPreview.transform.position = worldPosition; dragPreview.transform.position = worldPosition;
var scenName = OctopusTwinAppMain.Instance.projectListController.CursceneName;
Scene targetScene = SceneManager.GetSceneByName(scenName);
SceneManager.MoveGameObjectToScene(dragPreview,targetScene);
// 프리뷰 머티리얼을 원래대로 복원 // 프리뷰 머티리얼을 원래대로 복원
RestorePreviewMaterials(dragPreview); RestorePreviewMaterials(dragPreview);

5
Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs
View File

@@ -9,6 +9,7 @@ using UVC.Core;
using UVC.Data; using UVC.Data;
using UVC.Data.Core; using UVC.Data.Core;
using UVC.Management; using UVC.Management;
using UVC.Studio.Manager;
using UVC.UI.Tooltip; using UVC.UI.Tooltip;
namespace ChunilENG namespace ChunilENG
@@ -51,7 +52,9 @@ namespace ChunilENG
thermostatInfoItemManager = await LoadManager<ThermostatInfoItemManager>(); thermostatInfoItemManager = await LoadManager<ThermostatInfoItemManager>();
viewManager = await LoadManager<ViewManager>(); viewManager = await LoadManager<ViewManager>();
mqttManager = FindAnyObjectByType<MQTT>(); mqttManager = FindAnyObjectByType<MQTT>();
var selectMnager = InjectorAppContext.Instance.Get<SelectionManager>();
selectMnager.Gizmo.Dispose();
selectMnager.Gizmo.Initialize();
dataManager = await LoadManager<DataManager>(); dataManager = await LoadManager<DataManager>();
MQTTEventDisConnect(); MQTTEventDisConnect();
SetupDataSetting(); SetupDataSetting();

3
Assets/Scripts/UI/ProjectListController.cs
View File

@@ -203,7 +203,7 @@ namespace OCTOPUS_TWIN
break; break;
} }
} }
public string CursceneName;
public async UniTask SceneTransition(int index) public async UniTask SceneTransition(int index)
{ {
var sceneIndex = index == 2 ? 0 : 1; var sceneIndex = index == 2 ? 0 : 1;
@@ -219,6 +219,7 @@ namespace OCTOPUS_TWIN
private async UniTask LoadActiveProjectScene(string mainScene, SceneStatus status) private async UniTask LoadActiveProjectScene(string mainScene, SceneStatus status)
{ {
await sceneController.SceneChange(mainScene, status); await sceneController.SceneChange(mainScene, status);
CursceneName=mainScene;
} }
private void SetActiveProgjectDataObject(Transform parent, string targetName, bool isOn) private void SetActiveProgjectDataObject(Transform parent, string targetName, bool isOn)