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

Only check if radius is automatic

Browse Source
This commit is contained in:
SiboVG 2023-07-30 00:02:56 +02:00
parent 9183bde51e
commit 35a91b4654
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
View File

@ -849,12 +849,20 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
// have a radial offset of 0 from their centerline, we are in line. // have a radial offset of 0 from their centerline, we are in line.
if ((this.parent instanceof RingInstanceable) && if ((this.parent instanceof RingInstanceable) &&
(!MathUtil.equals(this.parent.getRadiusMethod().getRadius(this.parent.parent, this, this.parent.getRadiusOffset()), 0))) (!MathUtil.equals(this.parent.getRadiusMethod().getRadius(
this.parent.parent, this, this.parent.getRadiusOffset()), 0)))
return false; return false;
if ((candidate.parent instanceof RingInstanceable) && ((candidate.parent.parent == this) || if (candidate.parent instanceof RingInstanceable) {
(!MathUtil.equals(candidate.parent.getRadiusMethod().getRadius(candidate.parent.parent, candidate, candidate.parent.getRadiusOffset()), 0)))) // We need to check if the grandparent of the candidate is a body tube and if the outer radius is automatic.
// If so, then this would cause an infinite loop when checking the radius of the radiusMethod.
if (candidate.parent.parent == this && (this.isAftRadiusAutomatic() || this.isForeRadiusAutomatic())) {
return false; return false;
} else {
return MathUtil.equals(candidate.parent.getRadiusMethod().getRadius(
candidate.parent.parent, candidate, candidate.parent.getRadiusOffset()), 0);
}
}
return true; return true;
} }