BlackMATov/unity-flash-tools
1
0
Fork 0
mirror of https://github.com/BlackMATov/unity-flash-tools.git synced 2025-12-16 14:11:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

big name refactor continue

Browse Source
This commit is contained in:
Matvey Cherevko
2016-09-02 11:13:24 +07:00
parent e26fcd11e3
commit 0bdd3fe995
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/FlashTools/Resources/SwfSettings.asset
View File

@@ -11,7 +11,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6da591d87f967451298a275621e1fd5d, type: 3}
m_Name: SwfSettings
m_EditorClassIdentifier:
DefaultSettings:
Settings:
MaxAtlasSize: 1024
AtlasPadding: 1
PixelsPerUnit: 100

6
Assets/FlashTools/Scripts/Internal/Editor/SwfAssetEditor.cs
View File

@@ -38,7 +38,7 @@ namespace FlashTools.Internal {
}
static void OverriddenSettingsToDefault(SwfAsset asset) {
asset.Overridden = SwfSettings.GetDefaultSettings();
asset.Overridden = SwfSettings.GetDefault();
}
static void ApplyOverriddenSettings(SwfAsset asset) {
@@ -135,7 +135,7 @@ namespace FlashTools.Internal {
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();
{
var default_settings = SwfSettings.GetDefaultSettings();
var default_settings = SwfSettings.GetDefault();
SwfEditorUtils.DoWithEnabledGUI(
_assets.Any(p => !p.Overridden.CheckEquals(default_settings)), () => {
if ( GUILayout.Button("Default") ) {
@@ -166,7 +166,7 @@ namespace FlashTools.Internal {
.OfType<SwfAsset>()
.ToList();
_settingsFoldout =
_assets.Any(p => !p.Settings.CheckEquals(SwfSettings.GetDefaultSettings()));
_assets.Any(p => !p.Settings.CheckEquals(SwfSettings.GetDefault()));
}
void OnDisable() {

2
Assets/FlashTools/Scripts/Internal/Editor/SwfAssetPostprocessor.cs
View File

@@ -279,7 +279,7 @@ namespace FlashTools.Internal {
}
}
var settings_holder = SwfSettings.GetSettingsHolder();
var settings_holder = SwfSettings.GetHolder();
for ( var i = 0; i < baked_groups.Count; ++i ) {
var group = baked_groups[i];
switch ( group.Type ) {

10
Assets/FlashTools/Scripts/Internal/SwfSettings.cs
View File

@@ -62,7 +62,7 @@ namespace FlashTools.Internal {
public class SwfSettings : ScriptableObject {
public SwfSettingsData DefaultSettings;
public SwfSettingsData Settings;
[HideInInspector] public Material SimpleMaterial;
[HideInInspector] public Material IncrMaskMaterial;
@@ -175,11 +175,11 @@ namespace FlashTools.Internal {
// ---------------------------------------------------------------------
void Reset() {
DefaultSettings = SwfSettingsData.identity;
Settings = SwfSettingsData.identity;
FillMaterialsCache();
}
public static SwfSettings GetSettingsHolder() {
public static SwfSettings GetHolder() {
var settings_holder = LoadFirstAssetByFilter<SwfSettings>("t:SwfSettings");
if ( !settings_holder ) {
throw new UnityException("SwfSettings asset not found");
@@ -187,8 +187,8 @@ namespace FlashTools.Internal {
return settings_holder;
}
public static SwfSettingsData GetDefaultSettings() {
return GetSettingsHolder().DefaultSettings;
public static SwfSettingsData GetDefault() {
return GetHolder().Settings;
}
#endif
}

4
Assets/FlashTools/Scripts/SwfAsset.cs
View File

@@ -86,8 +86,8 @@ namespace FlashTools {
Data = new SwfAssetData();
Atlas = null;
Clips = new List<SwfClipAsset>();
Settings = SwfSettings.GetDefaultSettings();
Overridden = SwfSettings.GetDefaultSettings();
Settings = SwfSettings.GetDefault();
Overridden = SwfSettings.GetDefault();
}
#endif
}

5
unityflash.userprefs
View File

@@ -1,9 +1,8 @@
<Properties StartupItem="Assembly-CSharp.csproj">
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/FlashTools/Scripts/Internal/Editor/SwfPostprocessor.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/FlashTools/Scripts/Internal/Editor/SwfAssetEditor.cs">
<Files>
<File FileName="Assets/FlashTools/Scripts/Internal/Editor/SwfAnimationAssetPostprocessor.cs" Line="22" Column="38" />
<File FileName="Assets/FlashTools/Scripts/Internal/Editor/SwfPostprocessor.cs" Line="287" Column="37" />
<File FileName="Assets/FlashTools/Scripts/Internal/Editor/SwfAssetEditor.cs" Line="11" Column="40" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>