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

Texparameters need to be set while texture is bound.

Browse Source 
This was causing the GLSL Fast-flip code in GLJPanel to die, I think it
was trying to mipmap the FBO.
This commit is contained in:
bkuker 2013-09-22 18:11:13 -04:00
parent 7d289b3daa
commit a3c44f220b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java
View File

@ -127,12 +127,13 @@ public class RealisticRenderer extends RocketRenderer {
g.render(gl); g.render(gl);
if (decals && t != null && tex != null) { 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.enable(gl);
tex.bind(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.glMatrixMode(GL.GL_TEXTURE);
gl.glPushMatrix(); gl.glPushMatrix();
@ -170,6 +171,7 @@ public class RealisticRenderer extends RocketRenderer {
gl.glMatrixMode(GL.GL_TEXTURE); gl.glMatrixMode(GL.GL_TEXTURE);
gl.glPopMatrix(); gl.glPopMatrix();
gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
tex.disable(gl); tex.disable(gl);
} }