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

no magic shapes offsets

Browse Source
This commit is contained in:
Jindra Petřík
2016-12-04 10:30:34 +01:00
parent b889c5cb37
commit 0403e847f5
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyCharOffset.java
View File

@@ -32,14 +32,8 @@ public class IggyCharOffset implements StructureInterface {
@IggyFieldType(DataType.uint32_t)
long zero3;
@IggyFieldType(DataType.uint64_t)
private long address;
long offset;
public long getAddress() {
return address;
}
public IggyCharOffset(ReadDataStreamInterface stream) throws IOException {
readFromDataStream(stream);
}
@@ -65,12 +59,6 @@ public class IggyCharOffset implements StructureInterface {
yscale = stream.readUI16();
zero3 = stream.readUI32();
offset = stream.readUI64();
if (ischar1 > 0) {
address = offset + stream.position() - 8;
} else {
address = 0;
LOGGER.finer(String.format("Empty char"));
}
}
@Override

17
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyFont.java
View File

@@ -264,12 +264,19 @@ public class IggyFont extends IggyTag {
//here is offset [7] - 1136
s.seek(abs_start_of_char_struct, SeekMode.SET);
charOffsets = new ArrayList<>();
List<Long> charAddresses = new ArrayList<>();
for (int i = 0; i < char_count; i++) {
charOffsets.add(new IggyCharOffset(s));
IggyCharOffset iggyOffset = new IggyCharOffset(s);
charOffsets.add(iggyOffset);
if (iggyOffset.offset == 1) {
charAddresses.add(0L);
} else {
charAddresses.add(iggyOffset.offset + s.position() - 8);
}
}
glyphs = new ArrayList<>();
for (int i = 0; i < char_count; i++) {
long addr = charOffsets.get(i).getAddress();
long addr = charAddresses.get(i);
if (addr != 0) {
s.seek(addr, SeekMode.SET);
glyphs.add(new IggyShape(s));
@@ -374,14 +381,18 @@ public class IggyFont extends IggyTag {
s.setOlderOffsetToThisPos(start_of_char_struct_ofs_pos);
ib.writeConstLengthArray(IggyIndexBuilder.CONST_CHAR_OFFSET_SIZE, charOffsets.size());
List<Long> toFixOffsets = new ArrayList<>();
//offsets of shapes
for (IggyCharOffset ofs : charOffsets) {
ofs.offset = FILL_LATER_IF_AVAILABLE;
ofs.writeToDataStream(s);
toFixOffsets.add(s.position() - 8);
}
//long afterOfsAddr = s.position();
for (int i = 0; i < glyphs.size(); i++) {
IggyShape shp = glyphs.get(i);
if (shp != null) {
s.setOlderOffsetToThisPos(toFixOffsets.get(i));
shp.writeToDataStream(s);
}
}