LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-16 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Basic unit for transforms is Twip

Browse Source
This commit is contained in:
Jindra Petřík
2022-12-15 06:35:56 +01:00
parent b2bcb0db70
commit dfec7d6435
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/jpexs/decompiler/flash/gui/ImagePanel.java
View File

@@ -3041,6 +3041,13 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
return mutable;
}
public void applyTransformMatrix(Matrix matrix) {
transform = transform.preConcatenate(matrix);
Point2D newRegistrationPoint = new Point2D.Double();
matrix.toTransform().transform(registrationPoint, newRegistrationPoint);
registrationPoint = newRegistrationPoint;
}
private Rectangle2D getTransformBounds() {
int time = frozen ? 0 : this.time;
DepthState ds = null;
@@ -3073,7 +3080,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
int dframe = time % drawableFrameCount;
Shape outline = dt.getOutline(dframe, time, ds.ratio, renderContext, b.concatenate(new Matrix(ds.matrix)), true);
Rectangle bounds = outline.getBounds();
return new Rectangle2D.Double(bounds.x / SWF.unitDivisor, bounds.y / SWF.unitDivisor, bounds.width / SWF.unitDivisor, bounds.height / SWF.unitDivisor);
return new Rectangle2D.Double(bounds.x, bounds.y, bounds.width, bounds.height);
}
}
}

26
src/com/jpexs/decompiler/flash/gui/TransformPanel.java
View File

@@ -16,6 +16,7 @@
*/
package com.jpexs.decompiler.flash.gui;
import com.jpexs.decompiler.flash.exporters.commonshape.Matrix;
import com.jpexs.helpers.Reference;
import java.awt.Component;
import java.awt.FlowLayout;
@@ -85,8 +86,8 @@ public class TransformPanel extends JPanel {
}
public static enum Unit {
PX("px", 1.0, UnitKind.LENGTH),
TWIP("twip", 20.0, UnitKind.LENGTH),
PX("px", 1/20.0, UnitKind.LENGTH),
TWIP("twip", 1.0, UnitKind.LENGTH),
PERCENT("%", 0.0, UnitKind.LENGTH),
TURN("turn", 1 / 360.0, UnitKind.ANGLE),
DEG("°", 1, UnitKind.ANGLE),
@@ -187,15 +188,15 @@ public class TransformPanel extends JPanel {
double scaleHeight = Double.parseDouble(scaleHeightTextField.getText());
if (prevUnit == Unit.PERCENT) {
scaleWidthTextField.setText(formatDouble(convertUnit(bounds.getWidth() * scaleWidth / 100, Unit.PX, newUnit)));
scaleHeightTextField.setText(formatDouble(convertUnit(bounds.getHeight() * scaleHeight / 100, Unit.PX, newUnit)));
scaleWidthTextField.setText(formatDouble(convertUnit(bounds.getWidth() * scaleWidth / 100, Unit.TWIP, newUnit)));
scaleHeightTextField.setText(formatDouble(convertUnit(bounds.getHeight() * scaleHeight / 100, Unit.TWIP, newUnit)));
return;
}
if (newUnit == Unit.PERCENT) {
double scaleWidthPx = convertUnit(scaleWidth, prevUnit, Unit.PX);
double scaleHeightPx = convertUnit(scaleHeight, prevUnit, Unit.PX);
scaleWidthTextField.setText(formatDouble((scaleWidthPx * 100 / bounds.getWidth())));
scaleHeightTextField.setText(formatDouble((scaleHeightPx * 100 / bounds.getHeight())));
double scaleWidthTwip = convertUnit(scaleWidth, prevUnit, Unit.TWIP);
double scaleHeightTwip = convertUnit(scaleHeight, prevUnit, Unit.TWIP);
scaleWidthTextField.setText(formatDouble((scaleWidthTwip * 100 / bounds.getWidth())));
scaleHeightTextField.setText(formatDouble((scaleHeightTwip * 100 / bounds.getHeight())));
return;
}
@@ -342,8 +343,8 @@ public class TransformPanel extends JPanel {
private void update(Rectangle2D bounds) {
this.bounds = bounds;
if (!moveRelativeCheckBox.isSelected()) {
moveHorizontalTextField.setText(formatDouble(convertUnit(bounds.getX(), Unit.PX, (Unit) moveUnitComboBox.getSelectedItem())));
moveVerticalTextField.setText(formatDouble(convertUnit(bounds.getY(), Unit.PX, (Unit) moveUnitComboBox.getSelectedItem())));
moveHorizontalTextField.setText(formatDouble(convertUnit(bounds.getX(), Unit.TWIP, (Unit) moveUnitComboBox.getSelectedItem())));
moveVerticalTextField.setText(formatDouble(convertUnit(bounds.getY(), Unit.TWIP, (Unit) moveUnitComboBox.getSelectedItem())));
}
if (scaleProportionallyCheckBox.isSelected() && scaleUnitComboBox.getSelectedItem() != Unit.PERCENT) {
try {
@@ -359,8 +360,9 @@ public class TransformPanel extends JPanel {
}
private void clearMoveActionPerformed(ActionEvent e) {
moveHorizontalTextField.setText(formatDouble(bounds.getX()));
moveVerticalTextField.setText(formatDouble(bounds.getY()));
moveHorizontalTextField.setText(formatDouble(convertUnit(bounds.getX(), Unit.TWIP, Unit.PX)));
moveVerticalTextField.setText(formatDouble(convertUnit(bounds.getY(), Unit.TWIP, Unit.PX)));
moveUnitComboBox.setSelectedItem(Unit.PX);
moveRelativeCheckBox.setSelected(false);
}