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

Don't export transition inside when filled due to shoulder

Browse Source
This commit is contained in:
SiboVG 2023-09-09 22:23:33 +02:00
parent 74cd0e9636
commit a7a2f4acc9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/net/sf/openrocket/file/wavefrontobj/export/components/TransitionExporter.java
View File

@ -49,15 +49,20 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
private void generateMesh(InstanceContext context) { private void generateMesh(InstanceContext context) {
int startIdx = obj.getNumVertices(); int startIdx = obj.getNumVertices();
final boolean hasForeShoulder = Double.compare(component.getForeShoulderRadius(), 0) > 0 final boolean hasForeShoulder = Double.compare(component.getForeShoulderLength(), 0) > 0
&& Double.compare(component.getForeShoulderLength(), 0) > 0
&& component.getForeRadius() > 0; && component.getForeRadius() > 0;
final boolean hasAftShoulder = Double.compare(component.getAftShoulderRadius(), 0) > 0 final boolean hasAftShoulder = Double.compare(component.getAftShoulderLength(), 0) > 0
&& Double.compare(component.getAftShoulderLength(), 0) > 0
&& component.getAftRadius() > 0; && component.getAftRadius() > 0;
final boolean foreSmallerThickn = Double.compare(component.getForeRadius(), component.getThickness()) <= 0;
final boolean aftSmallerThickn = Double.compare(component.getAftRadius(), component.getThickness()) <= 0;
final boolean foreShoulderCapped = hasForeShoulder && component.isForeShoulderCapped();
final boolean aftShoulderCapped = hasAftShoulder && component.isAftShoulderCapped();
final boolean isFilled = component.isFilled() || final boolean isFilled = component.isFilled() ||
(Double.compare(component.getForeRadius(), component.getThickness()) <= 0 && (foreSmallerThickn && aftSmallerThickn) ||
Double.compare(component.getAftRadius(), component.getThickness()) <= 0); (foreSmallerThickn && aftShoulderCapped) ||
(aftSmallerThickn && foreShoulderCapped) ||
(foreShoulderCapped && aftShoulderCapped);
// Warn for zero-thickness shoulders // Warn for zero-thickness shoulders
if (hasForeShoulder && Double.compare(component.getForeShoulderThickness(), 0) == 0) { if (hasForeShoulder && Double.compare(component.getForeShoulderThickness(), 0) == 0) {