LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 08:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #2561 Cannot set filter strength to 128 or above

Browse Source
This commit is contained in:
Jindra Petřík
2025-11-16 10:40:46 +01:00
parent 0aa76cefb9
commit 8dc3efc528
18 changed files with 113 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/easygui/FiltersTreeTable.java
+1 -1
View File
@@ -561,7 +561,7 @@ public class FiltersTreeTable extends JTreeTable {
}
});
} else if (realValue.getClass() == Double.class || realValue.getClass() == Float.class) {
editor = new FloatEditor(filterField.toString(), filterField.filter, filterField.field, -1, realValue.getClass());
editor = new FloatEditor(filterField.toString(), filterField.filter, filterField.field, -1, realValue.getClass(), filterField.field.getAnnotation(SWFType.class));
if ("angle".equals(filterField.field.getName())) {
((FloatEditor) editor).setValueNormalizer(new ValueNormalizer() {
@Override
src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java
+1 -1
View File
@@ -353,7 +353,7 @@ public class GenericTagTreePanel extends GenericTagPanel {
editor = new EnumEditor(field.getName(), obj, field, index, type, swfType, values);
} else if (type.equals(double.class) || type.equals(Double.class)
|| type.equals(float.class) || type.equals(Float.class)) {
editor = new FloatEditor(field.getName(), obj, field, index, type);
editor = new FloatEditor(field.getName(), obj, field, index, type, swfType);
} else if (type.equals(int.class) || type.equals(Integer.class)
|| type.equals(short.class) || type.equals(Short.class)
|| type.equals(long.class) || type.equals(Long.class)) {
src/com/jpexs/decompiler/flash/gui/generictageditors/FloatEditor.java
+31 -2
View File
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui.generictageditors;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.flash.gui.View;
import com.jpexs.decompiler.flash.types.annotations.SWFType;
import com.jpexs.helpers.Helper;
import com.jpexs.helpers.ReflectionTools;
import java.awt.Component;
@@ -61,6 +62,7 @@ public class FloatEditor extends JPanel implements GenericTagEditor {
private JTextField textField;
private JLabel linkLabel;
private SWFType swfType;
@Override
public Dimension getPreferredSize() {
@@ -79,7 +81,7 @@ public class FloatEditor extends JPanel implements GenericTagEditor {
return 0;
}
public FloatEditor(String fieldName, Object obj, Field field, int index, Class<?> type) {
public FloatEditor(String fieldName, Object obj, Field field, int index, Class<?> type, SWFType swfType) {
this.obj = obj;
this.field = field;
this.index = index;
@@ -127,6 +129,7 @@ public class FloatEditor extends JPanel implements GenericTagEditor {
linkLabel.setVisible(false);
reset();
this.swfType = swfType;
}
@Override
@@ -159,10 +162,36 @@ public class FloatEditor extends JPanel implements GenericTagEditor {
val = Double.valueOf(textField.getText());
} else {
val = Float.valueOf(textField.getText());
}
}
if (normalizer != null) {
val = normalizer.toFieldValue(val);
}
if (swfType != null) {
switch (swfType.value()) {
case UFIXED8:
if ((float) val > 255f) {
val = 255f;
} else if ((float) val < 0) {
val = 0f;
}
break;
case FIXED8:
if ((float) val > 127f) {
val = 127f;
} else if ((float) val < -128f) {
val = -128f;
}
break;
case FIXED:
if ((double) val > 32767.0) {
val = 32767.0;
} else if ((double) val < -32768.0) {
val = -32768.0;
}
break;
}
}
ReflectionTools.setValue(obj, field, index, val);