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

1. Panel_MQTTConnectModal 삭제

Browse Source 
2. MessagePackFileManager 삭제
This commit is contained in:
wsh
2025-05-27 13:53:23 +09:00
parent d58fdd3d67
commit bfb1daabf4
12 changed files with 0 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1781
Assets/Prefabs/AAA/Panel_MQTTConnectModal.prefab
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/AAA/Panel_MQTTConnectModal.prefab.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 03a019a2380fb0b4a8f2e9b0a76e537e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

103
Assets/Scenes/pre-0.24.0.unity
View File

@@ -2233,7 +2233,6 @@ RectTransform:
- {fileID: 1085911555}
- {fileID: 1712022043}
- {fileID: 1195713950}
- {fileID: 1318345825}
- {fileID: 917198748}
- {fileID: 110380560}
- {fileID: 983009180}
@@ -7350,11 +7349,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3}
m_PrefabInstance: {fileID: 1891855909769109035}
m_PrefabAsset: {fileID: 0}
--- !u!224 &1318345825 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
m_PrefabInstance: {fileID: 2376718693367929665}
m_PrefabAsset: {fileID: 0}
--- !u!224 &1330774554 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8789936807297394088, guid: 8b1e53b08c386aa4f9d7890359831d12, type: 3}
@@ -9727,103 +9721,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3}
--- !u!1001 &2376718693367929665
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 3326604155737549848, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_Name
value: Panel_MQTTConnectModal
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_SizeDelta.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_SizeDelta.y
value: 880
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -540
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4430999702887605757, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3}
--- !u!224 &2476199971772782488 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5063094354339566518, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}

64
Assets/Scripts/Studio/AssetTool/MessagePackFileManager.cs
View File

@@ -1,64 +0,0 @@
using MessagePack.Resolvers;
using MessagePack;
using System.Threading.Tasks;
using System;
using System.IO;
using UnityEngine;
namespace Studio.Manage
{
public class MessagePackFileManager<T>
{
public void Initialize()
{
StaticCompositeResolver.Instance.Register(
GeneratedResolver.Instance,
StandardResolver.Instance
);
MessagePackSerializer.DefaultOptions = MessagePackSerializerOptions.Standard.WithResolver(
StaticCompositeResolver.Instance
);
}
public async Task<T> LoadAsync(string filePath)
{
var lz4Option = MessagePackSerializerOptions.Standard.
WithCompression(MessagePackCompression.Lz4Block).
WithResolver(StaticCompositeResolver.Instance);
byte[] readByte = null;
T deserailze = default(T);
try
{
readByte = await File.ReadAllBytesAsync(filePath);
deserailze = MessagePackSerializer.Deserialize<T>(readByte, lz4Option);
}
catch (Exception ex)
{
Debug.LogError($"Task Error: {ex.Message}\n{ex.StackTrace}");
int byteLength = 0;
if (readByte != null)
{
byteLength = (int)readByte.Length;
}
Debug.LogError("Read Byte Size : " + byteLength.ToString());
}
return deserailze;
}
public async Task SaveAsync(string filePath, T data)
{
var lz4Option = MessagePackSerializerOptions.Standard.
WithCompression(MessagePackCompression.Lz4Block).
WithResolver(StaticCompositeResolver.Instance);
try
{
byte[] bytes = MessagePackSerializer.Serialize<T>(data, lz4Option);
await File.WriteAllBytesAsync(filePath, bytes);
}
catch (Exception ex)
{
Debug.LogError($"Task Error: {ex.Message}\n{ex.StackTrace}");
}
}
}
}

2
Assets/Scripts/Studio/AssetTool/MessagePackFileManager.cs.meta
View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 592137e8c153e864caf3162a9433b79f

119
Assets/Scripts/Studio/Managers/FBXFileManager.cs
View File

