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

Merge origin/master

Browse Source
This commit is contained in:
Jindra Petřík
2015-05-25 06:18:12 +02:00
parent 97c33e9319 2167801c1f
commit aa5b8a34fb
3 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/Tag.java
View File

@@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.SWFOutputStream;
import com.jpexs.decompiler.flash.tags.base.BoundedTag;
import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
import com.jpexs.decompiler.flash.tags.base.CharacterTag;
import com.jpexs.decompiler.flash.tags.base.Exportable;
import com.jpexs.decompiler.flash.tags.base.NeedsCharacters;
import com.jpexs.decompiler.flash.tags.gfx.DefineCompactedFont;
@@ -527,6 +528,7 @@ public abstract class Tag implements NeedsCharacters, Exportable, Serializable {
originalRange = new ByteArrayRange(tagData);
}
@Override
public boolean isModified() {
return modified;
}
@@ -551,7 +553,7 @@ public abstract class Tag implements NeedsCharacters, Exportable, Serializable {
getNeededCharacters(needed2);
while (visited.size() != needed2.size()) {
for (Integer characterId : needed2) {
for (int characterId : needed2) {
if (!visited.contains(characterId)) {
visited.add(characterId);
if (swf.getCharacters().containsKey(characterId)) {
@@ -569,6 +571,21 @@ public abstract class Tag implements NeedsCharacters, Exportable, Serializable {
}
}
public void getDependentCharacters(Set<Integer> dependent) {
for (Tag tag : swf.tags) {
if (tag instanceof CharacterTag) {
Set<Integer> needed = new HashSet<>();
tag.getNeededCharactersDeep(needed);
for (int dep : dependent) {
if (needed.contains(dep)) {
dependent.add(((CharacterTag) tag).getCharacterId());
break;
}
}
}
}
}
public void getTagInfo(TagInfo tagInfo) {
tagInfo.addInfo("general", "tagType", String.format("%s (%d)", tagName, id));
@@ -600,5 +617,18 @@ public abstract class Tag implements NeedsCharacters, Exportable, Serializable {
if (needed.size() > 0) {
tagInfo.addInfo("general", "neededCharacters", Helper.joinStrings(needed, ", "));
}
/* todo: add dependent characters, getDependentCharacters method is currently slow
if (this instanceof CharacterTag) {
Set<Integer> dependent = new LinkedHashSet<>();
int characterId = ((CharacterTag) this).getCharacterId();
dependent.add(characterId);
getDependentCharacters(dependent);
dependent.remove(characterId);
if (dependent.size() > 0) {
tagInfo.addInfo("general", "dependentCharacters", Helper.joinStrings(dependent, ", "));
}
}*/
}
}