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

Added Context menu items to create new tags (shape, sprite, image, movie, sound, binaryData) from files and using font embed dialog for fonts

Browse Source
This commit is contained in:
Jindra Petřík
2023-10-22 10:25:50 +02:00
parent f3341c5490
commit 9d4a8feb2b
17 changed files with 359 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/ImageImporter.java
View File

@@ -53,8 +53,16 @@ public class ImageImporter extends TagImporter {
return importImage(it, newData, 0);
}
/**
*
* @param it
* @param newData
* @param tagType 0 = can change for defineBits, -1 = detect based on data
* @return
* @throws IOException
*/
public Tag importImage(ImageTag it, byte[] newData, int tagType) throws IOException {
if (newData[0] == 'B' && newData[1] == 'M') {
if (newData.length >= 2 && newData[0] == 'B' && newData[1] == 'M') {
BufferedImage b = ImageHelper.read(newData);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ImageHelper.write(b, ImageFormat.PNG, baos);
@@ -69,6 +77,18 @@ public class ImageImporter extends TagImporter {
tagType = it.getId();
}
}
if (tagType == -1) {
if (newData.length >= 4
&& newData[0] == (byte) 0xff
&& newData[1] == (byte) 0xd8
&& newData[2] == (byte) 0xff
&& newData[3] == (byte) 0xe0
) {
tagType = DefineBitsJPEG2Tag.ID;
} else {
tagType = DefineBitsLosslessTag.ID;
}
}
if (it.getId() == tagType) {
it.setImage(newData);
@@ -108,6 +128,7 @@ public class ImageImporter extends TagImporter {
imageTag.setModified(true);
it.getTimelined().replaceTag(it, imageTag);
imageTag.setTimelined(it.getTimelined());
swf.updateCharacters();
swf.resetTimelines(swf);
return imageTag;

58
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/MovieImporter.java
View File

@@ -261,9 +261,13 @@ public class MovieImporter {
if (timelined != null) {
timelined.resetTimeline();
}
if (timelined == null) {
timelined = movie.getTimelined();
}
int startFrame = 0;
int placeDepth = -1;
int maxPlaceDepth = 0;
if (timelined != null) {
for (Tag t : timelined.getTags()) {
if (t instanceof ShowFrameTag) {
@@ -275,13 +279,47 @@ public class MovieImporter {
placeDepth = pt.getDepth();
break;
}
if (pt.getDepth() > -1) {
if (pt.getDepth() > maxPlaceDepth) {
maxPlaceDepth = pt.getDepth();
}
}
}
}
}
if (placeDepth == -1) {
placeDepth = maxPlaceDepth + 1;
startFrame = 0;
}
int numTimelineFrames = timelined == null ? 0 : timelined.getFrameCount();
int importLastFrame = -1;
if (timelined != null) {
boolean placeWithCharacterIdFound = false;
ReadOnlyTagList tagList1 = timelined.getTags();
for (int p = 0; p < tagList1.size(); p++) {
Tag t = tagList1.get(p);
if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag place = (PlaceObjectTypeTag) t;
if (place.getCharacterId() == movie.characterID) {
placeWithCharacterIdFound = true;
}
}
if (t instanceof ShowFrameTag) {
if (!placeWithCharacterIdFound) {
PlaceObject2Tag placeObject = new PlaceObject2Tag(swf);
placeObject.setTimelined(timelined);
placeObject.placeFlagHasCharacter = true;
placeObject.characterId = movie.characterID;
placeObject.depth = placeDepth;
placeObject.placeFlagMove = false;
timelined.addTag(p, placeObject);
break;
}
}
}
VideoFrameTag lastVideoFrame = null;
for (FLVTAG ftag : videoTags) {
videoData = ((VIDEODATA) ftag.data);
@@ -322,10 +360,28 @@ public class MovieImporter {
ReadOnlyTagList tagList = timelined.getTags();
int p = 0;
boolean found = false;
boolean placeFound = false;
for (; p < tagList.size(); p++) {
Tag t = tagList.get(p);
if (t instanceof ShowFrameTag) {
if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag place = (PlaceObjectTypeTag) t;
if (place.getDepth() == placeDepth) {
placeFound = true;
}
}
if (t instanceof ShowFrameTag) {
swfFrameNum++;
if (!placeFound) {
PlaceObject2Tag placeObject = new PlaceObject2Tag(swf);
placeObject.setTimelined(timelined);
placeObject.depth = placeDepth;
placeObject.placeFlagMove = true;
placeObject.placeFlagHasRatio = true;
placeObject.ratio = swfFrameNum - startFrame;
timelined.addTag(p, placeObject);
p++;
}
placeFound = false;
if (swfFrameNum == idealFrame) {
found = true;
break;