LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-26 21:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tag bounds fixed

Browse Source
This commit is contained in:
honfika@gmail.com
2015-01-31 16:58:17 +01:00
parent a805e70820
commit 1f09953178
28 changed files with 167 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -75,6 +75,8 @@ import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
import com.jpexs.decompiler.flash.helpers.hilight.Highlighting;
import com.jpexs.decompiler.flash.tags.ABCContainerTag;
import com.jpexs.decompiler.flash.tags.DefineBinaryDataTag;
import com.jpexs.decompiler.flash.tags.DefineButton2Tag;
import com.jpexs.decompiler.flash.tags.DefineButtonTag;
import com.jpexs.decompiler.flash.tags.DefineSpriteTag;
import com.jpexs.decompiler.flash.tags.DoInitActionTag;
import com.jpexs.decompiler.flash.tags.EndTag;
@@ -1030,6 +1032,11 @@ public final class SWF implements SWFContainerItem, Timelined {
return uniqueAS3Packs(packs);
}
@Override
public RECT getRect() {
return displayRect;
}
@Override
public RECT getRect(Set<BoundedTag> added) {
return displayRect;
@@ -2304,6 +2311,9 @@ public final class SWF implements SWFContainerItem, Timelined {
public void clearImageCache() {
frameCache.clear();
DefineSpriteTag.clearCache();
DefineButtonTag.clearCache();
DefineButton2Tag.clearCache();
for (Tag tag : tags) {
if (tag instanceof ImageTag) {
((ImageTag) tag).clearCache();
@@ -2355,6 +2365,7 @@ public final class SWF implements SWFContainerItem, Timelined {
if (actions == null) {
actions = src.getActions();
}
HighlightedTextWriter writer = new HighlightedTextWriter(Configuration.getCodeFormatting(), true);
Action.actionsToSource(src, actions, src.toString()/*FIXME?*/, writer);
List<Highlighting> hilights = writer.instructionHilights;
@@ -2694,7 +2705,7 @@ public final class SWF implements SWFContainerItem, Timelined {
String assetName;
Tag drawableTag = (Tag) drawable;
RECT boundRect = drawable.getRect(new HashSet<BoundedTag>());
RECT boundRect = drawable.getRect();
if (exporter.exportedTags.containsKey(drawableTag)) {
assetName = exporter.exportedTags.get(drawableTag);
} else {
@@ -2858,7 +2869,7 @@ public final class SWF implements SWFContainerItem, Timelined {
}
}
RECT boundRect = drawable.getRect(new HashSet<BoundedTag>());
RECT boundRect = drawable.getRect();
ExportRectangle rect = new ExportRectangle(boundRect);
rect = mat.transform(rect);
Matrix m = mat.clone();
@@ -3006,7 +3017,7 @@ public final class SWF implements SWFContainerItem, Timelined {
BoundedTag b = (BoundedTag) character;
g.setPaint(new Color(255, 255, 255, 128));
g.setComposite(BlendComposite.Invert);
RECT r = b.getRect(new HashSet<BoundedTag>());
RECT r = b.getRect();
int div = (int) unzoom;
g.drawString(character.toString(), r.Xmin / div + 3, r.Ymin / div + 15);
g.draw(new Rectangle(r.Xmin / div, r.Ymin / div, r.getWidth() / div, r.getHeight() / div));