hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable custom coordinate transform

Browse Source 
There are just some weird bugs that occur, and I don't want to fix them right now...
This commit is contained in:
SiboVG 2023-08-23 17:18:34 +02:00
parent b1c8bbc895
commit cbdf621101
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java
View File

@ -36,8 +36,8 @@ public class OBJOptionChooser extends JPanel {
private final JCheckBox sRGB; private final JCheckBox sRGB;
private final JComboBox<ObjUtils.LevelOfDetail> LOD; private final JComboBox<ObjUtils.LevelOfDetail> LOD;
private final DoubleModel scalingModel; private final DoubleModel scalingModel;
private final JComboBox<Axis> axialCombo; //private final JComboBox<Axis> axialCombo;
private final JComboBox<Axis> forwardCombo; //private final JComboBox<Axis> forwardCombo;
private final List<RocketComponent> selectedComponents; private final List<RocketComponent> selectedComponents;
private final Rocket rocket; private final Rocket rocket;
@ -112,8 +112,10 @@ public class OBJOptionChooser extends JPanel {
advancedOptionsPanel.add(LOD, "growx, wrap unrel"); advancedOptionsPanel.add(LOD, "growx, wrap unrel");
// TODO: there were just too many bugs with the coordinate transform options, so I'm disabling them for now
// future Sibo, if you want to work on this, good luck...
//// Coordinate transformer //// Coordinate transformer
JLabel coordTransLabel = new JLabel(trans.get("OBJOptionChooser.lbl.CoordinateTransform")); /*JLabel coordTransLabel = new JLabel(trans.get("OBJOptionChooser.lbl.CoordinateTransform"));
coordTransLabel.setToolTipText(trans.get("OBJOptionChooser.lbl.CoordinateTransform.ttip")); coordTransLabel.setToolTipText(trans.get("OBJOptionChooser.lbl.CoordinateTransform.ttip"));
advancedOptionsPanel.add(coordTransLabel, "spanx, wrap"); advancedOptionsPanel.add(coordTransLabel, "spanx, wrap");
@ -141,7 +143,7 @@ public class OBJOptionChooser extends JPanel {
coordTransComboAction(e, forwardCombo); coordTransComboAction(e, forwardCombo);
} }
} }
}); });*/
// Let's just keep all the options for the axial axis, and only remove the forward axis options // Let's just keep all the options for the axial axis, and only remove the forward axis options
/*this.forwardCombo.addItemListener(new ItemListener() { /*this.forwardCombo.addItemListener(new ItemListener() {
@Override @Override
@ -198,9 +200,9 @@ public class OBJOptionChooser extends JPanel {
this.LOD.setSelectedItem(opts.getLOD()); this.LOD.setSelectedItem(opts.getLOD());
CoordTransform transformer = opts.getTransformer(); /*CoordTransform transformer = opts.getTransformer();
this.axialCombo.setSelectedItem(transformer.getAxialAxis()); this.axialCombo.setSelectedItem(transformer.getAxialAxis());
this.forwardCombo.setSelectedItem(transformer.getForwardAxis()); this.forwardCombo.setSelectedItem(transformer.getForwardAxis());*/
} }
/** /**
@ -223,10 +225,10 @@ public class OBJOptionChooser extends JPanel {
opts.setScaling((float) scalingModel.getValue()); opts.setScaling((float) scalingModel.getValue());
opts.setLOD((ObjUtils.LevelOfDetail) LOD.getSelectedItem()); opts.setLOD((ObjUtils.LevelOfDetail) LOD.getSelectedItem());
CoordTransform transformer = CoordTransform.generateUsingAxialAndForwardAxes( /*CoordTransform transformer = CoordTransform.generateUsingAxialAndForwardAxes(
(Axis) axialCombo.getSelectedItem(), (Axis) forwardCombo.getSelectedItem(), (Axis) axialCombo.getSelectedItem(), (Axis) forwardCombo.getSelectedItem(),
rocket.getLength(), 0, 0); rocket.getLength(), 0, 0);*/
opts.setTransformer(transformer); opts.setTransformer(new DefaultCoordTransform(rocket.getLength()));
} }
private static boolean isOnlyComponentAssembliesSelected(List<RocketComponent> selectedComponents) { private static boolean isOnlyComponentAssembliesSelected(List<RocketComponent> selectedComponents) {