From b5127221c67c60080953a73a2c815bb3c1c7f0be Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Wed, 31 Aug 2016 22:46:51 +0700 Subject: [PATCH] little style fixes --- .../Scripts/Internal/Editor/SwfPostprocessor.cs | 9 +++------ .../Scripts/Internal/Editor/SwfTools/SwfDecoder.cs | 3 +-- .../Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs | 5 ++--- .../Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs | 7 +++---- .../Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs | 5 ++--- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfPostprocessor.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfPostprocessor.cs index 94b0d35..58ba51c 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfPostprocessor.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfPostprocessor.cs @@ -62,8 +62,7 @@ namespace FlashTools.Internal { { var animation_data = new SwfAnimationData{ FrameRate = decoder.UncompressedHeader.FrameRate, - FrameSize = decoder.UncompressedHeader.FrameSize.ToUnityVectorSize() - }; + FrameSize = decoder.UncompressedHeader.FrameSize.ToUnityVectorSize()}; var context = new SwfContext(); var executer = new SwfContextExecuter(context, 0); while ( executer.NextFrame(decoder.Tags, context.DisplayList) ) { @@ -173,8 +172,7 @@ namespace FlashTools.Internal { ClipDepth = 0, Bitmap = mask.Bitmap, Matrix = mask.Matrix, - ColorTransform = mask.ColorTransform - }); + ColorTransform = mask.ColorTransform}); } } masks.RemoveAll(p => p.ClipDepth < depth); @@ -203,8 +201,7 @@ namespace FlashTools.Internal { var bitmap_data = new SwfAnimationBitmapData{ Id = bitmap_define.Key, RealSize = new Vector2(bitmap_define.Value.Width, bitmap_define.Value.Height), - SourceRect = rects[i] - }; + SourceRect = rects[i]}; bitmaps.Add(bitmap_data); } return bitmaps; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs index 22d7546..2b504c9 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs @@ -28,8 +28,7 @@ namespace FlashTools.Internal.SwfTools { var new_short_header = new SwfShortHeader{ Format = "FWS", Version = OriginalHeader.Version, - FileLength = OriginalHeader.FileLength - }; + FileLength = OriginalHeader.FileLength}; var uncompressed_stream = new MemoryStream(); new_short_header.Write(uncompressed_stream); rest_stream.WriteTo(uncompressed_stream); diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs index 6abe3a8..0f87572 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs @@ -18,9 +18,8 @@ } public static RemoveObject2Tag Create(SwfStreamReader reader) { - var tag = new RemoveObject2Tag(); - tag.Depth = reader.ReadUInt16(); - return tag; + return new RemoveObject2Tag{ + Depth = reader.ReadUInt16()}; } } } \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs index a1139de..c532e3b 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs @@ -19,10 +19,9 @@ } public static RemoveObjectTag Create(SwfStreamReader reader) { - var tag = new RemoveObjectTag(); - tag.CharacterId = reader.ReadUInt16(); - tag.Depth = reader.ReadUInt16(); - return tag; + return new RemoveObjectTag{ + CharacterId = reader.ReadUInt16(), + Depth = reader.ReadUInt16()}; } } } \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs index dd72c31..ec95300 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs @@ -20,9 +20,8 @@ namespace FlashTools.Internal.SwfTools.SwfTags { } public static SetBackgroundColorTag Create(SwfStreamReader reader) { - var tag = new SetBackgroundColorTag(); - tag.BackgroundColor = SwfColor.Read(reader, false); - return tag; + return new SetBackgroundColorTag{ + BackgroundColor = SwfColor.Read(reader, false)}; } } } \ No newline at end of file