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

Only draw carets in 3d when length > 0

Browse Source 
Only set the CG and CP for the 3D renderings when the length
is greater than 0. This makes the 3D rendering behavior consistent
with the 2D side view

Fixes #776

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
This commit is contained in:
Billy Olsen 2020-11-11 15:37:47 -07:00
parent 6582b24bc4
commit e4bbd09889
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
View File

@ -616,9 +616,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
cgy = cg.y * Math.cos(rotation) + cg.z*Math.sin(rotation);
}
figure3d.setCG(cg);
figure3d.setCP(cp);
double length = curConfig.getLength();
double diameter = Double.NaN;
@ -640,6 +637,14 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
extraText.setMassWithoutMotors( emptyInfo.getMass() );
extraText.setWarnings(warnings);
if (length > 0) {
figure3d.setCG(cg);
figure3d.setCP(cp);
} else {
figure3d.setCG(new Coordinate(Double.NaN, Double.NaN));
figure3d.setCP(new Coordinate(Double.NaN, Double.NaN));
}
if (figure.getType() == RocketPanel.VIEW_TYPE.SideView && length > 0) {
extraCP.setPosition(cpx, cpy);
extraCG.setPosition(cgx, cgy);