From 679962efa8912068d287a636289a18cbfb12eb7f Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Thu, 6 Oct 2016 23:34:10 +0700 Subject: [PATCH] FTRuntime and FTEditor namespaces --- Assets/FlashTools/Resources/SwfSettings.asset | 2 +- FTSources/FTEditor/FTEditor.csproj | 2 +- FTSources/FTEditor/Sources/Editors/SwfAssetEditor.cs | 5 ++++- FTSources/FTEditor/Sources/Editors/SwfClipAssetEditor.cs | 4 +++- FTSources/FTEditor/Sources/Editors/SwfClipAssetPreview.cs | 4 +++- .../FTEditor/Sources/Editors/SwfClipControllerEditor.cs | 4 +++- FTSources/FTEditor/Sources/Editors/SwfClipEditor.cs | 4 +++- FTSources/FTEditor/Sources/Editors/SwfManagerEditor.cs | 5 ++++- .../Sources/Postprocessors/SwfAssetPostprocessor.cs | 6 +++++- .../FTEditor/Sources/Postprocessors/SwfPostprocessor.cs | 6 +++++- FTSources/FTEditor/Sources/SwfEditorUtils.cs | 5 ++++- FTSources/FTEditor/Sources/SwfMaterialCache.cs | 4 +++- FTSources/FTEditor/Sources/SwfPropertyDrawers.cs | 4 +++- FTSources/FTRuntime/FTRuntime.csproj | 2 +- FTSources/FTRuntime/Sources/Internal/SwfAssocList.cs | 2 +- FTSources/FTRuntime/Sources/Internal/SwfAttributes.cs | 2 +- FTSources/FTRuntime/Sources/Internal/SwfList.cs | 2 +- FTSources/FTRuntime/Sources/Internal/SwfSettings.cs | 2 +- FTSources/FTRuntime/Sources/Internal/SwfUtils.cs | 2 +- FTSources/FTRuntime/Sources/SwfAsset.cs | 4 ++-- FTSources/FTRuntime/Sources/SwfClip.cs | 4 ++-- FTSources/FTRuntime/Sources/SwfClipAsset.cs | 4 ++-- FTSources/FTRuntime/Sources/SwfClipController.cs | 4 ++-- FTSources/FTRuntime/Sources/SwfManager.cs | 4 ++-- FTSources/FTSwfTools/FTSwfTools.csproj | 2 +- 25 files changed, 59 insertions(+), 30 deletions(-) diff --git a/Assets/FlashTools/Resources/SwfSettings.asset b/Assets/FlashTools/Resources/SwfSettings.asset index 55ba6ce..9a03aff 100644 --- a/Assets/FlashTools/Resources/SwfSettings.asset +++ b/Assets/FlashTools/Resources/SwfSettings.asset @@ -8,7 +8,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6da591d87f967451298a275621e1fd5d, type: 3} + m_Script: {fileID: 202113923, guid: 2d72a763e7d744285b19a282e955a055, type: 3} m_Name: SwfSettings m_EditorClassIdentifier: Settings: diff --git a/FTSources/FTEditor/FTEditor.csproj b/FTSources/FTEditor/FTEditor.csproj index d32f533..509eab3 100644 --- a/FTSources/FTEditor/FTEditor.csproj +++ b/FTSources/FTEditor/FTEditor.csproj @@ -5,7 +5,7 @@ AnyCPU {30886846-765A-400B-AD3E-436089DE68ED} Library - FlashTools + FTEditor True 0.5 v3.5 diff --git a/FTSources/FTEditor/Sources/Editors/SwfAssetEditor.cs b/FTSources/FTEditor/Sources/Editors/SwfAssetEditor.cs index 303e16b..fca29db 100644 --- a/FTSources/FTEditor/Sources/Editors/SwfAssetEditor.cs +++ b/FTSources/FTEditor/Sources/Editors/SwfAssetEditor.cs @@ -5,7 +5,10 @@ using System.IO; using System.Linq; using System.Collections.Generic; -namespace FlashTools.Internal { +using FTRuntime; +using FTRuntime.Internal; + +namespace FTEditor.Editors { [CustomEditor(typeof(SwfAsset)), CanEditMultipleObjects] public class SwfAssetEditor : Editor { List _assets = new List(); diff --git a/FTSources/FTEditor/Sources/Editors/SwfClipAssetEditor.cs b/FTSources/FTEditor/Sources/Editors/SwfClipAssetEditor.cs index 60378e6..d72952d 100644 --- a/FTSources/FTEditor/Sources/Editors/SwfClipAssetEditor.cs +++ b/FTSources/FTEditor/Sources/Editors/SwfClipAssetEditor.cs @@ -5,7 +5,9 @@ using System.IO; using System.Linq; using System.Collections.Generic; -namespace FlashTools.Internal { +using FTRuntime; + +namespace FTEditor.Editors { [CustomEditor(typeof(SwfClipAsset)), CanEditMultipleObjects] public class SwfClipAssetEditor : Editor { List _clips = new List(); diff --git a/FTSources/FTEditor/Sources/Editors/SwfClipAssetPreview.cs b/FTSources/FTEditor/Sources/Editors/SwfClipAssetPreview.cs index ee9959d..b82f8ba 100644 --- a/FTSources/FTEditor/Sources/Editors/SwfClipAssetPreview.cs +++ b/FTSources/FTEditor/Sources/Editors/SwfClipAssetPreview.cs @@ -3,7 +3,9 @@ using UnityEditor; using System.Linq; -namespace FlashTools.Internal { +using FTRuntime; + +namespace FTEditor.Editors { [CustomPreview(typeof(SwfClipAsset))] public class SwfClipAssetPreview : ObjectPreview { int _sequence = 0; diff --git a/FTSources/FTEditor/Sources/Editors/SwfClipControllerEditor.cs b/FTSources/FTEditor/Sources/Editors/SwfClipControllerEditor.cs index 8d7abb3..ed63394 100644 --- a/FTSources/FTEditor/Sources/Editors/SwfClipControllerEditor.cs +++ b/FTSources/FTEditor/Sources/Editors/SwfClipControllerEditor.cs @@ -4,7 +4,9 @@ using UnityEditor; using System.Linq; using System.Collections.Generic; -namespace FlashTools.Internal { +using FTRuntime; + +namespace FTEditor.Editors { [CustomEditor(typeof(SwfClipController)), CanEditMultipleObjects] public class SwfClipControllerEditor : Editor { List _controllers = new List(); diff --git a/FTSources/FTEditor/Sources/Editors/SwfClipEditor.cs b/FTSources/FTEditor/Sources/Editors/SwfClipEditor.cs index e9a6ade..6d077d1 100644 --- a/FTSources/FTEditor/Sources/Editors/SwfClipEditor.cs +++ b/FTSources/FTEditor/Sources/Editors/SwfClipEditor.cs @@ -4,7 +4,9 @@ using UnityEditor; using System.Linq; using System.Collections.Generic; -namespace FlashTools.Internal { +using FTRuntime; + +namespace FTEditor.Editors { [CustomEditor(typeof(SwfClip)), CanEditMultipleObjects] public class SwfClipEditor : Editor { List _clips = new List(); diff --git a/FTSources/FTEditor/Sources/Editors/SwfManagerEditor.cs b/FTSources/FTEditor/Sources/Editors/SwfManagerEditor.cs index e765de2..7f1b22b 100644 --- a/FTSources/FTEditor/Sources/Editors/SwfManagerEditor.cs +++ b/FTSources/FTEditor/Sources/Editors/SwfManagerEditor.cs @@ -3,7 +3,10 @@ using UnityEditor; using System.Collections.Generic; -namespace FlashTools.Internal { +using FTRuntime; +using FTRuntime.Internal; + +namespace FTEditor.Editors { [CustomEditor(typeof(SwfManager))] public class SwfManagerEditor : Editor { SwfManager _manager = null; diff --git a/FTSources/FTEditor/Sources/Postprocessors/SwfAssetPostprocessor.cs b/FTSources/FTEditor/Sources/Postprocessors/SwfAssetPostprocessor.cs index 60054f2..9f4a885 100644 --- a/FTSources/FTEditor/Sources/Postprocessors/SwfAssetPostprocessor.cs +++ b/FTSources/FTEditor/Sources/Postprocessors/SwfAssetPostprocessor.cs @@ -1,11 +1,15 @@ using UnityEngine; using UnityEditor; + using System; using System.IO; using System.Linq; using System.Collections.Generic; -namespace FlashTools.Internal { +using FTRuntime; +using FTRuntime.Internal; + +namespace FTEditor.Postprocessors { public class SwfAssetPostprocessor : AssetPostprocessor { static void OnPostprocessAllAssets( string[] imported_assets, diff --git a/FTSources/FTEditor/Sources/Postprocessors/SwfPostprocessor.cs b/FTSources/FTEditor/Sources/Postprocessors/SwfPostprocessor.cs index fd0966f..a2d6097 100644 --- a/FTSources/FTEditor/Sources/Postprocessors/SwfPostprocessor.cs +++ b/FTSources/FTEditor/Sources/Postprocessors/SwfPostprocessor.cs @@ -1,5 +1,6 @@ using UnityEngine; using UnityEditor; + using System; using System.IO; using System.Linq; @@ -9,7 +10,10 @@ using FTSwfTools; using FTSwfTools.SwfTags; using FTSwfTools.SwfTypes; -namespace FlashTools.Internal { +using FTRuntime; +using FTRuntime.Internal; + +namespace FTEditor.Postprocessors { public class SwfPostprocessor : AssetPostprocessor { static void OnPostprocessAllAssets( string[] imported_assets, diff --git a/FTSources/FTEditor/Sources/SwfEditorUtils.cs b/FTSources/FTEditor/Sources/SwfEditorUtils.cs index 53a4d1e..6d4407f 100644 --- a/FTSources/FTEditor/Sources/SwfEditorUtils.cs +++ b/FTSources/FTEditor/Sources/SwfEditorUtils.cs @@ -8,7 +8,10 @@ using System.Runtime.Serialization.Formatters.Binary; using Ionic.Zlib; -namespace FlashTools.Internal { +using FTRuntime; +using FTRuntime.Internal; + +namespace FTEditor { public static class SwfEditorUtils { // --------------------------------------------------------------------- diff --git a/FTSources/FTEditor/Sources/SwfMaterialCache.cs b/FTSources/FTEditor/Sources/SwfMaterialCache.cs index 09f6185..b4731d6 100644 --- a/FTSources/FTEditor/Sources/SwfMaterialCache.cs +++ b/FTSources/FTEditor/Sources/SwfMaterialCache.cs @@ -5,7 +5,9 @@ using UnityEditor; using System.IO; using System.Collections.Generic; -namespace FlashTools.Internal { +using FTRuntime; + +namespace FTEditor { public class SwfMaterialCache { const string SwfSimpleShaderName = "SwfSimpleShader"; diff --git a/FTSources/FTEditor/Sources/SwfPropertyDrawers.cs b/FTSources/FTEditor/Sources/SwfPropertyDrawers.cs index 1fbca11..bec804d 100644 --- a/FTSources/FTEditor/Sources/SwfPropertyDrawers.cs +++ b/FTSources/FTEditor/Sources/SwfPropertyDrawers.cs @@ -4,7 +4,9 @@ using UnityEditor; using System.Linq; using System.Collections.Generic; -namespace FlashTools.Internal { +using FTRuntime.Internal; + +namespace FTEditor { // // SwfIntRange diff --git a/FTSources/FTRuntime/FTRuntime.csproj b/FTSources/FTRuntime/FTRuntime.csproj index ced20e0..f6fb6e9 100644 --- a/FTSources/FTRuntime/FTRuntime.csproj +++ b/FTSources/FTRuntime/FTRuntime.csproj @@ -5,7 +5,7 @@ AnyCPU {48D55C1A-BBD5-44D9-9CC5-473A1BBA9AB5} Library - FlashTools + FTRuntime True 0.5 v3.5 diff --git a/FTSources/FTRuntime/Sources/Internal/SwfAssocList.cs b/FTSources/FTRuntime/Sources/Internal/SwfAssocList.cs index 537f901..a4cb7c2 100644 --- a/FTSources/FTRuntime/Sources/Internal/SwfAssocList.cs +++ b/FTSources/FTRuntime/Sources/Internal/SwfAssocList.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FlashTools.Internal { +namespace FTRuntime.Internal { public class SwfAssocList { SwfList _list; Dictionary _dict; diff --git a/FTSources/FTRuntime/Sources/Internal/SwfAttributes.cs b/FTSources/FTRuntime/Sources/Internal/SwfAttributes.cs index 31fdc99..dcbf110 100644 --- a/FTSources/FTRuntime/Sources/Internal/SwfAttributes.cs +++ b/FTSources/FTRuntime/Sources/Internal/SwfAttributes.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace FlashTools.Internal { +namespace FTRuntime.Internal { public class SwfIntRangeAttribute : PropertyAttribute { public int Min; public int Max; diff --git a/FTSources/FTRuntime/Sources/Internal/SwfList.cs b/FTSources/FTRuntime/Sources/Internal/SwfList.cs index 3033713..4023282 100644 --- a/FTSources/FTRuntime/Sources/Internal/SwfList.cs +++ b/FTSources/FTRuntime/Sources/Internal/SwfList.cs @@ -1,6 +1,6 @@ using System; -namespace FlashTools.Internal { +namespace FTRuntime.Internal { public class SwfList { T[] _data; int _size; diff --git a/FTSources/FTRuntime/Sources/Internal/SwfSettings.cs b/FTSources/FTRuntime/Sources/Internal/SwfSettings.cs index 62b6680..87e2ebe 100644 --- a/FTSources/FTRuntime/Sources/Internal/SwfSettings.cs +++ b/FTSources/FTRuntime/Sources/Internal/SwfSettings.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace FlashTools.Internal { +namespace FTRuntime.Internal { [System.Serializable] public struct SwfSettingsData { public enum AtlasFilter { diff --git a/FTSources/FTRuntime/Sources/Internal/SwfUtils.cs b/FTSources/FTRuntime/Sources/Internal/SwfUtils.cs index eee4e90..8b77dcc 100644 --- a/FTSources/FTRuntime/Sources/Internal/SwfUtils.cs +++ b/FTSources/FTRuntime/Sources/Internal/SwfUtils.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace FlashTools.Internal { +namespace FTRuntime.Internal { public static class SwfUtils { public const float UVPrecision = 1.0f / 16384.0f; diff --git a/FTSources/FTRuntime/Sources/SwfAsset.cs b/FTSources/FTRuntime/Sources/SwfAsset.cs index 6387196..13bf826 100644 --- a/FTSources/FTRuntime/Sources/SwfAsset.cs +++ b/FTSources/FTRuntime/Sources/SwfAsset.cs @@ -1,8 +1,8 @@ using UnityEngine; -using FlashTools.Internal; +using FTRuntime.Internal; using System.Collections.Generic; -namespace FlashTools { +namespace FTRuntime { [System.Serializable] public struct SwfVec2Data { public float x; diff --git a/FTSources/FTRuntime/Sources/SwfClip.cs b/FTSources/FTRuntime/Sources/SwfClip.cs index d899e8c..ea05d2d 100644 --- a/FTSources/FTRuntime/Sources/SwfClip.cs +++ b/FTSources/FTRuntime/Sources/SwfClip.cs @@ -1,7 +1,7 @@ using UnityEngine; -using FlashTools.Internal; +using FTRuntime.Internal; -namespace FlashTools { +namespace FTRuntime { [ExecuteInEditMode, DisallowMultipleComponent] [RequireComponent(typeof(MeshFilter), typeof(MeshRenderer))] public class SwfClip : MonoBehaviour { diff --git a/FTSources/FTRuntime/Sources/SwfClipAsset.cs b/FTSources/FTRuntime/Sources/SwfClipAsset.cs index 2fe6540..f76e760 100644 --- a/FTSources/FTRuntime/Sources/SwfClipAsset.cs +++ b/FTSources/FTRuntime/Sources/SwfClipAsset.cs @@ -1,8 +1,8 @@ using UnityEngine; -using FlashTools.Internal; +using FTRuntime.Internal; using System.Collections.Generic; -namespace FlashTools { +namespace FTRuntime { public class SwfClipAsset : ScriptableObject { [System.Serializable] public class SubMeshData { diff --git a/FTSources/FTRuntime/Sources/SwfClipController.cs b/FTSources/FTRuntime/Sources/SwfClipController.cs index 2f67339..034ad2e 100644 --- a/FTSources/FTRuntime/Sources/SwfClipController.cs +++ b/FTSources/FTRuntime/Sources/SwfClipController.cs @@ -1,7 +1,7 @@ using UnityEngine; -using FlashTools.Internal; +using FTRuntime.Internal; -namespace FlashTools { +namespace FTRuntime { [ExecuteInEditMode, DisallowMultipleComponent] [RequireComponent(typeof(SwfClip))] public class SwfClipController : MonoBehaviour { diff --git a/FTSources/FTRuntime/Sources/SwfManager.cs b/FTSources/FTRuntime/Sources/SwfManager.cs index cceee92..49da09f 100644 --- a/FTSources/FTRuntime/Sources/SwfManager.cs +++ b/FTSources/FTRuntime/Sources/SwfManager.cs @@ -1,8 +1,8 @@ using UnityEngine; -using FlashTools.Internal; +using FTRuntime.Internal; using System.Collections.Generic; -namespace FlashTools { +namespace FTRuntime { [ExecuteInEditMode, DisallowMultipleComponent] public class SwfManager : MonoBehaviour { SwfAssocList _clips = new SwfAssocList(); diff --git a/FTSources/FTSwfTools/FTSwfTools.csproj b/FTSources/FTSwfTools/FTSwfTools.csproj index 5ef3d9f..1834f41 100644 --- a/FTSources/FTSwfTools/FTSwfTools.csproj +++ b/FTSources/FTSwfTools/FTSwfTools.csproj @@ -5,7 +5,7 @@ AnyCPU {4EB8756F-398B-4356-90FB-0ED056B3E6E9} Library - FlashTools + FTSwfTools True 0.5 v3.5