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

color transform fix

Browse Source
This commit is contained in:
honfika@gmail.com
2016-03-21 11:56:50 +01:00
parent bc9a31421e
commit c95af115b9
4 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java
View File

@@ -43,22 +43,22 @@ public class DefineButtonSoundTag extends Tag implements CharacterIdTag {
public int buttonId;
@SWFType(BasicType.UI16)
public int buttonSoundChar0;
public int buttonSoundChar0; // OverUpToIdle
public SOUNDINFO buttonSoundInfo0;
@SWFType(BasicType.UI16)
public int buttonSoundChar1;
public int buttonSoundChar1; // IdleToOverUp
public SOUNDINFO buttonSoundInfo1;
@SWFType(BasicType.UI16)
public int buttonSoundChar2;
public int buttonSoundChar2; // OverUpToOverDown
public SOUNDINFO buttonSoundInfo2;
@SWFType(BasicType.UI16)
public int buttonSoundChar3;
public int buttonSoundChar3; // OverDownToOverUp
public SOUNDINFO buttonSoundInfo3;

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/ColorTransform.java
View File

@@ -28,7 +28,7 @@ import java.awt.image.RescaleOp;
public class ColorTransform implements Cloneable {
public RescaleOp toRescaleOp() {
return new RescaleOp(new float[]{getRedMulti() / 255f, getGreenMulti() / 255f, getBlueMulti() / 255f, getAlphaMulti() / 255f},
return new RescaleOp(new float[]{getRedMulti() / 256f, getGreenMulti() / 256f, getBlueMulti() / 256f, getAlphaMulti() / 256f},
new float[]{getRedAdd(), getGreenAdd(), getBlueAdd(), getAlphaAdd()}, null);
}

30
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
View File

@@ -35,6 +35,7 @@ import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
import com.jpexs.decompiler.flash.tags.CSMTextSettingsTag;
import com.jpexs.decompiler.flash.tags.DefineButton2Tag;
import com.jpexs.decompiler.flash.tags.DefineButtonCxformTag;
import com.jpexs.decompiler.flash.tags.DefineButtonSoundTag;
import com.jpexs.decompiler.flash.tags.DefineButtonTag;
import com.jpexs.decompiler.flash.tags.DefineEditTextTag;
import com.jpexs.decompiler.flash.tags.DefineFontNameTag;
@@ -1120,17 +1121,17 @@ public class XFLConverter {
if (colorTransform != null) {
writer.writeStartElement("color");
writer.writeStartElement("Color");
if (colorTransform.getRedMulti() != 255) {
writer.writeAttribute("redMultiplier", ((float) colorTransform.getRedMulti()) / 255.0f);
if (colorTransform.getRedMulti() != 256) {
writer.writeAttribute("redMultiplier", ((float) colorTransform.getRedMulti()) / 256.0f);
}
if (colorTransform.getGreenMulti() != 255) {
writer.writeAttribute("greenMultiplier", ((float) colorTransform.getGreenMulti()) / 255.0f);
if (colorTransform.getGreenMulti() != 256) {
writer.writeAttribute("greenMultiplier", ((float) colorTransform.getGreenMulti()) / 256.0f);
}
if (colorTransform.getBlueMulti() != 255) {
writer.writeAttribute("blueMultiplier", ((float) colorTransform.getBlueMulti()) / 255.0f);
if (colorTransform.getBlueMulti() != 256) {
writer.writeAttribute("blueMultiplier", ((float) colorTransform.getBlueMulti()) / 256.0f);
}
if (colorTransform.getAlphaMulti() != 255) {
writer.writeAttribute("alphaMultiplier", ((float) colorTransform.getAlphaMulti()) / 255.0f);
if (colorTransform.getAlphaMulti() != 256) {
writer.writeAttribute("alphaMultiplier", ((float) colorTransform.getAlphaMulti()) / 256.0f);
}
if (colorTransform.getRedAdd() != 0) {
@@ -1275,8 +1276,21 @@ public class XFLConverter {
symbolStr.writeAttribute("color", randomOutlineColor());
symbolStr.writeStartElement("frames");
int lastFrame = 0;
DefineButtonSoundTag sound = button.getSounds();
loopframes:
for (int frame = 1; frame <= 4; frame++) {
if (sound != null) {
switch (frame) {
case 1:
break;
case 2:
break;
case 3:
break;
case 4:
break;
}
}
for (BUTTONRECORD rec : records) {
if (rec.placeDepth == i) {
boolean ok = false;