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

Process entire part tree when finding active contexts instead of bailing out early when an inactive component is found.

Browse Source
This commit is contained in:
JoePfeiffer 2022-03-11 11:24:02 -07:00
parent 7d643f4787
commit d290525099
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
View File

@ -298,9 +298,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
}
private InstanceMap getActiveContextListAt(final RocketComponent component, final InstanceMap results, final Transformation parentTransform ){
final boolean active = this.isComponentActive(component);
if (!active)
return results;
final int instanceCount = component.getInstanceCount();
final Coordinate[] allOffsets = component.getInstanceOffsets();
final double[] allAngles = component.getInstanceAngles();
@ -314,9 +312,11 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
final Transformation angleTransform = Transformation.getAxialRotation(allAngles[currentInstanceNumber]);
final Transformation currentTransform = componentTransform.applyTransformation(offsetTransform)
.applyTransformation(angleTransform);
// constructs entry in-place
results.emplace(component, active, currentInstanceNumber, currentTransform);
// constructs entry in-place if this component is active
if (this.isComponentActive(component)) {
results.emplace(component, this.isComponentActive(component), currentInstanceNumber, currentTransform);
}
for(RocketComponent child : component.getChildren()) {
getActiveContextListAt(child, results, currentTransform);