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

[정영민] 설비 아이콘 활성화 오류 및 카메라 위치 오류 수정

Browse Source 
26.02.10
- 설비 아이콘 활성화
- 카메라 위치 오류 수정
This commit is contained in:
정영민
2026-02-10 18:25:06 +09:00
parent 928a2d1625
commit 647b4d0899
7 changed files with 61 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Window/PropertyWindow.prefab
View File

@@ -711,7 +711,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 0}
m_Direction: 0
m_Value: 1
m_Size: 0.9997558
m_Size: 0.9999941
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -1349,8 +1349,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000015258789}
m_SizeDelta: {x: 0, y: -0.17746803}
m_AnchoredPosition: {x: 0, y: -0.00012207031}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4790256706883938101
MonoBehaviour:
@@ -1385,7 +1385,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6982330689999531319}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:

28
Assets/Scenes/SystemScene.unity
View File

@@ -630,26 +630,18 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1205322734457541541, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.00012207031
objectReference: {fileID: 0}
- target: {fileID: 1554032197748324192, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1602519165350808158, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_Name
value: PropertyWindow
objectReference: {fileID: 0}
- target: {fileID: 4790256706883938101, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_ChildControlWidth
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7125265927081152491, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7930097770660311367, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_Size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8065352563668446013, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_Pivot.x
value: 1
@@ -730,18 +722,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8946140259888033016, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8946140259888033016, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8946140259888033016, guid: 4b98d7ee8b805ff42be384e91f3bf8a4, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

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

@@ -35,6 +35,7 @@ namespace ChunilENG
public void InitSceneMain()
{
Debug.Log("ChunilENGSceneMain: InitSceneMain called.");
BaseCameraPoistion();
OnAppInitialized();
}
@@ -63,6 +64,16 @@ namespace ChunilENG
await UniTask.CompletedTask;
}
private void BaseCameraPoistion()
{
var controller = OctopusTwinAppMain.Instance.cameraController;
controller.currentAzimuth = 305f;
controller.currentElevation = 23f;
controller.currentDistance = 10f;
controller.SetTargetPos(new Vector3(17f, 0.05f, -2.806954f));
}
//실제 데이터 받을 시 코드 변경 예정
private void SetupDataSetting()
{

53
Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs
View File

@@ -6,6 +6,7 @@ using OCTOPUS_TWIN.Command;
using OCTOPUS_TWIN.Management;
using OCTOPUS_TWIN.UI;
using UnityEngine;
using UVC.UI.Commands;
using UVC.UI.Toolbar;
using UVC.UI.Toolbar.Model;
@@ -42,46 +43,26 @@ namespace ChunilENG.UI
"Prefabs/UI/Toolbar/images/ic_camera_top_on",
"Prefabs/UI/Toolbar/images/ic_camera_top_off",
(isSelected) =>
{
//if (isSelected)
//{
// var building = ChunilENGSceneMain.Instance.building;
// if(building != null)
// {
// foreach(var machine in building.GetMachines())
// {
// machine.ReleaseAnimators();
// }
// }
//}
},
new CameraViewModeChangedCommand(ViewMode.TopView),
{
if (isSelected)
{
var controller = OctopusTwinAppMain.Instance.cameraController;
controller.SetViewMode(ViewMode.TopView);
}
},null,
"Top View 시점으로 변경합니다.");
toolbarModel.AddRadioButton("CameraControlGroup", "Quarter View", true,
"Prefabs/UI/Toolbar/images/ic_camera_quarter_on",
"Prefabs/UI/Toolbar/images/ic_camera_quarter_off",
(isSelected) =>
{
//if (isSelected)
//{
// var building = ChunilENGSceneMain.Instance.building;
// if (building == null) return;
// var currentFloorIndex = building.GetCurFloor().index;
// foreach (var machine in building.GetMachines())
// {
// if (machine.GetMachineFloorIndex() == currentFloorIndex)
// {
// machine.AssignAnimators();
// }
// else
// {
// machine.ReleaseAnimators();
// }
// }
//}
{
if (isSelected)
{
var controller = OctopusTwinAppMain.Instance.cameraController;
controller.SetViewMode(ViewMode.PerspectiveView);
}
},
new CameraViewModeChangedCommand(ViewMode.PerspectiveView),
null,
"Quarter View 시점으로 변경합니다.");
// 화면 캡처
@@ -100,8 +81,8 @@ namespace ChunilENG.UI
// 내/외벽 활성화/비활성화
toolbarModel.AddToggleButton("button_icon_control", false,
"Prefabs/UI/Toolbar/images/IMG_WallControl_on",
"Prefabs/UI/Toolbar/images/IMG_WallControl_off",
"Prefabs/UI/Toolbar/images/IMG_WallControl_on",
(isSelected) =>
{
var itemManager = ChunilENGSceneMain.Instance.GetManager<MachineInfoItemManager>();
@@ -131,7 +112,7 @@ namespace ChunilENG.UI
}
public void DeactiveSideToolButton()
{
toolbar.SetToggleButtonState("button_icon_control", false);
toolbar.SetToggleButtonState("button_icon_control", false, true);
toolbar.SetRadioButtonSelection("CameraControlGroup", "Quarter View", true);
}
}

2
Assets/Scripts/KEPCO/Command/UICommand/OpenHomePanelCommand.cs
View File

@@ -24,7 +24,7 @@ namespace KEPCO.Command
var uiManager = KEPCOSceneMain.Instance.GetManager<KEPCOUIManager>();
uiManager.GetCanvas<PopupCanvas>().ClosePanel();
//uiManager.GetCanvas<StaticCanvas>().GetPanel<LeftSidePanel>().ResetToolBox();
uiManager.GetCanvas<StaticCanvas>().GetPanel<LeftSidePanel>().InitSideToolButton();
}
}
}

