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

[#1618] Fix fin tab root points

Browse Source
This commit is contained in:
SiboVG 2022-08-26 23:07:36 +02:00
parent 71045c6675
commit f907ff186b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/net/sf/openrocket/rocketcomponent/FinSet.java
View File

@ -996,17 +996,22 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
return new Coordinate[]{}; return new Coordinate[]{};
} }
Coordinate[] rootPoints = getRootPoints(); final double xTabFront = getTabFrontEdge();
final double xTabTrail = getTabTrailingEdge();
final int pointCount = 5 + rootPoints.length; List<Coordinate> rootPoints = new ArrayList<>();
for (Coordinate point : getRootPoints()) {
if (point.x > xTabFront && point.x < xTabTrail) {
rootPoints.add(point);
}
}
final int pointCount = 5 + rootPoints.size();
Coordinate[] points = new Coordinate[pointCount]; Coordinate[] points = new Coordinate[pointCount];
final Coordinate finFront = this.getFinFront(); final Coordinate finFront = this.getFinFront();
final SymmetricComponent body = (SymmetricComponent)this.getParent(); final SymmetricComponent body = (SymmetricComponent)this.getParent();
final double xTabFront = getTabFrontEdge();
final double xTabTrail = getTabTrailingEdge();
// // limit the new heights to be no greater than the current body radius. // // limit the new heights to be no greater than the current body radius.
double yTabFront = Double.NaN; double yTabFront = Double.NaN;
double yTabTrail = Double.NaN; double yTabTrail = Double.NaN;
@ -1021,8 +1026,8 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
points[1] = new Coordinate(xTabFront, yTabBottom ); points[1] = new Coordinate(xTabFront, yTabBottom );
points[2] = new Coordinate(xTabTrail, yTabBottom ); points[2] = new Coordinate(xTabTrail, yTabBottom );
points[3] = new Coordinate(xTabTrail, yTabTrail); points[3] = new Coordinate(xTabTrail, yTabTrail);
for (int i = 0; i < rootPoints.length; i++) { for (int i = 0; i < rootPoints.size(); i++) {
points[i + 4] = rootPoints[rootPoints.length - 1 -i]; points[i + 4] = rootPoints.get(rootPoints.size() - 1 - i);
} }
points[pointCount - 1] = new Coordinate(xTabFront, yTabFront); points[pointCount - 1] = new Coordinate(xTabFront, yTabFront);