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

Merge pull request #750 from JoePfeiffer/clamp-calculateFinGeometry

Browse Source 
clamp x coordinate of intersections
This commit is contained in:
Joe Pfeiffer 2020-08-18 21:10:37 -06:00 committed by GitHub
commit 75c72806f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java
View File

@ -293,8 +293,15 @@ public class FinSetCalc extends RocketComponentCalc {
for (int i = i1; i <= i2; i++) {
// Intersection point (x,y)
// Note that y can be outside the bounds of the line
// defined by (x1, y1) (x2 y2) so x can similarly be outside
// the bounds. If the line is nearly horizontal, it can be
// 'way outside. We want to get the whole "strip", so we
// don't clamp y; however, we do clamp x to avoid numerical
// instabilities
double y = i * span / (DIVISIONS - 1);
double x = (y - y2) / (y1 - y2) * x1 + (y1 - y) / (y1 - y2) * x2;
double x = MathUtil.clamp((y - y2) / (y1 - y2) * x1 + (y1 - y) / (y1 - y2) * x2,
Math.min(x1, x2), Math.max(x1, x2));
if (x < chordLead[i])
chordLead[i] = x;
if (x > chordTrail[i])