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

Merge pull request '7/25 수정 사항' (#228) from pgd/20250725_1 into main

Browse Source 
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/228
This commit was merged in pull request #228.
This commit is contained in:
pgd
2025-07-25 16:09:45 +09:00
parent 88aa8b586c 3ab3dbc10d
commit 0ef6544776
7 changed files with 111 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Prefabs/AAA/GizmoRenderer.prefab
View File

@@ -225,7 +225,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4154756950530451975}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
@@ -281,15 +281,17 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0

245
Assets/Prefabs/AAA/Panel_StudioTopbar.prefab
View File

@@ -307,10 +307,10 @@ RectTransform:
- {fileID: 2641865167890791995}
m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 110, y: -22}
m_SizeDelta: {x: 210, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3489228134480339777
CanvasRenderer:
@@ -1090,10 +1090,10 @@ RectTransform:
- {fileID: 6894040108453440889}
m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 150, y: -124}
m_SizeDelta: {x: 290, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5212800262809355448
CanvasRenderer:
@@ -1467,10 +1467,10 @@ RectTransform:
- {fileID: 6467883027692677993}
m_Father: {fileID: 6340558249613605857}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 100.0695, y: -56}
m_SizeDelta: {x: 190.139, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1981890397451977413
CanvasRenderer:
@@ -2963,7 +2963,6 @@ GameObject:
- component: {fileID: 7017100227211141329}
- component: {fileID: 1684347328279880060}
- component: {fileID: 8716372905218989086}
- component: {fileID: 5627916286240764789}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -2985,10 +2984,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 6481722682416648472}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1684347328279880060
CanvasRenderer:
@@ -3053,7 +3052,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -3089,20 +3088,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &5627916286240764789
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2560603364830347304}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &2721372243835513048
GameObject:
m_ObjectHideFlags: 0
@@ -3282,10 +3267,10 @@ RectTransform:
- {fileID: 6668256650124147009}
m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 150, y: -22}
m_SizeDelta: {x: 290, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7527628306696851762
CanvasRenderer:
@@ -3862,10 +3847,10 @@ RectTransform:
- {fileID: 3488610485283054401}
m_Father: {fileID: 3612353324306706568}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 120, y: -56}
m_SizeDelta: {x: 230, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7519002699685595081
CanvasRenderer:
@@ -4810,10 +4795,10 @@ RectTransform:
- {fileID: 7631676095961012699}
m_Father: {fileID: 3612353324306706568}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 120, y: -22}
m_SizeDelta: {x: 230, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5915613553988833987
CanvasRenderer:
@@ -4950,10 +4935,10 @@ RectTransform:
- {fileID: 239898139430097969}
m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 110, y: -124}
m_SizeDelta: {x: 210, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4247297422581378552
CanvasRenderer:
@@ -6740,7 +6725,6 @@ GameObject:
- component: {fileID: 39081802091885578}
- component: {fileID: 7587368150757620990}
- component: {fileID: 8654835325965923314}
- component: {fileID: 2140752751788840653}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -6762,10 +6746,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3238963043025285338}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7587368150757620990
CanvasRenderer:
@@ -6830,7 +6814,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -6866,20 +6850,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &2140752751788840653
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5139031459477456866}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &5145370541214012035
GameObject:
m_ObjectHideFlags: 0
@@ -7313,10 +7283,10 @@ RectTransform:
- {fileID: 4934558975903239102}
m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 110, y: -90}
m_SizeDelta: {x: 210, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3369121211994654138
CanvasRenderer:
@@ -7429,7 +7399,6 @@ GameObject:
- component: {fileID: 7224508148832233434}
- component: {fileID: 6254609085111468795}
- component: {fileID: 7488666436362542306}
- component: {fileID: 5518524607387498583}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -7451,10 +7420,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 507044200192960012}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6254609085111468795
CanvasRenderer:
@@ -7519,7 +7488,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -7555,20 +7524,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &5518524607387498583
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5507712416580393121}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &5598713889840636921
GameObject:
m_ObjectHideFlags: 0
@@ -8007,10 +7962,10 @@ RectTransform:
- {fileID: 7773128163535172080}
m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 150, y: -158}
m_SizeDelta: {x: 290, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1538201362206907658
CanvasRenderer:
@@ -9512,10 +9467,10 @@ RectTransform:
- {fileID: 8983976402599428563}
m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 150, y: -90}
m_SizeDelta: {x: 290, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8819351641869115221
CanvasRenderer:
@@ -11877,10 +11832,10 @@ RectTransform:
- {fileID: 3407360332968577993}
m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 110, y: -56}
m_SizeDelta: {x: 210, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4300145224472273166
CanvasRenderer:
@@ -12068,7 +12023,6 @@ GameObject:
- component: {fileID: 4411952328846038397}
- component: {fileID: 6539332332075531913}
- component: {fileID: 2303845988930171271}
- component: {fileID: 2521248643174618728}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -12090,10 +12044,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8446467888244615418}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6539332332075531913
CanvasRenderer:
@@ -12158,7 +12112,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -12194,20 +12148,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &2521248643174618728
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8077915878948747490}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &8078574712506140396
GameObject:
m_ObjectHideFlags: 0
@@ -12219,7 +12159,6 @@ GameObject:
- component: {fileID: 5308505043497054505}
- component: {fileID: 607957240391468196}
- component: {fileID: 999338138509537173}
- component: {fileID: 8353000831921415421}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -12241,10 +12180,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 514594182029569209}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &607957240391468196
CanvasRenderer:
@@ -12309,7 +12248,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -12345,20 +12284,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &8353000831921415421
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8078574712506140396}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &8110366459860109492
GameObject:
m_ObjectHideFlags: 0
@@ -12545,10 +12470,10 @@ RectTransform:
- {fileID: 6769054886412449106}
m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 150, y: -56}
m_SizeDelta: {x: 290, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6487236260048461744
CanvasRenderer:
@@ -12978,10 +12903,10 @@ RectTransform:
- {fileID: 4551446790370479478}
m_Father: {fileID: 7049248817799997631}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 64.48075, y: -22}
m_SizeDelta: {x: 118.9615, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8129281279843792023
CanvasRenderer:
@@ -13118,10 +13043,10 @@ RectTransform:
- {fileID: 643449707283617506}
m_Father: {fileID: 7049248817799997631}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 64.48075, y: -56}
m_SizeDelta: {x: 118.9615, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3258050494349403066
CanvasRenderer:
@@ -13431,10 +13356,10 @@ RectTransform:
- {fileID: 290966527929266020}
m_Father: {fileID: 6340558249613605857}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 100.0695, y: -22}
m_SizeDelta: {x: 190.139, y: 30}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8978547910611737479
CanvasRenderer:

