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

Fix some more bugs in transition exporter

Browse Source
This commit is contained in:
SiboVG 2023-08-17 02:06:09 +02:00
parent 6e981a39a0
commit 353105d1bd
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,7 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
final boolean hasAftShoulder = Double.compare(component.getAftShoulderRadius(), 0) > 0 final boolean hasAftShoulder = Double.compare(component.getAftShoulderRadius(), 0) > 0
&& Double.compare(component.getAftShoulderLength(), 0) > 0 && Double.compare(component.getAftShoulderLength(), 0) > 0
&& component.getAftRadius() > 0; && component.getAftRadius() > 0;
final boolean isFilled = component.isFilled();
final List<Integer> outsideForeRingVertices = new ArrayList<>(); final List<Integer> outsideForeRingVertices = new ArrayList<>();
final List<Integer> outsideAftRingVertices = new ArrayList<>(); final List<Integer> outsideAftRingVertices = new ArrayList<>();
@ -60,9 +61,9 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
(component.getShapeType() == Transition.Shape.PARABOLIC && component.getShapeParameter() == 0)) { (component.getShapeType() == Transition.Shape.PARABOLIC && component.getShapeParameter() == 0)) {
float outerAft = (float) component.getAftRadius(); float outerAft = (float) component.getAftRadius();
float innerAft = (float) (component.getAftRadius() - component.getThickness()); float innerAft = isFilled ? 0 : (float) (component.getAftRadius() - component.getThickness());
float outerFore = (float) component.getForeRadius(); float outerFore = (float) component.getForeRadius();
float innerFore = (float) (component.getForeRadius() - component.getThickness()); float innerFore = isFilled ? 0 : (float) (component.getForeRadius() - component.getThickness());
TubeExporter.addTubeMesh(obj, transformer, null, outerFore, outerAft, innerFore, innerAft, TubeExporter.addTubeMesh(obj, transformer, null, outerFore, outerAft, innerFore, innerAft,
(float) component.getLength(), this.nrOfSides, (float) component.getLength(), this.nrOfSides,
@ -77,7 +78,7 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
outsideForeRingVertices, outsideAftRingVertices, hasForeShoulder, hasAftShoulder); outsideForeRingVertices, outsideAftRingVertices, hasForeShoulder, hasAftShoulder);
// Draw inside // Draw inside
if (!component.isFilled()) { if (!isFilled) {
addTransitionMesh(this.nrOfSides, numStacks, -component.getThickness(), false, addTransitionMesh(this.nrOfSides, numStacks, -component.getThickness(), false,
insideForeRingVertices, insideAftRingVertices, hasForeShoulder, hasAftShoulder); insideForeRingVertices, insideAftRingVertices, hasForeShoulder, hasAftShoulder);
} }
@ -120,7 +121,11 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
final int normalsStartIdx = obj.getNumNormals(); final int normalsStartIdx = obj.getNumNormals();
final double dxBase = component.getLength() / numStacks; // Base step size in the longitudinal direction final double dxBase = component.getLength() / numStacks; // Base step size in the longitudinal direction
final double actualLength = estimateActualLength(offsetRadius, dxBase); final double actualLength = estimateActualLength(offsetRadius, dxBase); // Actual length of the transition (due to reduced step size near the fore/aft end)
// Get the location where the fore/aft shoulder would end (due to its thickness)
final double xForeShoulder = component.getAftShoulderThickness();
final double xAftShoulder = component.getLength() - component.getForeShoulderThickness();
// Generate vertices and normals // Generate vertices and normals
float x = 0; // Distance from the fore end float x = 0; // Distance from the fore end
@ -183,9 +188,6 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
// For the inside transition shape if we're in the shoulder base region, we need to skip adding rings, // For the inside transition shape if we're in the shoulder base region, we need to skip adding rings,
// because this is where the shoulder base will be // because this is where the shoulder base will be
if (!isOutside) { if (!isOutside) {
// Get the location where the fore/aft shoulder would end (due to its thickness)
final double xForeShoulder = component.getAftShoulderThickness();
final double xAftShoulder = component.getLength() - component.getForeShoulderThickness();
if (hasForeShoulder && x < xForeShoulder) { if (hasForeShoulder && x < xForeShoulder) {
// If the current ring is before the fore shoulder ring and the next ring is after, clamp the // If the current ring is before the fore shoulder ring and the next ring is after, clamp the
// next ring to the fore shoulder ring // next ring to the fore shoulder ring
@ -202,11 +204,7 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
if (xNext > xAftShoulder) { if (xNext > xAftShoulder) {
xNext = (float) xAftShoulder; xNext = (float) xAftShoulder;
} }
// Skip the ring // Just keep going
else {
x = xNext;
continue;
}
} }
} }
@ -233,8 +231,8 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
} }
} }
// If we're at the fore end, stop // If we're at the aft end or aft shoulder, stop
if (Float.compare(x, (float) component.getLength()) == 0) { if (Float.compare(x, (float) component.getLength()) == 0 || Float.compare(x, (float) xAftShoulder) >= 0) {
break; break;
} }
@ -369,11 +367,12 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
private void addShoulder(float shoulderRadius, float shoulderLength, float shoulderThickness, boolean isCapped, private void addShoulder(float shoulderRadius, float shoulderLength, float shoulderThickness, boolean isCapped,
boolean isForeSide, int nrOfSides, List<Integer> outerRingVertices, List<Integer> innerRingVertices) { boolean isForeSide, int nrOfSides, List<Integer> outerRingVertices, List<Integer> innerRingVertices) {
final float innerCylinderRadius = isCapped ? 0 : shoulderRadius - shoulderThickness; final boolean isFilled = component.isFilled();
final float innerCylinderRadius = isCapped || isFilled ? 0 : shoulderRadius - shoulderThickness;
final List<Integer> outerCylinderForeVertices = new ArrayList<>(); final List<Integer> outerCylinderForeVertices = new ArrayList<>();
final List<Integer> outerCylinderAftVertices = new ArrayList<>(); final List<Integer> outerCylinderAftVertices = new ArrayList<>();
final List<Integer> innerCylinderForeVertices = isCapped ? null : new ArrayList<>(); final List<Integer> innerCylinderForeVertices = isCapped || isFilled ? null : new ArrayList<>();
final List<Integer> innerCylinderAftVertices = isCapped ? null : new ArrayList<>(); final List<Integer> innerCylinderAftVertices = isCapped || isFilled ? null : new ArrayList<>();
int startIdx; int startIdx;
int endIdx; int endIdx;
@ -412,7 +411,7 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
ObjUtils.translateVertices(obj, startIdx, endIdx, offsetLoc.getX(), offsetLoc.getY(), offsetLoc.getZ()); ObjUtils.translateVertices(obj, startIdx, endIdx, offsetLoc.getX(), offsetLoc.getY(), offsetLoc.getZ());
// Generate inner cylinder (no. 7) // Generate inner cylinder (no. 7)
if (!isCapped) { if (!(isCapped || isFilled)) {
startIdx = obj.getNumVertices(); startIdx = obj.getNumVertices();
CylinderExporter.addCylinderMesh(obj, transformer, null, innerCylinderRadius, shoulderLength + shoulderThickness, CylinderExporter.addCylinderMesh(obj, transformer, null, innerCylinderRadius, shoulderLength + shoulderThickness,
false, false, nrOfSides, innerCylinderForeVertices, innerCylinderAftVertices); false, false, nrOfSides, innerCylinderForeVertices, innerCylinderAftVertices);
@ -439,12 +438,14 @@ public class TransitionExporter extends RocketComponentExporter<Transition> {
} }
// Generate transition inner disk (no. 6) // Generate transition inner disk (no. 6)
if (!isFilled) { // If the transition is filled, there is no inside
if (isForeSide) { if (isForeSide) {
DiskExporter.closeDiskMesh(obj, transformer, null, innerRingVertices, innerCylinderAftVertices, false, false); DiskExporter.closeDiskMesh(obj, transformer, null, innerRingVertices, innerCylinderAftVertices, false, false);
} else { } else {
DiskExporter.closeDiskMesh(obj, transformer, null, innerRingVertices, innerCylinderForeVertices, false, true); DiskExporter.closeDiskMesh(obj, transformer, null, innerRingVertices, innerCylinderForeVertices, false, true);
} }
} }
}
private void closeFace(List<Integer> outerVertices, List<Integer> innerVertices, boolean isTopFace) { private void closeFace(List<Integer> outerVertices, List<Integer> innerVertices, boolean isTopFace) {
boolean filledCap = component.isFilled() || innerVertices.size() <= 1; boolean filledCap = component.isFilled() || innerVertices.size() <= 1;