sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Forgot to remove withSRGB from LwjglCanvas

Browse Source
This commit is contained in:
shadowislord 2014-06-03 23:18:20 -04:00
parent 52cd458601
commit 2aad768c8a
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java
View File

@ -2565,14 +2565,25 @@ public class LwjglRenderer implements Renderer {
return; return;
} }
setFrameBuffer(null);
if (enableSrgb) { if (enableSrgb) {
if (!glGetBoolean(GL30.GL_FRAMEBUFFER_SRGB_CAPABLE)) { if (!glGetBoolean(GL30.GL_FRAMEBUFFER_SRGB_CAPABLE)) {
logger.warning("Driver claims that default framebuffer " + logger.warning("Driver claims that default framebuffer "
"is not sRGB capable. Enabling anyway."); + "is not sRGB capable. Enabling anyway.");
} }
int encoding = GL30.glGetFramebufferAttachmentParameteri(GL30.GL_DRAW_FRAMEBUFFER,
GL_FRONT_LEFT,
GL30.GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING);
if (encoding != GL21.GL_SRGB) {
logger.warning("Driver claims that default framebuffer "
+ "is not using sRGB color encoding. Enabling anyway.");
}
glEnable(GL30.GL_FRAMEBUFFER_SRGB); glEnable(GL30.GL_FRAMEBUFFER_SRGB);
logger.log(Level.FINER, "SRGB FrameBuffer enabled (Gamma Correction)"); logger.log(Level.FINER, "SRGB FrameBuffer enabled (Gamma Correction)");
} else { } else {
glDisable(GL30.GL_FRAMEBUFFER_SRGB); glDisable(GL30.GL_FRAMEBUFFER_SRGB);

6
jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglCanvas.java
View File

@ -308,8 +308,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex
0, 0,
0, 0,
0, 0,
settings.useStereo3D()) settings.useStereo3D());
.withSRGB(settings.getGammaCorrection());
} }
return pbufferFormat; return pbufferFormat;
}else{ }else{
@ -323,8 +322,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex
0, 0,
0, 0,
0, 0,
settings.useStereo3D()) settings.useStereo3D());
.withSRGB(settings.getGammaCorrection());
} }
return canvasFormat; return canvasFormat;
} }

3
jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java
View File

@ -91,8 +91,7 @@ public class LwjglDisplay extends LwjglAbstractDisplay {
0, 0,
0, 0,
0, 0,
settings.useStereo3D()) settings.useStereo3D());
.withSRGB(settings.getGammaCorrection());
frameRate = settings.getFrameRate(); frameRate = settings.getFrameRate();
logger.log(Level.FINE, "Selected display mode: {0}", displayMode); logger.log(Level.FINE, "Selected display mode: {0}", displayMode);

3
jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java
View File

@ -65,8 +65,7 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable {
0, 0,
settings.getDepthBits(), settings.getDepthBits(),
settings.getStencilBits(), settings.getStencilBits(),
samples) samples);
.withSRGB(settings.getGammaCorrection());
width = settings.getWidth(); width = settings.getWidth();
height = settings.getHeight(); height = settings.getHeight();