62
Assets/Scripts/ExternalAssets/Gizmo/CameraGizmoListener.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections;
using UnityEditor;
using UnityEngine;
namespace Studio.RuntimeGizmo
@@ -19,22 +20,7 @@ namespace Studio.RuntimeGizmo
private IEnumerator cameraRotateCoroutine, projectionChangeCoroutine;
public event Action<string> onGizmoComponentClickedEnd;
private enum GizomType
{
Persp,
Iso,
Left,
Right,
Bottom,
Top,
Front,
Back
}
private GizomType gizomType;
public event Action<bool> onChangedMode;
private void Awake()
{
@@ -49,45 +35,20 @@ namespace Studio.RuntimeGizmo
public void OnGizmoComponentClicked( GizmoComponent component )
{
if ( component == GizmoComponent.Center )
{
SwitchOrthographicMode();
if(!IsCameraRotationAligned())
{
gizomType = mainCamera.orthographic ? GizomType.Persp : GizomType.Iso;
}
}
else if( component == GizmoComponent.XNegative )
{
if (component == GizmoComponent.Center)
SwitchOrthographicMode();
else if (component == GizmoComponent.XNegative)
RotateCameraInDirection(Vector3.right);
gizomType = GizomType.Left;
}
else if( component == GizmoComponent.XPositive )
{
else if (component == GizmoComponent.XPositive)
RotateCameraInDirection(-Vector3.right);
gizomType = GizomType.Right;
}
else if( component == GizmoComponent.YNegative )
{
else if (component == GizmoComponent.YNegative)
RotateCameraInDirection(Vector3.up);
gizomType = GizomType.Bottom;
}
else if( component == GizmoComponent.YPositive )
{
else if (component == GizmoComponent.YPositive)
RotateCameraInDirection(-Vector3.up);
gizomType = GizomType.Top;
}
else if( component == GizmoComponent.ZNegative )
{
else if (component == GizmoComponent.ZNegative)
RotateCameraInDirection(Vector3.forward);
gizomType = GizomType.Back;
}
else
{
else
RotateCameraInDirection(-Vector3.forward);
gizomType = GizomType.Front;
}
onGizmoComponentClickedEnd?.Invoke(gizomType.ToString());
}
private bool IsCameraRotationAligned()
@@ -149,7 +110,8 @@ namespace Studio.RuntimeGizmo
}
mainCamera.orthographic = !isOrthographic;
mainCamera.ResetProjectionMatrix();
onChangedMode?.Invoke(mainCamera.orthographic);
mainCamera.ResetProjectionMatrix();
projectionChangeCoroutine = null;
}

