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

In FinSetCalc.calculateFinGeometry(), make sure x coordinates of interections

Browse Source 
between lines defining fins and strips being used to estimate geometry aren't beyond bounds of fin.
This commit is contained in:
JoePfeiffer 2020-08-17 17:39:08 -06:00
parent 08f49d6a04
commit 99bdf71ba8
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++) { for (int i = i1; i <= i2; i++) {
// Intersection point (x,y) // 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 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]) if (x < chordLead[i])
chordLead[i] = x; chordLead[i] = x;
if (x > chordTrail[i]) if (x > chordTrail[i])