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

Merge pull request #1282 from JoePfeiffer/generalize-automatic-tube-fin-radius

Browse Source 
generalize getOuterRadius() so automatic radius tubes touch for number of tubes greater than 2 (ie whenever possible)
This commit is contained in:
SiboVG 2022-04-19 17:39:42 +02:00 committed by GitHub
commit a9dbc85a7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java
View File

@ -85,35 +85,37 @@ public class TubeFinSet extends ExternalComponent implements AxialPositionable,
*/ */
public double getOuterRadius() { public double getOuterRadius() {
if (autoRadius) { if (autoRadius) {
// Return auto radius from front or rear if (fins < 3) {
double r = -1; return getBodyRadius();
RocketComponent c = this.getParent();
if (c != null) {
if (c instanceof SymmetricComponent) {
r = ((SymmetricComponent) c).getAftRadius();
}
}
if (r < 0) {
r = DEFAULT_RADIUS;
} else { } else {
// for 5,6, and 8 fins, adjust the diameter to provide touching fins. return getTouchingRadius();
switch (fins) {
case 5:
r *= 1.43; // sin(36) / (1- sin(36), 36 = 360/5/2
break;
case 7:
r *= 0.77; // sin(25.7) / (1- sin(25.7)
break;
case 8:
r *= 0.62; // sin(22.5) / (1- sin(22.5)
break;
} }
} }
return r;
}
return outerRadius; return outerRadius;
} }
/**
* Return distance between tubes.
*
* @return distance between tubes. 0 if touching, negative if overlap
*/
public double getTubeSeparation() {
return 2.0*(getTouchingRadius() - getOuterRadius());
}
/**
* Return the required radius for the fins to be touching
*
* @return required radius
*/
private double getTouchingRadius() {
double r = getBodyRadius();
final double finSep = Math.PI / fins;
r *= Math.sin(finSep)/(1.0 - Math.sin(finSep));
return r;
}
/** /**
* Set the outer radius of the tube-fin. If the radius is less than the wall thickness, * Set the outer radius of the tube-fin. If the radius is less than the wall thickness,
* the wall thickness is decreased accordingly of the value of the radius. * the wall thickness is decreased accordingly of the value of the radius.
@ -355,8 +357,8 @@ public class TubeFinSet extends ExternalComponent implements AxialPositionable,
List<Coordinate> bounds = new ArrayList<Coordinate>(); List<Coordinate> bounds = new ArrayList<Coordinate>();
double r = getBodyRadius(); double r = getBodyRadius();
addBound(bounds, 0, 2 * (r + outerRadius)); addBound(bounds, 0, 2 * getBoundingRadius());
addBound(bounds, length, 2 * (r + outerRadius)); addBound(bounds, length, 2 * getBoundingRadius());
return bounds; return bounds;
} }
@ -364,8 +366,8 @@ public class TubeFinSet extends ExternalComponent implements AxialPositionable,
@Override @Override
public BoundingBox getInstanceBoundingBox() { public BoundingBox getInstanceBoundingBox() {
BoundingBox box = new BoundingBox(); BoundingBox box = new BoundingBox();
box.update(new Coordinate(0, -outerRadius, -outerRadius)); box.update(new Coordinate(0, -getOuterRadius(), -getOuterRadius()));
box.update(new Coordinate(length, outerRadius, outerRadius)); box.update(new Coordinate(length, getOuterRadius(), getOuterRadius()));
return box; return box;
} }
@ -413,8 +415,7 @@ public class TubeFinSet extends ExternalComponent implements AxialPositionable,
@Override @Override
public double getBoundingRadius() { public double getBoundingRadius() {
// TODO Auto-generated method stub return getBodyRadius() + getOuterRadius();
return 0;
} }
@Override @Override