From 637972967007801fab3deeefe15d51bafbd424d2 Mon Sep 17 00:00:00 2001 From: ChrisMickelson Date: Wed, 1 Feb 2017 21:50:15 -0500 Subject: [PATCH 1/3] Update RocketComponentSaver.java --- .../openrocket/file/openrocket/savers/RocketComponentSaver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java index 6be0ed885..45c7eaa1f 100644 --- a/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java @@ -240,7 +240,7 @@ public class RocketComponentSaver { private final static void emitColor(String elementName, List elements, Color color) { if (color != null) { elements.add("<" + elementName + " red=\"" + color.getRed() + "\" green=\"" + color.getGreen() - + "\" blue=\"" + color.getBlue() + "\"/>"); + + "\" blue=\"" + color.getBlue() + "\" alpha=\"" + color.getAlpha() + "\"/>"); } } From f6ccc7f264a7ba71733e9968d86b98a0c5a273fc Mon Sep 17 00:00:00 2001 From: ChrisMickelson Date: Wed, 1 Feb 2017 21:54:32 -0500 Subject: [PATCH 2/3] Update AppearanceHandler.java --- .../file/openrocket/importt/AppearanceHandler.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/AppearanceHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/AppearanceHandler.java index 11b52f2ba..b59cea9cd 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/AppearanceHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/AppearanceHandler.java @@ -51,7 +51,14 @@ class AppearanceHandler extends AbstractElementHandler { int red = Integer.parseInt(attributes.get("red")); int green = Integer.parseInt(attributes.get("green")); int blue = Integer.parseInt(attributes.get("blue")); - builder.setPaint(new Color(red, green, blue)); + int alpha = 255;//set default + // add a test if "alpha" was added to the XML / backwards compatibility + String a = attributes.get("alpha"); + if (a != null){ + // "alpha" string was present so load the value + alpha = Integer.parseInt(a); + } + builder.setPaint(new Color(red, green, blue, alpha)); return; } if ("shine".equals(element)) { @@ -96,4 +103,4 @@ class AppearanceHandler extends AbstractElementHandler { super.endHandler(element, attributes, content, warnings); } -} \ No newline at end of file +} From e0f5d7711b055a4a8808ff87dc7f3980cc38bce3 Mon Sep 17 00:00:00 2001 From: ChrisMickelson Date: Wed, 1 Feb 2017 22:00:15 -0500 Subject: [PATCH 3/3] Update RealisticRenderer.java Small bug fix to keep Unfinished renderer showing interior of tubes --- .../src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java index 363c36e2b..512c85179 100644 --- a/swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java +++ b/swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java @@ -112,8 +112,8 @@ public class RealisticRenderer extends RocketRenderer { gl.glLightModeli(GL2.GL_LIGHT_MODEL_COLOR_CONTROL, GL2.GL_SEPARATE_SPECULAR_COLOR); - convertColor(a.getPaint(), color);//color now contains alpha value - + convertColor(a.getPaint(), color); + color[3] = alpha;//re-set to "alpha" so that Unfinished renderer will show interior parts. gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_DIFFUSE, color, 0); gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_AMBIENT, color, 0);