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

fix looped children sprites bug

Browse Source
This commit is contained in:
Matvey Cherevko
2016-08-18 16:22:26 +07:00
parent a126f56606
commit 0eb97b22df
1 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,9 +20,11 @@ namespace FlashTools.Internal.SwfTools {
var tag = tags[CurrentTag++];
tag.AcceptVistor(this, dl);
if ( tag.TagType == SwfTagType.ShowFrame ) {
ChildrenNextFrameLooped(dl);
return true;
}
}
ChildrenNextFrameLooped(dl);
return false;
}
@@ -163,20 +165,6 @@ namespace FlashTools.Internal.SwfTools {
public SwfDisplayList Visit(ShowFrameTag tag, SwfDisplayList dl) {
Debug.LogError(tag);
var sprites = dl.Instances.Values
.Where (p => p.Type == SwfDisplayInstanceType.Sprite)
.Select(p => p as SwfDisplaySpriteInstance);
foreach ( var sprite in sprites ) {
var sprite_def = MainContex.Library.FindDefine<SwfLibrarySpriteDefine>(sprite.Id);
if ( sprite_def != null ) {
if ( sprite.CurrentTag >= sprite_def.ControlTags.Tags.Count ) {
sprite.Reset();
}
var sprite_executer = new SwfContextExecuter(MainContex, sprite.CurrentTag);
sprite_executer.NextFrame(sprite_def.ControlTags.Tags, sprite.DisplayList);
sprite.CurrentTag = sprite_executer.CurrentTag;
}
}
return dl;
}
@@ -291,5 +279,38 @@ namespace FlashTools.Internal.SwfTools {
};
MainContex.Library.Defines.Add(define_id, define);
}
bool IsSpriteTimelineEnd(SwfDisplaySpriteInstance sprite) {
var sprite_def = MainContex.Library.FindDefine<SwfLibrarySpriteDefine>(sprite.Id);
if ( sprite_def != null && sprite.CurrentTag < sprite_def.ControlTags.Tags.Count ) {
return false;
}
var children = sprite.DisplayList.Instances.Values
.Where (p => p.Type == SwfDisplayInstanceType.Sprite)
.Select(p => p as SwfDisplaySpriteInstance);
foreach ( var child in children ) {
if ( !IsSpriteTimelineEnd(child) ) {
return false;
}
}
return true;
}
void ChildrenNextFrameLooped(SwfDisplayList dl) {
var sprites = dl.Instances.Values
.Where (p => p.Type == SwfDisplayInstanceType.Sprite)
.Select(p => p as SwfDisplaySpriteInstance);
foreach ( var sprite in sprites ) {
var sprite_def = MainContex.Library.FindDefine<SwfLibrarySpriteDefine>(sprite.Id);
if ( sprite_def != null ) {
if ( IsSpriteTimelineEnd(sprite) ) {
sprite.Reset();
}
var sprite_executer = new SwfContextExecuter(MainContex, sprite.CurrentTag);
sprite_executer.NextFrame(sprite_def.ControlTags.Tags, sprite.DisplayList);
sprite.CurrentTag = sprite_executer.CurrentTag;
}
}
}
}
}