diff --git a/.hgignore b/.hgignore index 7e2ef56..c612990 100644 --- a/.hgignore +++ b/.hgignore @@ -4,5 +4,6 @@ glob:Library/* glob:*.sln glob:*.csproj +glob:*.userprefs glob:.DS_Store diff --git a/Assets/FlashTools/Scripts/Internal/Editor/Postprocessors/SwfPostprocessor.cs b/Assets/FlashTools/Scripts/Internal/Editor/Postprocessors/SwfPostprocessor.cs index 55918c6..b5255a9 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/Postprocessors/SwfPostprocessor.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/Postprocessors/SwfPostprocessor.cs @@ -5,9 +5,9 @@ using System.IO; using System.Linq; using System.Collections.Generic; -using FlashTools.Internal.SwfTools; -using FlashTools.Internal.SwfTools.SwfTags; -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools; +using SwfTools.SwfTags; +using SwfTools.SwfTypes; namespace FlashTools.Internal { public class SwfPostprocessor : AssetPostprocessor { @@ -289,4 +289,74 @@ namespace FlashTools.Internal { .ToList(); } } + + // --------------------------------------------------------------------- + // + // Extensions + // + // --------------------------------------------------------------------- + + static class SwfExtensions { + public static Matrix4x4 ToUMatrix(this SwfMatrix self) { + var mat = Matrix4x4.identity; + mat.m00 = self.ScaleX; + mat.m10 = self.RotateSkew0; + mat.m01 = self.RotateSkew1; + mat.m11 = self.ScaleY; + mat.m03 = self.TranslateX; + mat.m13 = self.TranslateY; + return mat; + } + + public static SwfBlendModeData ToBlendModeData(this SwfBlendMode self) { + switch ( self.Value ) { + case SwfBlendMode.Mode.Normal: + return new SwfBlendModeData(SwfBlendModeData.Types.Normal); + case SwfBlendMode.Mode.Layer: + return new SwfBlendModeData(SwfBlendModeData.Types.Layer); + case SwfBlendMode.Mode.Multiply: + return new SwfBlendModeData(SwfBlendModeData.Types.Multiply); + case SwfBlendMode.Mode.Screen: + return new SwfBlendModeData(SwfBlendModeData.Types.Screen); + case SwfBlendMode.Mode.Lighten: + return new SwfBlendModeData(SwfBlendModeData.Types.Lighten); + case SwfBlendMode.Mode.Darken: + return new SwfBlendModeData(SwfBlendModeData.Types.Darken); + case SwfBlendMode.Mode.Difference: + return new SwfBlendModeData(SwfBlendModeData.Types.Difference); + case SwfBlendMode.Mode.Add: + return new SwfBlendModeData(SwfBlendModeData.Types.Add); + case SwfBlendMode.Mode.Subtract: + return new SwfBlendModeData(SwfBlendModeData.Types.Subtract); + case SwfBlendMode.Mode.Invert: + return new SwfBlendModeData(SwfBlendModeData.Types.Invert); + case SwfBlendMode.Mode.Hardlight: + return new SwfBlendModeData(SwfBlendModeData.Types.Hardlight); + default: + Debug.LogWarningFormat( + "[FlashTools] SwfBlendMode. Unsupported blend mode '{0}'", + self.Value); + return new SwfBlendModeData(SwfBlendModeData.Types.Normal); + } + } + + public static SwfColorTransData ToColorTransData(this SwfColorTransform self) { + var trans = SwfColorTransData.identity; + if ( self.HasAdd ) { + trans.addColor = new SwfVec4Data( + self.RAdd / 256.0f, + self.GAdd / 256.0f, + self.BAdd / 256.0f, + self.AAdd / 256.0f); + } + if ( self.HasMul ) { + trans.mulColor = new SwfVec4Data( + self.RMul / 256.0f, + self.GMul / 256.0f, + self.BMul / 256.0f, + self.AMul / 256.0f); + } + return trans; + } + } } \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools.meta deleted file mode 100644 index aa36185..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 484a94bbfa1744985a66e8f387d32d00 -folderAsset: yes -timeCreated: 1457862313 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContext.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContext.cs.meta deleted file mode 100644 index 0a84c20..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContext.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 45e892bdc5efe44c0bef4552f2dcb5b0 -timeCreated: 1458464395 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs.meta deleted file mode 100644 index 97a97d1..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 642f43b0b67924926879406770376159 -timeCreated: 1458066637 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs.meta deleted file mode 100644 index 531c13b..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: ec49e670db02d4006b7722966e96ede6 -timeCreated: 1457864588 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfStreamReader.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfStreamReader.cs.meta deleted file mode 100644 index 2ca9534..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfStreamReader.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: add0a02be3196481daaf1fd9828f0f4e -timeCreated: 1457819513 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags.meta deleted file mode 100644 index 0e3a699..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 15db74a10abbb4b35ab17143a18753a5 -folderAsset: yes -timeCreated: 1457805943 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBinaryDataTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBinaryDataTag.cs.meta deleted file mode 100644 index aca5c6e..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBinaryDataTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 6ffeb1c85031245dcbcdb64b486fa91c -timeCreated: 1472925860 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLossless2Tag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLossless2Tag.cs.meta deleted file mode 100644 index a57012b..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLossless2Tag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 9a86e93cfb4a14b91bca7f9669b7ee7e -timeCreated: 1457806192 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLosslessTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLosslessTag.cs.meta deleted file mode 100644 index b8d9969..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLosslessTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 93930c1f11b8b4299b5b252c8d1e44cc -timeCreated: 1457806180 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSceneAndFrameLabelDataTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSceneAndFrameLabelDataTag.cs.meta deleted file mode 100644 index 8fbee3d..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSceneAndFrameLabelDataTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 8861b3a830cd64ddb8e2b3373a6952dc -timeCreated: 1457806126 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape2Tag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape2Tag.cs.meta deleted file mode 100644 index bc12c98..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape2Tag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: c14bd04574d2540f5b4c834e394ff09b -timeCreated: 1457806145 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape3Tag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape3Tag.cs.meta deleted file mode 100644 index 6317da3..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape3Tag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 17f96f9e9841246658fdc871e73cc2cc -timeCreated: 1457806154 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape4Tag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape4Tag.cs.meta deleted file mode 100644 index 8a5aa0d..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape4Tag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 8588b2fc4ef4a49cfb422ae16057b33b -timeCreated: 1457806164 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShapeTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShapeTag.cs.meta deleted file mode 100644 index e009fe4..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShapeTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 4c4031f2278a949ea8f13253950a43d6 -timeCreated: 1457806135 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSpriteTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSpriteTag.cs.meta deleted file mode 100644 index 135b08f..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSpriteTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: d3c659fdccfff42f9a79049ed13aab4f -timeCreated: 1457806204 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DoABCTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DoABCTag.cs.meta deleted file mode 100644 index 5caf4a2..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DoABCTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 1644c7cd661b049a0afab118c09d69a5 -timeCreated: 1472819662 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebugger2Tag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebugger2Tag.cs.meta deleted file mode 100644 index 88b79db..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebugger2Tag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: b616323c0469d4e81ba73869b289b21e -timeCreated: 1472880545 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebuggerTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebuggerTag.cs.meta deleted file mode 100644 index 6493382..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebuggerTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: e5d4c7d7a464b4c44be8b8653686760e -timeCreated: 1472880531 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableTelemetryTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableTelemetryTag.cs.meta deleted file mode 100644 index ce68f39..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableTelemetryTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 40db138046cd1449a9e0a3d5020d9963 -timeCreated: 1472925852 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EndTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EndTag.cs.meta deleted file mode 100644 index 47039e9..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EndTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: cfab3868fff1148f3ada0a0bb74b660b -timeCreated: 1457806094 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ExportAssetsTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ExportAssetsTag.cs.meta deleted file mode 100644 index 892d78f..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ExportAssetsTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 91d525c5510d747daa79a206efa73ee8 -timeCreated: 1472655466 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FileAttributesTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FileAttributesTag.cs.meta deleted file mode 100644 index 5510650..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FileAttributesTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 7799f56fc5f01418f99c69da8d177010 -timeCreated: 1457806214 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FrameLabelTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FrameLabelTag.cs.meta deleted file mode 100644 index a7c784d..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FrameLabelTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 6324f9cc87fb24045bbc089ff54e7969 -timeCreated: 1457806085 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/MetadataTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/MetadataTag.cs.meta deleted file mode 100644 index 01757ff..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/MetadataTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: cc3acad5d3b2f4f6c85b645acc3ba632 -timeCreated: 1472881090 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject2Tag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject2Tag.cs.meta deleted file mode 100644 index 7631913..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject2Tag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: b1fd75a14bb004dcbaf692b2cf9b7498 -timeCreated: 1457806017 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject3Tag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject3Tag.cs.meta deleted file mode 100644 index 054cc45..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject3Tag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: f0b85321c9e164303a2fb2a6106f6699 -timeCreated: 1457806030 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObjectTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObjectTag.cs.meta deleted file mode 100644 index 392d2d1..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObjectTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: ba536e4ee6b3848948e7208a1cefefdf -timeCreated: 1457806006 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ProtectTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ProtectTag.cs.meta deleted file mode 100644 index 2914a8d..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ProtectTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 20eb1ce1437f24232afac6c8d35d11ef -timeCreated: 1472880066 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs.meta deleted file mode 100644 index 2b38f4c..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 50a3f4c3646154192b0c4dcb40b315b3 -timeCreated: 1457806055 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs.meta deleted file mode 100644 index 77149fc..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: a66815e233fed447f8319dd343167b2e -timeCreated: 1457806046 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ScriptLimitsTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ScriptLimitsTag.cs.meta deleted file mode 100644 index 498fb36..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ScriptLimitsTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 2e2d082e1df494a31acef10d5e90be69 -timeCreated: 1472880814 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs.meta deleted file mode 100644 index 8a8bdb5..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 9ba6ee247270a4e2582be095c59f59bf -timeCreated: 1457806076 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ShowFrameTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ShowFrameTag.cs.meta deleted file mode 100644 index b736c69..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ShowFrameTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 06e82bd9e78964590b8b35dbe6ca47c0 -timeCreated: 1457806067 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagBase.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagBase.cs.meta deleted file mode 100644 index 0b3cc3d..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagBase.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: dc12052cbac15441bb21840c82f5ebbc -timeCreated: 1457805979 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagVisitor.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagVisitor.cs.meta deleted file mode 100644 index a1577ba..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagVisitor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: a50cd5b2e4fdc4596a01180777325faa -timeCreated: 1458065417 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SymbolClassTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SymbolClassTag.cs.meta deleted file mode 100644 index 51412dd..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SymbolClassTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: dc9919be0498b49659aa77f6da045eb9 -timeCreated: 1472654295 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnknownTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnknownTag.cs.meta deleted file mode 100644 index e100862..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnknownTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 15edc6d79a7fc4bbcb127dd779a0bc13 -timeCreated: 1457806224 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnsupportedTag.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnsupportedTag.cs.meta deleted file mode 100644 index 1f204db..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnsupportedTag.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: fd477bfe9657d4fdfad37644ef25c1c6 -timeCreated: 1471528636 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes.meta deleted file mode 100644 index f5f78da..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c6e637f9f090c4acbb2fecefe412c91c -folderAsset: yes -timeCreated: 1457881315 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs deleted file mode 100644 index b7a97ba..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs +++ /dev/null @@ -1,97 +0,0 @@ -using UnityEngine; - -namespace FlashTools.Internal.SwfTools.SwfTypes { - public struct SwfBlendMode { - public enum Mode { - Normal, // + - Layer, // + - Multiply, // + - Screen, // + - Lighten, // + - Darken, // + - Difference, // + - Add, // + - Subtract, // + - Invert, // + - Alpha, // - - Erase, // - - Overlay, // + - Hardlight // + - } - public Mode Value; - - public static SwfBlendMode identity { - get { - return new SwfBlendMode{ - Value = Mode.Normal}; - } - } - - public static SwfBlendMode Read(SwfStreamReader reader) { - var mode_id = reader.ReadByte(); - return new SwfBlendMode{ - Value = ModeFromByte(mode_id)}; - } - - public override string ToString() { - return string.Format( - "SwfBlendMode. Mode: {0}", - Value); - } - - public SwfBlendModeData ToBlendModeData() { - switch ( Value ) { - case Mode.Normal: - return new SwfBlendModeData(SwfBlendModeData.Types.Normal); - case Mode.Layer: - return new SwfBlendModeData(SwfBlendModeData.Types.Layer); - case Mode.Multiply: - return new SwfBlendModeData(SwfBlendModeData.Types.Multiply); - case Mode.Screen: - return new SwfBlendModeData(SwfBlendModeData.Types.Screen); - case Mode.Lighten: - return new SwfBlendModeData(SwfBlendModeData.Types.Lighten); - case Mode.Darken: - return new SwfBlendModeData(SwfBlendModeData.Types.Darken); - case Mode.Difference: - return new SwfBlendModeData(SwfBlendModeData.Types.Difference); - case Mode.Add: - return new SwfBlendModeData(SwfBlendModeData.Types.Add); - case Mode.Subtract: - return new SwfBlendModeData(SwfBlendModeData.Types.Subtract); - case Mode.Invert: - return new SwfBlendModeData(SwfBlendModeData.Types.Invert); - case Mode.Hardlight: - return new SwfBlendModeData(SwfBlendModeData.Types.Hardlight); - default: - Debug.LogWarningFormat( - "[FlashTools] SwfBlendMode. Unsupported blend mode '{0}'", - Value); - return new SwfBlendModeData(SwfBlendModeData.Types.Normal); - } - } - - static Mode ModeFromByte(byte mode_id) { - switch ( mode_id ) { - case 0: // Mode.Normal too - case 1: return Mode.Normal; - case 2: return Mode.Layer; - case 3: return Mode.Multiply; - case 4: return Mode.Screen; - case 5: return Mode.Lighten; - case 6: return Mode.Darken; - case 7: return Mode.Difference; - case 8: return Mode.Add; - case 9: return Mode.Subtract; - case 10: return Mode.Invert; - case 11: return Mode.Alpha; - case 12: return Mode.Erase; - case 13: return Mode.Overlay; - case 14: return Mode.Hardlight; - default: - throw new UnityException(string.Format( - "Incorrect blend mode id: {0}", mode_id)); - } - } - } -} \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs.meta deleted file mode 100644 index 0190b84..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 1f87ec74e6af540748af80d4a1cc1b49 -timeCreated: 1457882212 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfClipActions.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfClipActions.cs.meta deleted file mode 100644 index fa48129..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfClipActions.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 1daabaaa9d07a4d9184fe8dd1928803f -timeCreated: 1457881505 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColor.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColor.cs.meta deleted file mode 100644 index fddead5..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 3bdf80e6c1ea34969a12400fa1a4a03b -timeCreated: 1457881354 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColorTransform.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColorTransform.cs.meta deleted file mode 100644 index 9ebca72..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColorTransform.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: f85807ea0dc87404983006ba9b04ebb7 -timeCreated: 1457881474 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfControlTags.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfControlTags.cs.meta deleted file mode 100644 index cb11c4d..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfControlTags.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 904b18edf65b7485fb93fdeec65e93d3 -timeCreated: 1457881525 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfFillStyleType.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfFillStyleType.cs.meta deleted file mode 100644 index eba9982..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfFillStyleType.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 392129356a8e143989e89d24bb52060e -timeCreated: 1457976003 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfLongHeaderType.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfLongHeaderType.cs.meta deleted file mode 100644 index e0b135d..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfLongHeaderType.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: b6ee0fe9207424e20a8f928a9d72df91 -timeCreated: 1457881396 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfMatrix.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfMatrix.cs.meta deleted file mode 100644 index 95b891c..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfMatrix.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: c0843850979784e0eb2ef2e2f7d3ef8c -timeCreated: 1457881450 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfRect.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfRect.cs.meta deleted file mode 100644 index fed2f82..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfRect.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: ce2e00762eae848eeab3f543b6ccd368 -timeCreated: 1457881342 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShapesWithStyle.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShapesWithStyle.cs.meta deleted file mode 100644 index db958ab..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShapesWithStyle.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 9ad135e326c424eb2a9bb593525c4192 -timeCreated: 1457881438 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShortHeader.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShortHeader.cs deleted file mode 100644 index 1ae13a4..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShortHeader.cs +++ /dev/null @@ -1,41 +0,0 @@ -using UnityEngine; -using System.IO; - -namespace FlashTools.Internal.SwfTools.SwfTypes { - public struct SwfShortHeader { - public string Format; - public byte Version; - public uint FileLength; - - public static SwfShortHeader Read(SwfStreamReader reader) { - var header = new SwfShortHeader(); - header.Format = new string(reader.ReadChars(3)); - header.Version = reader.ReadByte(); - header.FileLength = reader.ReadUInt32(); - return header; - } - - public void Write(Stream stream) { - if ( Format == null || Format.Length != 3 ) { - throw new UnityException(string.Format( - "Incorrect SwfShortHeader Format: {0}", - Format)); - } - stream.WriteByte((byte)Format[0]); - stream.WriteByte((byte)Format[1]); - stream.WriteByte((byte)Format[2]); - stream.WriteByte(Version); - stream.WriteByte((byte)((FileLength >> 0) & 0xFF)); - stream.WriteByte((byte)((FileLength >> 8) & 0xFF)); - stream.WriteByte((byte)((FileLength >> 16) & 0xFF)); - stream.WriteByte((byte)((FileLength >> 24) & 0xFF)); - } - - public override string ToString() { - return string.Format( - "SwfShortHeader. " + - "Format: {0}, Version: {1}, FileLength: {2}", - Format, Version, FileLength); - } - } -} \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShortHeader.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShortHeader.cs.meta deleted file mode 100644 index 071e432..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShortHeader.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 669a2dd77726b497aab3e816c280e023 -timeCreated: 1457881385 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfSurfaceFilters.cs.meta b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfSurfaceFilters.cs.meta deleted file mode 100644 index f21d90a..0000000 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfSurfaceFilters.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 9160ac10286e843ccb7fae733e9de5d8 -timeCreated: 1457881516 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContext.cs b/FTSources/SwfTools/Sources/SwfContext.cs similarity index 96% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContext.cs rename to FTSources/SwfTools/Sources/SwfContext.cs index f1a6d29..3f4a068 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContext.cs +++ b/FTSources/SwfTools/Sources/SwfContext.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools { +namespace SwfTools { using LibraryDefines = SortedDictionary; using DisplayInstances = SortedDictionary; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs b/FTSources/SwfTools/Sources/SwfContextExecuter.cs similarity index 93% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs rename to FTSources/SwfTools/Sources/SwfContextExecuter.cs index 89e58f3..4630753 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs +++ b/FTSources/SwfTools/Sources/SwfContextExecuter.cs @@ -1,10 +1,10 @@ -using UnityEngine; -using System.Linq; +using System.Linq; using System.Collections.Generic; -using FlashTools.Internal.SwfTools.SwfTags; -using FlashTools.Internal.SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools { +using SwfTools.SwfTags; +using SwfTools.SwfTypes; + +namespace SwfTools { public class SwfContextExecuter : SwfTagVisitor { public SwfLibrary Library = null; public int CurrentTag = 0; @@ -18,7 +18,6 @@ namespace FlashTools.Internal.SwfTools { dl.FrameName = string.Empty; while ( CurrentTag < tags.Count ) { var tag = tags[CurrentTag++]; - TagToDebugLog(tag); tag.AcceptVistor(this, dl); if ( tag.TagType == SwfTagType.ShowFrame ) { ChildrenNextFrameLooped(dl); @@ -53,12 +52,8 @@ namespace FlashTools.Internal.SwfTools { } public SwfDisplayList Visit(PlaceObject2Tag tag, SwfDisplayList dl) { - var is_shape = tag.HasCharacter - ? Library.HasDefine(tag.CharacterId) - : false; - var is_sprite = tag.HasCharacter - ? Library.HasDefine(tag.CharacterId) - : false; + var is_shape = tag.HasCharacter && Library.HasDefine(tag.CharacterId); + var is_sprite = tag.HasCharacter && Library.HasDefine(tag.CharacterId); if ( tag.HasCharacter ) { SwfDisplayInstance old_inst = null; if ( tag.Move ) { // replace character @@ -102,12 +97,8 @@ namespace FlashTools.Internal.SwfTools { } public SwfDisplayList Visit(PlaceObject3Tag tag, SwfDisplayList dl) { - var is_shape = tag.HasCharacter - ? Library.HasDefine(tag.CharacterId) - : false; - var is_sprite = tag.HasCharacter - ? Library.HasDefine(tag.CharacterId) - : false; + var is_shape = tag.HasCharacter && Library.HasDefine(tag.CharacterId); + var is_sprite = tag.HasCharacter && Library.HasDefine(tag.CharacterId); if ( tag.HasCharacter ) { SwfDisplayInstance old_inst = null; if ( tag.Move ) { // replace character @@ -373,13 +364,5 @@ namespace FlashTools.Internal.SwfTools { } } } - - void TagToDebugLog(SwfTagBase tag) { - if ( tag is UnsupportedTag || tag is UnknownTag ) { - Debug.LogWarningFormat( - "[FlashTools] SwfContextExecuter. {0}", - tag); - } - } } } \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs b/FTSources/SwfTools/Sources/SwfDecoder.cs similarity index 84% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs rename to FTSources/SwfTools/Sources/SwfDecoder.cs index 2b504c9..9be0eca 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfDecoder.cs +++ b/FTSources/SwfTools/Sources/SwfDecoder.cs @@ -1,10 +1,10 @@ -using UnityEngine; -using System.IO; +using System.IO; using System.Collections.Generic; -using FlashTools.Internal.SwfTools.SwfTags; -using FlashTools.Internal.SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools { +using SwfTools.SwfTags; +using SwfTools.SwfTypes; + +namespace SwfTools { public class SwfDecoder { public SwfShortHeader OriginalHeader; public SwfLongHeader UncompressedHeader; @@ -30,12 +30,12 @@ namespace FlashTools.Internal.SwfTools { Version = OriginalHeader.Version, FileLength = OriginalHeader.FileLength}; var uncompressed_stream = new MemoryStream(); - new_short_header.Write(uncompressed_stream); + SwfShortHeader.Write(new_short_header, uncompressed_stream); rest_stream.WriteTo(uncompressed_stream); uncompressed_stream.Position = 0; return uncompressed_stream; default: - throw new UnityException(string.Format( + throw new System.Exception(string.Format( "Unsupported swf format: {0}", OriginalHeader.Format)); } } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfStreamReader.cs b/FTSources/SwfTools/Sources/SwfStreamReader.cs similarity index 98% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfStreamReader.cs rename to FTSources/SwfTools/Sources/SwfStreamReader.cs index 726b9ed..fec59f2 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfStreamReader.cs +++ b/FTSources/SwfTools/Sources/SwfStreamReader.cs @@ -1,9 +1,10 @@ using System.IO; using System.Text; using System.Collections.Generic; + using Ionic.Zlib; -namespace FlashTools.Internal.SwfTools { +namespace SwfTools { public class SwfStreamReader { struct BitContext { public byte CachedByte; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBinaryDataTag.cs b/FTSources/SwfTools/Sources/SwfTags/DefineBinaryDataTag.cs similarity index 92% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBinaryDataTag.cs rename to FTSources/SwfTools/Sources/SwfTags/DefineBinaryDataTag.cs index c6ca34a..8695365 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBinaryDataTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DefineBinaryDataTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DefineBinaryDataTag : SwfTagBase { public ushort Tag; public byte[] Data; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLossless2Tag.cs b/FTSources/SwfTools/Sources/SwfTags/DefineBitsLossless2Tag.cs similarity index 94% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLossless2Tag.cs rename to FTSources/SwfTools/Sources/SwfTags/DefineBitsLossless2Tag.cs index 5fbd2ab..8e9f9de 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLossless2Tag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DefineBitsLossless2Tag.cs @@ -1,6 +1,4 @@ -using UnityEngine; - -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DefineBitsLossless2Tag : SwfTagBase { public ushort CharacterId; public byte BitmapFormat; @@ -51,7 +49,7 @@ namespace FlashTools.Internal.SwfTools.SwfTags { } } else { //TODO: IMPLME - throw new UnityException(string.Format( + throw new System.Exception(string.Format( "Unsupported DefineBitsLossless2 Format: {0}", BitmapFormat)); } return result; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLosslessTag.cs b/FTSources/SwfTools/Sources/SwfTags/DefineBitsLosslessTag.cs similarity index 93% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLosslessTag.cs rename to FTSources/SwfTools/Sources/SwfTags/DefineBitsLosslessTag.cs index 03fe3bf..64c836f 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineBitsLosslessTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DefineBitsLosslessTag.cs @@ -1,6 +1,4 @@ -using UnityEngine; - -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DefineBitsLosslessTag : SwfTagBase { public ushort CharacterId; public byte BitmapFormat; @@ -51,7 +49,7 @@ namespace FlashTools.Internal.SwfTools.SwfTags { } } else { //TODO: IMPLME - throw new UnityException(string.Format( + throw new System.Exception(string.Format( "Unsupported DefineBitsLossless Format: {0}", BitmapFormat)); } return result; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSceneAndFrameLabelDataTag.cs b/FTSources/SwfTools/Sources/SwfTags/DefineSceneAndFrameLabelDataTag.cs similarity index 96% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSceneAndFrameLabelDataTag.cs rename to FTSources/SwfTools/Sources/SwfTags/DefineSceneAndFrameLabelDataTag.cs index 5a146ff..c154afb 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSceneAndFrameLabelDataTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DefineSceneAndFrameLabelDataTag.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DefineSceneAndFrameLabelDataTag : SwfTagBase { public struct SceneOffsetData { public uint Offset; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape2Tag.cs b/FTSources/SwfTools/Sources/SwfTags/DefineShape2Tag.cs similarity index 90% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape2Tag.cs rename to FTSources/SwfTools/Sources/SwfTags/DefineShape2Tag.cs index 6f9cc02..bf6c961 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape2Tag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DefineShape2Tag.cs @@ -1,6 +1,6 @@ -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DefineShape2Tag : SwfTagBase { public ushort ShapeId; public SwfRect ShapeBounds; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape3Tag.cs b/FTSources/SwfTools/Sources/SwfTags/DefineShape3Tag.cs similarity index 90% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape3Tag.cs rename to FTSources/SwfTools/Sources/SwfTags/DefineShape3Tag.cs index 57864ce..3f08860 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape3Tag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DefineShape3Tag.cs @@ -1,6 +1,6 @@ -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DefineShape3Tag : SwfTagBase { public ushort ShapeId; public SwfRect ShapeBounds; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape4Tag.cs b/FTSources/SwfTools/Sources/SwfTags/DefineShape4Tag.cs similarity index 91% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape4Tag.cs rename to FTSources/SwfTools/Sources/SwfTags/DefineShape4Tag.cs index 11a4e47..fca3188 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShape4Tag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DefineShape4Tag.cs @@ -1,6 +1,6 @@ -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DefineShape4Tag : SwfTagBase { public ushort ShapeId; public SwfRect ShapeBounds; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShapeTag.cs b/FTSources/SwfTools/Sources/SwfTags/DefineShapeTag.cs similarity index 90% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShapeTag.cs rename to FTSources/SwfTools/Sources/SwfTags/DefineShapeTag.cs index e6bf0da..48066e3 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineShapeTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DefineShapeTag.cs @@ -1,6 +1,6 @@ -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DefineShapeTag : SwfTagBase { public ushort ShapeId; public SwfRect ShapeBounds; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSpriteTag.cs b/FTSources/SwfTools/Sources/SwfTags/DefineSpriteTag.cs similarity index 89% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSpriteTag.cs rename to FTSources/SwfTools/Sources/SwfTags/DefineSpriteTag.cs index 1d2516b..9e3f4c4 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DefineSpriteTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DefineSpriteTag.cs @@ -1,6 +1,6 @@ -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DefineSpriteTag : SwfTagBase { public ushort SpriteId; public ushort FrameCount; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DoABCTag.cs b/FTSources/SwfTools/Sources/SwfTags/DoABCTag.cs similarity index 89% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DoABCTag.cs rename to FTSources/SwfTools/Sources/SwfTags/DoABCTag.cs index 2ac5572..e4ccdfc 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DoABCTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/DoABCTag.cs @@ -1,6 +1,6 @@ -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class DoABCTag : SwfTagBase { public bool ExecuteImmediately; public string Name; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebugger2Tag.cs b/FTSources/SwfTools/Sources/SwfTags/EnableDebugger2Tag.cs similarity index 93% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebugger2Tag.cs rename to FTSources/SwfTools/Sources/SwfTags/EnableDebugger2Tag.cs index 2bc4ca8..db3f69d 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebugger2Tag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/EnableDebugger2Tag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class EnableDebugger2Tag : SwfTagBase { public string MD5PasswordHash; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebuggerTag.cs b/FTSources/SwfTools/Sources/SwfTags/EnableDebuggerTag.cs similarity index 92% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebuggerTag.cs rename to FTSources/SwfTools/Sources/SwfTags/EnableDebuggerTag.cs index 6f0ca0d..edc203c 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableDebuggerTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/EnableDebuggerTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class EnableDebuggerTag : SwfTagBase { public string MD5PasswordHash; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableTelemetryTag.cs b/FTSources/SwfTools/Sources/SwfTags/EnableTelemetryTag.cs similarity index 93% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableTelemetryTag.cs rename to FTSources/SwfTools/Sources/SwfTags/EnableTelemetryTag.cs index be9a793..280b992 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EnableTelemetryTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/EnableTelemetryTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class EnableTelemetryTag : SwfTagBase { public byte[] SHA256PasswordHash; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EndTag.cs b/FTSources/SwfTools/Sources/SwfTags/EndTag.cs similarity index 88% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EndTag.cs rename to FTSources/SwfTools/Sources/SwfTags/EndTag.cs index aa6be20..d088b4b 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/EndTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/EndTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class EndTag : SwfTagBase { public override SwfTagType TagType { get { return SwfTagType.End; } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ExportAssetsTag.cs b/FTSources/SwfTools/Sources/SwfTags/ExportAssetsTag.cs similarity index 88% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ExportAssetsTag.cs rename to FTSources/SwfTools/Sources/SwfTags/ExportAssetsTag.cs index 83510cd..2bce96b 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ExportAssetsTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/ExportAssetsTag.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class ExportAssetsTag : SwfTagBase { public struct AssetTagData { public ushort Tag; @@ -26,7 +26,7 @@ namespace FlashTools.Internal.SwfTools.SwfTags { public static ExportAssetsTag Create(SwfStreamReader reader) { var asset_tag_count = reader.ReadUInt16(); - var asset_tags = new List((int)asset_tag_count); + var asset_tags = new List(asset_tag_count); for ( var i = 0; i < asset_tag_count; ++i ) { asset_tags.Add(new AssetTagData{ Tag = reader.ReadUInt16(), diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FileAttributesTag.cs b/FTSources/SwfTools/Sources/SwfTags/FileAttributesTag.cs similarity index 89% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FileAttributesTag.cs rename to FTSources/SwfTools/Sources/SwfTags/FileAttributesTag.cs index 9b87e84..aedf0b9 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FileAttributesTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/FileAttributesTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class FileAttributesTag : SwfTagBase { public override SwfTagType TagType { get { return SwfTagType.FileAttributes; } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FrameLabelTag.cs b/FTSources/SwfTools/Sources/SwfTags/FrameLabelTag.cs similarity index 93% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FrameLabelTag.cs rename to FTSources/SwfTools/Sources/SwfTags/FrameLabelTag.cs index 75bf68e..2701545 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/FrameLabelTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/FrameLabelTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class FrameLabelTag : SwfTagBase { public string Name; public byte AnchorFlag; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/MetadataTag.cs b/FTSources/SwfTools/Sources/SwfTags/MetadataTag.cs similarity index 91% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/MetadataTag.cs rename to FTSources/SwfTools/Sources/SwfTags/MetadataTag.cs index 70481cd..54fed96 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/MetadataTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/MetadataTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class MetadataTag : SwfTagBase { public string Metadata; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject2Tag.cs b/FTSources/SwfTools/Sources/SwfTags/PlaceObject2Tag.cs similarity index 96% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject2Tag.cs rename to FTSources/SwfTools/Sources/SwfTags/PlaceObject2Tag.cs index d387ec5..384f894 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject2Tag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/PlaceObject2Tag.cs @@ -1,7 +1,7 @@ using System.Text; -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class PlaceObject2Tag : SwfTagBase { public bool HasClipActions; public bool HasClipDepth; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject3Tag.cs b/FTSources/SwfTools/Sources/SwfTags/PlaceObject3Tag.cs similarity index 98% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject3Tag.cs rename to FTSources/SwfTools/Sources/SwfTags/PlaceObject3Tag.cs index 4957933..29036ef 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObject3Tag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/PlaceObject3Tag.cs @@ -1,7 +1,7 @@ using System.Text; -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class PlaceObject3Tag : SwfTagBase { public bool HasClipActions; public bool HasClipDepth; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObjectTag.cs b/FTSources/SwfTools/Sources/SwfTags/PlaceObjectTag.cs similarity index 91% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObjectTag.cs rename to FTSources/SwfTools/Sources/SwfTags/PlaceObjectTag.cs index b1adb52..e14e034 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/PlaceObjectTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/PlaceObjectTag.cs @@ -1,6 +1,6 @@ -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class PlaceObjectTag : SwfTagBase { public ushort CharacterId; public ushort Depth; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ProtectTag.cs b/FTSources/SwfTools/Sources/SwfTags/ProtectTag.cs similarity index 89% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ProtectTag.cs rename to FTSources/SwfTools/Sources/SwfTags/ProtectTag.cs index 81b963c..fe2c001 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ProtectTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/ProtectTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class ProtectTag : SwfTagBase { public string MD5Password; @@ -12,7 +12,7 @@ public override string ToString() { return string.Format( - "ProtectTag." + + "ProtectTag. " + "MD5Password: {0}", MD5Password); } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs b/FTSources/SwfTools/Sources/SwfTags/RemoveObject2Tag.cs similarity index 91% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs rename to FTSources/SwfTools/Sources/SwfTags/RemoveObject2Tag.cs index 0f87572..d0a9bb6 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObject2Tag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/RemoveObject2Tag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class RemoveObject2Tag : SwfTagBase { public ushort Depth; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs b/FTSources/SwfTools/Sources/SwfTags/RemoveObjectTag.cs similarity index 92% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs rename to FTSources/SwfTools/Sources/SwfTags/RemoveObjectTag.cs index c532e3b..f3b3fea 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/RemoveObjectTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/RemoveObjectTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class RemoveObjectTag : SwfTagBase { public ushort CharacterId; public ushort Depth; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ScriptLimitsTag.cs b/FTSources/SwfTools/Sources/SwfTags/ScriptLimitsTag.cs similarity index 93% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ScriptLimitsTag.cs rename to FTSources/SwfTools/Sources/SwfTags/ScriptLimitsTag.cs index 01cdec5..2d601fa 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ScriptLimitsTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/ScriptLimitsTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class ScriptLimitsTag : SwfTagBase { public ushort MaxRecursionDepth; public ushort ScriptTimeoutSeconds; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs b/FTSources/SwfTools/Sources/SwfTags/SetBackgroundColorTag.cs similarity index 86% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs rename to FTSources/SwfTools/Sources/SwfTags/SetBackgroundColorTag.cs index ec95300..a3dcf05 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SetBackgroundColorTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/SetBackgroundColorTag.cs @@ -1,6 +1,6 @@ -using FlashTools.Internal.SwfTools.SwfTypes; +using SwfTools.SwfTypes; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class SetBackgroundColorTag : SwfTagBase { public SwfColor BackgroundColor; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ShowFrameTag.cs b/FTSources/SwfTools/Sources/SwfTags/ShowFrameTag.cs similarity index 89% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ShowFrameTag.cs rename to FTSources/SwfTools/Sources/SwfTags/ShowFrameTag.cs index a0cf1e7..3632412 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/ShowFrameTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/ShowFrameTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class ShowFrameTag : SwfTagBase { public override SwfTagType TagType { get { return SwfTagType.ShowFrame; } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagBase.cs b/FTSources/SwfTools/Sources/SwfTags/SwfTagBase.cs similarity index 91% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagBase.cs rename to FTSources/SwfTools/Sources/SwfTags/SwfTagBase.cs index e4d6783..dcf9d99 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagBase.cs +++ b/FTSources/SwfTools/Sources/SwfTags/SwfTagBase.cs @@ -1,34 +1,34 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public enum SwfTagType { // ----------------------------- // Display list // ----------------------------- - PlaceObject = 4, - PlaceObject2 = 26, - PlaceObject3 = 70, - RemoveObject = 5, + PlaceObject = 4, + PlaceObject2 = 26, + PlaceObject3 = 70, + RemoveObject = 5, RemoveObject2 = 28, - ShowFrame = 1, + ShowFrame = 1, // ----------------------------- // Control // ----------------------------- - SetBackgroundColor = 9, - FrameLabel = 43, - Protect = 24, - End = 0, - ExportAssets = 56, - ImportAssets = 57, // Unsupported - EnableDebugger = 58, - EnableDebugger2 = 64, - ScriptLimits = 65, - SetTabIndex = 66, // Unsupported - ImportAssets2 = 71, // Unsupported - SymbolClass = 76, - Metadata = 77, - DefineScalingGrid = 78, // Unsupported + SetBackgroundColor = 9, + FrameLabel = 43, + Protect = 24, + End = 0, + ExportAssets = 56, + ImportAssets = 57, // Unsupported + EnableDebugger = 58, + EnableDebugger2 = 64, + ScriptLimits = 65, + SetTabIndex = 66, // Unsupported + ImportAssets2 = 71, // Unsupported + SymbolClass = 76, + Metadata = 77, + DefineScalingGrid = 78, // Unsupported DefineSceneAndFrameLabelData = 86, // ----------------------------- @@ -121,8 +121,8 @@ // Metadata // ----------------------------- - FileAttributes = 69, - EnableTelemetry = 93, + FileAttributes = 69, + EnableTelemetry = 93, DefineBinaryData = 87, // ----------------------------- diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagVisitor.cs b/FTSources/SwfTools/Sources/SwfTags/SwfTagVisitor.cs similarity index 97% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagVisitor.cs rename to FTSources/SwfTools/Sources/SwfTags/SwfTagVisitor.cs index 315aec0..0ddc390 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagVisitor.cs +++ b/FTSources/SwfTools/Sources/SwfTags/SwfTagVisitor.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public interface SwfTagVisitor { TResult Visit(PlaceObjectTag tag, TArg arg); TResult Visit(PlaceObject2Tag tag, TArg arg); @@ -6,6 +6,7 @@ TResult Visit(RemoveObjectTag tag, TArg arg); TResult Visit(RemoveObject2Tag tag, TArg arg); TResult Visit(ShowFrameTag tag, TArg arg); + TResult Visit(SetBackgroundColorTag tag, TArg arg); TResult Visit(FrameLabelTag tag, TArg arg); TResult Visit(ProtectTag tag, TArg arg); @@ -17,17 +18,23 @@ TResult Visit(SymbolClassTag tag, TArg arg); TResult Visit(MetadataTag tag, TArg arg); TResult Visit(DefineSceneAndFrameLabelDataTag tag, TArg arg); + TResult Visit(DoABCTag tag, TArg arg); + TResult Visit(DefineShapeTag tag, TArg arg); TResult Visit(DefineShape2Tag tag, TArg arg); TResult Visit(DefineShape3Tag tag, TArg arg); TResult Visit(DefineShape4Tag tag, TArg arg); + TResult Visit(DefineBitsLosslessTag tag, TArg arg); TResult Visit(DefineBitsLossless2Tag tag, TArg arg); + TResult Visit(DefineSpriteTag tag, TArg arg); + TResult Visit(FileAttributesTag tag, TArg arg); TResult Visit(EnableTelemetryTag tag, TArg arg); TResult Visit(DefineBinaryDataTag tag, TArg arg); + TResult Visit(UnknownTag tag, TArg arg); TResult Visit(UnsupportedTag tag, TArg arg); } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SymbolClassTag.cs b/FTSources/SwfTools/Sources/SwfTags/SymbolClassTag.cs similarity index 88% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SymbolClassTag.cs rename to FTSources/SwfTools/Sources/SwfTags/SymbolClassTag.cs index b4f672b..a6866b7 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SymbolClassTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/SymbolClassTag.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class SymbolClassTag : SwfTagBase { public struct SymbolTagData { public ushort Tag; @@ -26,7 +26,7 @@ namespace FlashTools.Internal.SwfTools.SwfTags { public static SymbolClassTag Create(SwfStreamReader reader) { var symbol_tag_count = reader.ReadUInt16(); - var symbol_tags = new List((int)symbol_tag_count); + var symbol_tags = new List(symbol_tag_count); for ( var i = 0; i < symbol_tag_count; ++i ) { symbol_tags.Add(new SymbolTagData{ Tag = reader.ReadUInt16(), diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnknownTag.cs b/FTSources/SwfTools/Sources/SwfTags/UnknownTag.cs similarity index 91% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnknownTag.cs rename to FTSources/SwfTools/Sources/SwfTags/UnknownTag.cs index 1c91b3a..f5eb03d 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnknownTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/UnknownTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class UnknownTag : SwfTagBase { public int _tagId; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnsupportedTag.cs b/FTSources/SwfTools/Sources/SwfTags/UnsupportedTag.cs similarity index 85% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnsupportedTag.cs rename to FTSources/SwfTools/Sources/SwfTags/UnsupportedTag.cs index aacec39..ddb2092 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/UnsupportedTag.cs +++ b/FTSources/SwfTools/Sources/SwfTags/UnsupportedTag.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTags { +namespace SwfTools.SwfTags { public class UnsupportedTag : SwfTagBase { SwfTagType _tagType; @@ -12,7 +12,8 @@ public override string ToString() { return string.Format( - "{0}. Unsupported tag!", + "UnsupportedTag. " + + "TagType: {0}", TagType); } diff --git a/FTSources/SwfTools/Sources/SwfTypes/SwfBlendMode.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfBlendMode.cs new file mode 100644 index 0000000..f1aa66c --- /dev/null +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfBlendMode.cs @@ -0,0 +1,65 @@ +namespace SwfTools.SwfTypes { + public struct SwfBlendMode { + public enum Mode { + Normal, + Layer, + Multiply, + Screen, + Lighten, + Darken, + Difference, + Add, + Subtract, + Invert, + Alpha, + Erase, + Overlay, + Hardlight + } + public Mode Value; + + public static SwfBlendMode identity { + get { + return new SwfBlendMode{ + Value = Mode.Normal}; + } + } + + public static SwfBlendMode Read(SwfStreamReader reader) { + var mode_id = reader.ReadByte(); + return new SwfBlendMode{ + Value = ModeFromByte(mode_id)}; + } + + public override string ToString() { + return string.Format( + "SwfBlendMode. " + + "Mode: {0}", + Value); + } + + static Mode ModeFromByte(byte mode_id) { + switch ( mode_id ) { + case 0: // Mode.Normal too + case 1: return Mode.Normal; + case 2: return Mode.Layer; + case 3: return Mode.Multiply; + case 4: return Mode.Screen; + case 5: return Mode.Lighten; + case 6: return Mode.Darken; + case 7: return Mode.Difference; + case 8: return Mode.Add; + case 9: return Mode.Subtract; + case 10: return Mode.Invert; + case 11: return Mode.Alpha; + case 12: return Mode.Erase; + case 13: return Mode.Overlay; + case 14: return Mode.Hardlight; + default: + throw new System.Exception(string.Format( + "Incorrect blend mode id: {0}", + mode_id)); + } + } + } +} \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfClipActions.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfClipActions.cs similarity index 66% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfClipActions.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfClipActions.cs index d55b3be..cebfa94 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfClipActions.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfClipActions.cs @@ -1,6 +1,4 @@ -using UnityEngine; - -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfClipActions { public static SwfClipActions identity { get { @@ -9,7 +7,7 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { } public static SwfClipActions Read(SwfStreamReader reader) { - throw new UnityException("Clip actions is unsupported"); + throw new System.Exception("Clip actions is unsupported"); } public override string ToString() { diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColor.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfColor.cs similarity index 84% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColor.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfColor.cs index 0bcd3f8..608d6dc 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColor.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfColor.cs @@ -1,6 +1,4 @@ -using UnityEngine; - -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfColor { public byte R; public byte G; @@ -31,7 +29,8 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { public override string ToString() { return string.Format( - "SwfColor. R: {0}, G: {1}, B: {2}, A: {3}", + "SwfColor. " + + "R: {0}, G: {1}, B: {2}, A: {3}", R, G, B, A); } } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColorTransform.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfColorTransform.cs similarity index 78% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColorTransform.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfColorTransform.cs index 4e12d39..48a55ff 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfColorTransform.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfColorTransform.cs @@ -1,6 +1,4 @@ -using UnityEngine; - -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfColorTransform { public short RMul; public short GMul; @@ -58,24 +56,5 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { RMul, GMul, GMul, AMul, HasMul, RAdd, GAdd, BAdd, AAdd, HasAdd); } - - public SwfColorTransData ToColorTransData() { - var trans = SwfColorTransData.identity; - if ( HasAdd ) { - trans.addColor = new SwfVec4Data( - RAdd / 256.0f, - GAdd / 256.0f, - BAdd / 256.0f, - AAdd / 256.0f); - } - if ( HasMul ) { - trans.mulColor = new SwfVec4Data( - RMul / 256.0f, - GMul / 256.0f, - BMul / 256.0f, - AMul / 256.0f); - } - return trans; - } } } \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfControlTags.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfControlTags.cs similarity index 82% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfControlTags.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfControlTags.cs index f308601..6a2f19f 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfControlTags.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfControlTags.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using FlashTools.Internal.SwfTools.SwfTags; +using SwfTools.SwfTags; -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfControlTags { public List Tags; @@ -26,7 +26,8 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { public override string ToString() { return string.Format( - "SwfControlTags. Tags: {0}", + "SwfControlTags. " + + "Tags: {0}", Tags.Count); } } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfFillStyleType.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfFillStyleType.cs similarity index 88% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfFillStyleType.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfFillStyleType.cs index 79b2e58..4c1a053 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfFillStyleType.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfFillStyleType.cs @@ -1,6 +1,4 @@ -using UnityEngine; - -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfFillStyleType { public enum Type { SolidColor, @@ -29,7 +27,8 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { public override string ToString() { return string.Format( - "SwfFillStyleType. Type: {0}", + "SwfFillStyleType. " + + "Type: {0}", Value); } @@ -65,8 +64,9 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { case 0x42: return Type.NonSmoothedRepeatingBitmap; case 0x43: return Type.NonSmoothedClippedBitmap; default: - throw new UnityException(string.Format( - "Incorrect fill stype type id: {0}", type_id)); + throw new System.Exception(string.Format( + "Incorrect fill stype type id: {0}", + type_id)); } } } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfLongHeaderType.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfLongHeader.cs similarity index 63% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfLongHeaderType.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfLongHeader.cs index 26ee092..db9cd63 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfLongHeaderType.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfLongHeader.cs @@ -1,4 +1,4 @@ -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfLongHeader { public SwfShortHeader ShortHeader; public SwfRect FrameSize; @@ -6,12 +6,11 @@ public ushort FrameCount; public static SwfLongHeader Read(SwfStreamReader reader) { - var header = new SwfLongHeader(); - header.ShortHeader = SwfShortHeader.Read(reader); - header.FrameSize = SwfRect.Read(reader); - header.FrameRate = reader.ReadFixedPoint_8_8(); - header.FrameCount = reader.ReadUInt16(); - return header; + return new SwfLongHeader{ + ShortHeader = SwfShortHeader.Read(reader), + FrameSize = SwfRect.Read(reader), + FrameRate = reader.ReadFixedPoint_8_8(), + FrameCount = reader.ReadUInt16()}; } public override string ToString() { diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfMatrix.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfMatrix.cs similarity index 84% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfMatrix.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfMatrix.cs index 71e2da1..d13dbe6 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfMatrix.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfMatrix.cs @@ -1,6 +1,4 @@ -using UnityEngine; - -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfMatrix { public float ScaleX; public float ScaleY; @@ -58,16 +56,5 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { RotateSkew0, RotateSkew1, TranslateX, TranslateY); } - - public Matrix4x4 ToUMatrix() { - var mat = Matrix4x4.identity; - mat.m00 = ScaleX; - mat.m10 = RotateSkew0; - mat.m01 = RotateSkew1; - mat.m11 = ScaleY; - mat.m03 = TranslateX; - mat.m13 = TranslateY; - return mat; - } } } \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfRect.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfRect.cs similarity index 92% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfRect.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfRect.cs index bf94a54..07112c0 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfRect.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfRect.cs @@ -1,6 +1,4 @@ -using UnityEngine; - -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfRect { public float XMin; public float XMax; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShapesWithStyle.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfShapesWithStyle.cs similarity index 96% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShapesWithStyle.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfShapesWithStyle.cs index ab5ef5d..b290be1 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfShapesWithStyle.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfShapesWithStyle.cs @@ -1,7 +1,6 @@ -using UnityEngine; -using System.Collections.Generic; +using System.Collections.Generic; -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfShapesWithStyle { public enum ShapeStyleType { Shape, @@ -55,7 +54,7 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { ReadShapeRecords(reader, shapes.FillStyles, true, true, true); break; default: - throw new UnityException(string.Format( + throw new System.Exception(string.Format( "Unsupported ShapeStyleType: {0}", style_type)); } return shapes; @@ -63,7 +62,8 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { public override string ToString() { return string.Format( - "SwfShapesWithStyle. FillStyles: {0}", + "SwfShapesWithStyle. " + + "FillStyles: {0}", FillStyles.Count); } @@ -113,8 +113,8 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { fill_style.BitmapId = reader.ReadUInt16(); fill_style.BitmapMatrix = SwfMatrix.Read(reader, true); } else { - Debug.LogError( - "[FlashTools] Imported .swf file contains vector graphics. " + + throw new System.Exception( + "Imported .swf file contains vector graphics. " + "You should use Tools/FlashExport.jsfl script for prepare .fla file"); } return fill_style; @@ -214,7 +214,8 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { var fill_style_bits = reader.ReadUnsignedBits(4); var line_style_bits = reader.ReadUnsignedBits(4); while ( !ReadShapeRecord( - reader, fill_styles, ref fill_style_bits, ref line_style_bits, + reader, fill_styles, + ref fill_style_bits, ref line_style_bits, allow_big_array, with_alpha, line2_type) ) { continue; diff --git a/FTSources/SwfTools/Sources/SwfTypes/SwfShortHeader.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfShortHeader.cs new file mode 100644 index 0000000..9f630bf --- /dev/null +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfShortHeader.cs @@ -0,0 +1,48 @@ +using System.IO; + +namespace SwfTools.SwfTypes { + public struct SwfShortHeader { + public string Format; + public byte Version; + public uint FileLength; + + public static SwfShortHeader Read(SwfStreamReader reader) { + return CheckHeader(new SwfShortHeader{ + Format = new string(reader.ReadChars(3)), + Version = reader.ReadByte(), + FileLength = reader.ReadUInt32()}); + } + + public static void Write(SwfShortHeader header, Stream stream) { + CheckHeader(header); + stream.WriteByte((byte)header.Format[0]); + stream.WriteByte((byte)header.Format[1]); + stream.WriteByte((byte)header.Format[2]); + stream.WriteByte(header.Version); + stream.WriteByte((byte)((header.FileLength >> 0) & 0xFF)); + stream.WriteByte((byte)((header.FileLength >> 8) & 0xFF)); + stream.WriteByte((byte)((header.FileLength >> 16) & 0xFF)); + stream.WriteByte((byte)((header.FileLength >> 24) & 0xFF)); + } + + public override string ToString() { + return string.Format( + "SwfShortHeader. " + + "Format: {0}, Version: {1}, FileLength: {2}", + Format, Version, FileLength); + } + + static SwfShortHeader CheckHeader(SwfShortHeader header) { + if ( string.IsNullOrEmpty(header.Format) || (header.Format != "FWS" && header.Format != "CWS") ) { + throw new System.Exception(string.Format( + "Incorrect swf header format: {0}", + header.Format)); + } else if ( header.Version != 28 ) { + throw new System.Exception(string.Format( + "Incorrect swf header version: {0}", + header.Version)); + } + return header; + } + } +} \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfSurfaceFilters.cs b/FTSources/SwfTools/Sources/SwfTypes/SwfSurfaceFilters.cs similarity index 97% rename from Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfSurfaceFilters.cs rename to FTSources/SwfTools/Sources/SwfTypes/SwfSurfaceFilters.cs index 56a84a0..1a2ac25 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfSurfaceFilters.cs +++ b/FTSources/SwfTools/Sources/SwfTypes/SwfSurfaceFilters.cs @@ -1,7 +1,6 @@ -using UnityEngine; -using System.Collections.Generic; +using System.Collections.Generic; -namespace FlashTools.Internal.SwfTools.SwfTypes { +namespace SwfTools.SwfTypes { public struct SwfSurfaceFilters { public abstract class Filter { public enum Types { @@ -142,7 +141,7 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { public static SwfSurfaceFilters Read(SwfStreamReader reader) { var filter_count = reader.ReadByte(); - var filters = new List((int)filter_count); + var filters = new List(filter_count); for ( var i = 0; i < filter_count; ++i ) { filters.Add(ReadFilter(reader)); } @@ -152,7 +151,8 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { public override string ToString() { return string.Format( - "SwfSurfaceFilters. Filters: {0}", + "SwfSurfaceFilters. " + + "Filters: {0}", Filters.Count); } @@ -178,7 +178,7 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { case 6: return ReadConcreteFilter(new ColorMatrixFilter (), reader); case 7: return ReadConcreteFilter(new GradientBevelFilter(), reader); default: - throw new UnityException(string.Format( + throw new System.Exception(string.Format( "Incorrect surface filter type id: {0}", type_id)); } }