@@ -28,22 +28,17 @@ namespace Studio.AssetTool
public SaveData saveData;
public SharedMaterial sharedMaterial;
private MessagePackFileManager<SaveData> messagePacker;
private bool isSaveTaskComplete = true;
public bool isLoadTaskComplete = true;
public Transform fbxAnchor;
public Action onLoadComplete;
private List<string> filePaths = new List<string>();
private int loadingCount;
public FBXFileManager()
{
dataRepo = new CustomAssetDataRepository();
saveData = new SaveData();
sharedMaterial = new SharedMaterial();
messagePacker = new MessagePackFileManager<SaveData>();
messagePacker.Initialize();
identifier = string.IsNullOrEmpty(identifier) ? "defaultAssetData" : identifier;
fbxAnchor = new GameObject("LocalAssetDataAnchor").transform;
}
@@ -54,7 +49,6 @@ namespace Studio.AssetTool
public void LoadLocalFBXDirectorys(List<string> folderPaths)
{
loadingCount = folderPaths.Count;
foreach (var path in folderPaths)
{
@@ -126,27 +120,6 @@ namespace Studio.AssetTool
}
//StartCoroutine(CoroutineSaveToLocalData(assetDatas, path));
}
public void LoadLocalData()
{
if (isLoadTaskComplete == false)
{
return;
}
string path = Application.streamingAssetsPath + "/baseAssetData";
string filePath = GetLocalPath(path);
if (!CheckFilePathExists(filePath))
{
isLoadTaskComplete = true;
return;
}
// var command = new ActivateMoveGizmoCommand(rtgController);
//CommandInvoker.instance.Invoke(command);
CoroutineRunner.instance.StartCoroutine(CoroutineLoadFromLocalData(filePath));
}
public CustomAssetData GetCustomAssetData(string name)
{
@@ -154,99 +127,7 @@ namespace Studio.AssetTool
//return listAssets.FirstOrDefault(x => x.name == name);
}
string GetLocalPath(string path)
{
if (string.IsNullOrEmpty(path))
{
return Path.Combine(Application.persistentDataPath, identifier);
}
else
{
return path;
}
}
bool CheckFilePathExists(string filePath)
{
if (!System.IO.File.Exists(filePath))
{
Debug.Log("No File Found At : " + filePath);
return false;
}
return true;
}
IEnumerator CoroutineLoadFromLocalData(string filePath)
{
isLoadTaskComplete = false;
Task<SaveData> task = Task<SaveData>.Run(() => messagePacker.LoadAsync(filePath));
yield return new WaitUntil(() => task.IsCompleted);
if (task.Result == null)
{
Debug.LogError("Error on loading local data.");
Debug.LogError("Error file location : " + filePath);
isLoadTaskComplete = true;
yield break;
}
saveData = task.Result;
CoroutineRunner.instance.StartCoroutine(LoadDefaultModelDatas());
isLoadTaskComplete = true;
}
IEnumerator LoadDefaultModelDatas()
{
foreach (var tex in saveData.textureDatas)
{
sharedMaterial.AddTextureData(tex);
}
for (int i = 0; i < saveData.modelDatas.Length; i++)
{
var modelData = saveData.modelDatas[i];
string assetName = modelData.attributes.FirstOrDefault(x => x[0].Equals("assetName"))?[1];
if (dataRepo.TryGetDataFromName(assetName, out var p))
continue;
LoadSaveData(saveData, i);
yield return null;
}
}
void LoadSaveData(SaveData saveData, int index)
{
var modelData = saveData.modelDatas[index];
string assetName = modelData.attributes.FirstOrDefault(x => x[0].Equals("assetName"))?[1];
string folderName = modelData.attributes.FirstOrDefault(x => x[0].Equals("folderName"))?[1];
string createDate = modelData.attributes.FirstOrDefault(x => x[0].Equals("createDate"))?[1];
string lastRevisionDate = modelData.attributes.FirstOrDefault(x => x[0].Equals("lastRevisionDate"))?[1];
string uploadDate = modelData.attributes.FirstOrDefault(x => x[0].Equals("uploadDate"))?[1];
string creator = modelData.attributes.FirstOrDefault(x => x[0].Equals("creator"))?[1];
string manager = modelData.attributes.FirstOrDefault(x => x[0].Equals("manager"))?[1];
Texture2D thumbnail = new Texture2D(1, 1);
thumbnail.LoadImage(saveData.thumbnailDatas[index].data);
GameObject newObject = new GameObject(assetName);
newObject.transform.parent = fbxAnchor;
CustomAssetData assetData = newObject.AddComponent<CustomAssetData>();
assetData.assetName = assetName;
assetData.folderName = folderName;
assetData.createDate = createDate;
assetData.LastRevisionDate = lastRevisionDate;
assetData.UploadDate = uploadDate;
assetData.Creator = creator;
assetData.Manager = manager;
assetData.loadedObject = modelData.LoadModelData(sharedMaterial);
assetData.thumbnail = thumbnail;
assetData.OnLoadComplete();
OnLoadComplete(assetData);
//assetData.onLoadProgress.RemoveAllListeners();
//assetData.onLoadProgress.AddListener((x) => item.onLoadProgress?.Invoke(x));
}
void OnLoadComplete(CustomAssetData assetData)
{

1
Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs
View File

@@ -37,7 +37,6 @@ namespace Studio.Manage
canvas_popup.panel_startsetting.onClick3DFactorySetting += canvas_popup.panel_3dfactorysetting.Active;
canvas_popup.panel_startsetting.onClickAssetSetting += canvas_popup.panel_assetsetting.Active;
canvas_popup.panel_datafiltersetting.onSaveMQTTFilterData += canvas_popup.panel_mqttconnectmodal.SetFilterData;
canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData;
canvas_popup.panel_3dfactorysetting.onUISetting += canvas_popup.panel_dynamicobjectuisetting.SetData;

1
Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs
View File

@@ -23,7 +23,6 @@
canvas_popup.panel_startsetting.onClickMQTTSetting += canvas_popup.panel_mqttsetting.Active;
canvas_popup.panel_startsetting.onClick3DFactorySetting += canvas_popup.panel_3dfactorysetting.Active;
canvas_popup.panel_datafiltersetting.onSaveMQTTFilterData += canvas_popup.panel_mqttconnectmodal.SetFilterData;
canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData;
canvas_popup.panel_3dfactorysetting.onUISetting += canvas_popup.panel_dynamicobjectuisetting.SetData;

4
Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs
View File

@@ -41,7 +41,6 @@ namespace Studio
public Panel_Thumbnail panel_thumbnail;
public Panel_ObjectDistance panel_objectdistance;
public Panel_APIConnectModal panel_apiconnectmodal;
public Panel_MQTTConnectModal panel_mqttconnectmodal;
public Panel_DataFilterSetting panel_datafiltersetting;
public Panel_MultilingualSettingModal panel_multilingualsettingmodal;
public Panel_LoggingModal panel_loggingmodal;
@@ -91,9 +90,6 @@ namespace Studio
panel_apiconnectmodal.onClickFilterButton += dataManager.SetFilterData;
panel_apiconnectmodal.onSaveAPIData += dataManager.SetAPIData;
panel_mqttconnectmodal.onClickFilterButton += dataManager.SetFilterData;
panel_mqttconnectmodal.onSaveMQTTData += dataManager.SetMQTTData;
dataManager.mqttData += panel_datafiltersetting.SetLoadMQTTDataList;
dataManager.apiData += panel_datafiltersetting.SetLoadAPIDataList;

4
Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs
View File

@@ -22,7 +22,6 @@ namespace Studio
public Panel_NewProjectInfo panel_newprojectinfo;
public Panel_OpenProjectInfo panel_openprojectinfo;
public Panel_APIConnectModal panel_apiconnectmodal;
public Panel_MQTTConnectModal panel_mqttconnectmodal;
public Panel_DataFilterSetting panel_datafiltersetting;
public Panel_MultilingualSettingModal panel_multilingualsettingmodal;
public Panel_LoggingModal panel_loggingmodal;
@@ -38,9 +37,6 @@ namespace Studio
panel_apiconnectmodal.onClickFilterButton += dataManager.SetFilterData;
panel_apiconnectmodal.onSaveAPIData += dataManager.SetAPIData;
panel_mqttconnectmodal.onClickFilterButton += dataManager.SetFilterData;
panel_mqttconnectmodal.onSaveMQTTData += dataManager.SetMQTTData;
dataManager.mqttData += panel_datafiltersetting.SetLoadMQTTDataList;
dataManager.apiData += panel_datafiltersetting.SetLoadAPIDataList;

131
Assets/Scripts/Studio/UI/Panel/Panel_MQTTConnectModal.cs
View File

@@ -1,131 +0,0 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace Studio.UI
{
public class Panel_MQTTConnectModal : PanelBase
{
private TextMeshProUGUI Text_Domain;
private TextMeshProUGUI Text_Port;
private RectTransform TopicContent;
private Button Button_AddTopic;
private Button Button_Save;
private UI_DataBindingItem prf_mqttTopicItem;
private List<UI_DataBindingItem> topicItems = new List<UI_DataBindingItem>();
private UI_DataBindingItem selectedTopicItem;
public MQTTData loadMQTTData;
public Action<UI_DataBindingItem> onClickFilterButton;
public Action<SaveMQTTData> onSaveMQTTData;
private void TestDataConnected()
{
var mqttJson = Resources.Load<TextAsset>("MQTTData").text;
loadMQTTData = JsonConvert.DeserializeObject<MQTTData>(mqttJson);
}
public override void AfterAwake()
{
TestDataConnected();
prf_mqttTopicItem = Resources.Load<UI_DataBindingItem>("Prefabs/UI/PRF_DataBindingItemItem");
SetURLText();
Button_AddTopic.onClick.AddListener(AddTopicItem);
Button_Save.onClick.AddListener(Save);
}
//app_config
/// <summary>
/// 설정한 데이터값 가져와 적용
/// </summary>
private void ConnectedData()
{
//string path = Path.Combine(Application.streamingAssetsPath, "app_config.json");
//string json = System.IO.File.ReadAllText(path);
//loadMQTTData = JsonUtility.FromJson<MQTTData>(json);
SetURLText();
}
/// <summary>
/// 도메인 PORT 설정
/// </summary>
private void SetURLText()
{
Text_Domain.SetText(loadMQTTData.domain);
Text_Port.SetText(loadMQTTData.port);
}
private void OnClickFilterButton(UI_DataBindingItem item)
{
selectedTopicItem = item;
onClickFilterButton?.Invoke(selectedTopicItem);
}
/// <summary>
/// 토픽 아이템 추가
/// </summary>
private void AddTopicItem()
{
var item = Instantiate(prf_mqttTopicItem, TopicContent);
item.onRemove += RemoveTopicItem;
item.onFilter += OnClickFilterButton;
topicItems.Add(item);
Button_AddTopic.transform.SetAsLastSibling();
}
/// <summary>
/// TopicItem 제거
/// </summary>
/// <param name="item"></param>
private void RemoveTopicItem(UI_DataBindingItem item)
{
topicItems.Remove(item);
Destroy(item.gameObject);
}
/// <summary>
/// MQTT 데이터 추가
/// </summary>
private void Save()
{
var saveData = GetMQTTData();
onSaveMQTTData?.Invoke(saveData);
}
/// <summary>
///
/// </summary>
/// <param name="filterData"></param>
public void SetFilterData(SaveFilterData filterData)
{
if (selectedTopicItem == null)
return;
selectedTopicItem.SetFilterData(filterData);
selectedTopicItem.SetChangedInputFieldTopicName();
}
/// <summary>
/// MQTTData 가져오기
/// </summary>
/// <returns></returns>
private SaveMQTTData GetMQTTData()
{
SaveMQTTData saveMQTTData = new SaveMQTTData();
saveMQTTData.domain = Text_Domain.text;
saveMQTTData.port = Text_Port.text;
foreach (var topicItem in topicItems)
{
saveMQTTData.saveFilterData.Add(topicItem.GetFilterData());
}
return saveMQTTData;
}
}
}

2
Assets/Scripts/Studio/UI/Panel/Panel_MQTTConnectModal.cs.meta
View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 10071fcfca7c256488c4fcad74083bf1