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

Removes the old JOGL renderer and uses the new unified renderer as it works correctly now

Browse Source
This commit is contained in:
Julien Gouesse 2015-09-22 23:06:16 +02:00
parent e3a45755c6
commit daa18429d1
2 changed files with 1 additions and 2703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2699
jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglRenderer.java
View File

File diff suppressed because it is too large Load Diff

5
jme3-jogl/src/main/java/com/jme3/system/jogl/JoglContext.java
View File

@ -40,7 +40,6 @@ import com.jme3.renderer.RendererException;
import com.jme3.renderer.jogl.JoglGL; import com.jme3.renderer.jogl.JoglGL;
import com.jme3.renderer.jogl.JoglGLExt; import com.jme3.renderer.jogl.JoglGLExt;
import com.jme3.renderer.jogl.JoglGLFbo; import com.jme3.renderer.jogl.JoglGLFbo;
import com.jme3.renderer.jogl.JoglRenderer;
import com.jme3.renderer.opengl.GL2; import com.jme3.renderer.opengl.GL2;
import com.jme3.renderer.opengl.GL3; import com.jme3.renderer.opengl.GL3;
import com.jme3.renderer.opengl.GL4; import com.jme3.renderer.opengl.GL4;
@ -192,9 +191,7 @@ public abstract class JoglContext implements JmeContext {
glfbo = (GLFbo) GLTracer.createDesktopGlTracer(glfbo, GLFbo.class); glfbo = (GLFbo) GLTracer.createDesktopGlTracer(glfbo, GLFbo.class);
} }
//FIXME uncomment the line below when the unified renderer is ready for the prime time :) renderer = new GLRenderer(gl, glext, glfbo);
//renderer = new GLRenderer(gl, glext, glfbo);
renderer = new JoglRenderer();
renderer.initialize(); renderer.initialize();
} else { } else {
throw new UnsupportedOperationException("Unsupported renderer: " + settings.getRenderer()); throw new UnsupportedOperationException("Unsupported renderer: " + settings.getRenderer());