LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-29 10:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to properly display and zoom GFX DefineSubImage

Browse Source
This commit is contained in:
Jindra Petřík
2022-10-23 18:20:42 +02:00
parent 73250c4969
commit f0b8e2dfef
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineSubImage.java
View File

@@ -32,6 +32,7 @@ import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Set;
import net.npe.dds.DDSReader;
/**
@@ -53,7 +54,7 @@ public class DefineSubImage extends ImageTag {
public int x2;
public int y2;
@HideInRawEdit
private SerializableImage serImage;
@@ -94,7 +95,7 @@ public class DefineSubImage extends ImageTag {
x2 = sis.readUI16("x2");
y2 = sis.readUI16("y2");
}
@Override
public void setImage(byte[] data) throws IOException {
serImage = new SerializableImage(ImageHelper.read(data));
@@ -120,8 +121,8 @@ public class DefineSubImage extends ImageTag {
@Override
protected SerializableImage getImage() {
if (serImage == null) {
DefineExternalImage2 image = (DefineExternalImage2)swf.getImage(imageCharacterId | 0x8000);
DefineExternalImage2 image = (DefineExternalImage2) swf.getImage(imageCharacterId | 0x8000);
Path imagePath = Paths.get(image.getSwf().getFile()).getParent().resolve(Paths.get(image.fileName));
byte[] imageData;
try {
@@ -129,7 +130,7 @@ public class DefineSubImage extends ImageTag {
} catch (IOException e) {
return null;
}
int [] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(image.targetWidth, image.targetHeight, Image.SCALE_DEFAULT);
@@ -144,4 +145,9 @@ public class DefineSubImage extends ImageTag {
public Dimension getImageDimension() {
return new Dimension(x2 - x1, y2 - y1);
}
@Override
public void getNeededCharacters(Set<Integer> needed) {
needed.add(imageCharacterId | 0x8000);
}
}

15
src/com/jpexs/decompiler/flash/gui/MainPanel.java
View File

@@ -3952,6 +3952,8 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
public static SWF makeTimelinedImage(ImageTag imageTag) {
SWF swf = new SWF();
swf.gfx = imageTag.getSwf().gfx;
swf.version = imageTag.getSwf().version;
int w = (int) (imageTag.getImageDimension().getWidth() * SWF.unitDivisor);
int h = (int) (imageTag.getImageDimension().getHeight() * SWF.unitDivisor);
swf.displayRect = new RECT(0, w, 0, h);
@@ -3963,6 +3965,16 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
if (imageTag instanceof DefineBitsTag) {
jpegTablesTag = imageTag.getSwf().getJtt();
}
Set<Integer> needed = new LinkedHashSet<>();
imageTag.getNeededCharacters(needed);
List<CharacterTag> neededCopies = new ArrayList<>();
for (int n : needed) {
CharacterTag ct = (CharacterTag) imageTag.getSwf().getCharacter(n).cloneTag();
ct.setSwf(swf);
neededCopies.add(ct);
}
ImageTag imageTagCopy = (ImageTag) imageTag.cloneTag();
imageTagCopy.setSwf(swf);
int imageCharId = imageTag.getCharacterId();
@@ -4035,6 +4047,9 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
if (jpegTablesTag != null) {
swf.addTag(jpegTablesTag);
}
for (CharacterTag neededCopy : neededCopies) {
swf.addTag(neededCopy);
}
swf.addTag(imageTagCopy);
swf.addTag(shapeTag);
swf.addTag(placeTag);