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

Merge pull request #2379 from SiboVG/issue-2378

Browse Source 
Include radius clamping in clamping exclude
This commit is contained in:
Sibo Van Gool 2023-10-21 01:42:44 +02:00 committed by GitHub
commit e46c0bec2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/net/sf/openrocket/rocketcomponent/Transition.java
View File

@ -402,7 +402,10 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
((Transition) listener).setForeShoulderRadius(foreShoulderRadius, doClamping); ((Transition) listener).setForeShoulderRadius(foreShoulderRadius, doClamping);
} }
} }
foreShoulderRadius = Math.min(foreShoulderRadius, getForeRadius());
if (doClamping) {
foreShoulderRadius = Math.min(foreShoulderRadius, getForeRadius());
}
if (MathUtil.equals(this.foreShoulderRadius, foreShoulderRadius)) if (MathUtil.equals(this.foreShoulderRadius, foreShoulderRadius))
return; return;
@ -486,7 +489,9 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
} }
} }
aftShoulderRadius = Math.min(aftShoulderRadius, getAftRadius()); if (doClamping) {
aftShoulderRadius = Math.min(aftShoulderRadius, getAftRadius());
}
if (MathUtil.equals(this.aftShoulderRadius, aftShoulderRadius)) if (MathUtil.equals(this.aftShoulderRadius, aftShoulderRadius))
return; return;