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

카메라 기능 개선 작업

Browse Source
This commit is contained in:
정영민
2025-03-20 15:53:40 +09:00
parent 0e25d8beb0
commit e7462a3506
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Plugins/XRLib/GenericController/Orbital/OrbitalController.cs
View File

@@ -392,10 +392,11 @@ namespace WI
public void CameraTopView() public void CameraTopView()
{ {
var saveData = saveTargetPositions[ViewMode.TopView]; var saveData = saveTargetPositions[ViewMode.TopView];
option.maxDistance = 35f; option.maxDistance = 50f;
if (saveData == null) if (saveData == null)
{ {
nextPosition = new Vector3(4f, 21.9f, 1f);
option.currentElevation = 90f; option.currentElevation = 90f;
option.currentDistance = 35f; option.currentDistance = 35f;
option.currentAzimuth = 0f; option.currentAzimuth = 0f;
@@ -432,6 +433,7 @@ namespace WI
if (saveData == null) if (saveData == null)
{ {
nextPosition = option.originTargetPos;
option.currentDistance = option.originDistance; option.currentDistance = option.originDistance;
option.currentAzimuth = option.originAzimuth; option.currentAzimuth = option.originAzimuth;
option.currentElevation = option.originElevation; option.currentElevation = option.originElevation;
@@ -494,7 +496,6 @@ namespace WI
var cameraData = saveTargetPositions[currentViewMode]; var cameraData = saveTargetPositions[currentViewMode];
nextPosition = new Vector3(cameraData.x, cameraData.y, cameraData.z); nextPosition = new Vector3(cameraData.x, cameraData.y, cameraData.z);
Debug.Log(nextPosition);
option.currentDistance = cameraData.distance; option.currentDistance = cameraData.distance;
option.currentAzimuth = cameraData.azimuth; option.currentAzimuth = cameraData.azimuth;
option.currentElevation = cameraData.elevation; option.currentElevation = cameraData.elevation;

8
Assets/Scripts/EventConnecter.cs
View File

@@ -160,6 +160,14 @@ namespace CHN
building.SetCurrentFloorInternalState(); building.SetCurrentFloorInternalState();
var raycaster = FindSingle<CHNRaycaster>();
if (raycaster.hitFloorIndex != building.currentFloor.floorIndex)
{
var slider = FindSingle<Canvas_Right>().panel_floorcontrol;
slider.ChangeValueFromOutside(raycaster.hitFloorIndex);
}
var pos = controller.option.target.position; var pos = controller.option.target.position;
if (building.currentFloor.FloorContainsPoint(pos)) if (building.currentFloor.FloorContainsPoint(pos))

6
CompleteTimeAlarmInfo.json
View File

@@ -1360,7 +1360,7 @@
"sttm": "0814", "sttm": "0814",
"totm": "", "totm": "",
"goaltime": "500", "goaltime": "500",
"ptotm": "2025-03-20 17:14:35", "ptotm": "2025-03-20 18:27:04",
"psttm": "2025-03-17 08:14:33" "psttm": "2025-03-17 08:14:33"
}, },
"isCheck": false "isCheck": false
@@ -1622,7 +1622,7 @@
"worknm": "Injector No.16", "worknm": "Injector No.16",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "비가동", "statusnm": "가동중",
"itemcd": "24298739", "itemcd": "24298739",
"itemdesc": "BAFFLE ASM-FRT DIFF CARR", "itemdesc": "BAFFLE ASM-FRT DIFF CARR",
"pjtcd": "GF9", "pjtcd": "GF9",
@@ -1727,7 +1727,7 @@
"worknm": "가공반-1", "worknm": "가공반-1",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "가동중", "statusnm": "계획정지",
"itemcd": "55354247", "itemcd": "55354247",
"itemdesc": "COVER ASM-TMG BELT RR", "itemdesc": "COVER ASM-TMG BELT RR",
"pjtcd": "GEN3", "pjtcd": "GEN3",