LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-16 10:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

font export: max ascent value is 1024, frame export progress

Browse Source
This commit is contained in:
honfika@gmail.com
2015-03-31 13:41:41 +02:00
parent b220e473d2
commit efa71dcba5
3 changed files with 58 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,6 @@ import java.util.Collection;
import java.util.EmptyStackException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -173,11 +172,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream;
import javax.imageio.stream.FileImageOutputStream;
import javax.imageio.stream.ImageOutputStream;
import net.kroo.elliot.GifSequenceWriter;
import org.monte.media.VideoFormatKeys;
import org.monte.media.avi.AVIWriter;
/**
* Class representing SWF file
@@ -1585,41 +1579,6 @@ public final class SWF implements SWFContainerItem, Timelined {
fos.write(chunkBytes);
}
public static void makeAVI(Iterator<BufferedImage> images, int frameRate, File file) throws IOException {
if (!images.hasNext()) {
return;
}
AVIWriter out = new AVIWriter(file);
BufferedImage img0 = images.next();
out.addVideoTrack(VideoFormatKeys.ENCODING_AVI_PNG, 1, frameRate, img0.getWidth(), img0.getHeight(), 0, 0);
try {
out.write(0, img0, 1);
while (images.hasNext()) {
out.write(0, images.next(), 1);
}
} finally {
out.close();
}
}
public static void makeGIF(Iterator<BufferedImage> images, int frameRate, File file) throws IOException {
if (!images.hasNext()) {
return;
}
try (ImageOutputStream output = new FileImageOutputStream(file)) {
BufferedImage img0 = images.next();
GifSequenceWriter writer = new GifSequenceWriter(output, img0.getType(), 1000 / frameRate, true);
writer.writeToSequence(img0);
while (images.hasNext()) {
writer.writeToSequence(images.next());
}
writer.close();
}
}
public static String getTypePrefix(CharacterTag c) {
if (c instanceof ShapeTag) {
return "shape";

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/FontExporter.java
View File

@@ -162,12 +162,16 @@ public class FontExporter {
int ascent = t.getAscent();
if (ascent != -1) {
f.setAscender(Math.round(ascent / divider));
float value = Math.round(ascent / divider);
value = Math.min(value, 1024);
f.setAscender(value);
}
int descent = t.getDescent();
if (descent != -1) {
f.setDescender(Math.round(descent / divider));
float value = Math.round(descent / divider);
value = Math.min(value, 1024);
f.setDescender(value);
}
int glyphCount = 0;

57
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/FrameExporter.java
View File

@@ -71,6 +71,11 @@ import java.util.Set;
import java.util.Stack;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.imageio.stream.FileImageOutputStream;
import javax.imageio.stream.ImageOutputStream;
import net.kroo.elliot.GifSequenceWriter;
import org.monte.media.VideoFormatKeys;
import org.monte.media.avi.AVIWriter;
/**
*
@@ -128,7 +133,7 @@ public class FrameExporter {
if (settings.mode == FramesExportMode.SVG) {
for (int i = 0; i < frames.size(); i++) {
if (evl != null) {
evl.handleExportingEvent("frame", i, frames.size(), tim.parentTag == null ? "" : tim.parentTag.getName());
evl.handleExportingEvent("frame", i + 1, frames.size(), tim.parentTag == null ? "" : tim.parentTag.getName());
}
final int fi = i;
@@ -156,7 +161,7 @@ public class FrameExporter {
}, handler).run();
if (evl != null) {
evl.handleExportedEvent("frame", i, frames.size(), tim.parentTag == null ? "" : tim.parentTag.getName());
evl.handleExportedEvent("frame", i + 1, frames.size(), tim.parentTag == null ? "" : tim.parentTag.getName());
}
}
@@ -303,7 +308,14 @@ public class FrameExporter {
if (evl != null) {
evl.handleExportingEvent("frame", pos + 1, fframes.size(), tim.parentTag == null ? "" : tim.parentTag.getName());
}
return SWF.frameToImageGet(ftim, fframes.get(pos++), 0, null, 0, ftim.displayRect, new Matrix(), new ColorTransform(), fbackgroundColor, false, settings.zoom).getBufferedImage();
BufferedImage result = SWF.frameToImageGet(ftim, fframes.get(pos++), 0, null, 0, ftim.displayRect, new Matrix(), new ColorTransform(), fbackgroundColor, false, settings.zoom).getBufferedImage();
if (evl != null) {
evl.handleExportedEvent("frame", pos + 1, fframes.size(), tim.parentTag == null ? "" : tim.parentTag.getName());
}
return result;
}
};
@@ -313,7 +325,7 @@ public class FrameExporter {
@Override
public void run() throws IOException {
File f = new File(foutdir + File.separator + "frames.gif");
SWF.makeGIF(frameImages, swf.frameRate, f);
makeGIF(frameImages, swf.frameRate, f, evl);
ret.add(f);
}
}, handler).run();
@@ -376,7 +388,7 @@ public class FrameExporter {
@Override
public void run() throws IOException {
File f = new File(foutdir + File.separator + "frames.avi");
SWF.makeAVI(frameImages, swf.frameRate, f);
makeAVI(frameImages, swf.frameRate, f, evl);
ret.add(f);
}
}, handler).run();
@@ -393,6 +405,41 @@ public class FrameExporter {
return "[" + rgb.red + "," + rgb.green + "," + rgb.blue + "," + ((rgb instanceof RGBA) ? ((RGBA) rgb).getAlphaFloat() : 1) + "]";
}
public static void makeAVI(Iterator<BufferedImage> images, int frameRate, File file, EventListener evl) throws IOException {
if (!images.hasNext()) {
return;
}
AVIWriter out = new AVIWriter(file);
BufferedImage img0 = images.next();
out.addVideoTrack(VideoFormatKeys.ENCODING_AVI_PNG, 1, frameRate, img0.getWidth(), img0.getHeight(), 0, 0);
try {
out.write(0, img0, 1);
while (images.hasNext()) {
out.write(0, images.next(), 1);
}
} finally {
out.close();
}
}
public static void makeGIF(Iterator<BufferedImage> images, int frameRate, File file, EventListener evl) throws IOException {
if (!images.hasNext()) {
return;
}
try (ImageOutputStream output = new FileImageOutputStream(file)) {
BufferedImage img0 = images.next();
GifSequenceWriter writer = new GifSequenceWriter(output, img0.getType(), 1000 / frameRate, true);
writer.writeToSequence(img0);
while (images.hasNext()) {
writer.writeToSequence(images.next());
}
writer.close();
}
}
public static String framesToHtmlCanvas(double unitDivisor, Timeline timeline, List<Integer> frames, int time, DepthState stateUnderCursor, int mouseButton, RECT displayRect, ColorTransform colorTransform, Color backGroundColor) {
StringBuilder sb = new StringBuilder();
if (frames == null) {