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

Don't calculate fillet volume is no fillet

Browse Source
This commit is contained in:
SiboVG 2023-05-09 01:24:11 +02:00
parent a0b9093957
commit 7aaaf4bce9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -581,7 +581,8 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
* 5. Return twice that since there is a fillet on each side of the fin. * 5. Return twice that since there is a fillet on each side of the fin.
*/ */
protected Coordinate calculateFilletVolumeCentroid() { protected Coordinate calculateFilletVolumeCentroid() {
if((null == this.parent) || (!SymmetricComponent.class.isAssignableFrom(this.parent.getClass()))){ if ((this.filletRadius == 0) || (this.parent == null) ||
(!SymmetricComponent.class.isAssignableFrom(this.parent.getClass()))) {
return Coordinate.ZERO; return Coordinate.ZERO;
} }
Coordinate[] mountPoints = this.getRootPoints(); Coordinate[] mountPoints = this.getRootPoints();
@ -594,7 +595,7 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
final Coordinate finLead = getFinFront(); final Coordinate finLead = getFinFront();
final double xFinEnd = finLead.x + getLength(); final double xFinEnd = finLead.x + getLength();
final Coordinate[] rootPoints = getMountPoints( finLead.x, xFinEnd, -finLead.x, -finLead.y); final Coordinate[] rootPoints = getMountPoints( finLead.x, xFinEnd, -finLead.x, -finLead.y);
if (0 == rootPoints.length) { if (rootPoints.length == 0) {
return Coordinate.ZERO; return Coordinate.ZERO;
} }