BlackMATov/unity-flash-tools
1
0
Fork 0
mirror of https://github.com/BlackMATov/unity-flash-tools.git synced 2026-03-22 04:44:08 +07:00
Code Issues Packages Projects Releases Wiki Activity

remove avm2 tests

Browse Source
This commit is contained in:
Matvey Cherevko
2016-08-17 23:37:25 +07:00
parent 98967ba346
commit bf64b0341c
12 changed files with 29 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assembly-CSharp-Editor.csproj
View File

@@ -49,8 +49,6 @@
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfAnimationAssetPostprocessor.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfAnimationEditor.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfPostprocessor.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfAvm2\SwfAbcCode.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfAvm2\SwfAbcFile.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfContext.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfContextExecuter.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfDecoder.cs" />
@@ -63,7 +61,7 @@
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\DefineShape4Tag.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\DefineShapeTag.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\DefineSpriteTag.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\DoAbcTag.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\DoABCTag.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\EndTag.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\FileAttributesTag.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\FrameLabelTag.cs" />
@@ -78,6 +76,7 @@
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\SwfTagVisitor.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\SymbolClassTag.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTags\UnknownTag.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTypes\SwfABCFile.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTypes\SwfBlendMode.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTypes\SwfClipActions.cs" />
<Compile Include="Assets\FlashTools\Scripts\Internal\Editor\SwfTools\SwfTypes\SwfColor.cs" />

BIN
Assets/FlashTools/Examples/Animations/Tests/8_actions.fla
View File

Binary file not shown.

8
Assets/FlashTools/Examples/Animations/Tests/8_actions.fla.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 234e21b51b9db45c6882667df9fb6d40
timeCreated: 1471328196
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfAvm2.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 8dce9e2d646224ac8bd1d856706867b9
folderAsset: yes
timeCreated: 1471422116
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

87
Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfAvm2/SwfAbcCode.cs
View File

@@ -1,87 +0,0 @@
namespace FlashTools.Internal.SwfTools.SwfAvm2 {
public class SwfAbcCode {
public static SwfAbcCode Read(SwfStreamReader reader) {
return new SwfAbcCode();
}
}
}
/*
const int OP_popscope = 0x1D;
const int OP_pushbyte = 0x24;
const int OP_pushscope = 0x30;
const int OP_returnvoid = 0x47;
const int OP_constructsuper = 0x49;
const int OP_callpropvoid = 0x4F;
const int OP_newclass = 0x58;
const int OP_findpropstrict = 0x5D;
const int OP_getlex = 0x60;
const int OP_getscopeobject = 0x65;
const int OP_getproperty = 0x66;
const int OP_initproperty = 0x68;
const int OP_getlocal0 = 0xD0;
static void ParseAVM2Instructions(SwfStreamReader reader) {
while ( !reader.IsEOF ) {
var op_code = reader.ReadByte();
switch ( op_code ) {
case OP_popscope:
break;
case OP_pushbyte:
{
var value = reader.ReadByte();
}
break;
case OP_pushscope:
break;
case OP_returnvoid:
break;
case OP_constructsuper:
{
var arg_count = reader.ReadEncodedU32();
}
break;
case OP_callpropvoid:
{
var index = reader.ReadEncodedU32();
var arg_count = reader.ReadEncodedU32();
}
break;
case OP_newclass:
{
var index = reader.ReadEncodedU32();
}
break;
case OP_findpropstrict:
{
var index = reader.ReadEncodedU32();
}
break;
case OP_getlex:
{
var index = reader.ReadEncodedU32();
}
break;
case OP_getscopeobject:
{
var index = reader.ReadByte();
}
break;
case OP_getproperty:
{
var index = reader.ReadEncodedU32();
}
break;
case OP_initproperty:
{
var index = reader.ReadEncodedU32();
}
break;
case OP_getlocal0:
break;
default:
throw new UnityException(string.Format(
"Unknown OpCode: {0}",
op_code));
}
}
}*/

12
Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfAvm2/SwfAbcCode.cs.meta
View File

@@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: f2f840c022ac04f2d9bf391eb5e47425
timeCreated: 1471423209
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs
View File

