Merge pull request #1721 from SiboVG/bug-color

Don't explicitly save smokeAlpha in photostudio .ork

core/src/net/sf/openrocket/file/openrocket/savers/PhotoStudioSaver.java

@@ -43,7 +43,6 @@ public class PhotoStudioSaver {
         emitColor("flameColor", elements, photoSettings.get("flameColor"));
         elements.add("<smoke>" + photoSettings.get("smoke") + "</smoke>");
         emitColor("smokeColor", elements, photoSettings.get("smokeColor"));
-        elements.add("<smokeOpacity>" + photoSettings.get("smokeOpacity") + "</smokeOpacity>");
         elements.add("<sparks>" + photoSettings.get("sparks") + "</sparks>");
         elements.add("<exhaustScale>" + photoSettings.get("exhaustScale") + "</exhaustScale>");
         elements.add("<flameAspectRatio>" + photoSettings.get("flameAspectRatio") + "</flameAspectRatio>");

swing/src/net/sf/openrocket/file/photo/PhotoStudioGetter.java

@@ -135,11 +135,6 @@ public class PhotoStudioGetter {
             p.setSmokeColor(smokeColor);
             return;
         }
-        if ("smokeOpacity".equals(element)) {
-            double smokeOpacity = Double.parseDouble(content);
-            p.setSmokeOpacity(smokeOpacity);
-            return;
-        }
         if ("sparks".equals(element)) {
             boolean sparks = Boolean.parseBoolean(content);
             p.setSparks(sparks);

swing/src/net/sf/openrocket/file/photo/PhotoStudioSetter.java

@@ -41,7 +41,6 @@ public class PhotoStudioSetter {
         photoSettings.put("flameColor", getColor(p.getFlameColor()));
         photoSettings.put("smoke", String.valueOf(p.isSmoke()));
         photoSettings.put("smokeColor", getColor(p.getSmokeColor()));
-        photoSettings.put("smokeOpacity", String.valueOf(p.getSmokeOpacity()));
         photoSettings.put("sparks", String.valueOf(p.isSparks()));
         photoSettings.put("exhaustScale", String.valueOf(p.getExhaustScale()));
         photoSettings.put("flameAspectRatio", String.valueOf(p.getFlameAspectRatio()));

swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettings.java

@@ -31,7 +31,6 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings
 	private Color flameColor = new Color(255, 100, 50);
 	private boolean smoke = false;
 	private Color smokeColor = new Color(230, 230, 230, 102);
-	private double smokeOpacity = 0.4;
 	private boolean sparks = false;
 	private double exhaustScale = 1.0;
 	private double flameAspectRatio = 1.0;
@@ -204,19 +203,23 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings
 	}
 	
 	public void setSmokeColor(Color smokeColor) {
-		smokeColor.setAlpha(this.smokeColor.getAlpha());
 		this.smokeColor = smokeColor;
 		fireChangeEvent();
 	}
-	
+
-	public double getSmokeAlpha() {
-		return smokeColor.getAlpha() / 255f;
-	}
 	
 	public void setSmokeAlpha(double alpha) {
 		smokeColor.setAlpha((int) (alpha * 255));
 		fireChangeEvent();
 	}
+
+	public double getSmokeOpacity() {
+		return smokeColor.getAlpha() / 255f;
+	}
+
+	public void setSmokeOpacity(double smokeOpacity) {
+		setSmokeAlpha(smokeOpacity);
+	}
 	
 	public boolean isSparks() {
 		return sparks;
@@ -271,13 +274,4 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings
 		this.sparkWeight = sparkWeight;
 		fireChangeEvent();
 	}
-
-	public double getSmokeOpacity() {
-		return smokeOpacity;
-	}
-
-	public void setSmokeOpacity(double smokeOpacity) {
-		this.smokeOpacity = smokeOpacity;
-		setSmokeAlpha(smokeOpacity);
-	}
 }

swing/src/net/sf/openrocket/gui/figure3d/photo/exhaust/FlameRenderer.java

@@ -152,8 +152,6 @@ public final class FlameRenderer {
 
 		public Color getSmokeColor();
 
-		public double getSmokeAlpha();
-
 		public double getFlameAspectRatio();
 
 		public boolean isSparks();