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

Fix transparency display issue

Browse Source 
Use the provided alpha from the color when it is available when
rendering the model in the 3d finished view. The 3d unfinished view will
continue to override the alpha to show interior components.

Additionally, enable the GL2.GL_COLOR_MATERIAL for the rendering of
the component to display the right alpha settings.

Fixes #878

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
This commit is contained in:
Billy Olsen 2021-02-20 20:40:40 -07:00
parent 5e3729bb58
commit ab86cb7f4e
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java
View File

@ -101,15 +101,23 @@ public class RealisticRenderer extends RocketRenderer {
render(gl, geom, Surface.EDGES, app, false, alpha); render(gl, geom, Surface.EDGES, app, false, alpha);
} }
protected float[] convertColor(Appearance a, float alpha) {
float[] color = new float[4];
convertColor(a.getPaint(), color);
return color;
}
private void render(GL2 gl, Geometry g, Surface which, Appearance a, boolean decals, float alpha) { private void render(GL2 gl, Geometry g, Surface which, Appearance a, boolean decals, float alpha) {
final Decal t = a.getTexture(); final Decal t = a.getTexture();
final Texture tex = textures.getTexture(t); final Texture tex = textures.getTexture(t);
gl.glLightModeli(GL2.GL_LIGHT_MODEL_COLOR_CONTROL, GL2.GL_SEPARATE_SPECULAR_COLOR); gl.glLightModeli(GL2.GL_LIGHT_MODEL_COLOR_CONTROL, GL2.GL_SEPARATE_SPECULAR_COLOR);
float[] convertedColor = this.convertColor(a, alpha);
for (int i=0; i < convertedColor.length; i++) {
color[i] = convertedColor[i];
}
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_DIFFUSE, color, 0);
gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_AMBIENT, color, 0); gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_AMBIENT, color, 0);
@ -149,6 +157,7 @@ public class RealisticRenderer extends RocketRenderer {
gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA); gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
gl.glEnable(GL.GL_BLEND); gl.glEnable(GL.GL_BLEND);
gl.glEnable(GL2.GL_COLOR_MATERIAL);
gl.glDepthFunc(GL.GL_LEQUAL); gl.glDepthFunc(GL.GL_LEQUAL);
gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
@ -167,6 +176,7 @@ public class RealisticRenderer extends RocketRenderer {
gl.glPopMatrix(); gl.glPopMatrix();
gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
gl.glDisable(GL2.GL_COLOR_MATERIAL);
tex.disable(gl); tex.disable(gl);
} }

8
swing/src/net/sf/openrocket/gui/figure3d/UnfinishedRenderer.java
View File

@ -21,4 +21,12 @@ public class UnfinishedRenderer extends RealisticRenderer {
protected Appearance getAppearance(RocketComponent c) { protected Appearance getAppearance(RocketComponent c) {
return DefaultAppearance.getDefaultAppearance(c); return DefaultAppearance.getDefaultAppearance(c);
} }
@Override
protected float[] convertColor(final Appearance a, float alpha) {
float[] color = new float[4];
convertColor(a.getPaint(), color);
color[3] = alpha;//re-set to "alpha" so that Unfinished renderer will show interior parts.
return color;
}
} }