@@ -206,7 +206,7 @@ namespace FlashTools.Internal.SwfTools {
return dl;
}
public SwfDisplayList Visit(DoAbcTag tag, SwfDisplayList dl) {
public SwfDisplayList Visit(DoABCTag tag, SwfDisplayList dl) {
Debug.Log(tag);
return dl;
}

18
Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/DoABCTag.cs
View File

@@ -1,13 +1,13 @@
using FlashTools.Internal.SwfTools.SwfAvm2;
using FlashTools.Internal.SwfTools.SwfTypes;
namespace FlashTools.Internal.SwfTools.SwfTags {
public class DoAbcTag : SwfTagBase {
public class DoABCTag : SwfTagBase {
public bool ExecuteImmediately;
public string Name;
public SwfAbcFile AbcFile;
public SwfABCFile ABCFile;
public override SwfTagType TagType {
get { return SwfTagType.DoAbc; }
get { return SwfTagType.DoABC; }
}
public override TResult AcceptVistor<TArg, TResult>(SwfTagVisitor<TArg, TResult> visitor, TArg arg) {
@@ -15,18 +15,18 @@ namespace FlashTools.Internal.SwfTools.SwfTags {
}
public override string ToString() {
return "DoAbc.";
return "DoABC.";
}
public static DoAbcTag Create(SwfStreamReader reader) {
public static DoABCTag Create(SwfStreamReader reader) {
const int kDoAbcLazyInitializeFlag = 1;
var flags = reader.ReadUInt32();
var name = reader.ReadString();
var abc_file = SwfAbcFile.Read(reader);
return new DoAbcTag{
var abc_file = SwfABCFile.Read(reader);
return new DoABCTag{
ExecuteImmediately = (flags & kDoAbcLazyInitializeFlag) == 0,
Name = name,
AbcFile = abc_file};
ABCFile = abc_file};
}
}
}

4
Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagBase.cs
View File

@@ -37,7 +37,7 @@
//DoAction = 12,
//DoInitAction = 59,
DoAbc = 82,
DoABC = 82,
// -----------------------------
// Shape
@@ -167,7 +167,7 @@
case (int)SwfTagType.End: return EndTag.Create(reader);
case (int)SwfTagType.SymbolClass: return SymbolClassTag.Create(reader);
case (int)SwfTagType.DefineSceneAndFrameLabelData: return DefineSceneAndFrameLabelDataTag.Create(reader);
case (int)SwfTagType.DoAbc: return DoAbcTag.Create(reader);
case (int)SwfTagType.DoABC: return DoABCTag.Create(reader);
case (int)SwfTagType.DefineShape: return DefineShapeTag.Create(reader);
case (int)SwfTagType.DefineShape2: return DefineShape2Tag.Create(reader);
case (int)SwfTagType.DefineShape3: return DefineShape3Tag.Create(reader);

2
Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTags/SwfTagVisitor.cs
View File

@@ -11,7 +11,7 @@
TResult Visit(EndTag tag, TArg arg);
TResult Visit(SymbolClassTag tag, TArg arg);
TResult Visit(DefineSceneAndFrameLabelDataTag tag, TArg arg);
TResult Visit(DoAbcTag 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);

21
Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfAvm2/SwfAbcFile.cs → Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfABCFile.cs
View File

@@ -2,18 +2,18 @@
using System;
using System.Collections.Generic;
namespace FlashTools.Internal.SwfTools.SwfAvm2 {
public class SwfAbcFile {
namespace FlashTools.Internal.SwfTools.SwfTypes {
public class SwfABCFile {
public AbcFileInfo Info;
public static SwfAbcFile Read(SwfStreamReader reader) {
return new SwfAbcFile{
public static SwfABCFile Read(SwfStreamReader reader) {
return new SwfABCFile{
Info = ParseAbcFileInfo(reader)};
}
// ------------------------------------------------------------------------
//
// Data
// Info
//
// ------------------------------------------------------------------------
@@ -199,7 +199,7 @@ namespace FlashTools.Internal.SwfTools.SwfAvm2 {
public uint LocalCount;
public uint InitScopeDepth;
public uint MaxScopeDepth;
public byte[] Code;
public byte[] AbcCodeBytes;
public List<ExceptionInfo> Exceptions;
public List<TraitInfo> Traits;
}
@@ -240,6 +240,13 @@ namespace FlashTools.Internal.SwfTools.SwfAvm2 {
abc_file_info.MinorVersion = reader.ReadUInt16();
abc_file_info.MajorVersion = reader.ReadUInt16();
if ( abc_file_info.MinorVersion != 16 || abc_file_info.MajorVersion != 46 ) {
throw new UnityException(string.Format(
"Incorrect SwfAbcFile version: {0}.{1}",
abc_file_info.MajorVersion,
abc_file_info.MinorVersion));
}
abc_file_info.ConstantPool = ParseConstantPoolInfo(reader);
abc_file_info.Methods = new List<MethodInfo>((int)reader.ReadEncodedU32());
@@ -756,7 +763,7 @@ namespace FlashTools.Internal.SwfTools.SwfAvm2 {
info.LocalCount = reader.ReadEncodedU32();
info.InitScopeDepth = reader.ReadEncodedU32();
info.MaxScopeDepth = reader.ReadEncodedU32();
info.Code = reader.ReadBytes((int)reader.ReadEncodedU32());
info.AbcCodeBytes = reader.ReadBytes((int)reader.ReadEncodedU32());
info.Exceptions = ParseExceptionsInfo(reader);
info.Traits = ParseTraitsInfo(reader);
return info;

0
Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfAvm2/SwfAbcFile.cs.meta → Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfABCFile.cs.meta
View File