8
Assets/Scripts/ExternalAssets/Gizmo/SceneGizmoRenderer.cs
View File

@@ -61,8 +61,8 @@ namespace Studio.RuntimeGizmo
imageHolderTR = (RectTransform) imageHolder.transform;
controller = (SceneGizmoController) Instantiate( controller );
imageHolder.texture = controller.TargetTexture;
GetComponent<CameraGizmoListener>().onGizmoComponentClickedEnd += OnGizmoComponentClickedEnd;
text_mode.text = "front";
GetComponent<CameraGizmoListener>().onChangedMode += OnChangedMode;
text_mode.text = "Persp";
}
private void Start()
@@ -119,9 +119,9 @@ namespace Studio.RuntimeGizmo
return new Vector3( 1f + localPos.x / size.x, 1f + localPos.y / size.y, 0f );
}
private void OnGizmoComponentClickedEnd(string text)
private void OnChangedMode(bool isOrthographic)
{
text_mode.text = text;
text_mode.text = isOrthographic ? "Iso" : "Persp";
}
#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_WEBGL || UNITY_FACEBOOK || UNITY_WSA || UNITY_WSA_10_0

2
Assets/Scripts/Studio/Connect/StudioService.cs
View File

@@ -308,7 +308,7 @@ namespace Studio
}
//TODO :리팩토링 필요함.
var datas = json["data"].ToString();
var datas = json.ToString();
JObject test = JObject.Parse(datas);
var list = new List<Dictionary<string, string>>();
foreach (JProperty te1 in test.Children())

3
Assets/Scripts/Studio/UI/Elements/UI_BaseDataButton.cs
View File

@@ -4,6 +4,7 @@ using UnityEngine.UI;
using Studio.UI;
using Studio.Setting.Connect;
using XRLib.UI;
using System;
namespace Studio
@@ -36,7 +37,7 @@ namespace Studio
baseDataKey = name;
dataValue = data as StudioEntityWithState<object>;
buttonName.text = name;
buttonName.text = name.Split(new[] { "/api/" }, StringSplitOptions.None)[1];
}
}
}

6
Assets/Scripts/Studio/UI/Panel/Panel_APISetting.cs
View File

@@ -53,7 +53,7 @@ namespace Studio.UI
{
Active(true);
prevAPIConnectionItems.Clear();
foreach (var mqttitem in prevAPIConnectionItems)
foreach (var mqttitem in apiConnectionItems)
{
prevAPIConnectionItems.Add(mqttitem);
}
@@ -101,9 +101,9 @@ namespace Studio.UI
ItemCreate();
var index = 0;
foreach (var mqttitem in apiConnectionItems)
foreach (var apiItem in apiConnectionItems)
{
mqttitem.RevertInfo(prevAPISetting.apiConnections[index]);
apiItem.RevertInfo(prevAPISetting.apiConnections[index]);
index++;
}
}