LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-17 22:48:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor + fix next frame

Browse Source
This commit is contained in:
Exund
2023-06-30 00:24:28 +02:00
committed by Jindra Petřík
parent e5012930ef
commit 99b4d8e76b
3 changed files with 82 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/jpexs/decompiler/flash/gui/CollectDepthAsSpritesDialogue.java
View File

@@ -24,7 +24,6 @@ import java.awt.Window;
import java.awt.event.ActionEvent;
import java.util.Collection;
import java.util.List;
import java.util.Vector;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JCheckBox;

2
src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
View File

@@ -1257,4 +1257,4 @@ contextmenu.showInFramesFolder = Show in frames folder
#after 20.1.0
contextmenu.collapseAll = Collapse all
contextmenu.collectDepthAsSprites = Collect items at same depth as sprites
contextmenu.collectDepthAsSprites = Collect tags at same depth as sprites

126
src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
View File

@@ -88,6 +88,7 @@ import com.jpexs.decompiler.flash.tags.base.BinaryDataInterface;
import com.jpexs.decompiler.flash.tags.base.ButtonTag;
import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
import com.jpexs.decompiler.flash.tags.base.CharacterTag;
import com.jpexs.decompiler.flash.tags.base.DepthTag;
import com.jpexs.decompiler.flash.tags.base.ImageTag;
import com.jpexs.decompiler.flash.tags.base.MorphShapeTag;
import com.jpexs.decompiler.flash.tags.base.PackedBinaryData;
@@ -4107,21 +4108,16 @@ public class TagTreeContextMenu extends JPopupMenu {
}
}
private void collectDepthAsSprites(ActionEvent e) {
List<TreeItem> frames = getSelectedItems();
Frame first = (Frame) frames.get(0);
Timelined timelined = first.timeline.timelined;
SWF swf = timelined instanceof SWF ? (SWF) timelined : ((DefineSpriteTag) timelined).getSwf();
private void collectDepthAsSprites(ActionEvent evt) {
List<Frame> frames = new ArrayList<>();
Set<Integer> originalDepths = new TreeSet<>();
for (TreeItem item : frames) {
for (TreeItem item : getSelectedItems()) {
Frame f = (Frame) item;
frames.add(f);
for (Tag t : f.innerTags) {
if (t instanceof RemoveTag) {
originalDepths.add(((RemoveTag) t).getDepth());
} else if (t instanceof PlaceObjectTypeTag) {
originalDepths.add(((PlaceObjectTypeTag) t).getDepth());
if (t instanceof DepthTag) {
originalDepths.add(((DepthTag) t).getDepth());
}
}
}
@@ -4129,11 +4125,22 @@ public class TagTreeContextMenu extends JPopupMenu {
CollectDepthAsSpritesDialogue dialog = new CollectDepthAsSpritesDialogue(Main.getDefaultDialogsOwner());
if (dialog.showDialog(originalDepths) == CollectDepthAsSpritesDialogue.OK_OPTION) {
Frame first = frames.get(0);
Frame afterLast = null;
Timelined timelined = first.timeline.timelined;
SWF swf = timelined instanceof SWF ? (SWF) timelined : ((DefineSpriteTag) timelined).getSwf();
List<Integer> depths = dialog.getDepths();
boolean replace = dialog.getReplace();
boolean offset = dialog.getOffset();
boolean firstMatrix = dialog.getEnsureFirstMatrix();
if (replace) {
Frame last = frames.get(frames.size() - 1);
afterLast = last.timeline.getFrame(last.frame + 1);
}
Map<Integer, DefineSpriteTag> sprites = new HashMap<>();
for (int d : depths) {
DefineSpriteTag sprite = new DefineSpriteTag(swf);
@@ -4145,7 +4152,7 @@ public class TagTreeContextMenu extends JPopupMenu {
sprite.addTag(showFrame);
}
if(replace) {
if (replace) {
timelined.addTag(timelined.indexOfTag(first.innerTags.get(0)), sprite);
} else {
timelined.addTag(sprite);
@@ -4157,21 +4164,27 @@ public class TagTreeContextMenu extends JPopupMenu {
try {
for (int i = frames.size() - 1; i > -1; i--) {
Frame f = (Frame) frames.get(i);
Map<Integer, PlaceObjectTypeTag> prevMatrixAtDepth = new HashMap<>();
Frame f = frames.get(i);
Map<Integer, MATRIX> prevMatrixAtDepth = new HashMap<>();
int pf = f.frame - 1;
for (int j = 0; j < f.innerTags.size(); j++) {
Tag t = f.innerTags.get(j);
int depth = -1;
if (t instanceof RemoveTag) {
depth = ((RemoveTag) t).getDepth();
} else if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag place = (PlaceObjectTypeTag) t;
depth = place.getDepth();
if (t instanceof DepthTag) {
int depth = ((DepthTag) t).getDepth();
if (!sprites.containsKey(depth)) {
continue;
}
DefineSpriteTag sprite = sprites.get(depth);
Tag clone = t.cloneTag();
clone.setModified(true);
if (firstMatrix && i == 0 && clone instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag place = (PlaceObjectTypeTag) clone;
if (firstMatrix && i == 0) {
if (place.getMatrix() == null) {
for (; pf > -1; pf--) {
if (prevMatrixAtDepth.containsKey(depth)) {
@@ -4182,41 +4195,31 @@ public class TagTreeContextMenu extends JPopupMenu {
for (Tag pt : prev.innerTags) {
if (pt instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag pplace = (PlaceObjectTypeTag) pt;
prevMatrixAtDepth.putIfAbsent(pplace.getDepth(), pplace);
MATRIX m = pplace.getMatrix();
if (m != null) {
prevMatrixAtDepth.putIfAbsent(pplace.getDepth(), m);
}
}
}
}
}
}
}
if (sprites.containsKey(depth)) {
DefineSpriteTag sprite = sprites.get(depth);
Tag clone = t.cloneTag();
clone.setModified(true);
if (firstMatrix && i == 0 && clone instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag place = (PlaceObjectTypeTag) clone;
if (place.getMatrix() == null) {
PlaceObjectTypeTag previous = prevMatrixAtDepth.get(place.getDepth());
if (previous != null) {
MATRIX m = previous.getMatrix();
if (m != null) {
place.setPlaceFlagHasMatrix(true);
place.setPlaceFlagMove(true);
place.setMatrix(new MATRIX(m));
}
MATRIX prevMatrix = prevMatrixAtDepth.get(place.getDepth());
if (prevMatrix != null) {
place.setPlaceFlagHasMatrix(true);
place.setPlaceFlagMove(true);
place.setMatrix(new MATRIX(prevMatrix));
}
}
}
clone.setTimelined(sprite);
sprite.addTag(i, clone);
if (replace) {
f.innerTags.remove(t);
t.getTimelined().removeTag(t);
swf.removeTag(t);
timelined.removeTag(t);
//swf.removeTag(t);
j--;
}
}
@@ -4277,15 +4280,48 @@ public class TagTreeContextMenu extends JPopupMenu {
place.setTimelined(timelined);
first.innerTags.add(place);
timelined.addTag(timelined.indexOfTag(first.innerTags.get(0)), place);
if (afterLast != null) {
MATRIX lastMatrix = null;
ReadOnlyTagList sTags = sprite.getTags();
for (int i = sTags.size() - 1; i > -1; i--) {
Tag t = sTags.get(i);
if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag tplace = (PlaceObjectTypeTag) t;
lastMatrix = tplace.getMatrix();
if (lastMatrix != null) {
break;
}
}
}
List<Tag> tags = afterLast.innerTags;
for (int i = tags.size() - 1; i > -1; i--) {
Tag t = tags.get(i);
if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag tplace = (PlaceObjectTypeTag) t;
if (tplace.getDepth() == place.depth && tplace.getMatrix() == null) {
tplace.setMatrix(new MATRIX(lastMatrix));
tplace.setPlaceFlagHasMatrix(true);
tplace.setPlaceFlagMove(true);
}
}
}
}
}
}
sprite.setSwf(swf, true);
sprite.resetTimeline();
}
swf.updateCharacters();
if (replace) {
timelined.resetTimeline();
swf.computeDependentCharacters();
swf.computeDependentFrames();
}