From a3c44f220b295eef3f4467589cbbf44d1ea93613 Mon Sep 17 00:00:00 2001 From: bkuker Date: Sun, 22 Sep 2013 18:11:13 -0400 Subject: [PATCH] Texparameters need to be set while texture is bound. This was causing the GLSL Fast-flip code in GLJPanel to die, I think it was trying to mipmap the FBO. --- .../net/sf/openrocket/gui/figure3d/RealisticRenderer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java b/core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java index a08c8ccb1..cdbae97b9 100644 --- a/core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java +++ b/core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java @@ -127,12 +127,13 @@ public class RealisticRenderer extends RocketRenderer { g.render(gl); if (decals && t != null && tex != null) { - gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR_MIPMAP_LINEAR); - gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR); tex.enable(gl); tex.bind(gl); + gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR_MIPMAP_LINEAR); + gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR); + gl.glMatrixMode(GL.GL_TEXTURE); gl.glPushMatrix(); @@ -170,6 +171,7 @@ public class RealisticRenderer extends RocketRenderer { gl.glMatrixMode(GL.GL_TEXTURE); gl.glPopMatrix(); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); + tex.disable(gl); }