From 3d02766d41ab987a1a508fa8564af305138d240c Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Wed, 18 Jan 2023 00:13:04 +0100
Subject: [PATCH] [#1980] Render booster markers even if no children

---
 .../rocketcomponent/FlightConfiguration.java  | 19 +++++++++++++++++--
 .../gui/scalefigure/RocketFigure.java         |  9 +++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index 271e1fb59..44089a499 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -67,6 +67,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	private Map<Integer, Boolean> preloadStageActiveness = null;
 	final private Collection<MotorConfiguration> activeMotors = new ConcurrentLinkedQueue<MotorConfiguration>();
 	final private InstanceMap activeInstances = new InstanceMap();
+	final private InstanceMap extraRenderInstances = new InstanceMap();		// Extra instances to be rendered, besides the active instances
 	
 	private int boundsModID = -1;
 	private BoundingBox cachedBoundsAerodynamic = new BoundingBox();	// Bounding box of all aerodynamic components
@@ -288,7 +289,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		}
 
 		AxialStage stage = rocket.getStage(stageNumber);
-		return stage != null && stage.getChildCount() > 0 &&
+		return stage != null && stage.getChildCount() > 0 &&		// Stages with no children are marked as inactive
 				stages.get(stageNumber) != null && stages.get(stageNumber).active;
 	}
 
@@ -398,6 +399,15 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	public InstanceMap getActiveInstances() {
 		return activeInstances;
 	}
+
+	/**
+	 * Returns the InstanceMap of instances that need to be rendered, but are not present in {@link #getActiveInstances()}.
+	 * This is the case for example for a booster that has no children. It is marked as an inactive stage, but it still needs to be rendered.
+	 * @return the InstanceMap of instances that need to be rendered, but are not present in {@link #getActiveInstances()}.
+	 */
+	public InstanceMap getExtraRenderInstances() {
+		return extraRenderInstances;
+	}
 	
 	/*
 	 * Generates a read-only, instance-aware collection of the components for this rocket & configuration
@@ -406,7 +416,8 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	 */
 	private void updateActiveInstances() {
 		activeInstances.clear();
-		getActiveContextListAt( this.rocket, activeInstances, Transformation.IDENTITY);
+		extraRenderInstances.clear();
+		getActiveContextListAt(this.rocket, activeInstances, Transformation.IDENTITY);
 	}
 
 	private InstanceMap getActiveContextListAt(final RocketComponent component, final InstanceMap results, final Transformation parentTransform ){
@@ -428,6 +439,10 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 			// constructs entry in-place if this component is active
 			if (this.isComponentActive(component)) {
 				results.emplace(component, currentInstanceNumber, currentTransform);
+			} else if (component instanceof ParallelStage && stages.get(component.getStageNumber()).active) {
+				// Boosters with no children are marked as inactive, but still need to be rendered.
+				// See GitHub issue #1980 for more information.
+				extraRenderInstances.emplace(component, currentInstanceNumber, currentTransform);
 			}
 
 			for(RocketComponent child : component.getChildren()) {
diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
index fa195b4c0..0925aca8a 100644
--- a/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
+++ b/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
@@ -384,7 +384,12 @@ public class RocketFigure extends AbstractScaleFigure {
 		// allShapes is an output buffer -- it stores all the generated shapes
 		allShapes.clear();
 
-		for (Entry<RocketComponent, ArrayList<InstanceContext>> entry : config.getActiveInstances().entrySet()) {
+		addShapesFromInstanceEntries(allShapes, config.getActiveInstances().entrySet());
+		addShapesFromInstanceEntries(allShapes, config.getExtraRenderInstances().entrySet());
+	}
+
+	private void addShapesFromInstanceEntries(PriorityQueue<RocketComponentShape> allShapes, Set<Entry<RocketComponent, ArrayList<InstanceContext>>> entries) {
+		for (Entry<RocketComponent, ArrayList<InstanceContext>> entry : entries) {
 			final RocketComponent comp = entry.getKey();
 
 			// Only draw pod sets and boosters when they are selected
@@ -409,7 +414,7 @@ public class RocketFigure extends AbstractScaleFigure {
 			}
 		}
 	}
-	
+
 	/**
 	 * Gets the shapes required to draw the component.
 	 *