diff --git a/Assets/Animations/ObjectDistanceLine.cs b/Assets/Animations/ObjectDistanceLine.cs index 50371b6e..72c9e189 100644 --- a/Assets/Animations/ObjectDistanceLine.cs +++ b/Assets/Animations/ObjectDistanceLine.cs @@ -4,7 +4,7 @@ using System.Linq; using UnityEngine; using UnityEditor; -namespace XED +namespace Studio { //TODO::areabox°¡ ¾Æ´Ï¶ó TwinObject¸¦ ´ë»óÀ¸·Î µ¿ÀÛÇϵµ·Ï ¼öÁ¤ public class ObjectDistanceLine : MonoBehaviour diff --git a/Assets/Editor/WI/FontChanger.cs b/Assets/Editor/WI/FontChanger.cs index 17e57f5d..4880fe62 100644 --- a/Assets/Editor/WI/FontChanger.cs +++ b/Assets/Editor/WI/FontChanger.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEngine; using UnityEngine.SceneManagement; -namespace XED.UI +namespace Studio.UI { public class FontChanger : MonoBehaviour { diff --git a/Assets/Editor/WI/INIEditor.cs b/Assets/Editor/WI/INIEditor.cs index 5cb8b571..d79e1772 100644 --- a/Assets/Editor/WI/INIEditor.cs +++ b/Assets/Editor/WI/INIEditor.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using UnityEditor; using UnityEngine; using XRLib; -using XED; +using Studio; [CustomAsset(".ini")] diff --git a/Assets/Editor/WI/TwinObjectPreprocessingHelper.cs b/Assets/Editor/WI/TwinObjectPreprocessingHelper.cs index 87e7dae7..40f73e85 100644 --- a/Assets/Editor/WI/TwinObjectPreprocessingHelper.cs +++ b/Assets/Editor/WI/TwinObjectPreprocessingHelper.cs @@ -10,7 +10,7 @@ using UnityEditor.AddressableAssets.Settings; using UnityEditor.AddressableAssets; #endif -namespace XED +namespace Studio { public class TwinObjectPreprocessingHelper { diff --git a/Assets/NewStudioJYM/Scripts/ConnectDataManager.cs b/Assets/NewStudioJYM/Scripts/ConnectDataManager.cs index 40efefff..78221625 100644 --- a/Assets/NewStudioJYM/Scripts/ConnectDataManager.cs +++ b/Assets/NewStudioJYM/Scripts/ConnectDataManager.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace XED +namespace Studio { public class ConnectDataManager : MonoBehaviour { diff --git a/Assets/NewStudioJYM/Scripts/Panel_APIConnectModal.cs b/Assets/NewStudioJYM/Scripts/Panel_APIConnectModal.cs index 4b6df77e..338dbdec 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_APIConnectModal.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_APIConnectModal.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; -namespace XED +namespace Studio { public class Panel_APIConnectModal : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_AlarmConnectModal.cs b/Assets/NewStudioJYM/Scripts/Panel_AlarmConnectModal.cs index 87d8dc60..f342d63e 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_AlarmConnectModal.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_AlarmConnectModal.cs @@ -7,7 +7,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio { public class Panel_AlarmConnectModal : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_DataConnectModal.cs b/Assets/NewStudioJYM/Scripts/Panel_DataConnectModal.cs index 55ee3da0..76c5cc6b 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_DataConnectModal.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_DataConnectModal.cs @@ -9,7 +9,7 @@ using UnityEngine.UI; using XRLib; using XRLib.UI; -namespace XED +namespace Studio { public class Panel_DataConnectModal : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_DataFilterSetting.cs b/Assets/NewStudioJYM/Scripts/Panel_DataFilterSetting.cs index fec688e9..490f3412 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_DataFilterSetting.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_DataFilterSetting.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio { public class Panel_DataFilterSetting : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_DynamicObjectInfo.cs b/Assets/NewStudioJYM/Scripts/Panel_DynamicObjectInfo.cs index e59e35aa..c4480ebd 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_DynamicObjectInfo.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_DynamicObjectInfo.cs @@ -2,14 +2,14 @@ using System.Collections.Generic; using TMPro; using UnityEngine; using XRLib.UI; -using XED.Manage; +using Studio.Manage; using System.Linq; -using XED.Core; -using XED.Command; +using Studio.Core; +using Studio.Command; using UnityEngine.UI; using System; -namespace XED.UI +namespace Studio.UI { public class Panel_DynamicObjectInfo : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_DynamicObjectUISetting.cs b/Assets/NewStudioJYM/Scripts/Panel_DynamicObjectUISetting.cs index 9e157317..a6cb83ea 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_DynamicObjectUISetting.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_DynamicObjectUISetting.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using XRLib.UI; -namespace XED +namespace Studio { public class Panel_DynamicObjectUISetting : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_ExitChecker.cs b/Assets/NewStudioJYM/Scripts/Panel_ExitChecker.cs index 23064a90..9aef112d 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_ExitChecker.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_ExitChecker.cs @@ -3,7 +3,7 @@ using XRLib.UI; using UnityEngine.UI; using System; -namespace XED +namespace Studio { public class Panel_ExitChecker : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_GenerateDynamicObject.cs b/Assets/NewStudioJYM/Scripts/Panel_GenerateDynamicObject.cs index cd2a57f1..edcf8edc 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_GenerateDynamicObject.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_GenerateDynamicObject.cs @@ -7,7 +7,7 @@ using Newtonsoft.Json; using System; using XRLib; -namespace XED +namespace Studio { public class Panel_GenerateDynamicObject : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_LoggingModal.cs b/Assets/NewStudioJYM/Scripts/Panel_LoggingModal.cs index e3722e3f..7b842d56 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_LoggingModal.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_LoggingModal.cs @@ -1,7 +1,7 @@ using UnityEngine; using XRLib.UI; -namespace XED +namespace Studio { public class Panel_LoggingModal : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_MQTTConnectModal.cs b/Assets/NewStudioJYM/Scripts/Panel_MQTTConnectModal.cs index 1b13978a..1d7b4b26 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_MQTTConnectModal.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_MQTTConnectModal.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio { public class Panel_MQTTConnectModal : PanelBase { diff --git a/Assets/NewStudioJYM/Scripts/Panel_MultilingualSettingModal.cs b/Assets/NewStudioJYM/Scripts/Panel_MultilingualSettingModal.cs index 905370d2..bb951661 100644 --- a/Assets/NewStudioJYM/Scripts/Panel_MultilingualSettingModal.cs +++ b/Assets/NewStudioJYM/Scripts/Panel_MultilingualSettingModal.cs @@ -10,7 +10,7 @@ using TriLibCore.SFB; using System.Text; using Studio.UVC.UI; -namespace XED +namespace Studio { [Serializable] public class LanguageConfig diff --git a/Assets/NewStudioJYM/Scripts/QuitManager.cs b/Assets/NewStudioJYM/Scripts/QuitManager.cs index 307824d4..503bee41 100644 --- a/Assets/NewStudioJYM/Scripts/QuitManager.cs +++ b/Assets/NewStudioJYM/Scripts/QuitManager.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace XED +namespace Studio { public class QuitManager : MonoBehaviour diff --git a/Assets/NewStudioJYM/Scripts/StudioJYMCanvas_Popup.cs b/Assets/NewStudioJYM/Scripts/StudioJYMCanvas_Popup.cs index 7c5a059d..3c84aad2 100644 --- a/Assets/NewStudioJYM/Scripts/StudioJYMCanvas_Popup.cs +++ b/Assets/NewStudioJYM/Scripts/StudioJYMCanvas_Popup.cs @@ -1,10 +1,10 @@ using UnityEngine; using UnityEngine.UI; -using XED.UI; +using Studio.UI; using XRLib; using XRLib.UI; -namespace XED +namespace Studio { public class StudioJYMCanvas_Popup : CanvasBase, ISingle { diff --git a/Assets/NewStudioJYM/Scripts/StudioJYMPopupCanvasHandler.cs b/Assets/NewStudioJYM/Scripts/StudioJYMPopupCanvasHandler.cs index d6ff9250..505d6f8c 100644 --- a/Assets/NewStudioJYM/Scripts/StudioJYMPopupCanvasHandler.cs +++ b/Assets/NewStudioJYM/Scripts/StudioJYMPopupCanvasHandler.cs @@ -1,7 +1,7 @@ using UnityEngine; -using XED.Manage; +using Studio.Manage; -namespace XED +namespace Studio { public class StudioJYMPopupCanvasHandler : CanvasEventHandler { diff --git a/Assets/NewStudioJYM/Scripts/TestAPIData.cs b/Assets/NewStudioJYM/Scripts/TestAPIData.cs index 582d45f8..87391b76 100644 --- a/Assets/NewStudioJYM/Scripts/TestAPIData.cs +++ b/Assets/NewStudioJYM/Scripts/TestAPIData.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace XED +namespace Studio { #region LoadData [Serializable] diff --git a/Assets/NewStudioJYM/Scripts/UI_AddOtherDataItem.cs b/Assets/NewStudioJYM/Scripts/UI_AddOtherDataItem.cs index 6b0d6169..26b0d0c3 100644 --- a/Assets/NewStudioJYM/Scripts/UI_AddOtherDataItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_AddOtherDataItem.cs @@ -5,7 +5,7 @@ using System; using XRLib.UI; using UnityEngine.UI; -namespace XED +namespace Studio { public class UI_AddOtherDataItem : UIBase { diff --git a/Assets/NewStudioJYM/Scripts/UI_AddOtherDataTypeItem.cs b/Assets/NewStudioJYM/Scripts/UI_AddOtherDataTypeItem.cs index f2bf4e85..788f27f1 100644 --- a/Assets/NewStudioJYM/Scripts/UI_AddOtherDataTypeItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_AddOtherDataTypeItem.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio { public enum StorageDataType { diff --git a/Assets/NewStudioJYM/Scripts/UI_AlarmDataItem.cs b/Assets/NewStudioJYM/Scripts/UI_AlarmDataItem.cs index e30805c2..b02f952f 100644 --- a/Assets/NewStudioJYM/Scripts/UI_AlarmDataItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_AlarmDataItem.cs @@ -5,7 +5,7 @@ using TMPro; using System; using System.Collections.Generic; -namespace XED +namespace Studio { public class UI_AlarmDataItem : UIBase { diff --git a/Assets/NewStudioJYM/Scripts/UI_ComparisonSettingItem.cs b/Assets/NewStudioJYM/Scripts/UI_ComparisonSettingItem.cs index ebd854ee..b684a930 100644 --- a/Assets/NewStudioJYM/Scripts/UI_ComparisonSettingItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_ComparisonSettingItem.cs @@ -6,7 +6,7 @@ using UnityEngine.UI; using System.Linq; using System; -namespace XED +namespace Studio { public class UI_ComparisonSettingItem : UIBase diff --git a/Assets/NewStudioJYM/Scripts/UI_DataBindingItem.cs b/Assets/NewStudioJYM/Scripts/UI_DataBindingItem.cs index e5dc5f32..b8204f87 100644 --- a/Assets/NewStudioJYM/Scripts/UI_DataBindingItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_DataBindingItem.cs @@ -4,7 +4,7 @@ using TMPro; using UnityEngine.UI; using System; -namespace XED +namespace Studio { public class UI_DataBindingItem : UIBase { diff --git a/Assets/NewStudioJYM/Scripts/UI_DataSettingItem.cs b/Assets/NewStudioJYM/Scripts/UI_DataSettingItem.cs index 4ab6c41d..591c045d 100644 --- a/Assets/NewStudioJYM/Scripts/UI_DataSettingItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_DataSettingItem.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio { public class UI_DataSettingItem : UIBase { diff --git a/Assets/NewStudioJYM/Scripts/UI_DataTypeSelectedItem.cs b/Assets/NewStudioJYM/Scripts/UI_DataTypeSelectedItem.cs index 1bc82bfa..c9130c22 100644 --- a/Assets/NewStudioJYM/Scripts/UI_DataTypeSelectedItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_DataTypeSelectedItem.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio { public enum DataType { diff --git a/Assets/NewStudioJYM/Scripts/UI_DynamicDataStyleItem.cs b/Assets/NewStudioJYM/Scripts/UI_DynamicDataStyleItem.cs index 0e6ff6e5..2a995120 100644 --- a/Assets/NewStudioJYM/Scripts/UI_DynamicDataStyleItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_DynamicDataStyleItem.cs @@ -4,7 +4,7 @@ using TMPro; using System; using System.Collections.Generic; -namespace XED +namespace Studio { public enum DataStyle { diff --git a/Assets/NewStudioJYM/Scripts/UI_DynamicObjectItem.cs b/Assets/NewStudioJYM/Scripts/UI_DynamicObjectItem.cs index bde33570..5690554b 100644 --- a/Assets/NewStudioJYM/Scripts/UI_DynamicObjectItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_DynamicObjectItem.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using System.Collections.Generic; using System; -namespace XED +namespace Studio { public class UI_DynamicObjectItem : UIBase { diff --git a/Assets/NewStudioJYM/Scripts/UI_DynamicObjectUISettingItem.cs b/Assets/NewStudioJYM/Scripts/UI_DynamicObjectUISettingItem.cs index 557cf471..3ecf408d 100644 --- a/Assets/NewStudioJYM/Scripts/UI_DynamicObjectUISettingItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_DynamicObjectUISettingItem.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; using TMPro; using System; -namespace XED +namespace Studio { public enum UIDesignStyle { diff --git a/Assets/NewStudioJYM/Scripts/UI_EventParameterItem.cs b/Assets/NewStudioJYM/Scripts/UI_EventParameterItem.cs index 37ae6de1..939ec173 100644 --- a/Assets/NewStudioJYM/Scripts/UI_EventParameterItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_EventParameterItem.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; using System; -namespace XED +namespace Studio { public class UI_EventParameterItem : UIBase { diff --git a/Assets/NewStudioJYM/Scripts/UI_LoadDataHierarchyItem.cs b/Assets/NewStudioJYM/Scripts/UI_LoadDataHierarchyItem.cs index 62c74042..74723579 100644 --- a/Assets/NewStudioJYM/Scripts/UI_LoadDataHierarchyItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_LoadDataHierarchyItem.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; using System; using System.Text; -namespace XED +namespace Studio { public class UI_LoadDataHierarchyItem : UIBase { diff --git a/Assets/NewStudioJYM/Scripts/UI_MatchingTypeDataItem.cs b/Assets/NewStudioJYM/Scripts/UI_MatchingTypeDataItem.cs index e9ba9a90..f94ef554 100644 --- a/Assets/NewStudioJYM/Scripts/UI_MatchingTypeDataItem.cs +++ b/Assets/NewStudioJYM/Scripts/UI_MatchingTypeDataItem.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio { public enum MatchingDataType { diff --git a/Assets/NewStudioPGD/DashBoard/SDIDashboardTest.cs b/Assets/NewStudioPGD/DashBoard/SDIDashboardTest.cs index bfc5e16e..0cd442d5 100644 --- a/Assets/NewStudioPGD/DashBoard/SDIDashboardTest.cs +++ b/Assets/NewStudioPGD/DashBoard/SDIDashboardTest.cs @@ -5,9 +5,9 @@ using Studio.UVC.UI; using System.Collections.Generic; using UnityEngine; using UnityEngine.Rendering; -using XED.UI; +using Studio.UI; -namespace XED +namespace Studio { public class SDIDashboardTest : MonoBehaviour { diff --git a/Assets/NewStudioPGD/DashBoard/UISidePanel.cs b/Assets/NewStudioPGD/DashBoard/UISidePanel.cs index b62dd763..2b0ffce9 100644 --- a/Assets/NewStudioPGD/DashBoard/UISidePanel.cs +++ b/Assets/NewStudioPGD/DashBoard/UISidePanel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Xml.Linq; using UnityEngine; -using XED; +using Studio; namespace Studio.UVC.UI { diff --git a/Assets/NewStudioPGD/Scripts/Command/ExitProgramCommand.cs b/Assets/NewStudioPGD/Scripts/Command/ExitProgramCommand.cs index a3029580..b35ccd75 100644 --- a/Assets/NewStudioPGD/Scripts/Command/ExitProgramCommand.cs +++ b/Assets/NewStudioPGD/Scripts/Command/ExitProgramCommand.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace XED.Command +namespace Studio.Command { public class ExitProgramCommand : IIrreversibleCommand { diff --git a/Assets/NewStudioPGD/Scripts/Manager/StudioPopupCanvasHandler.cs b/Assets/NewStudioPGD/Scripts/Manager/StudioPopupCanvasHandler.cs index 3fc8ba94..9b577a16 100644 --- a/Assets/NewStudioPGD/Scripts/Manager/StudioPopupCanvasHandler.cs +++ b/Assets/NewStudioPGD/Scripts/Manager/StudioPopupCanvasHandler.cs @@ -1,4 +1,4 @@ -namespace XED.Manage +namespace Studio.Manage { public class StudioPopupCanvasHandler : CanvasEventHandler { diff --git a/Assets/NewStudioPGD/Scripts/UI/Canvas/Canvas_Studio_Popup.cs b/Assets/NewStudioPGD/Scripts/UI/Canvas/Canvas_Studio_Popup.cs index f0d58b39..ccdf4567 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Canvas/Canvas_Studio_Popup.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Canvas/Canvas_Studio_Popup.cs @@ -1,9 +1,9 @@ using UnityEngine; -using XED.Manage; -using XED.UI; +using Studio.Manage; +using Studio.UI; using XRLib.UI; -namespace XED +namespace Studio { public class Canvas_Studio_Popup : CanvasBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Canvas/StudioCanvas_Static.cs b/Assets/NewStudioPGD/Scripts/UI/Canvas/StudioCanvas_Static.cs index 08030657..d82397dc 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Canvas/StudioCanvas_Static.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Canvas/StudioCanvas_Static.cs @@ -1,7 +1,7 @@ -using XED.Command; +using Studio.Command; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class StudioCanvas_Static : CanvasBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Element/ProjectTemplateDropdown.cs b/Assets/NewStudioPGD/Scripts/UI/Element/ProjectTemplateDropdown.cs index 4134793e..af87c1ba 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Element/ProjectTemplateDropdown.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Element/ProjectTemplateDropdown.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.EventSystems; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class ProjectTemplateDropdown : UIBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Element/UI_AppSettingItem.cs b/Assets/NewStudioPGD/Scripts/UI/Element/UI_AppSettingItem.cs index 4ea18d34..9ddb89aa 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Element/UI_AppSettingItem.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Element/UI_AppSettingItem.cs @@ -5,7 +5,7 @@ using TMPro; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class UI_AppSettingItem : UIBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Element/UI_AuthenticationItem.cs b/Assets/NewStudioPGD/Scripts/UI/Element/UI_AuthenticationItem.cs index 448b29ce..d319f682 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Element/UI_AuthenticationItem.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Element/UI_AuthenticationItem.cs @@ -5,7 +5,7 @@ using TMPro; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class UI_AuthenticationItem : UIBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Element/UI_LogicItem.cs b/Assets/NewStudioPGD/Scripts/UI/Element/UI_LogicItem.cs index 3e9bc761..5dd85098 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Element/UI_LogicItem.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Element/UI_LogicItem.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class UI_LogicItem : UIBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Element/UI_QuickStartItem.cs b/Assets/NewStudioPGD/Scripts/UI/Element/UI_QuickStartItem.cs index aae18275..543364a3 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Element/UI_QuickStartItem.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Element/UI_QuickStartItem.cs @@ -5,7 +5,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class UI_QuickStartItem : UIBase, IPointerDownHandler { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_AppLogicList.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_AppLogicList.cs index 91a9f7ad..6db9c598 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_AppLogicList.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_AppLogicList.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using UnityEngine; -using XED.Manage; +using Studio.Manage; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_AppLogicList : PanelBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_AppSetting.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_AppSetting.cs index e63bdf01..3aec445e 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_AppSetting.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_AppSetting.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_AppSetting : PanelBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_Authentication.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_Authentication.cs index 1319bdba..e93eedbf 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_Authentication.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_Authentication.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_Authentication : PanelBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_Inspector.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_Inspector.cs index f6c06d0f..735889d2 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_Inspector.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_Inspector.cs @@ -1,7 +1,7 @@ using UnityEngine; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_Inspector : PanelBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_NewProjectInfo.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_NewProjectInfo.cs index 6f362a54..9b4cbefd 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_NewProjectInfo.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_NewProjectInfo.cs @@ -7,7 +7,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_NewProjectInfo : PanelBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_OpenProjectInfo.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_OpenProjectInfo.cs index 529ad932..2bbadf3b 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_OpenProjectInfo.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_OpenProjectInfo.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_OpenProjectInfo : PanelBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_QuickStart.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_QuickStart.cs index 9aa90170..f1bc63ae 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_QuickStart.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_QuickStart.cs @@ -8,7 +8,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_QuickStart : PanelBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_SelectLogic.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_SelectLogic.cs index f7aa8e25..ed56afa3 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_SelectLogic.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_SelectLogic.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_SelectLogic : PanelBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_StartImage.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_StartImage.cs index 9799c2a8..56753a97 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_StartImage.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_StartImage.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_StartImage : PanelBase { diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/StudioPanel_Topbar.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/StudioPanel_Topbar.cs index ea3964f9..7a336719 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/StudioPanel_Topbar.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/StudioPanel_Topbar.cs @@ -2,7 +2,7 @@ using System; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class StudioPanel_Topbar : PanelBase { diff --git a/Assets/Scripts/Assets/Gizmo/CameraGizmoListener.cs b/Assets/Scripts/Assets/Gizmo/CameraGizmoListener.cs index ed7618cc..409a7ef6 100644 --- a/Assets/Scripts/Assets/Gizmo/CameraGizmoListener.cs +++ b/Assets/Scripts/Assets/Gizmo/CameraGizmoListener.cs @@ -2,7 +2,7 @@ using System.Collections; using UnityEngine; -namespace XED.RuntimeGizmo +namespace Studio.RuntimeGizmo { public class CameraGizmoListener : MonoBehaviour { diff --git a/Assets/Scripts/Assets/Gizmo/CameraMovement.cs b/Assets/Scripts/Assets/Gizmo/CameraMovement.cs index 4ef2aba6..e0db3057 100644 --- a/Assets/Scripts/Assets/Gizmo/CameraMovement.cs +++ b/Assets/Scripts/Assets/Gizmo/CameraMovement.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace XED.RuntimeGizmo +namespace Studio.RuntimeGizmo { public class CameraMovement : MonoBehaviour { diff --git a/Assets/Scripts/Assets/Gizmo/GizmoController.cs b/Assets/Scripts/Assets/Gizmo/GizmoController.cs index aef88b14..06495cf7 100644 --- a/Assets/Scripts/Assets/Gizmo/GizmoController.cs +++ b/Assets/Scripts/Assets/Gizmo/GizmoController.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; using UnityEngine; using XRLib; -using XED.UI; +using Studio.UI; -namespace XED.RuntimeGizmo +namespace Studio.RuntimeGizmo { public class GizmoController : MonoBehaviour, ISingle { diff --git a/Assets/Scripts/Assets/Gizmo/RTGController.cs b/Assets/Scripts/Assets/Gizmo/RTGController.cs index cff4925b..8a24a0b7 100644 --- a/Assets/Scripts/Assets/Gizmo/RTGController.cs +++ b/Assets/Scripts/Assets/Gizmo/RTGController.cs @@ -1,11 +1,11 @@ using RTG; using System.Collections.Generic; using UnityEngine; -using XED.Command; -using XED.Core; -using XED.Manage; +using Studio.Command; +using Studio.Core; +using Studio.Manage; -namespace XED.RuntimeGizmo +namespace Studio.RuntimeGizmo { public class RTGController //: MonoBehaviour { diff --git a/Assets/Scripts/Assets/Gizmo/SceneGizmoController.cs b/Assets/Scripts/Assets/Gizmo/SceneGizmoController.cs index 0bed1159..1b98ec12 100644 --- a/Assets/Scripts/Assets/Gizmo/SceneGizmoController.cs +++ b/Assets/Scripts/Assets/Gizmo/SceneGizmoController.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace XED.RuntimeGizmo +namespace Studio.RuntimeGizmo { public enum GizmoComponent { None = -1, Center = 0, XNegative = 1, XPositive = 2, YNegative = 3, YPositive = 4, ZNegative = 5, ZPositive = 6 }; diff --git a/Assets/Scripts/Assets/Gizmo/SceneGizmoRenderer.cs b/Assets/Scripts/Assets/Gizmo/SceneGizmoRenderer.cs index 0e6d7434..b1008774 100644 --- a/Assets/Scripts/Assets/Gizmo/SceneGizmoRenderer.cs +++ b/Assets/Scripts/Assets/Gizmo/SceneGizmoRenderer.cs @@ -5,7 +5,7 @@ using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.UI; -namespace XED.RuntimeGizmo +namespace Studio.RuntimeGizmo { [System.Serializable] public class ComponentClickedEvent : UnityEvent diff --git a/Assets/Scripts/BoxHighLighter.cs b/Assets/Scripts/BoxHighLighter.cs index 1855fb7a..b7a49c11 100644 --- a/Assets/Scripts/BoxHighLighter.cs +++ b/Assets/Scripts/BoxHighLighter.cs @@ -1,9 +1,9 @@ using UnityEngine; using UnityEngine.Pool; -using XED.Interfaces; -using static XED.Wall; +using Studio.Interfaces; +using static Studio.Wall; -namespace XED +namespace Studio { public class BoxHighLighter : MonoBehaviour, IPooledObject { diff --git a/Assets/Scripts/Canvas_Component.cs b/Assets/Scripts/Canvas_Component.cs index 9987b190..b554085f 100644 --- a/Assets/Scripts/Canvas_Component.cs +++ b/Assets/Scripts/Canvas_Component.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using UnityEngine.UI.Extensions; -using XED.Manage; +using Studio.Manage; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Canvas_Component : CanvasBase { diff --git a/Assets/Scripts/ConnectionHandlePoint.cs b/Assets/Scripts/ConnectionHandlePoint.cs index b7c59388..15e0934b 100644 --- a/Assets/Scripts/ConnectionHandlePoint.cs +++ b/Assets/Scripts/ConnectionHandlePoint.cs @@ -4,10 +4,10 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using UnityEngine.UI.Extensions; using XRLib.UI; -using XED.UI; +using Studio.UI; using static DrawLine; -namespace XED +namespace Studio { public class ConnectionHandlePoint : UIBase, IPointerDownHandler { diff --git a/Assets/Scripts/CustomMessagePackResolver.cs b/Assets/Scripts/CustomMessagePackResolver.cs index 2b14b42b..bc2060ea 100644 --- a/Assets/Scripts/CustomMessagePackResolver.cs +++ b/Assets/Scripts/CustomMessagePackResolver.cs @@ -10,17 +10,17 @@ public class CustomMessagePackResolver : IFormatterResolver private static readonly Dictionary formatters = new Dictionary { - { typeof(XED.Manage.MaterialPropertyData), new MessagePack.Formatters.XED.Manage.MaterialPropertyDataFormatter() }, - { typeof(XED.Manage.ModelData), new MessagePack.Formatters.XED.Manage.ModelDataFormatter() }, - { typeof(XED.Manage.SaveData), new MessagePack.Formatters.XED.Manage.SaveDataFormatter() }, - { typeof(XED.Manage.SavedModelData), new MessagePack.Formatters.XED.Manage.SavedModelDataFormatter() }, - { typeof(XED.Manage.SerializableMesh), new MessagePack.Formatters.XED.Manage.SerializableMeshFormatter() }, - { typeof(XED.Manage.SerializableQuaternion), new MessagePack.Formatters.XED.Manage.SerializableQuaternionFormatter() }, - { typeof(XED.Manage.SerializableVector2), new MessagePack.Formatters.XED.Manage.SerializableVector2Formatter() }, - { typeof(XED.Manage.SerializableVector3), new MessagePack.Formatters.XED.Manage.SerializableVector3Formatter() }, - { typeof(XED.Manage.SubmeshData), new MessagePack.Formatters.XED.Manage.SubmeshDataFormatter() }, - { typeof(XED.Manage.TextureData), new MessagePack.Formatters.XED.Manage.TextureDataFormatter() }, - { typeof(XED.Manage.TransformData), new MessagePack.Formatters.XED.Manage.TransformDataFormatter() }, + { typeof(Studio.Manage.MaterialPropertyData), new MessagePack.Formatters.XED.Manage.MaterialPropertyDataFormatter() }, + { typeof(Studio.Manage.ModelData), new MessagePack.Formatters.XED.Manage.ModelDataFormatter() }, + { typeof(Studio.Manage.SaveData), new MessagePack.Formatters.XED.Manage.SaveDataFormatter() }, + { typeof(Studio.Manage.SavedModelData), new MessagePack.Formatters.XED.Manage.SavedModelDataFormatter() }, + { typeof(Studio.Manage.SerializableMesh), new MessagePack.Formatters.XED.Manage.SerializableMeshFormatter() }, + { typeof(Studio.Manage.SerializableQuaternion), new MessagePack.Formatters.XED.Manage.SerializableQuaternionFormatter() }, + { typeof(Studio.Manage.SerializableVector2), new MessagePack.Formatters.XED.Manage.SerializableVector2Formatter() }, + { typeof(Studio.Manage.SerializableVector3), new MessagePack.Formatters.XED.Manage.SerializableVector3Formatter() }, + { typeof(Studio.Manage.SubmeshData), new MessagePack.Formatters.XED.Manage.SubmeshDataFormatter() }, + { typeof(Studio.Manage.TextureData), new MessagePack.Formatters.XED.Manage.TextureDataFormatter() }, + { typeof(Studio.Manage.TransformData), new MessagePack.Formatters.XED.Manage.TransformDataFormatter() }, }; public IMessagePackFormatter GetFormatter() diff --git a/Assets/Scripts/Examples/AutoFactory/AGVLift.cs b/Assets/Scripts/Examples/AutoFactory/AGVLift.cs index 64d54c1b..0a38b260 100644 --- a/Assets/Scripts/Examples/AutoFactory/AGVLift.cs +++ b/Assets/Scripts/Examples/AutoFactory/AGVLift.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace XED +namespace Studio { public class AGVLift : MonoBehaviour { diff --git a/Assets/Scripts/Examples/AutoFactory/AGVMap.cs b/Assets/Scripts/Examples/AutoFactory/AGVMap.cs index 1fb1340a..048dd840 100644 --- a/Assets/Scripts/Examples/AutoFactory/AGVMap.cs +++ b/Assets/Scripts/Examples/AutoFactory/AGVMap.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEngine; using XRLib; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class AGVMap : MonoBehaviour, ISingle { diff --git a/Assets/Scripts/Examples/AutoFactory/AGVMapEditor.cs b/Assets/Scripts/Examples/AutoFactory/AGVMapEditor.cs index 0c04999e..79c75590 100644 --- a/Assets/Scripts/Examples/AutoFactory/AGVMapEditor.cs +++ b/Assets/Scripts/Examples/AutoFactory/AGVMapEditor.cs @@ -2,9 +2,9 @@ using Newtonsoft.Json; using System; using UnityEditor; using UnityEngine; -using XED.VirtualFactory; +using Studio.VirtualFactory; -namespace XED.EditorUtil +namespace Studio.EditorUtil { #if UNITY_EDITOR [CustomEditor(typeof(AGVMap))] diff --git a/Assets/Scripts/Examples/AutoFactory/AGVNeedsScanner.cs b/Assets/Scripts/Examples/AutoFactory/AGVNeedsScanner.cs index a7cf163b..150867aa 100644 --- a/Assets/Scripts/Examples/AutoFactory/AGVNeedsScanner.cs +++ b/Assets/Scripts/Examples/AutoFactory/AGVNeedsScanner.cs @@ -1,8 +1,8 @@ using NUnit.Framework; using System.Collections.Generic; -using XED.Manage; +using Studio.Manage; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class AGVNeedsScanner : NeedsScanner { diff --git a/Assets/Scripts/Examples/AutoFactory/AGVNodeEditor.cs b/Assets/Scripts/Examples/AutoFactory/AGVNodeEditor.cs index 1e734c52..5c52e4f6 100644 --- a/Assets/Scripts/Examples/AutoFactory/AGVNodeEditor.cs +++ b/Assets/Scripts/Examples/AutoFactory/AGVNodeEditor.cs @@ -1,10 +1,10 @@ -namespace XED.EditorUtil +namespace Studio.EditorUtil { using System; using UnityEditor; using UnityEngine; - using XED.VirtualFactory; + using Studio.VirtualFactory; #if UNITY_EDITOR [CustomEditor(typeof(AGVNode))] public class AGVNodeEditor : Editor diff --git a/Assets/Scripts/Examples/AutoFactory/NeedsScanner.cs b/Assets/Scripts/Examples/AutoFactory/NeedsScanner.cs index ba993796..15525d93 100644 --- a/Assets/Scripts/Examples/AutoFactory/NeedsScanner.cs +++ b/Assets/Scripts/Examples/AutoFactory/NeedsScanner.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public abstract class NeedsScanner { diff --git a/Assets/Scripts/Examples/AutoFactory/ResourceNeedsScanner.cs b/Assets/Scripts/Examples/AutoFactory/ResourceNeedsScanner.cs index 18ce01c7..a24d98ed 100644 --- a/Assets/Scripts/Examples/AutoFactory/ResourceNeedsScanner.cs +++ b/Assets/Scripts/Examples/AutoFactory/ResourceNeedsScanner.cs @@ -1,6 +1,6 @@ using System; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class ResourceNeedsScanner : NeedsScanner { diff --git a/Assets/Scripts/Examples/AutoFactory/StackerCraneNeedsScanner.cs b/Assets/Scripts/Examples/AutoFactory/StackerCraneNeedsScanner.cs index c2acb0b3..4b8af1f6 100644 --- a/Assets/Scripts/Examples/AutoFactory/StackerCraneNeedsScanner.cs +++ b/Assets/Scripts/Examples/AutoFactory/StackerCraneNeedsScanner.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerCraneNeedsScanner : NeedsScanner { diff --git a/Assets/Scripts/Examples/AutoFactory/VirtualFactoryManager.cs b/Assets/Scripts/Examples/AutoFactory/VirtualFactoryManager.cs index 586baee1..1481a1c4 100644 --- a/Assets/Scripts/Examples/AutoFactory/VirtualFactoryManager.cs +++ b/Assets/Scripts/Examples/AutoFactory/VirtualFactoryManager.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using UnityEditor; using UnityEngine; -using XED.Manage; -using XED.VirtualFactory; +using Studio.Manage; +using Studio.VirtualFactory; -namespace XED +namespace Studio { public enum FactoryNeeds { diff --git a/Assets/Scripts/GeneratedMessagePackResolver.cs b/Assets/Scripts/GeneratedMessagePackResolver.cs index 040dd495..4c087db5 100644 --- a/Assets/Scripts/GeneratedMessagePackResolver.cs +++ b/Assets/Scripts/GeneratedMessagePackResolver.cs @@ -49,29 +49,29 @@ namespace MessagePack.Resolvers { lookup = new global::System.Collections.Generic.Dictionary(23) { - { typeof(global::XED.Manage.MaterialPropertyData[]), 0 }, - { typeof(global::XED.Manage.ModelData[]), 1 }, - { typeof(global::XED.Manage.SavedModelData[]), 2 }, - { typeof(global::XED.Manage.SerializableVector2[]), 3 }, - { typeof(global::XED.Manage.SerializableVector3[]), 4 }, - { typeof(global::XED.Manage.SerializableVector4[]), 5 }, - { typeof(global::XED.Manage.SubmeshData[]), 6 }, - { typeof(global::XED.Manage.TextureData[]), 7 }, - { typeof(global::XED.Manage.ThumbnailData[]), 8 }, + { typeof(global::Studio.Manage.MaterialPropertyData[]), 0 }, + { typeof(global::Studio.Manage.ModelData[]), 1 }, + { typeof(global::Studio.Manage.SavedModelData[]), 2 }, + { typeof(global::Studio.Manage.SerializableVector2[]), 3 }, + { typeof(global::Studio.Manage.SerializableVector3[]), 4 }, + { typeof(global::Studio.Manage.SerializableVector4[]), 5 }, + { typeof(global::Studio.Manage.SubmeshData[]), 6 }, + { typeof(global::Studio.Manage.TextureData[]), 7 }, + { typeof(global::Studio.Manage.ThumbnailData[]), 8 }, { typeof(string[][]), 9 }, - { typeof(global::XED.Manage.MaterialPropertyData), 10 }, - { typeof(global::XED.Manage.ModelData), 11 }, - { typeof(global::XED.Manage.SaveData), 12 }, - { typeof(global::XED.Manage.SavedModelData), 13 }, - { typeof(global::XED.Manage.SerializableMesh), 14 }, - { typeof(global::XED.Manage.SerializableQuaternion), 15 }, - { typeof(global::XED.Manage.SerializableVector2), 16 }, - { typeof(global::XED.Manage.SerializableVector3), 17 }, - { typeof(global::XED.Manage.SerializableVector4), 18 }, - { typeof(global::XED.Manage.SubmeshData), 19 }, - { typeof(global::XED.Manage.TextureData), 20 }, - { typeof(global::XED.Manage.ThumbnailData), 21 }, - { typeof(global::XED.Manage.TransformData), 22 }, + { typeof(global::Studio.Manage.MaterialPropertyData), 10 }, + { typeof(global::Studio.Manage.ModelData), 11 }, + { typeof(global::Studio.Manage.SaveData), 12 }, + { typeof(global::Studio.Manage.SavedModelData), 13 }, + { typeof(global::Studio.Manage.SerializableMesh), 14 }, + { typeof(global::Studio.Manage.SerializableQuaternion), 15 }, + { typeof(global::Studio.Manage.SerializableVector2), 16 }, + { typeof(global::Studio.Manage.SerializableVector3), 17 }, + { typeof(global::Studio.Manage.SerializableVector4), 18 }, + { typeof(global::Studio.Manage.SubmeshData), 19 }, + { typeof(global::Studio.Manage.TextureData), 20 }, + { typeof(global::Studio.Manage.ThumbnailData), 21 }, + { typeof(global::Studio.Manage.TransformData), 22 }, }; } @@ -85,15 +85,15 @@ namespace MessagePack.Resolvers switch (key) { - case 0: return new global::MessagePack.Formatters.ArrayFormatter(); - case 1: return new global::MessagePack.Formatters.ArrayFormatter(); - case 2: return new global::MessagePack.Formatters.ArrayFormatter(); - case 3: return new global::MessagePack.Formatters.ArrayFormatter(); - case 4: return new global::MessagePack.Formatters.ArrayFormatter(); - case 5: return new global::MessagePack.Formatters.ArrayFormatter(); - case 6: return new global::MessagePack.Formatters.ArrayFormatter(); - case 7: return new global::MessagePack.Formatters.ArrayFormatter(); - case 8: return new global::MessagePack.Formatters.ArrayFormatter(); + case 0: return new global::MessagePack.Formatters.ArrayFormatter(); + case 1: return new global::MessagePack.Formatters.ArrayFormatter(); + case 2: return new global::MessagePack.Formatters.ArrayFormatter(); + case 3: return new global::MessagePack.Formatters.ArrayFormatter(); + case 4: return new global::MessagePack.Formatters.ArrayFormatter(); + case 5: return new global::MessagePack.Formatters.ArrayFormatter(); + case 6: return new global::MessagePack.Formatters.ArrayFormatter(); + case 7: return new global::MessagePack.Formatters.ArrayFormatter(); + case 8: return new global::MessagePack.Formatters.ArrayFormatter(); case 9: return new global::MessagePack.Formatters.ArrayFormatter(); case 10: return new MessagePack.Formatters.XED.Manage.MaterialPropertyDataFormatter(); case 11: return new MessagePack.Formatters.XED.Manage.ModelDataFormatter(); @@ -143,10 +143,10 @@ namespace MessagePack.Resolvers namespace MessagePack.Formatters.XED.Manage { - public sealed class MaterialPropertyDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class MaterialPropertyDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.MaterialPropertyData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.MaterialPropertyData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -169,7 +169,7 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.texUIDs, options); } - public global::XED.Manage.MaterialPropertyData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.MaterialPropertyData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -179,7 +179,7 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::XED.Manage.MaterialPropertyData(); + var ____result = new global::Studio.Manage.MaterialPropertyData(); for (int i = 0; i < length; i++) { @@ -229,10 +229,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class ModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class ModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.ModelData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.ModelData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -245,12 +245,12 @@ namespace MessagePack.Formatters.XED.Manage writer.Write(value.id); writer.Write(value.parentId); global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.modelComponentName, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.transformData, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.mesh, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.materialProperties, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.transformData, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.mesh, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.materialProperties, options); } - public global::XED.Manage.ModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.ModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -260,7 +260,7 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::XED.Manage.ModelData(); + var ____result = new global::Studio.Manage.ModelData(); for (int i = 0; i < length; i++) { @@ -276,13 +276,13 @@ namespace MessagePack.Formatters.XED.Manage ____result.modelComponentName = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 3: - ____result.transformData = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.transformData = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 4: - ____result.mesh = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.mesh = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 5: - ____result.materialProperties = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.materialProperties = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; default: reader.Skip(); @@ -295,10 +295,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class SaveDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SaveDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SaveData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SaveData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -308,12 +308,12 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; writer.WriteArrayHeader(3); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.modelDatas, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.textureDatas, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.thumbnailDatas, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.modelDatas, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.textureDatas, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.thumbnailDatas, options); } - public global::XED.Manage.SaveData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.SaveData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -323,20 +323,20 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::XED.Manage.SaveData(); + var ____result = new global::Studio.Manage.SaveData(); for (int i = 0; i < length; i++) { switch (i) { case 0: - ____result.modelDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.modelDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 1: - ____result.textureDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.textureDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 2: - ____result.thumbnailDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.thumbnailDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; default: reader.Skip(); @@ -349,10 +349,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class SavedModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SavedModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SavedModelData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SavedModelData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -363,10 +363,10 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; writer.WriteArrayHeader(2); global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.attributes, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.models, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.models, options); } - public global::XED.Manage.SavedModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.SavedModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -376,7 +376,7 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::XED.Manage.SavedModelData(); + var ____result = new global::Studio.Manage.SavedModelData(); for (int i = 0; i < length; i++) { @@ -386,7 +386,7 @@ namespace MessagePack.Formatters.XED.Manage ____result.attributes = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 1: - ____result.models = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.models = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; default: reader.Skip(); @@ -399,10 +399,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class SerializableMeshFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SerializableMeshFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableMesh value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SerializableMesh value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -412,14 +412,14 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; writer.WriteArrayHeader(5); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.vertices, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.normals, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.tangents, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.uv, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.submeshes, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.vertices, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.normals, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.tangents, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.uv, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.submeshes, options); } - public global::XED.Manage.SerializableMesh Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.SerializableMesh Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -429,26 +429,26 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::XED.Manage.SerializableMesh(); + var ____result = new global::Studio.Manage.SerializableMesh(); for (int i = 0; i < length; i++) { switch (i) { case 0: - ____result.vertices = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.vertices = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 1: - ____result.normals = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.normals = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 2: - ____result.tangents = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.tangents = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 3: - ____result.uv = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.uv = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 4: - ____result.submeshes = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.submeshes = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; default: reader.Skip(); @@ -461,10 +461,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class SerializableQuaternionFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SerializableQuaternionFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableQuaternion value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SerializableQuaternion value, global::MessagePack.MessagePackSerializerOptions options) { writer.WriteArrayHeader(4); writer.Write(value.x); @@ -473,7 +473,7 @@ namespace MessagePack.Formatters.XED.Manage writer.Write(value.w); } - public global::XED.Manage.SerializableQuaternion Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.SerializableQuaternion Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -482,7 +482,7 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); var length = reader.ReadArrayHeader(); - var ____result = new global::XED.Manage.SerializableQuaternion(); + var ____result = new global::Studio.Manage.SerializableQuaternion(); for (int i = 0; i < length; i++) { @@ -511,17 +511,17 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class SerializableVector2Formatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SerializableVector2Formatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableVector2 value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SerializableVector2 value, global::MessagePack.MessagePackSerializerOptions options) { writer.WriteArrayHeader(2); writer.Write(value.x); writer.Write(value.y); } - public global::XED.Manage.SerializableVector2 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.SerializableVector2 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -549,16 +549,16 @@ namespace MessagePack.Formatters.XED.Manage } } - var ____result = new global::XED.Manage.SerializableVector2(__x__, __y__); + var ____result = new global::Studio.Manage.SerializableVector2(__x__, __y__); reader.Depth--; return ____result; } } - public sealed class SerializableVector3Formatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SerializableVector3Formatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableVector3 value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SerializableVector3 value, global::MessagePack.MessagePackSerializerOptions options) { writer.WriteArrayHeader(3); writer.Write(value.x); @@ -566,7 +566,7 @@ namespace MessagePack.Formatters.XED.Manage writer.Write(value.z); } - public global::XED.Manage.SerializableVector3 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.SerializableVector3 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -598,16 +598,16 @@ namespace MessagePack.Formatters.XED.Manage } } - var ____result = new global::XED.Manage.SerializableVector3(__x__, __y__, __z__); + var ____result = new global::Studio.Manage.SerializableVector3(__x__, __y__, __z__); reader.Depth--; return ____result; } } - public sealed class SerializableVector4Formatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SerializableVector4Formatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableVector4 value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SerializableVector4 value, global::MessagePack.MessagePackSerializerOptions options) { writer.WriteArrayHeader(4); writer.Write(value.x); @@ -616,7 +616,7 @@ namespace MessagePack.Formatters.XED.Manage writer.Write(value.w); } - public global::XED.Manage.SerializableVector4 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.SerializableVector4 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -652,16 +652,16 @@ namespace MessagePack.Formatters.XED.Manage } } - var ____result = new global::XED.Manage.SerializableVector4(__x__, __y__, __z__, __w__); + var ____result = new global::Studio.Manage.SerializableVector4(__x__, __y__, __z__, __w__); reader.Depth--; return ____result; } } - public sealed class SubmeshDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class SubmeshDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SubmeshData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.SubmeshData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -675,7 +675,7 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.triangles, options); } - public global::XED.Manage.SubmeshData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.SubmeshData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -685,7 +685,7 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::XED.Manage.SubmeshData(); + var ____result = new global::Studio.Manage.SubmeshData(); for (int i = 0; i < length; i++) { @@ -708,10 +708,10 @@ namespace MessagePack.Formatters.XED.Manage } } - public sealed class TextureDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class TextureDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.TextureData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.TextureData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -726,7 +726,7 @@ namespace MessagePack.Formatters.XED.Manage writer.Write(value.data); } - public global::XED.Manage.TextureData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.TextureData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -759,16 +759,16 @@ namespace MessagePack.Formatters.XED.Manage } } - var ____result = new global::XED.Manage.TextureData(__name__, __uid__, __data__); + var ____result = new global::Studio.Manage.TextureData(__name__, __uid__, __data__); reader.Depth--; return ____result; } } - public sealed class ThumbnailDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class ThumbnailDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.ThumbnailData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.ThumbnailData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -780,7 +780,7 @@ namespace MessagePack.Formatters.XED.Manage writer.Write(value.data); } - public global::XED.Manage.ThumbnailData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.ThumbnailData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -804,16 +804,16 @@ namespace MessagePack.Formatters.XED.Manage } } - var ____result = new global::XED.Manage.ThumbnailData(__data__); + var ____result = new global::Studio.Manage.ThumbnailData(__data__); reader.Depth--; return ____result; } } - public sealed class TransformDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter + public sealed class TransformDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter { - public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.TransformData value, global::MessagePack.MessagePackSerializerOptions options) + public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::Studio.Manage.TransformData value, global::MessagePack.MessagePackSerializerOptions options) { if (value == null) { @@ -823,12 +823,12 @@ namespace MessagePack.Formatters.XED.Manage global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; writer.WriteArrayHeader(3); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.position, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.rotation, options); - global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.scale, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.position, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.rotation, options); + global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Serialize(ref writer, value.scale, options); } - public global::XED.Manage.TransformData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) + public global::Studio.Manage.TransformData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options) { if (reader.TryReadNil()) { @@ -838,20 +838,20 @@ namespace MessagePack.Formatters.XED.Manage options.Security.DepthStep(ref reader); global::MessagePack.IFormatterResolver formatterResolver = options.Resolver; var length = reader.ReadArrayHeader(); - var ____result = new global::XED.Manage.TransformData(); + var ____result = new global::Studio.Manage.TransformData(); for (int i = 0; i < length; i++) { switch (i) { case 0: - ____result.position = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.position = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 1: - ____result.rotation = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.rotation = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; case 2: - ____result.scale = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); + ____result.scale = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify(formatterResolver).Deserialize(ref reader, options); break; default: reader.Skip(); diff --git a/Assets/Scripts/LocationMapper.cs b/Assets/Scripts/LocationMapper.cs index 96d5bd72..ffdfc63c 100644 --- a/Assets/Scripts/LocationMapper.cs +++ b/Assets/Scripts/LocationMapper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; using XRLib; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class LocationMapper : MonoBehaviour, ISingle { diff --git a/Assets/Scripts/Map.cs b/Assets/Scripts/Map.cs index 4f27bee0..587e90a6 100644 --- a/Assets/Scripts/Map.cs +++ b/Assets/Scripts/Map.cs @@ -1,4 +1,4 @@ -namespace XED +namespace Studio { public class Map : MonoBehaviour { diff --git a/Assets/Scripts/Pair.cs b/Assets/Scripts/Pair.cs index b582b572..c4de088d 100644 --- a/Assets/Scripts/Pair.cs +++ b/Assets/Scripts/Pair.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace XED +namespace Studio { public class Pair { diff --git a/Assets/Scripts/Panel_ModeControl.cs b/Assets/Scripts/Panel_ModeControl.cs index de7336ee..37d3c31f 100644 --- a/Assets/Scripts/Panel_ModeControl.cs +++ b/Assets/Scripts/Panel_ModeControl.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_ModeControl : PanelBase { diff --git a/Assets/Scripts/Studio/AssetTool/CreateInterferedObjectButtonCommand.cs b/Assets/Scripts/Studio/AssetTool/CreateInterferedObjectButtonCommand.cs index 554111e7..0f086e7b 100644 --- a/Assets/Scripts/Studio/AssetTool/CreateInterferedObjectButtonCommand.cs +++ b/Assets/Scripts/Studio/AssetTool/CreateInterferedObjectButtonCommand.cs @@ -1,8 +1,8 @@ using UnityEngine; -using XED.Asset; -using XED.Command; +using Studio.Asset; +using Studio.Command; -namespace XED.Command +namespace Studio.Command { public class CreateInterferedObjectButtonCommand : IReversibleCommand { diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index 26cdb8b6..9d8e9686 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -1,19 +1,19 @@ using System.Collections.Generic; using UnityEngine; -using XED.UI; +using Studio.UI; using XRLib; -using XED.Manage; -using XED.Command; -using XED.Util; -using XED.HierarchyTree; +using Studio.Manage; +using Studio.Command; +using Studio.Util; +using Studio.HierarchyTree; using System.Linq; using UnityEditor; using System; -using XED.Core; +using Studio.Core; using System.Collections; -using XED.AssetLibraryTree; +using Studio.AssetLibraryTree; -namespace XED.Asset +namespace Studio.Asset { public class CustomAssetConnector : Manager { diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs index 617ccfec..f8ad295d 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetDataHandler.cs @@ -1,10 +1,10 @@ -using XED.Asset; -using XED.AssetLibraryTree; -using XED.HierarchyTree; -using XED.Manage; -using XED.Util; +using Studio.Asset; +using Studio.AssetLibraryTree; +using Studio.HierarchyTree; +using Studio.Manage; +using Studio.Util; -namespace XED +namespace Studio { public class CustomAssetDataHandler { diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetDataRepository.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetDataRepository.cs index acea99eb..f282be6e 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetDataRepository.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetDataRepository.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using XED.Util; +using Studio.Util; -namespace XED.Repositories +namespace Studio.Repositories { public class CustomAssetDataRepository { diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs index a3febc15..740f1690 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetEventHandler.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using XED.AssetLibraryTree; -using XED.HierarchyTree; -using XED.Manage; -using XED.Util; +using Studio.AssetLibraryTree; +using Studio.HierarchyTree; +using Studio.Manage; +using Studio.Util; -namespace XED.Asset +namespace Studio.Asset { public class CustomAssetEventHandler { diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs index 4034fd86..f4b74197 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs @@ -4,10 +4,10 @@ using System.Diagnostics.Contracts; using System.Linq; using UnityEngine; using UnityEngine.EventSystems; -using XED.DataStructures; -using XED.UI; +using Studio.DataStructures; +using Studio.UI; -namespace XED.Util +namespace Studio.Util { public class CustomAssetRenderObject : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler { diff --git a/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs b/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs index 9addf5db..2dfebac0 100644 --- a/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs +++ b/Assets/Scripts/Studio/AssetTool/DirectorySearch.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using UnityEngine; -namespace XED +namespace Studio { public class DirectorySearch { diff --git a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs b/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs index 17a2d2af..ebbd08bb 100644 --- a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs +++ b/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs @@ -4,16 +4,16 @@ using System.IO; using UnityEngine.Events; using System.Collections; using TriLibCore.SFB; -using XED.Util; +using Studio.Util; using System.Threading.Tasks; using System; using System.Linq; -using XED.Repositories; -using XED.Asset; +using Studio.Repositories; +using Studio.Asset; using Ookii.Dialogs; -using XED.Command; +using Studio.Command; -namespace XED.Manage +namespace Studio.Manage { public class FBXFileManager : Manager { diff --git a/Assets/Scripts/Studio/AssetTool/LocalItem.cs b/Assets/Scripts/Studio/AssetTool/LocalItem.cs index fb38a96c..833879f4 100644 --- a/Assets/Scripts/Studio/AssetTool/LocalItem.cs +++ b/Assets/Scripts/Studio/AssetTool/LocalItem.cs @@ -5,7 +5,7 @@ using System.IO; using UnityEngine; using XRLib; -namespace XED +namespace Studio { public class LocalItem { diff --git a/Assets/Scripts/Studio/AssetTool/MaterialPropertyData.cs b/Assets/Scripts/Studio/AssetTool/MaterialPropertyData.cs index 2df02a63..b3d4ab15 100644 --- a/Assets/Scripts/Studio/AssetTool/MaterialPropertyData.cs +++ b/Assets/Scripts/Studio/AssetTool/MaterialPropertyData.cs @@ -1,7 +1,7 @@ using MessagePack; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public class MaterialPropertyData diff --git a/Assets/Scripts/Studio/AssetTool/MessagePackFileManager.cs b/Assets/Scripts/Studio/AssetTool/MessagePackFileManager.cs index 6127742d..d3eddfd7 100644 --- a/Assets/Scripts/Studio/AssetTool/MessagePackFileManager.cs +++ b/Assets/Scripts/Studio/AssetTool/MessagePackFileManager.cs @@ -5,7 +5,7 @@ using System; using System.IO; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { public class MessagePackFileManager diff --git a/Assets/Scripts/Studio/AssetTool/ModelData.cs b/Assets/Scripts/Studio/AssetTool/ModelData.cs index 31e5e9a4..35ae46c6 100644 --- a/Assets/Scripts/Studio/AssetTool/ModelData.cs +++ b/Assets/Scripts/Studio/AssetTool/ModelData.cs @@ -1,6 +1,6 @@ using MessagePack; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public class ModelData diff --git a/Assets/Scripts/Studio/AssetTool/ObjectSnap.cs b/Assets/Scripts/Studio/AssetTool/ObjectSnap.cs index 25126086..6c550311 100644 --- a/Assets/Scripts/Studio/AssetTool/ObjectSnap.cs +++ b/Assets/Scripts/Studio/AssetTool/ObjectSnap.cs @@ -1,7 +1,7 @@ using System.Collections; using UnityEngine; -namespace XED.Util +namespace Studio.Util { public class ObjectSnap : MonoBehaviour { diff --git a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs index 71ee98e8..3713cc85 100644 --- a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs @@ -4,14 +4,14 @@ using System.Linq; using UnityEditor; using UnityEngine; using UnityEngine.EventSystems; -using XED.Asset; -using XED.Command; -using XED.DataStructures; -using XED.Interfaces; -using XED.Manage; -using XED.RuntimeGizmo; +using Studio.Asset; +using Studio.Command; +using Studio.DataStructures; +using Studio.Interfaces; +using Studio.Manage; +using Studio.RuntimeGizmo; -namespace XED.Util +namespace Studio.Util { public class RenderObjectHandler : Manager, IModeController, IInputHandler { diff --git a/Assets/Scripts/Studio/AssetTool/SaveData.cs b/Assets/Scripts/Studio/AssetTool/SaveData.cs index 9b20f9f3..bfa600b2 100644 --- a/Assets/Scripts/Studio/AssetTool/SaveData.cs +++ b/Assets/Scripts/Studio/AssetTool/SaveData.cs @@ -1,6 +1,6 @@ using MessagePack; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public class SaveData diff --git a/Assets/Scripts/Studio/AssetTool/SavedModelData.cs b/Assets/Scripts/Studio/AssetTool/SavedModelData.cs index cbf411fb..bd2ca244 100644 --- a/Assets/Scripts/Studio/AssetTool/SavedModelData.cs +++ b/Assets/Scripts/Studio/AssetTool/SavedModelData.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public class SavedModelData diff --git a/Assets/Scripts/Studio/AssetTool/SharedMaterial.cs b/Assets/Scripts/Studio/AssetTool/SharedMaterial.cs index c2ba8d3b..2f516c28 100644 --- a/Assets/Scripts/Studio/AssetTool/SharedMaterial.cs +++ b/Assets/Scripts/Studio/AssetTool/SharedMaterial.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { public class SharedMaterial { diff --git a/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs b/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs index 599fee8f..6e6f9620 100644 --- a/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs +++ b/Assets/Scripts/Studio/AssetTool/TwinObjectPreprocessingHelper.cs @@ -8,7 +8,7 @@ using UnityEditor.AddressableAssets.Settings; using UnityEditor.AddressableAssets; #endif -namespace XED +namespace Studio { public class TwinObjectPreprocessingHelper { diff --git a/Assets/Scripts/Studio/Attributes/PropertyVisibleAttribute.cs b/Assets/Scripts/Studio/Attributes/PropertyVisibleAttribute.cs index 875f04a7..d59dee32 100644 --- a/Assets/Scripts/Studio/Attributes/PropertyVisibleAttribute.cs +++ b/Assets/Scripts/Studio/Attributes/PropertyVisibleAttribute.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace XED.Attributes +namespace Studio.Attributes { [AttributeUsage(AttributeTargets.Field)] public class PropertyVisibleAttribute : Attribute diff --git a/Assets/Scripts/Studio/Command/ActionCommand.cs b/Assets/Scripts/Studio/Command/ActionCommand.cs index 112a0155..02d43ff8 100644 --- a/Assets/Scripts/Studio/Command/ActionCommand.cs +++ b/Assets/Scripts/Studio/Command/ActionCommand.cs @@ -1,6 +1,6 @@ -using XED.Command; +using Studio.Command; -namespace XED.Manage +namespace Studio.Manage { public class ActionCommand : IReversibleCommand { diff --git a/Assets/Scripts/Studio/Command/CameraCommand/MoveToTargetCommand.cs b/Assets/Scripts/Studio/Command/CameraCommand/MoveToTargetCommand.cs index 52d091aa..2ffae2b7 100644 --- a/Assets/Scripts/Studio/Command/CameraCommand/MoveToTargetCommand.cs +++ b/Assets/Scripts/Studio/Command/CameraCommand/MoveToTargetCommand.cs @@ -1,10 +1,10 @@ using System.IO; using UnityEngine; -using XED.Asset; -using XED.Command; -using XED.Manage; +using Studio.Asset; +using Studio.Command; +using Studio.Manage; -namespace XED +namespace Studio { public class MoveToTargetCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs b/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs index ad2407e6..2fc8004d 100644 --- a/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs +++ b/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs @@ -1,6 +1,6 @@ -using XED.Asset; +using Studio.Asset; -namespace XED.Command +namespace Studio.Command { public class CreateConnectedAssetCommand : IReversibleCommand { diff --git a/Assets/Scripts/Studio/Command/FileCommand/LoadLocalModelDataCommand.cs b/Assets/Scripts/Studio/Command/FileCommand/LoadLocalModelDataCommand.cs index a2cd1415..ab1d356f 100644 --- a/Assets/Scripts/Studio/Command/FileCommand/LoadLocalModelDataCommand.cs +++ b/Assets/Scripts/Studio/Command/FileCommand/LoadLocalModelDataCommand.cs @@ -1,12 +1,12 @@ using System.Collections; using System.Linq; using UnityEngine; -using XED.Asset; -using XED.Manage; -using XED.Repositories; -using XED.Util; +using Studio.Asset; +using Studio.Manage; +using Studio.Repositories; +using Studio.Util; -namespace XED.Command +namespace Studio.Command { public class LoadLocalModelDataCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/FileCommand/LoadLocalTextureDataCommand.cs b/Assets/Scripts/Studio/Command/FileCommand/LoadLocalTextureDataCommand.cs index eedfd4fb..77096257 100644 --- a/Assets/Scripts/Studio/Command/FileCommand/LoadLocalTextureDataCommand.cs +++ b/Assets/Scripts/Studio/Command/FileCommand/LoadLocalTextureDataCommand.cs @@ -1,8 +1,8 @@ using System.Collections; using UnityEngine; -using XED.Manage; +using Studio.Manage; -namespace XED.Command +namespace Studio.Command { public class LoadLocalTextureDataCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateMoveGizmoCommand.cs b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateMoveGizmoCommand.cs index bb82ebb9..1f258060 100644 --- a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateMoveGizmoCommand.cs +++ b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateMoveGizmoCommand.cs @@ -1,8 +1,8 @@ -using XED.Manage; -using XED.RuntimeGizmo; -using XED.Util; +using Studio.Manage; +using Studio.RuntimeGizmo; +using Studio.Util; -namespace XED.Command +namespace Studio.Command { public class ActivateMoveGizmoCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateRotateGizmoCommand.cs b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateRotateGizmoCommand.cs index efa7dfeb..a0ca7357 100644 --- a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateRotateGizmoCommand.cs +++ b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateRotateGizmoCommand.cs @@ -1,8 +1,8 @@ -using XED.Manage; -using XED.RuntimeGizmo; -using XED.Util; +using Studio.Manage; +using Studio.RuntimeGizmo; +using Studio.Util; -namespace XED.Command +namespace Studio.Command { public class ActivateRotateGizmoCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateScaleGizmoCommand.cs b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateScaleGizmoCommand.cs index 319090c7..b3b4b904 100644 --- a/Assets/Scripts/Studio/Command/GizmoCommand/ActivateScaleGizmoCommand.cs +++ b/Assets/Scripts/Studio/Command/GizmoCommand/ActivateScaleGizmoCommand.cs @@ -1,8 +1,8 @@ -using XED.Manage; -using XED.RuntimeGizmo; -using XED.Util; +using Studio.Manage; +using Studio.RuntimeGizmo; +using Studio.Util; -namespace XED.Command +namespace Studio.Command { public class ActivateScaleGizmoCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/GizmoCommand/ResetGizmoCommand.cs b/Assets/Scripts/Studio/Command/GizmoCommand/ResetGizmoCommand.cs index b3ec5d0c..e44ba1ea 100644 --- a/Assets/Scripts/Studio/Command/GizmoCommand/ResetGizmoCommand.cs +++ b/Assets/Scripts/Studio/Command/GizmoCommand/ResetGizmoCommand.cs @@ -1,8 +1,8 @@ -using XED.Manage; -using XED.RuntimeGizmo; -using XED.Util; +using Studio.Manage; +using Studio.RuntimeGizmo; +using Studio.Util; -namespace XED.Command +namespace Studio.Command { public class ResetGizmoCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/ICommand.cs b/Assets/Scripts/Studio/Command/ICommand.cs index 9251c9d4..b263a5ef 100644 --- a/Assets/Scripts/Studio/Command/ICommand.cs +++ b/Assets/Scripts/Studio/Command/ICommand.cs @@ -1,5 +1,5 @@ -namespace XED.Command +namespace Studio.Command { public interface ICommand { diff --git a/Assets/Scripts/Studio/Command/IIrreversibleCommand.cs b/Assets/Scripts/Studio/Command/IIrreversibleCommand.cs index 193c5a3f..95fca628 100644 --- a/Assets/Scripts/Studio/Command/IIrreversibleCommand.cs +++ b/Assets/Scripts/Studio/Command/IIrreversibleCommand.cs @@ -1,4 +1,4 @@ -namespace XED.Command +namespace Studio.Command { public interface IIrreversibleCommand : ICommand { diff --git a/Assets/Scripts/Studio/Command/IReversibleCommand.cs b/Assets/Scripts/Studio/Command/IReversibleCommand.cs index deec1fd7..43211207 100644 --- a/Assets/Scripts/Studio/Command/IReversibleCommand.cs +++ b/Assets/Scripts/Studio/Command/IReversibleCommand.cs @@ -1,4 +1,4 @@ -namespace XED.Command +namespace Studio.Command { public interface IReversibleCommand : ICommand { diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs index dae8f1a6..b676c3ad 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using UnityEngine; -using XED.Asset; -using XED.HierarchyTree; -using XED.Manage; -using XED.Util; +using Studio.Asset; +using Studio.HierarchyTree; +using Studio.Manage; +using Studio.Util; -namespace XED.Command +namespace Studio.Command { public class CopyObjectCommand : IReversibleCommand { diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs index af5dbbb4..3b2d0dfc 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using XED.Asset; -using XED.Command; -using XED.HierarchyTree; -using XED.Manage; -using XED.Util; +using Studio.Asset; +using Studio.Command; +using Studio.HierarchyTree; +using Studio.Manage; +using Studio.Util; -namespace XED +namespace Studio { public class RemoveAllObjectCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs index d790e9ea..79c25cfa 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; -using XED.Asset; -using XED.HierarchyTree; -using XED.Manage; -using XED.Util; +using Studio.Asset; +using Studio.HierarchyTree; +using Studio.Manage; +using Studio.Util; -namespace XED.Command +namespace Studio.Command { public class RemoveSelectObjectCommand : IReversibleCommand { diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs b/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs index 97628403..0365fb8a 100644 --- a/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; using TriLibCore.SFB; -using XED.Asset; -using XED.HierarchyTree; -using XED.Manage; -using XED.Util; +using Studio.Asset; +using Studio.HierarchyTree; +using Studio.Manage; +using Studio.Util; -namespace XED.Command +namespace Studio.Command { public class LoadProjectCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/NewProjectCommand.cs b/Assets/Scripts/Studio/Command/ProjectCommand/NewProjectCommand.cs index f8353064..2f187544 100644 --- a/Assets/Scripts/Studio/Command/ProjectCommand/NewProjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ProjectCommand/NewProjectCommand.cs @@ -1,7 +1,7 @@ -using XED.Asset; -using XED.Manage; +using Studio.Asset; +using Studio.Manage; -namespace XED.Command +namespace Studio.Command { public class NewProjectCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/SaveProjectCommand.cs b/Assets/Scripts/Studio/Command/ProjectCommand/SaveProjectCommand.cs index 118ef485..e812f588 100644 --- a/Assets/Scripts/Studio/Command/ProjectCommand/SaveProjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ProjectCommand/SaveProjectCommand.cs @@ -3,13 +3,13 @@ using System; using System.Collections.Generic; using System.IO; using TriLibCore.SFB; -using XED.Asset; -using XED.Command; -using XED.Manage; -using XED.Service; -using XED.Util; +using Studio.Asset; +using Studio.Command; +using Studio.Manage; +using Studio.Service; +using Studio.Util; -namespace XED +namespace Studio { public class SaveProjectCommand : IIrreversibleCommand { diff --git a/Assets/Scripts/Studio/Command/ReversibleCommand.cs b/Assets/Scripts/Studio/Command/ReversibleCommand.cs deleted file mode 100644 index baba007b..00000000 --- a/Assets/Scripts/Studio/Command/ReversibleCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -namespace XED.Command -{ - public class ReversibleCommand : IReversibleCommand - { - public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); } - - public void Execute() - { - throw new System.NotImplementedException(); - } - public void Undo() - { - throw new System.NotImplementedException(); - } - public void Redo() - { - throw new System.NotImplementedException(); - } - - public bool CanExecute() - { - throw new System.NotImplementedException(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Studio/Command/ReversibleCommand.cs.meta b/Assets/Scripts/Studio/Command/ReversibleCommand.cs.meta deleted file mode 100644 index d30d63df..00000000 --- a/Assets/Scripts/Studio/Command/ReversibleCommand.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 7ff6c570160edd045a15341286982c16 \ No newline at end of file diff --git a/Assets/Scripts/Studio/Common/BoundaryCornerDetector.cs b/Assets/Scripts/Studio/Common/BoundaryCornerDetector.cs deleted file mode 100644 index 6c88e3b9..00000000 --- a/Assets/Scripts/Studio/Common/BoundaryCornerDetector.cs +++ /dev/null @@ -1,171 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -public class BoundaryCornerDetector : MonoBehaviour -{ - [SerializeField] private float angleThreshold = 30f; // °¢µµ ÀÓ°è°ª (±âº»: 30µµ) - [SerializeField] private Color cornerColor = Color.green; // Corner Ç¥½Ã »ö»ó - [SerializeField] private float cornerSize = 0.05f; // Corner ½Ã°¢È­ Å©±â - - private List boundaryEdges = new List(); // ¹Ù¿î´õ¸® ¸ð¼­¸® - private List boundaryCorners = new List(); // ¹Ù¿î´õ¸®¿¡¼­ ãÀº ²ÀÁþÁ¡ - - void Start() - { - Mesh mesh = GetComponent().mesh; - - // ¸Þ½Ã µ¥ÀÌÅÍ - Vector3[] vertices = mesh.vertices; - int[] triangles = mesh.triangles; - - // ¹Ù¿î´õ¸® ¸ð¼­¸® ÃßÃâ - Dictionary edgeCount = new Dictionary(); - for (int i = 0; i < triangles.Length; i += 3) - { - int v1 = triangles[i]; - int v2 = triangles[i + 1]; - int v3 = triangles[i + 2]; - - AddEdge(edgeCount, v1, v2); - AddEdge(edgeCount, v2, v3); - AddEdge(edgeCount, v3, v1); - } - - // ¹Ù¿î´õ¸® ¸ð¼­¸® ÇÊÅ͸µ - foreach (var edge in edgeCount) - { - if (edge.Value == 1) - { - boundaryEdges.Add(edge.Key); - } - } - - Debug.Log($"Boundary Edges Count: {boundaryEdges.Count}"); - - // ¹Ù¿î´õ¸® ¹öÅØ½º ÃßÃâ - HashSet boundaryVertices = new HashSet(); - foreach (var edge in boundaryEdges) - { - boundaryVertices.Add(edge.Vertex1); - boundaryVertices.Add(edge.Vertex2); - } - - // ¹Ù¿î´õ¸® ¹öÅØ½º¿¡¼­ corner °è»ê - foreach (int vertexIndex in boundaryVertices) - { - List connectedNormals = GetConnectedNormals(vertexIndex, boundaryEdges, vertices); - - // ³ë¸Ö º¤ÅÍµé °£ ÃÖ´ë °¢µµ °è»ê - float maxAngle = CalculateMaxAngle(connectedNormals); - if (maxAngle > angleThreshold) - { - boundaryCorners.Add(vertexIndex); - Debug.Log($"Corner Found: Vertex Index {vertexIndex}, Angle {maxAngle}"); - } - } - } - - // ¹Ù¿î´õ¸® ¸ð¼­¸®¿¡ ¿¬°áµÈ ³ë¸Ö º¤ÅÍ °¡Á®¿À±â - private List GetConnectedNormals(int vertexIndex, List edges, Vector3[] vertices) - { - List normals = new List(); - - foreach (var edge in edges) - { - if (edge.Vertex1 == vertexIndex || edge.Vertex2 == vertexIndex) - { - // ¸ð¼­¸®¿¡ ¿¬°áµÈ ³ë¸Ö °è»ê - Vector3 v1 = vertices[edge.Vertex1]; - Vector3 v2 = vertices[edge.Vertex2]; - - Vector3 normal = (v2 - v1).normalized; // °£´ÜÇÑ ¹æÇâ º¤ÅÍ·Î ´ëü °¡´É - normals.Add(normal); - } - } - - return normals; - } - - // ÃÖ´ë °¢µµ °è»ê - private float CalculateMaxAngle(List normals) - { - float maxAngle = 0f; - - for (int i = 0; i < normals.Count; i++) - { - for (int j = i + 1; j < normals.Count; j++) - { - float angle = Vector3.Angle(normals[i], normals[j]); - if (angle > maxAngle) - { - maxAngle = angle; - } - } - } - - return maxAngle; - } - - private void AddEdge(Dictionary edgeCount, int v1, int v2) - { - Edge edge = new Edge(v1, v2); - if (edgeCount.ContainsKey(edge)) - { - edgeCount[edge]++; - } - else - { - edgeCount[edge] = 1; - } - } - - private void OnDrawGizmos() - { - if (boundaryCorners == null || boundaryCorners.Count == 0) return; - - Mesh mesh = GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - - Gizmos.color = cornerColor; - - foreach (int index in boundaryCorners) - { - Vector3 worldPos = transform.TransformPoint(vertices[index]); - Gizmos.DrawSphere(worldPos, cornerSize); // Corner ½Ã°¢È­ - } - } - - // Edge ±¸Á¶Ã¼ Á¤ÀÇ - private struct Edge - { - public int Vertex1, Vertex2; - - public Edge(int v1, int v2) - { - if (v1 < v2) - { - Vertex1 = v1; - Vertex2 = v2; - } - else - { - Vertex1 = v2; - Vertex2 = v1; - } - } - - public override bool Equals(object obj) - { - if (obj is Edge edge) - { - return Vertex1 == edge.Vertex1 && Vertex2 == edge.Vertex2; - } - return false; - } - - public override int GetHashCode() - { - return Vertex1.GetHashCode() ^ Vertex2.GetHashCode(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Studio/Common/BoundaryCornerDetector.cs.meta b/Assets/Scripts/Studio/Common/BoundaryCornerDetector.cs.meta deleted file mode 100644 index 54d76a5e..00000000 --- a/Assets/Scripts/Studio/Common/BoundaryCornerDetector.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 33418bb552f3743409c12c9f91dc058e \ No newline at end of file diff --git a/Assets/Scripts/Studio/Common/MatrixConverter.cs b/Assets/Scripts/Studio/Common/MatrixConverter.cs index a1e609f9..62e2206c 100644 --- a/Assets/Scripts/Studio/Common/MatrixConverter.cs +++ b/Assets/Scripts/Studio/Common/MatrixConverter.cs @@ -5,107 +5,110 @@ using Unity.Burst; using Unity.Jobs; using Unity.Mathematics; using Unity.Collections; -[BurstCompile] -public struct TransformToMatrixJob : IJobParallelFor +namespace Studio.Util { - [ReadOnly] public NativeArray positions; - [ReadOnly] public NativeArray rotations; - [ReadOnly] public NativeArray scales; - public NativeArray matrices; - - public void Execute(int index) + [BurstCompile] + public struct TransformToMatrixJob : IJobParallelFor { - matrices[index] = float4x4.TRS(positions[index], rotations[index], scales[index]); - } -} -public class MatrixConverter -{ - public Matrix4x4[] ConvertToMatrixArray(Transform[] transformArray) - { - int count = transformArray.Length; - NativeArray positions = new NativeArray(count, Allocator.TempJob); - NativeArray rotations = new NativeArray(count, Allocator.TempJob); - NativeArray scales = new NativeArray(count, Allocator.TempJob); - NativeArray matrices = new NativeArray(count, Allocator.TempJob); + [ReadOnly] public NativeArray positions; + [ReadOnly] public NativeArray rotations; + [ReadOnly] public NativeArray scales; + public NativeArray matrices; - for (int i = 0; i < count; i++) + public void Execute(int index) { - positions[i] = transformArray[i].position; - rotations[i] = transformArray[i].rotation; - scales[i] = transformArray[i].localScale; + matrices[index] = float4x4.TRS(positions[index], rotations[index], scales[index]); } - - TransformToMatrixJob job = new TransformToMatrixJob - { - positions = positions, - rotations = rotations, - scales = scales, - matrices = matrices - }; - - JobHandle handle = job.Schedule(count, 256); - handle.Complete(); - - Matrix4x4[] result = new Matrix4x4[count]; - for (int i = 0; i < count; i++) - { - result[i] = matrices[i]; - } - - positions.Dispose(); - rotations.Dispose(); - scales.Dispose(); - matrices.Dispose(); - - return result; } - public Matrix4x4[] ConvertToMatrixArray(Transform meshTransform, Transform[] transformArray) + public class MatrixConverter { - int count = transformArray.Length; - NativeArray positions = new NativeArray(count, Allocator.TempJob); - NativeArray rotations = new NativeArray(count, Allocator.TempJob); - NativeArray scales = new NativeArray(count, Allocator.TempJob); - NativeArray matrices = new NativeArray(count, Allocator.TempJob); + public Matrix4x4[] ConvertToMatrixArray(Transform[] transformArray) + { + int count = transformArray.Length; + NativeArray positions = new NativeArray(count, Allocator.TempJob); + NativeArray rotations = new NativeArray(count, Allocator.TempJob); + NativeArray scales = new NativeArray(count, Allocator.TempJob); + NativeArray matrices = new NativeArray(count, Allocator.TempJob); - for (int i = 0; i < count; i++) - { - positions[i] = transformArray[i].position; - rotations[i] = transformArray[i].rotation; - scales[i] = transformArray[i].lossyScale; + for (int i = 0; i < count; i++) + { + positions[i] = transformArray[i].position; + rotations[i] = transformArray[i].rotation; + scales[i] = transformArray[i].localScale; + } + + TransformToMatrixJob job = new TransformToMatrixJob + { + positions = positions, + rotations = rotations, + scales = scales, + matrices = matrices + }; + + JobHandle handle = job.Schedule(count, 256); + handle.Complete(); + + Matrix4x4[] result = new Matrix4x4[count]; + for (int i = 0; i < count; i++) + { + result[i] = matrices[i]; + } + + positions.Dispose(); + rotations.Dispose(); + scales.Dispose(); + matrices.Dispose(); + + return result; } - - TransformToMatrixJob job = new TransformToMatrixJob + public Matrix4x4[] ConvertToMatrixArray(Transform meshTransform, Transform[] transformArray) { - positions = positions, - rotations = rotations, - scales = scales, - matrices = matrices - }; - - JobHandle handle = job.Schedule(count, 256); - positions.Dispose(handle); - rotations.Dispose(handle); - scales.Dispose(handle); - matrices.Dispose(handle); - handle.Complete(); - - Matrix4x4 meshMatrix = Matrix4x4.TRS(meshTransform.position, meshTransform.rotation, meshTransform.lossyScale); - Matrix4x4[] result = new Matrix4x4[count]; - for (int i = 0; i < count; i++) - { - result[i] = matrices[i]; - result[i] = result[i] * meshMatrix; - } - return result; - } - public Matrix4x4[] ConvertToMatrixArray(Matrix4x4 meshTransformMatrix, Matrix4x4[] transformMatrices) - { - int count = transformMatrices.Length; - Matrix4x4[] result = new Matrix4x4[count]; - for (int i = 0; i < count; i++) - { - result[i] = transformMatrices[i] * meshTransformMatrix; + int count = transformArray.Length; + NativeArray positions = new NativeArray(count, Allocator.TempJob); + NativeArray rotations = new NativeArray(count, Allocator.TempJob); + NativeArray scales = new NativeArray(count, Allocator.TempJob); + NativeArray matrices = new NativeArray(count, Allocator.TempJob); + + for (int i = 0; i < count; i++) + { + positions[i] = transformArray[i].position; + rotations[i] = transformArray[i].rotation; + scales[i] = transformArray[i].lossyScale; + } + + TransformToMatrixJob job = new TransformToMatrixJob + { + positions = positions, + rotations = rotations, + scales = scales, + matrices = matrices + }; + + JobHandle handle = job.Schedule(count, 256); + positions.Dispose(handle); + rotations.Dispose(handle); + scales.Dispose(handle); + matrices.Dispose(handle); + handle.Complete(); + + Matrix4x4 meshMatrix = Matrix4x4.TRS(meshTransform.position, meshTransform.rotation, meshTransform.lossyScale); + Matrix4x4[] result = new Matrix4x4[count]; + for (int i = 0; i < count; i++) + { + result[i] = matrices[i]; + result[i] = result[i] * meshMatrix; + } + return result; + } + public Matrix4x4[] ConvertToMatrixArray(Matrix4x4 meshTransformMatrix, Matrix4x4[] transformMatrices) + { + int count = transformMatrices.Length; + Matrix4x4[] result = new Matrix4x4[count]; + for (int i = 0; i < count; i++) + { + result[i] = transformMatrices[i] * meshTransformMatrix; + } + return result; } - return result; } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Studio/Common/ProejctData.cs b/Assets/Scripts/Studio/Common/ProejctData.cs index 15738ea6..b8f634ae 100644 --- a/Assets/Scripts/Studio/Common/ProejctData.cs +++ b/Assets/Scripts/Studio/Common/ProejctData.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace XED.Util +namespace Studio.Util { public class ProjectData { diff --git a/Assets/Scripts/Studio/Common/ResourceURL.cs b/Assets/Scripts/Studio/Common/ResourceURL.cs index 57c64673..aadcd1d5 100644 --- a/Assets/Scripts/Studio/Common/ResourceURL.cs +++ b/Assets/Scripts/Studio/Common/ResourceURL.cs @@ -1,4 +1,4 @@ -namespace XED.Manage +namespace Studio.Manage { public class ResourceURL { diff --git a/Assets/Scripts/Studio/Connect/ResponseModel.cs b/Assets/Scripts/Studio/Connect/ResponseModel.cs index a1a7dd76..1936b3ee 100644 --- a/Assets/Scripts/Studio/Connect/ResponseModel.cs +++ b/Assets/Scripts/Studio/Connect/ResponseModel.cs @@ -44,10 +44,10 @@ namespace Studio.Setting.Connect private T entity; public T Entity { get => entity; } - private string? message; - public string? Message { get => message; } + private string message; + public string Message { get => message; } - public EntityWithState(APIState state, T entity, string? message = null) + public EntityWithState(APIState state, T entity, string message = null) { this.state = state; this.entity = entity; diff --git a/Assets/Scripts/Studio/Core/CommandInvoker.cs b/Assets/Scripts/Studio/Core/CommandInvoker.cs index 46392af7..44786f6d 100644 --- a/Assets/Scripts/Studio/Core/CommandInvoker.cs +++ b/Assets/Scripts/Studio/Core/CommandInvoker.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using UnityEngine; -using XED.Core; -using XED.Interfaces; -using XED.Manage; +using Studio.Core; +using Studio.Interfaces; +using Studio.Manage; -namespace XED.Command +namespace Studio.Command { public class CommandInvoker: IInputHandler { diff --git a/Assets/Scripts/Studio/Core/SystemMain.cs b/Assets/Scripts/Studio/Core/SystemMain.cs index be074e92..6fc56eb2 100644 --- a/Assets/Scripts/Studio/Core/SystemMain.cs +++ b/Assets/Scripts/Studio/Core/SystemMain.cs @@ -1,8 +1,8 @@ -using XED.Asset; -using XED.Command; -using XED.Manage; +using Studio.Asset; +using Studio.Command; +using Studio.Manage; -namespace XED.Core +namespace Studio.Core { public class SystemMain : UnitySingleton { diff --git a/Assets/Scripts/Studio/Core/UnitySingleton.cs b/Assets/Scripts/Studio/Core/UnitySingleton.cs index a0c0a88c..08b8414a 100644 --- a/Assets/Scripts/Studio/Core/UnitySingleton.cs +++ b/Assets/Scripts/Studio/Core/UnitySingleton.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace XED.Core +namespace Studio.Core { public abstract class UnitySingleton : UnityEngine.MonoBehaviour where T : UnitySingleton { diff --git a/Assets/Scripts/Studio/DataStructures/CustomAssetData.cs b/Assets/Scripts/Studio/DataStructures/CustomAssetData.cs index bdc24ff6..5c6dbef6 100644 --- a/Assets/Scripts/Studio/DataStructures/CustomAssetData.cs +++ b/Assets/Scripts/Studio/DataStructures/CustomAssetData.cs @@ -5,7 +5,7 @@ using TriLibCore; using UnityEngine; using UnityEngine.Events; -namespace XED.Util +namespace Studio.Util { public class CustomAssetData : UnityEngine.MonoBehaviour { diff --git a/Assets/Scripts/Studio/DataStructures/Enums.cs b/Assets/Scripts/Studio/DataStructures/Enums.cs index 1fd6afce..26f72a8a 100644 --- a/Assets/Scripts/Studio/DataStructures/Enums.cs +++ b/Assets/Scripts/Studio/DataStructures/Enums.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace XED +namespace Studio { public static class Enums { diff --git a/Assets/Scripts/Studio/DataStructures/KDTree.cs b/Assets/Scripts/Studio/DataStructures/KDTree.cs index 3ec02518..ec21cbf0 100644 --- a/Assets/Scripts/Studio/DataStructures/KDTree.cs +++ b/Assets/Scripts/Studio/DataStructures/KDTree.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace XED.DataStructures +namespace Studio.DataStructures { public class KDTree { diff --git a/Assets/Scripts/Studio/DataStructures/SerializableMesh.cs b/Assets/Scripts/Studio/DataStructures/SerializableMesh.cs index 984ed6d0..1c81d9a8 100644 --- a/Assets/Scripts/Studio/DataStructures/SerializableMesh.cs +++ b/Assets/Scripts/Studio/DataStructures/SerializableMesh.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Rendering; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public class SerializableMesh diff --git a/Assets/Scripts/Studio/DataStructures/SerializableQuaternion.cs b/Assets/Scripts/Studio/DataStructures/SerializableQuaternion.cs index 38559f68..c369597d 100644 --- a/Assets/Scripts/Studio/DataStructures/SerializableQuaternion.cs +++ b/Assets/Scripts/Studio/DataStructures/SerializableQuaternion.cs @@ -1,7 +1,7 @@ using MessagePack; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public struct SerializableQuaternion diff --git a/Assets/Scripts/Studio/DataStructures/SerializableVector2.cs b/Assets/Scripts/Studio/DataStructures/SerializableVector2.cs index cb162938..36a4bed2 100644 --- a/Assets/Scripts/Studio/DataStructures/SerializableVector2.cs +++ b/Assets/Scripts/Studio/DataStructures/SerializableVector2.cs @@ -2,7 +2,7 @@ using MessagePack; using System.Linq; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public struct SerializableVector2 diff --git a/Assets/Scripts/Studio/DataStructures/SerializableVector3.cs b/Assets/Scripts/Studio/DataStructures/SerializableVector3.cs index 1455f71a..ad2ffd8b 100644 --- a/Assets/Scripts/Studio/DataStructures/SerializableVector3.cs +++ b/Assets/Scripts/Studio/DataStructures/SerializableVector3.cs @@ -2,7 +2,7 @@ using MessagePack; using System.Linq; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public struct SerializableVector3 diff --git a/Assets/Scripts/Studio/DataStructures/SerializableVector4.cs b/Assets/Scripts/Studio/DataStructures/SerializableVector4.cs index c49c21e9..f651cb1e 100644 --- a/Assets/Scripts/Studio/DataStructures/SerializableVector4.cs +++ b/Assets/Scripts/Studio/DataStructures/SerializableVector4.cs @@ -2,7 +2,7 @@ using MessagePack; using System.Linq; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public struct SerializableVector4 diff --git a/Assets/Scripts/Studio/DataStructures/SubmeshData.cs b/Assets/Scripts/Studio/DataStructures/SubmeshData.cs index 7feff335..908b8786 100644 --- a/Assets/Scripts/Studio/DataStructures/SubmeshData.cs +++ b/Assets/Scripts/Studio/DataStructures/SubmeshData.cs @@ -1,6 +1,6 @@ using MessagePack; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] diff --git a/Assets/Scripts/Studio/DataStructures/TextureData.cs b/Assets/Scripts/Studio/DataStructures/TextureData.cs index 8a13c86e..c6161a79 100644 --- a/Assets/Scripts/Studio/DataStructures/TextureData.cs +++ b/Assets/Scripts/Studio/DataStructures/TextureData.cs @@ -1,6 +1,6 @@ using MessagePack; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] diff --git a/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs b/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs index bea67735..bb39d5ab 100644 --- a/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs +++ b/Assets/Scripts/Studio/DataStructures/ThumbnailData.cs @@ -1,6 +1,6 @@ using MessagePack; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public class ThumbnailData diff --git a/Assets/Scripts/Studio/DataStructures/TransformData.cs b/Assets/Scripts/Studio/DataStructures/TransformData.cs index d94a6ce1..ec6951f1 100644 --- a/Assets/Scripts/Studio/DataStructures/TransformData.cs +++ b/Assets/Scripts/Studio/DataStructures/TransformData.cs @@ -1,7 +1,7 @@ using MessagePack; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { [MessagePackObject] public class TransformData diff --git a/Assets/Scripts/Studio/Interfaces/IInputHandler.cs b/Assets/Scripts/Studio/Interfaces/IInputHandler.cs index ae36d24a..9d3ccdd4 100644 --- a/Assets/Scripts/Studio/Interfaces/IInputHandler.cs +++ b/Assets/Scripts/Studio/Interfaces/IInputHandler.cs @@ -1,6 +1,6 @@ -using XED.Manage; +using Studio.Manage; -namespace XED.Interfaces +namespace Studio.Interfaces { public interface IInputHandler { diff --git a/Assets/Scripts/Studio/Interfaces/IModeController.cs b/Assets/Scripts/Studio/Interfaces/IModeController.cs index cba3eb28..c7df6fc3 100644 --- a/Assets/Scripts/Studio/Interfaces/IModeController.cs +++ b/Assets/Scripts/Studio/Interfaces/IModeController.cs @@ -1,4 +1,4 @@ -namespace XED.Interfaces +namespace Studio.Interfaces { public interface IModeController { diff --git a/Assets/Scripts/Studio/Interfaces/IPooledObject.cs b/Assets/Scripts/Studio/Interfaces/IPooledObject.cs index 8e9aa306..4a947d9d 100644 --- a/Assets/Scripts/Studio/Interfaces/IPooledObject.cs +++ b/Assets/Scripts/Studio/Interfaces/IPooledObject.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEngine.Pool; -namespace XED.Interfaces +namespace Studio.Interfaces { public interface IPooledObject { diff --git a/Assets/Scripts/Studio/Legacy/Building/Floor.cs b/Assets/Scripts/Studio/Legacy/Building/Floor.cs index 515908d5..195ab9fd 100644 --- a/Assets/Scripts/Studio/Legacy/Building/Floor.cs +++ b/Assets/Scripts/Studio/Legacy/Building/Floor.cs @@ -3,9 +3,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.Pool; -using XED.Interfaces; +using Studio.Interfaces; -namespace XED +namespace Studio { [Serializable] diff --git a/Assets/Scripts/Studio/Legacy/Building/LinePoint.cs b/Assets/Scripts/Studio/Legacy/Building/LinePoint.cs index 7a560597..3318aed0 100644 --- a/Assets/Scripts/Studio/Legacy/Building/LinePoint.cs +++ b/Assets/Scripts/Studio/Legacy/Building/LinePoint.cs @@ -4,10 +4,10 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.Pool; using UnityEngine.UIElements; -using XED; +using Studio; using static UnityEngine.Rendering.DebugUI; -namespace XED +namespace Studio { public class LinePoint : MonoBehaviour { diff --git a/Assets/Scripts/Studio/Legacy/Building/MeshCreator.cs b/Assets/Scripts/Studio/Legacy/Building/MeshCreator.cs index be03a7b6..9da8428a 100644 --- a/Assets/Scripts/Studio/Legacy/Building/MeshCreator.cs +++ b/Assets/Scripts/Studio/Legacy/Building/MeshCreator.cs @@ -5,7 +5,7 @@ using TriLibCore.Dae.Schema; using UnityEngine; using XRLib; -namespace XED.Manage +namespace Studio.Manage { public class MeshCreator : Manager { diff --git a/Assets/Scripts/Studio/Legacy/Building/ObjectDistanceLine.cs b/Assets/Scripts/Studio/Legacy/Building/ObjectDistanceLine.cs index 0b974410..c3688542 100644 --- a/Assets/Scripts/Studio/Legacy/Building/ObjectDistanceLine.cs +++ b/Assets/Scripts/Studio/Legacy/Building/ObjectDistanceLine.cs @@ -4,9 +4,9 @@ using System.Linq; using UnityEngine; using UnityEditor; using XRLib; -using XED.UI; +using Studio.UI; -namespace XED.UI +namespace Studio.UI { //TODO::areabox°¡ ¾Æ´Ï¶ó TwinObject¸¦ ´ë»óÀ¸·Î µ¿ÀÛÇϵµ·Ï ¼öÁ¤ public class ObjectDistanceLine : MonoBehaviour, ISingle diff --git a/Assets/Scripts/Studio/Legacy/Building/ObjectHandler.cs b/Assets/Scripts/Studio/Legacy/Building/ObjectHandler.cs index cfaba8fe..07fc22c4 100644 --- a/Assets/Scripts/Studio/Legacy/Building/ObjectHandler.cs +++ b/Assets/Scripts/Studio/Legacy/Building/ObjectHandler.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; using XRLib; -using XED; +using Studio; public class ObjectHandler : MonoBehaviour, ISingle { diff --git a/Assets/Scripts/Studio/Legacy/Building/TwoPointLine.cs b/Assets/Scripts/Studio/Legacy/Building/TwoPointLine.cs index 0eccb741..fdafaa0d 100644 --- a/Assets/Scripts/Studio/Legacy/Building/TwoPointLine.cs +++ b/Assets/Scripts/Studio/Legacy/Building/TwoPointLine.cs @@ -1,7 +1,7 @@ using UnityEngine; using System; -namespace XED +namespace Studio { [Serializable] public class TwoPointLine diff --git a/Assets/Scripts/Studio/Legacy/Building/Wall.cs b/Assets/Scripts/Studio/Legacy/Building/Wall.cs index 09c7f03c..41242130 100644 --- a/Assets/Scripts/Studio/Legacy/Building/Wall.cs +++ b/Assets/Scripts/Studio/Legacy/Building/Wall.cs @@ -5,10 +5,10 @@ using System.Linq; using System.Security.Cryptography; using UnityEngine; using XRLib; -using static XED.Enums; +using static Studio.Enums; using Color = UnityEngine.Color; -namespace XED +namespace Studio { public class Wall : TwinObject { diff --git a/Assets/Scripts/Studio/Legacy/Building/WallBuilder.cs b/Assets/Scripts/Studio/Legacy/Building/WallBuilder.cs index 8b7407f8..e04670f4 100644 --- a/Assets/Scripts/Studio/Legacy/Building/WallBuilder.cs +++ b/Assets/Scripts/Studio/Legacy/Building/WallBuilder.cs @@ -6,13 +6,13 @@ using UnityEditor; using UnityEngine; using UnityEngine.EventSystems; using XRLib; -using XED.Interfaces; -using XED.Manage; -using XED.RuntimeGizmo; +using Studio.Interfaces; +using Studio.Manage; +using Studio.RuntimeGizmo; using Object = UnityEngine.Object; -using static XED.Enums; +using static Studio.Enums; -namespace XED.Manage +namespace Studio.Manage { public class WallBuilder : Manager, IInputHandler, IModeController { diff --git a/Assets/Scripts/Studio/Legacy/Building/WallGroup.cs b/Assets/Scripts/Studio/Legacy/Building/WallGroup.cs index f1d34932..be1bc1aa 100644 --- a/Assets/Scripts/Studio/Legacy/Building/WallGroup.cs +++ b/Assets/Scripts/Studio/Legacy/Building/WallGroup.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.Pool; using XRLib; -namespace XED +namespace Studio { public class WallGroup : TwinObject { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGV.cs b/Assets/Scripts/Studio/Machine/AGV/AGV.cs index bb1499ce..2bce7804 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGV.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGV.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class AGV : Loader { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVAction.cs b/Assets/Scripts/Studio/Machine/AGV/AGVAction.cs index c27efda4..37487321 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVAction.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVAction.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using XED.VirtualFactory; +using Studio.VirtualFactory; public class AGVAction { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVEntity.cs b/Assets/Scripts/Studio/Machine/AGV/AGVEntity.cs index d68b52e8..c0e15bbb 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVEntity.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVEntity.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using System.Numerics; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class AGVEntity: IEntity { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVManager.cs b/Assets/Scripts/Studio/Machine/AGV/AGVManager.cs index 3a685ab4..2666271e 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVManager.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVManager.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using UnityEngine; -using XED.VirtualFactory; +using Studio.VirtualFactory; using XRLib; -namespace XED.Manage +namespace Studio.Manage { public class AGVManager : Manager { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNode.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNode.cs index 0941b88e..9d94df5c 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNode.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNode.cs @@ -4,7 +4,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class AGVNode : TwinObject { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeClass.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeClass.cs index 5da012d7..dfde2e56 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeClass.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeClass.cs @@ -2,7 +2,7 @@ using UnityEngine; using System.Collections.Generic; using System; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { [Serializable] diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeEntity.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeEntity.cs index ecbd8873..91b730c6 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeEntity.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeEntity.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { [Serializable] public class AGVNodeEntity : IEntity diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeLinkManager.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeLinkManager.cs index a8ea2282..fdaa0857 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeLinkManager.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeLinkManager.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using UnityEngine; -using XED.VirtualFactory; +using Studio.VirtualFactory; -namespace XED.Manage +namespace Studio.Manage { public class AGVNodeLinkManager : Manager { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeManager.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeManager.cs index b02f8b53..2a5b681d 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeManager.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeManager.cs @@ -5,13 +5,13 @@ using System.IO; using TriLibCore.SFB; using UnityEngine; using XRLib; -using XED.Interfaces; -using XED.VirtualFactory; -using XED.Asset; +using Studio.Interfaces; +using Studio.VirtualFactory; +using Studio.Asset; using Object = UnityEngine.Object; -using static XED.Enums; +using static Studio.Enums; -namespace XED.Manage +namespace Studio.Manage { public class AGVNodeManager : Manager, IModeController, IInputHandler diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeModePopup.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeModePopup.cs index a3f995f1..2ae10b42 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeModePopup.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodeModePopup.cs @@ -4,9 +4,9 @@ using TMPro; using UnityEngine; using UnityEngine.UI; using XRLib.UI; -using static XED.Enums; +using static Studio.Enums; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class AGVNodeModePopup : PanelBase { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodePopup.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodePopup.cs index 49a6ad04..4aaa4150 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodePopup.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVNodePopup.cs @@ -6,7 +6,7 @@ using UnityEngine.UI; using XRLib; using XRLib.UI; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class AGVNodePopup : PanelBase { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVPortNode.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVPortNode.cs index 38ae4099..5046c15e 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVPortNode.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/AGVPortNode.cs @@ -1,6 +1,6 @@ using System; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class AGVPortNode : AGVNode { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/DestroyPort.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/DestroyPort.cs index e20335b7..3291912b 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/DestroyPort.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/DestroyPort.cs @@ -1,4 +1,4 @@ -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class DestroyPort : OutputPort { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/Entity.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/Entity.cs index 4384df68..9d555f55 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/Entity.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/Entity.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public interface IEntity { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/GeneratePort.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/GeneratePort.cs index 16b91e68..bb3af083 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/GeneratePort.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/GeneratePort.cs @@ -1,7 +1,7 @@ using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class GeneratePort : OutputPort { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/InputPort.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/InputPort.cs index b07ce6d7..a708bf4f 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/InputPort.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/InputPort.cs @@ -1,6 +1,6 @@ using System; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { //¹º°¡ ³õ°í ³ª°¡´Â °æ¿ì public class InputPort : Port diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/Loader.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/Loader.cs index c95d3730..e1833191 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/Loader.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/Loader.cs @@ -2,7 +2,7 @@ using System; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class Loader : TwinObject { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/NodeGizmoController.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/NodeGizmoController.cs index 9f836a81..d260f308 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/NodeGizmoController.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/NodeGizmoController.cs @@ -1,7 +1,7 @@ using RTG; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { public class NodeGizmoController : Manager { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/OutputPort.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/OutputPort.cs index fe796235..b46b39b4 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/OutputPort.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/OutputPort.cs @@ -1,4 +1,4 @@ -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { //¹º°¡ µé°í ³ª°¡´Â °æ¿ì public class OutputPort : Port diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/Port.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/Port.cs index 0aebb1d2..da68c71f 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/Port.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/Port.cs @@ -1,4 +1,4 @@ -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class Port : Loader { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/PortMap.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/PortMap.cs index ef3e3f77..6af1a04e 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/PortMap.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/PortMap.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using XRLib; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class PortMap : MonoBehaviour, ISingle { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/StackerInputPort.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/StackerInputPort.cs index afc899a4..cc8b6476 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/StackerInputPort.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/StackerInputPort.cs @@ -1,4 +1,4 @@ -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerInputPort : InputPort { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVNode/StackerOutputPort.cs b/Assets/Scripts/Studio/Machine/AGV/AGVNode/StackerOutputPort.cs index 1848c051..b7744220 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVNode/StackerOutputPort.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVNode/StackerOutputPort.cs @@ -1,4 +1,4 @@ -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerOutputPort : OutputPort { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVOrderClass.cs b/Assets/Scripts/Studio/Machine/AGV/AGVOrderClass.cs index 05923d4a..9d54dda6 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVOrderClass.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVOrderClass.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public enum TargetCase { diff --git a/Assets/Scripts/Studio/Machine/AGV/AGVSpec.cs b/Assets/Scripts/Studio/Machine/AGV/AGVSpec.cs index fd26c689..d14c6281 100644 --- a/Assets/Scripts/Studio/Machine/AGV/AGVSpec.cs +++ b/Assets/Scripts/Studio/Machine/AGV/AGVSpec.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { [CreateAssetMenu(fileName = "AGVSpecData", menuName = "AGVSpecData")] public class AGVSpec : ScriptableObject diff --git a/Assets/Scripts/Studio/Machine/AGV/Battery.cs b/Assets/Scripts/Studio/Machine/AGV/Battery.cs index 63dc05ab..6747f4ab 100644 --- a/Assets/Scripts/Studio/Machine/AGV/Battery.cs +++ b/Assets/Scripts/Studio/Machine/AGV/Battery.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public enum BatteryState { diff --git a/Assets/Scripts/Studio/Machine/AGV/BezierCurve.cs b/Assets/Scripts/Studio/Machine/AGV/BezierCurve.cs index 05632ef1..be46b660 100644 --- a/Assets/Scripts/Studio/Machine/AGV/BezierCurve.cs +++ b/Assets/Scripts/Studio/Machine/AGV/BezierCurve.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace XED +namespace Studio { public class BezierCurve : MonoBehaviour { diff --git a/Assets/Scripts/Studio/Machine/AGV/ChargeZone.cs b/Assets/Scripts/Studio/Machine/AGV/ChargeZone.cs index 3a1fdf4e..458f9987 100644 --- a/Assets/Scripts/Studio/Machine/AGV/ChargeZone.cs +++ b/Assets/Scripts/Studio/Machine/AGV/ChargeZone.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Unity.Burst.Intrinsics; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class ChargeZone : MonoBehaviour { diff --git a/Assets/Scripts/Studio/Machine/AGV/ObstacleSensor.cs b/Assets/Scripts/Studio/Machine/AGV/ObstacleSensor.cs index 26705759..45774d4d 100644 --- a/Assets/Scripts/Studio/Machine/AGV/ObstacleSensor.cs +++ b/Assets/Scripts/Studio/Machine/AGV/ObstacleSensor.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Rendering; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { [RequireComponent(typeof(SphereCollider))] public class ObstacleSensor : MonoBehaviour diff --git a/Assets/Scripts/Studio/Machine/AGV/Tester/BezierCurveTester.cs b/Assets/Scripts/Studio/Machine/AGV/Tester/BezierCurveTester.cs index 1c370eb7..78bd329a 100644 --- a/Assets/Scripts/Studio/Machine/AGV/Tester/BezierCurveTester.cs +++ b/Assets/Scripts/Studio/Machine/AGV/Tester/BezierCurveTester.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace XED +namespace Studio { public class BezierCurveTester: MonoBehaviour { diff --git a/Assets/Scripts/Studio/Machine/AMR_Class.cs b/Assets/Scripts/Studio/Machine/AMR_Class.cs index d5bd4ee4..6be9fa89 100644 --- a/Assets/Scripts/Studio/Machine/AMR_Class.cs +++ b/Assets/Scripts/Studio/Machine/AMR_Class.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { [Serializable] public class AMR_Class diff --git a/Assets/Scripts/Studio/Machine/ASRS_Class.cs b/Assets/Scripts/Studio/Machine/ASRS_Class.cs index 7fd9acb9..099aeb12 100644 --- a/Assets/Scripts/Studio/Machine/ASRS_Class.cs +++ b/Assets/Scripts/Studio/Machine/ASRS_Class.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { [Serializable] public class ASRS_Lifter_Class diff --git a/Assets/Scripts/Studio/Machine/Cobot_Class.cs b/Assets/Scripts/Studio/Machine/Cobot_Class.cs index a0132876..eccbd61b 100644 --- a/Assets/Scripts/Studio/Machine/Cobot_Class.cs +++ b/Assets/Scripts/Studio/Machine/Cobot_Class.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { [Serializable] public class COBOT_Class diff --git a/Assets/Scripts/Studio/Machine/DataDistributer.cs b/Assets/Scripts/Studio/Machine/DataDistributer.cs index 492f2c7c..53f39288 100644 --- a/Assets/Scripts/Studio/Machine/DataDistributer.cs +++ b/Assets/Scripts/Studio/Machine/DataDistributer.cs @@ -4,7 +4,7 @@ using UnityEngine; using Newtonsoft.Json; using System.Reflection; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class DataDistributer : MonoBehaviour { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/Cell.cs b/Assets/Scripts/Studio/Machine/StackerCrane/Cell.cs index 7cf621d7..c04c3742 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/Cell.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/Cell.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class Cell : Loader { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/LoadEntity.cs b/Assets/Scripts/Studio/Machine/StackerCrane/LoadEntity.cs index 47750479..f2fa874e 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/LoadEntity.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/LoadEntity.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class LoadEntity : IEntity { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/Product.cs b/Assets/Scripts/Studio/Machine/StackerCrane/Product.cs index 7e7e96c7..2217629f 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/Product.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/Product.cs @@ -1,7 +1,7 @@ using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class Product : TwinObject { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCrane.cs b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCrane.cs index 2b6a3a2f..c62f8c9c 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCrane.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCrane.cs @@ -4,7 +4,7 @@ using System.Linq; using UnityEngine; using XRLib; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerCrane : TwinObject { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneAction.cs b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneAction.cs index 19289790..d9d2bb69 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneAction.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneAction.cs @@ -1,4 +1,4 @@ -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerCraneAction { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneFork.cs b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneFork.cs index a7549a13..eaf97040 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneFork.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneFork.cs @@ -1,4 +1,4 @@ -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerCraneFork: Loader { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneLog.cs b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneLog.cs index ed5b0d55..acf8fb80 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneLog.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneLog.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.IO; using XRLib; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerCraneLog: MonoBehaviour, ISingle { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneManager.cs b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneManager.cs index e807236b..c6cbe788 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneManager.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneManager.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using UnityEngine; using XRLib; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerCraneManager : MonoBehaviour, ISingle { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneTask.cs b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneTask.cs index 26d06055..0f75ff9d 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneTask.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneTask.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerCraneTask { diff --git a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneTestUI.cs b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneTestUI.cs index 2f57dd08..669b7297 100644 --- a/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneTestUI.cs +++ b/Assets/Scripts/Studio/Machine/StackerCrane/StackerCraneTestUI.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using TMPro; using UnityEngine; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class StackerCraneTestUI : MonoBehaviour { diff --git a/Assets/Scripts/Studio/Machine/Supplier_Class.cs b/Assets/Scripts/Studio/Machine/Supplier_Class.cs index e3c9425a..ebfe1898 100644 --- a/Assets/Scripts/Studio/Machine/Supplier_Class.cs +++ b/Assets/Scripts/Studio/Machine/Supplier_Class.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace XED +namespace Studio { [Serializable] public class Supplier_Class diff --git a/Assets/Scripts/Studio/Managers/CameraManager.cs b/Assets/Scripts/Studio/Managers/CameraManager.cs index 5d2fbddd..bcd99d05 100644 --- a/Assets/Scripts/Studio/Managers/CameraManager.cs +++ b/Assets/Scripts/Studio/Managers/CameraManager.cs @@ -1,7 +1,7 @@ using UnityEngine; -using XED.Command; +using Studio.Command; -namespace XED.Manage +namespace Studio.Manage { public class CameraManager : Manager { diff --git a/Assets/Scripts/Studio/Managers/CanvasEventHandler.cs b/Assets/Scripts/Studio/Managers/CanvasEventHandler.cs index aae215c8..d8d641ed 100644 --- a/Assets/Scripts/Studio/Managers/CanvasEventHandler.cs +++ b/Assets/Scripts/Studio/Managers/CanvasEventHandler.cs @@ -1,6 +1,6 @@ using XRLib.UI; -namespace XED.Manage +namespace Studio.Manage { public class CanvasEventHandler { diff --git a/Assets/Scripts/Studio/Managers/CoroutineRunner.cs b/Assets/Scripts/Studio/Managers/CoroutineRunner.cs index ddd53af6..a45ffaac 100644 --- a/Assets/Scripts/Studio/Managers/CoroutineRunner.cs +++ b/Assets/Scripts/Studio/Managers/CoroutineRunner.cs @@ -1,8 +1,8 @@ using System.Collections; using UnityEngine; -using XED.Core; +using Studio.Core; -namespace XED +namespace Studio { public class CoroutineRunner : UnitySingleton { diff --git a/Assets/Scripts/Studio/Managers/CursorManager.cs b/Assets/Scripts/Studio/Managers/CursorManager.cs index 331c6672..fc205a7e 100644 --- a/Assets/Scripts/Studio/Managers/CursorManager.cs +++ b/Assets/Scripts/Studio/Managers/CursorManager.cs @@ -1,8 +1,8 @@ using System.Drawing.Printing; using UnityEngine; -using XED.UI; +using Studio.UI; -namespace XED.Manage +namespace Studio.Manage { public class CursorManager : Manager { diff --git a/Assets/Scripts/Studio/Managers/EventConnector.cs b/Assets/Scripts/Studio/Managers/EventConnector.cs index 57a822c5..219cc37f 100644 --- a/Assets/Scripts/Studio/Managers/EventConnector.cs +++ b/Assets/Scripts/Studio/Managers/EventConnector.cs @@ -1,11 +1,11 @@ using UnityEngine; using System.Collections.Generic; using System; -using XED.Core; -using XED.Command; +using Studio.Core; +using Studio.Command; using XRLib.UI; -namespace XED.Manage +namespace Studio.Manage { [DefaultExecutionOrder(int.MaxValue)] public class EventConnector : UnitySingleton diff --git a/Assets/Scripts/Studio/Managers/InputHandler.cs b/Assets/Scripts/Studio/Managers/InputHandler.cs index 9098cdec..a8adee17 100644 --- a/Assets/Scripts/Studio/Managers/InputHandler.cs +++ b/Assets/Scripts/Studio/Managers/InputHandler.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace XED.Manage +namespace Studio.Manage { public class InputHandler { diff --git a/Assets/Scripts/Studio/Managers/InterferedObjectManager.cs b/Assets/Scripts/Studio/Managers/InterferedObjectManager.cs index 156eda56..ec30fab9 100644 --- a/Assets/Scripts/Studio/Managers/InterferedObjectManager.cs +++ b/Assets/Scripts/Studio/Managers/InterferedObjectManager.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using TriLibCore.Interfaces; using UnityEngine; -using XED.Util; +using Studio.Util; using XRLib; -namespace XED.Manage +namespace Studio.Manage { public class InterferedObjectManager : Manager { diff --git a/Assets/Scripts/Studio/Managers/LinkDataUIManager.cs b/Assets/Scripts/Studio/Managers/LinkDataUIManager.cs index 5486e038..2f6ee1bb 100644 --- a/Assets/Scripts/Studio/Managers/LinkDataUIManager.cs +++ b/Assets/Scripts/Studio/Managers/LinkDataUIManager.cs @@ -1,11 +1,11 @@ using UnityEngine; -using XED.UI; +using Studio.UI; using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -namespace XED.VirtualFactory +namespace Studio.VirtualFactory { public class LinkDataUIManager : MonoBehaviour { diff --git a/Assets/Scripts/Studio/Managers/Manager.cs b/Assets/Scripts/Studio/Managers/Manager.cs index c3353d57..4bf3a636 100644 --- a/Assets/Scripts/Studio/Managers/Manager.cs +++ b/Assets/Scripts/Studio/Managers/Manager.cs @@ -1,4 +1,4 @@ -namespace XED.Manage +namespace Studio.Manage { public abstract class Manager { diff --git a/Assets/Scripts/Studio/Managers/ManagerHub.cs b/Assets/Scripts/Studio/Managers/ManagerHub.cs index ed3faa02..2504b5bb 100644 --- a/Assets/Scripts/Studio/Managers/ManagerHub.cs +++ b/Assets/Scripts/Studio/Managers/ManagerHub.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using UnityEngine; -using XED.Asset; -using XED.Core; -using XED.Util; +using Studio.Asset; +using Studio.Core; +using Studio.Util; -namespace XED.Manage +namespace Studio.Manage { public class ManagerHub : UnitySingleton { diff --git a/Assets/Scripts/Studio/Managers/ModePanel.cs b/Assets/Scripts/Studio/Managers/ModePanel.cs index 2cc7e66b..ec81de32 100644 --- a/Assets/Scripts/Studio/Managers/ModePanel.cs +++ b/Assets/Scripts/Studio/Managers/ModePanel.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; using UnityEngine; using XRLib; -using XED.Interfaces; -using XED.Util; +using Studio.Interfaces; +using Studio.Util; -namespace XED.Manage +namespace Studio.Manage { public class ModePanel : MonoBehaviour, ISingle { diff --git a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs index c4f8301b..5c87cc61 100644 --- a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs @@ -1,4 +1,4 @@ -namespace XED.Manage +namespace Studio.Manage { public class PopupCanvasHandler : CanvasEventHandler { diff --git a/Assets/Scripts/Studio/Managers/ProjectManager.cs b/Assets/Scripts/Studio/Managers/ProjectManager.cs index 762fba15..cdecc2b9 100644 --- a/Assets/Scripts/Studio/Managers/ProjectManager.cs +++ b/Assets/Scripts/Studio/Managers/ProjectManager.cs @@ -6,14 +6,14 @@ using System.Linq; using TriLibCore.Dae.Schema; using TriLibCore.SFB; using UnityEditor; -using XED.Asset; -using XED.Command; -using XED.HierarchyTree; -using XED.Service; -using XED.Util; +using Studio.Asset; +using Studio.Command; +using Studio.HierarchyTree; +using Studio.Service; +using Studio.Util; using XRLib; -namespace XED.Manage +namespace Studio.Manage { public class ProjectManager : Manager { diff --git a/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs b/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs index a2c96853..7cc6e2e9 100644 --- a/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs @@ -1,9 +1,9 @@ using UnityEngine; -using XED.Command; -using XED.UI; -using XED.Util; +using Studio.Command; +using Studio.UI; +using Studio.Util; -namespace XED.Manage +namespace Studio.Manage { public class StaticCanvasHandler : CanvasEventHandler { diff --git a/Assets/Scripts/Studio/Managers/UIManager.cs b/Assets/Scripts/Studio/Managers/UIManager.cs index 49a86f1b..d5afff9a 100644 --- a/Assets/Scripts/Studio/Managers/UIManager.cs +++ b/Assets/Scripts/Studio/Managers/UIManager.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using UnityEngine; -using XED.Core; +using Studio.Core; using XRLib.UI; -namespace XED.Manage +namespace Studio.Manage { public class UIManager : UnitySingleton { diff --git a/Assets/Scripts/Studio/Managers/UserInputManager.cs b/Assets/Scripts/Studio/Managers/UserInputManager.cs index 31f4c1ed..6a79b145 100644 --- a/Assets/Scripts/Studio/Managers/UserInputManager.cs +++ b/Assets/Scripts/Studio/Managers/UserInputManager.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using UnityEngine; using XRLib; -namespace XED.Manage +namespace Studio.Manage { public class UserInputManager : MonoBehaviour { diff --git a/Assets/Scripts/Studio/Service/AssetDataService.cs b/Assets/Scripts/Studio/Service/AssetDataService.cs index c5154345..e012739c 100644 --- a/Assets/Scripts/Studio/Service/AssetDataService.cs +++ b/Assets/Scripts/Studio/Service/AssetDataService.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; -using XED.Util; -using XED.Asset; +using Studio.Util; +using Studio.Asset; using System.Linq; -using XED.HierarchyTree; +using Studio.HierarchyTree; -namespace XED.Service +namespace Studio.Service { public class AssetDataService { diff --git a/Assets/Scripts/Studio/TwinObject/TwinContainer.cs b/Assets/Scripts/Studio/TwinObject/TwinContainer.cs index dc472546..ba2c31e6 100644 --- a/Assets/Scripts/Studio/TwinObject/TwinContainer.cs +++ b/Assets/Scripts/Studio/TwinObject/TwinContainer.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace XED +namespace Studio { [CreateAssetMenu(fileName ="TwinContainer",menuName ="AddressableAsset/TwinContainer")] public class TwinContainer : ScriptableObject diff --git a/Assets/Scripts/Studio/TwinObject/TwinMetaData.cs b/Assets/Scripts/Studio/TwinObject/TwinMetaData.cs index 760f4886..3c7efc76 100644 --- a/Assets/Scripts/Studio/TwinObject/TwinMetaData.cs +++ b/Assets/Scripts/Studio/TwinObject/TwinMetaData.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace XED +namespace Studio { [Serializable] public class TwinMetaData diff --git a/Assets/Scripts/Studio/TwinObject/TwinObject.cs b/Assets/Scripts/Studio/TwinObject/TwinObject.cs index 217334e6..4555d242 100644 --- a/Assets/Scripts/Studio/TwinObject/TwinObject.cs +++ b/Assets/Scripts/Studio/TwinObject/TwinObject.cs @@ -1,10 +1,10 @@ using Newtonsoft.Json; using UnityEngine; -using XED.Attributes; -using XED.UI; -using XED.VirtualFactory; +using Studio.Attributes; +using Studio.UI; +using Studio.VirtualFactory; -namespace XED +namespace Studio { public class TwinObject : MonoBehaviour { diff --git a/Assets/Scripts/Studio/TwinObject/TwinPhysics.cs b/Assets/Scripts/Studio/TwinObject/TwinPhysics.cs index 7c9c0e4f..c6eb0480 100644 --- a/Assets/Scripts/Studio/TwinObject/TwinPhysics.cs +++ b/Assets/Scripts/Studio/TwinObject/TwinPhysics.cs @@ -2,7 +2,7 @@ using System; using UnityEngine; using XRLib.Util; -namespace XED +namespace Studio { [Serializable] public class TwinPhysics diff --git a/Assets/Scripts/Studio/UI/AccessibilitySettings_ButtonDropdown.cs b/Assets/Scripts/Studio/UI/AccessibilitySettings_ButtonDropdown.cs index 953c7936..a8388ac3 100644 --- a/Assets/Scripts/Studio/UI/AccessibilitySettings_ButtonDropdown.cs +++ b/Assets/Scripts/Studio/UI/AccessibilitySettings_ButtonDropdown.cs @@ -1,8 +1,8 @@ using UnityEngine; using UnityEngine.UI; -using XED.UI; +using Studio.UI; -namespace XED +namespace Studio { public class AccessibilitySettings_ButtonDropdown : UI_ButtonDropdown { diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs index fd1e0013..1bccf74c 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_DragArea.cs @@ -1,10 +1,10 @@ using UnityEngine; -using XED.Asset; -using XED.Manage; -using XED.UI; +using Studio.Asset; +using Studio.Manage; +using Studio.UI; using XRLib.UI; -namespace XED +namespace Studio { public class Canvas_DragArea : CanvasBase { diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index b824a6cd..1dfc9db9 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -1,12 +1,12 @@ using UnityEngine; -using XED.Manage; -using XED.UI; -using XED.Util; -using XED.VirtualFactory; +using Studio.Manage; +using Studio.UI; +using Studio.Util; +using Studio.VirtualFactory; using XRLib; using XRLib.UI; -namespace XED +namespace Studio { public class Canvas_Popup : CanvasBase, ISingle { diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs index fc149411..757bc210 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs @@ -1,7 +1,7 @@ using UnityEngine; using XRLib.UI; -namespace XED +namespace Studio { public class Canvas_SceneGizmo : CanvasBase { diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs index 99b03353..4c0c3216 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs @@ -1,11 +1,11 @@ using XRLib; using XRLib.UI; using UnityEngine; -using XED.Manage; -using XED.Util; -using XED.Command; +using Studio.Manage; +using Studio.Util; +using Studio.Command; -namespace XED.UI +namespace Studio.UI { public class Canvas_Static : CanvasBase { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_AssetEdit.cs b/Assets/Scripts/Studio/UI/Elements/UI_AssetEdit.cs index 46f13263..dc48652c 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_AssetEdit.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_AssetEdit.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; using TMPro; -namespace XED.UI +namespace Studio.UI { public class UI_AssetEdit : MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_ButtonDropdown.cs b/Assets/Scripts/Studio/UI/Elements/UI_ButtonDropdown.cs index 672bc70c..03b62973 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_ButtonDropdown.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_ButtonDropdown.cs @@ -4,7 +4,7 @@ using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.UI; -namespace XED.UI +namespace Studio.UI { public class UI_ButtonDropdown : UnityEngine.MonoBehaviour, IDeselectHandler { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_DistanceLabel.cs b/Assets/Scripts/Studio/UI/Elements/UI_DistanceLabel.cs index 9712c76e..51ade1d9 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_DistanceLabel.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_DistanceLabel.cs @@ -4,7 +4,7 @@ using UnityEngine.UI; using XRLib; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class UI_DistanceLabel : UIBase { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_DragDrop.cs b/Assets/Scripts/Studio/UI/Elements/UI_DragDrop.cs index 80458be7..76a92073 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_DragDrop.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_DragDrop.cs @@ -6,7 +6,7 @@ using UnityEngine.UI.Extensions; using XRLib.UI; using static DrawLine; -namespace XED.UI +namespace Studio.UI { public class UI_DragDrop : MonoBehaviour,IBeginDragHandler,IDragHandler,IEndDragHandler,IDropHandler { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_InterferedObjectButton.cs b/Assets/Scripts/Studio/UI/Elements/UI_InterferedObjectButton.cs index f6db44a2..5fff8d5e 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_InterferedObjectButton.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_InterferedObjectButton.cs @@ -2,10 +2,10 @@ using System; using TMPro; using UnityEngine; using UnityEngine.UI; -using XED.Util; +using Studio.Util; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class UI_InterferedObjectButton : UIBase { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_LinkData.cs b/Assets/Scripts/Studio/UI/Elements/UI_LinkData.cs index 07bf6372..d49d05dd 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_LinkData.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_LinkData.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.UI; using TMPro; -namespace XED.UI +namespace Studio.UI { public class UI_LinkData : MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_ObjectDistance.cs b/Assets/Scripts/Studio/UI/Elements/UI_ObjectDistance.cs index 6034293d..69cca306 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_ObjectDistance.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_ObjectDistance.cs @@ -2,7 +2,7 @@ using UnityEngine; using TMPro; using XRLib.UI; -namespace XED +namespace Studio { public class UI_ObjectDistance : UIBase { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_PredefinedTypeItem.cs b/Assets/Scripts/Studio/UI/Elements/UI_PredefinedTypeItem.cs index f68352eb..1054242c 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_PredefinedTypeItem.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_PredefinedTypeItem.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class UI_PredefinedTypeItem : UIBase { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_PropertyViewerInfo.cs b/Assets/Scripts/Studio/UI/Elements/UI_PropertyViewerInfo.cs index 388e3220..67de9259 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_PropertyViewerInfo.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_PropertyViewerInfo.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class UI_PropertyViewerInfo : UIBase { diff --git a/Assets/Scripts/Studio/UI/Elements/UI_WindowDrag.cs b/Assets/Scripts/Studio/UI/Elements/UI_WindowDrag.cs index 58097460..33c816c1 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_WindowDrag.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_WindowDrag.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.EventSystems; -namespace XED.UI +namespace Studio.UI { public class UI_WindowDrag : UnityEngine.MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDragHandler, IPointerDownHandler { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AccessibilitySettings.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AccessibilitySettings.cs index 80a41a8d..aca37275 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AccessibilitySettings.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AccessibilitySettings.cs @@ -8,7 +8,7 @@ using XRLib; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_AccessibilitySettings : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetEdit.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetEdit.cs index 2e443ef5..56b96ce1 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetEdit.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetEdit.cs @@ -3,9 +3,9 @@ using UnityEngine.UI; using System.Collections.Generic; using XRLib.UI; using TMPro; -using XED.VirtualFactory; +using Studio.VirtualFactory; -namespace XED.UI +namespace Studio.UI { public class Panel_AssetEdit : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs index d9febddd..26f5bb5b 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs @@ -1,10 +1,10 @@ using UnityEngine; using XRLib.UI; -using XED.HierarchyTree; +using Studio.HierarchyTree; using UnityEngine.UI; -using XED.AssetLibraryTree; +using Studio.AssetLibraryTree; -namespace XED.UI +namespace Studio.UI { public class Panel_AssetLibrary : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs index 889c0440..19b2fbec 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs @@ -4,13 +4,13 @@ using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.UI; -using XED.AssetLibraryTree; -using XED.HierarchyTree; -using XED.Util; +using Studio.AssetLibraryTree; +using Studio.HierarchyTree; +using Studio.Util; using XRLib.UI; -using static XED.UI.Panel_PredefinedType; +using static Studio.UI.Panel_PredefinedType; -namespace XED.UI +namespace Studio.UI { public class Panel_AssetProperties : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ColorPicker.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ColorPicker.cs index 765802ea..aa48cea1 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ColorPicker.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ColorPicker.cs @@ -8,7 +8,7 @@ using XRLib; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_ColorPicker : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_DragHandler.cs b/Assets/Scripts/Studio/UI/Panel/Panel_DragHandler.cs index 3196a37d..ec76d4c1 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_DragHandler.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_DragHandler.cs @@ -4,7 +4,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_DragHandler : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_Hierarchy.cs b/Assets/Scripts/Studio/UI/Panel/Panel_Hierarchy.cs index f3363890..908fa060 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_Hierarchy.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_Hierarchy.cs @@ -1,10 +1,10 @@ using UnityEngine; using XRLib.UI; -using XED.Core; -using XED.HierarchyTree; +using Studio.Core; +using Studio.HierarchyTree; using UnityEngine.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_Hierarchy : PanelBase//UnityEngine.MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_InterferedObjectList.cs b/Assets/Scripts/Studio/UI/Panel/Panel_InterferedObjectList.cs index 5622f677..08f4ff84 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_InterferedObjectList.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_InterferedObjectList.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using XED.Manage; -using XED.Util; +using Studio.Manage; +using Studio.Util; using XRLib; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_InterferedObjectList : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_InterworkingDataList.cs b/Assets/Scripts/Studio/UI/Panel/Panel_InterworkingDataList.cs index 8d1ea468..824074f6 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_InterworkingDataList.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_InterworkingDataList.cs @@ -1,10 +1,10 @@ using UnityEngine; using UnityEngine.UI; -using XED.HierarchyTree; +using Studio.HierarchyTree; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_InterworkingDataList : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectAlign.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectAlign.cs index dcd981ff..ed5b43a7 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectAlign.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectAlign.cs @@ -1,12 +1,12 @@ using TMPro; using UnityEngine; using UnityEngine.UI; -using XED.Asset; -using XED.Manage; -using XED.Util; +using Studio.Asset; +using Studio.Manage; +using Studio.Util; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_ObjectAlign : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs index 4c32cace..32f53c5f 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs @@ -2,11 +2,11 @@ using System; using System.Collections.Generic; using TMPro; using UnityEngine; -using XED.Util; +using Studio.Util; using XRLib; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_ObjectDistance : PanelBase, ISingle { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistanceLabelList.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistanceLabelList.cs index 02a2e493..89bd9a7f 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistanceLabelList.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistanceLabelList.cs @@ -2,7 +2,7 @@ using UnityEngine; using XRLib; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_ObjectDistanceLabelList : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectInfo.cs index cd9f2f72..37074bea 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectInfo.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectInfo.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using TMPro; using UnityEngine; using XRLib.UI; -using XED.Manage; +using Studio.Manage; using System.Linq; -using XED.Core; -using XED.Command; +using Studio.Core; +using Studio.Command; -namespace XED.UI +namespace Studio.UI { public class Panel_ObjectInfo : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectTool.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectTool.cs index 63d8ca2e..c18f5dd4 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectTool.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectTool.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; using XRLib; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_ObjectTool : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_PredefinedType.cs b/Assets/Scripts/Studio/UI/Panel/Panel_PredefinedType.cs index 6aabbd26..34dd77fa 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_PredefinedType.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_PredefinedType.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_PredefinedType : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_PropertyViewer.cs b/Assets/Scripts/Studio/UI/Panel/Panel_PropertyViewer.cs index 6280e414..35a680ff 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_PropertyViewer.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_PropertyViewer.cs @@ -6,11 +6,11 @@ using UnityEngine; using UnityEngine.UI; using XRLib; using XRLib.UI; -using XED.UI; -using XED.Attributes; +using Studio.UI; +using Studio.Attributes; using TMPro; -namespace XED.UI +namespace Studio.UI { public class Panel_PropertyViewer : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ShortCuts.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ShortCuts.cs index 94bfd749..65a03ee2 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ShortCuts.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ShortCuts.cs @@ -3,9 +3,9 @@ using UnityEngine; using UnityEngine.UI; using XRLib; using XRLib.UI; -using XED.Core; +using Studio.Core; -namespace XED.UI +namespace Studio.UI { public class Panel_ShortCuts : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_Thumbnail.cs b/Assets/Scripts/Studio/UI/Panel/Panel_Thumbnail.cs index 8b71aeaa..76687d79 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_Thumbnail.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_Thumbnail.cs @@ -1,11 +1,11 @@ using System; using UnityEngine; using UnityEngine.UI; -using XED.AssetLibraryTree; -using XED.Util; +using Studio.AssetLibraryTree; +using Studio.Util; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_Thumbnail : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_Toolbar.cs b/Assets/Scripts/Studio/UI/Panel/Panel_Toolbar.cs index df8150b3..ed9d9307 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_Toolbar.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_Toolbar.cs @@ -1,9 +1,9 @@ using System; using UnityEngine.UI; using XRLib.UI; -using static XED.Enums; +using static Studio.Enums; -namespace XED.UI +namespace Studio.UI { public class Panel_Toolbar : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_Tooltip.cs b/Assets/Scripts/Studio/UI/Panel/Panel_Tooltip.cs index 7f3fe419..d31a4acf 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_Tooltip.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_Tooltip.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; using UnityEngine.UI.Extensions; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_Tooltip : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs b/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs index 7093de17..53293879 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs @@ -2,7 +2,7 @@ using UnityEngine.UI; using System; using XRLib.UI; using System.Diagnostics; -namespace XED.UI +namespace Studio.UI { public class Panel_TopBar : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_WallDrawTool.cs b/Assets/Scripts/Studio/UI/Panel/Panel_WallDrawTool.cs index 4258bf8d..d779fb28 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_WallDrawTool.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_WallDrawTool.cs @@ -1,7 +1,7 @@ using XRLib; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class Panel_WallDrawTool : PanelBase { diff --git a/Assets/Scripts/Studio/UI/Tag/UI_GUIWindow.cs b/Assets/Scripts/Studio/UI/Tag/UI_GUIWindow.cs index f8a23737..f3e63fb4 100644 --- a/Assets/Scripts/Studio/UI/Tag/UI_GUIWindow.cs +++ b/Assets/Scripts/Studio/UI/Tag/UI_GUIWindow.cs @@ -1,10 +1,10 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using XED.Manage; +using Studio.Manage; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public enum GUIState { diff --git a/Assets/Scripts/Studio/UI/Tag/UI_GUIWindowHeader.cs b/Assets/Scripts/Studio/UI/Tag/UI_GUIWindowHeader.cs index 583032fc..865dd712 100644 --- a/Assets/Scripts/Studio/UI/Tag/UI_GUIWindowHeader.cs +++ b/Assets/Scripts/Studio/UI/Tag/UI_GUIWindowHeader.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.EventSystems; using XRLib.UI; -namespace XED.UI +namespace Studio.UI { public class UI_GUIWindowHeader : UIBase, IPointerDownHandler { diff --git a/Assets/Scripts/Studio/UI/Tag/UI_TooltipOwner.cs b/Assets/Scripts/Studio/UI/Tag/UI_TooltipOwner.cs index 3ce42910..1c52ac8e 100644 --- a/Assets/Scripts/Studio/UI/Tag/UI_TooltipOwner.cs +++ b/Assets/Scripts/Studio/UI/Tag/UI_TooltipOwner.cs @@ -1,7 +1,7 @@ using UnityEngine; using XRLib.UI; -namespace XED +namespace Studio { public class UI_TooltipOwner : UIBase { diff --git a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryItem.cs b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryItem.cs index 7be44992..ec82bc99 100644 --- a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryItem.cs +++ b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryItem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; -namespace XED.AssetLibraryTree +namespace Studio.AssetLibraryTree { public enum AssetLibraryItemType { diff --git a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPooledScrollView.cs b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPooledScrollView.cs index d2f3b1bf..40aeaca9 100644 --- a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPooledScrollView.cs +++ b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPooledScrollView.cs @@ -3,12 +3,12 @@ using UnityEngine; using UnityEngine.Pool; using UnityEngine.Events; using TMPro; -using XED.Manage; +using Studio.Manage; using Unity.Hierarchy; -using XED.Core; -using XED.Command; +using Studio.Core; +using Studio.Command; -namespace XED.AssetLibraryTree +namespace Studio.AssetLibraryTree { public class AssetLibraryPooledScrollView : MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPopupScrollViewItem.cs b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPopupScrollViewItem.cs index 1e282c20..9fba8e11 100644 --- a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPopupScrollViewItem.cs +++ b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPopupScrollViewItem.cs @@ -5,7 +5,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using TMPro; -namespace XED.AssetLibraryTree +namespace Studio.AssetLibraryTree { public class AssetLibraryPopupScrollViewItem : UnityEngine.MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollFolderUI.cs b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollFolderUI.cs index 740447af..f23a1aa2 100644 --- a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollFolderUI.cs +++ b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollFolderUI.cs @@ -1,6 +1,6 @@ using TMPro; -namespace XED.AssetLibraryTree +namespace Studio.AssetLibraryTree { public class AssetLibraryScrollFolderUI : UnityEngine.MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollItemUI.cs b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollItemUI.cs index 76f635fb..922a7249 100644 --- a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollItemUI.cs +++ b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollItemUI.cs @@ -5,10 +5,10 @@ using UnityEngine.UI; using TMPro; using UnityEngine.EventSystems; using UnityEngine.Events; -using XED.Manage; -using XED.Util; +using Studio.Manage; +using Studio.Util; -namespace XED.AssetLibraryTree +namespace Studio.AssetLibraryTree { public class AssetLibraryScrollItemUI : UnityEngine.MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler//, IBeginDragHandler, IEndDragHandler, { diff --git a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollRect.cs b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollRect.cs index 55ef7ced..0a46a493 100644 --- a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollRect.cs +++ b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryScrollRect.cs @@ -5,9 +5,9 @@ using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.UI; -using XED.UI; +using Studio.UI; -namespace XED.AssetLibraryTree +namespace Studio.AssetLibraryTree { public class AssetLibraryScrollRect : ScrollRect, IPointerDownHandler { diff --git a/Assets/Scripts/Studio/UI/TreeView/HierarchyItem.cs b/Assets/Scripts/Studio/UI/TreeView/HierarchyItem.cs index b5d174d1..0aa6c862 100644 --- a/Assets/Scripts/Studio/UI/TreeView/HierarchyItem.cs +++ b/Assets/Scripts/Studio/UI/TreeView/HierarchyItem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; -namespace XED.HierarchyTree +namespace Studio.HierarchyTree { public enum HierarchyItemType { diff --git a/Assets/Scripts/Studio/UI/TreeView/HierarchyPooledScrollView.cs b/Assets/Scripts/Studio/UI/TreeView/HierarchyPooledScrollView.cs index e83b3704..158e527b 100644 --- a/Assets/Scripts/Studio/UI/TreeView/HierarchyPooledScrollView.cs +++ b/Assets/Scripts/Studio/UI/TreeView/HierarchyPooledScrollView.cs @@ -3,12 +3,12 @@ using UnityEngine; using UnityEngine.Pool; using UnityEngine.Events; using TMPro; -using XED.Manage; +using Studio.Manage; using Unity.Hierarchy; -using XED.Core; -using XED.Command; +using Studio.Core; +using Studio.Command; -namespace XED.HierarchyTree +namespace Studio.HierarchyTree { public class HierarchyPooledScrollView : MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/TreeView/HierarchyPopupScrollViewItem.cs b/Assets/Scripts/Studio/UI/TreeView/HierarchyPopupScrollViewItem.cs index ef85fbe0..ee3c5689 100644 --- a/Assets/Scripts/Studio/UI/TreeView/HierarchyPopupScrollViewItem.cs +++ b/Assets/Scripts/Studio/UI/TreeView/HierarchyPopupScrollViewItem.cs @@ -5,7 +5,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using TMPro; -namespace XED.HierarchyTree +namespace Studio.HierarchyTree { public class HierarchyPopupScrollViewItem : UnityEngine.MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollItemUI.cs b/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollItemUI.cs index 6a820729..0569c839 100644 --- a/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollItemUI.cs +++ b/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollItemUI.cs @@ -8,7 +8,7 @@ using UnityEngine.Events; using System; using XRLib; -namespace XED.HierarchyTree +namespace Studio.HierarchyTree { public class HierarchyScrollItemUI : UnityEngine.MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler//, IBeginDragHandler, IEndDragHandler, { diff --git a/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollRect.cs b/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollRect.cs index 7db7b663..939851c9 100644 --- a/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollRect.cs +++ b/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollRect.cs @@ -5,9 +5,9 @@ using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.UI; -using XED.UI; +using Studio.UI; -namespace XED.HierarchyTree +namespace Studio.HierarchyTree { public class HierarchyScrollRect : ScrollRect, IPointerDownHandler, IPointerUpHandler, IPointerExitHandler { diff --git a/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewMenu.cs b/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewMenu.cs index acce4003..2a18f8d4 100644 --- a/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewMenu.cs +++ b/Assets/Scripts/Studio/UI/TreeView/PopupScrollViewMenu.cs @@ -1,8 +1,8 @@ using TMPro; using UnityEngine; -using XED.HierarchyTree; +using Studio.HierarchyTree; -namespace XED.UI +namespace Studio.UI { public class PopupScrollViewMenu : MonoBehaviour { diff --git a/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs b/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs index bac697fb..7a164bf5 100644 --- a/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs +++ b/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs @@ -3,16 +3,16 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; using XRLib.UI; -using XED.Asset; -using XED.HierarchyTree; -using XED.Manage; +using Studio.Asset; +using Studio.HierarchyTree; +using Studio.Manage; -namespace XED.UI +namespace Studio.UI { public class ScrollViewMenu_ImportExport : PanelBase, IDeselectHandler { private Canvas canvas; - private XED.AssetLibraryTree.AssetLibraryScrollRect scrollRect; + private Studio.AssetLibraryTree.AssetLibraryScrollRect scrollRect; private Button btnExport; private Button btnImport; private Selectable selectable; diff --git a/Assets/Scripts/Studio/Utility/EnumUtil.cs b/Assets/Scripts/Studio/Utility/EnumUtil.cs index 702d4823..9b51eb97 100644 --- a/Assets/Scripts/Studio/Utility/EnumUtil.cs +++ b/Assets/Scripts/Studio/Utility/EnumUtil.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel; using System.Reflection; -namespace XED +namespace Studio { public static class EnumUtil { diff --git a/Assets/Scripts/Studio/Utility/TextureUtil.cs b/Assets/Scripts/Studio/Utility/TextureUtil.cs index f5edc642..07b29379 100644 --- a/Assets/Scripts/Studio/Utility/TextureUtil.cs +++ b/Assets/Scripts/Studio/Utility/TextureUtil.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace XED.Util +namespace Studio.Util { public static class TextureUtil { diff --git a/Assets/Scripts/TreeItem.cs b/Assets/Scripts/TreeItem.cs index cfcecddb..7d35bf14 100644 --- a/Assets/Scripts/TreeItem.cs +++ b/Assets/Scripts/TreeItem.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace XED +namespace Studio { public class TreeItem { diff --git a/Assets/Scripts/UVC/UI/UVCScrollView.cs b/Assets/Scripts/UVC/UI/UVCScrollView.cs index 4032f3b6..954f776e 100644 --- a/Assets/Scripts/UVC/UI/UVCScrollView.cs +++ b/Assets/Scripts/UVC/UI/UVCScrollView.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using XED.VirtualFactory; +using Studio.VirtualFactory; namespace Studio.UVC.UI { diff --git a/Assets/Scripts/XRLib/GenericController/Raycaster.cs b/Assets/Scripts/XRLib/GenericController/Raycaster.cs index 67292d55..21fb6406 100644 --- a/Assets/Scripts/XRLib/GenericController/Raycaster.cs +++ b/Assets/Scripts/XRLib/GenericController/Raycaster.cs @@ -4,9 +4,9 @@ using System.Linq; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using XED; +using Studio; -namespace XED.Manage +namespace Studio.Manage { [DefaultExecutionOrder(int.MinValue)] public class Raycaster : MonoBehaviour diff --git a/Assets/Scripts/XRLib/UI/CanvasBase.cs b/Assets/Scripts/XRLib/UI/CanvasBase.cs index b8a14371..e1069ff7 100644 --- a/Assets/Scripts/XRLib/UI/CanvasBase.cs +++ b/Assets/Scripts/XRLib/UI/CanvasBase.cs @@ -1,4 +1,4 @@ -using XED.Manage; +using Studio.Manage; namespace XRLib.UI { diff --git a/Assets/legacy/Scripts/HierarchyPanel.cs b/Assets/legacy/Scripts/HierarchyPanel.cs index d621a17c..4fd18b90 100644 --- a/Assets/legacy/Scripts/HierarchyPanel.cs +++ b/Assets/legacy/Scripts/HierarchyPanel.cs @@ -8,7 +8,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio { public class HierarchyPanel : PanelBase,IDropHandler { diff --git a/Assets/legacy/Scripts/HierarchyTree.cs b/Assets/legacy/Scripts/HierarchyTree.cs index 9d16e080..0ef9752e 100644 --- a/Assets/legacy/Scripts/HierarchyTree.cs +++ b/Assets/legacy/Scripts/HierarchyTree.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.PlayerLoop; using XRLib; -namespace XED.Hierarchy +namespace Studio.Hierarchy { public class HierarchyTree { diff --git a/Assets/legacy/Scripts/UI_DragDrop_.cs b/Assets/legacy/Scripts/UI_DragDrop_.cs index 682449c0..5a032432 100644 --- a/Assets/legacy/Scripts/UI_DragDrop_.cs +++ b/Assets/legacy/Scripts/UI_DragDrop_.cs @@ -6,7 +6,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio { public class UI_DragDrop_ : MonoBehaviour,IBeginDragHandler,IDragHandler,IEndDragHandler,IDropHandler { diff --git a/Assets/legacy/Scripts/UI_HierarchyItem.cs b/Assets/legacy/Scripts/UI_HierarchyItem.cs index 0cbb49f3..29b8762d 100644 --- a/Assets/legacy/Scripts/UI_HierarchyItem.cs +++ b/Assets/legacy/Scripts/UI_HierarchyItem.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; using XRLib; using XRLib.UI; -namespace XED +namespace Studio { public class UI_HierarchyItem : UIBase {