41
Assets/Scripts/KEPCO/UI/LeftSidePanel.cs
View File

@@ -15,29 +15,18 @@ namespace KEPCO.UI
{
[SerializeField]
private Toolbar toolbar;
[SerializeField]
private SideTabBar sideTabBar;
private CaptureRecoder recorder;
public override async UniTask Init()
{
toolbar = transform.GetComponentInChildren<Toolbar>();
sideTabBar = transform.GetComponentInChildren<SideTabBar>();
SetupCaptureSetting();
SetupToolBox();
await UniTask.CompletedTask;
}
private void OnEnable()
{
SetupToolBox();
var initialViewCommand = new CameraViewModeChangedCommand(ViewMode.PerspectiveView);
initialViewCommand.Execute();
}
private void SetupToolBox()
{
// ToolbarModel 인스턴스 생성
@@ -48,15 +37,27 @@ namespace KEPCO.UI
toolbarModel.AddRadioButton("CameraControlGroup", "Top View", false,
"Prefabs/UI/Toolbar/images/ic_camera_top_on",
"Prefabs/UI/Toolbar/images/ic_camera_top_off",
(IsSelected) => { if (IsSelected) Debug.Log("2D 뷰 선택됨"); },
new CameraViewModeChangedCommand(ViewMode.TopView),
"Top View 시점으로 변경합니다.");
(isSelected) =>
{
if (isSelected)
{
var controller = OctopusTwinAppMain.Instance.cameraController;
controller.SetViewMode(ViewMode.TopView);
}
}, null,
"Top View 시점으로 변경합니다.");
toolbarModel.AddRadioButton("CameraControlGroup", "Quarter View", true,
"Prefabs/UI/Toolbar/images/ic_camera_quarter_on",
"Prefabs/UI/Toolbar/images/ic_camera_quarter_off",
(IsSelected) => { if (IsSelected) Debug.Log("3D 뷰 선택됨"); },
new CameraViewModeChangedCommand(ViewMode.PerspectiveView),
(isSelected) =>
{
if (isSelected)
{
var controller = OctopusTwinAppMain.Instance.cameraController;
controller.SetViewMode(ViewMode.PerspectiveView);
}
},
null,
"Quarter View 시점으로 변경합니다.");
// 화면 캡처
@@ -96,6 +97,12 @@ namespace KEPCO.UI
recorder = new CaptureRecoder();
recorder.Setup();
}
public void InitSideToolButton()
{
toolbar.SetToggleButtonState("button_gis_control", true, true);
toolbar.SetRadioButtonSelection("CameraControlGroup", "Quarter View", true);
}
}
}

5
Assets/Scripts/KEPCO/UI/TopMenuPanel.cs
View File

@@ -33,11 +33,6 @@ namespace KEPCO.UI
await UniTask.CompletedTask;
}
private void OnEnable()
{
SetupToolBox();
}
private void SetupTopMenu()
{
if (topMenu == null)