diff options
author | Sven Gothel <[email protected]> | 2012-10-12 15:29:01 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-10-12 15:29:01 +0200 |
commit | bd47a89aad60a6915551fa847eea1ecda78fc9d5 (patch) | |
tree | afe4afc204e7642f74f36543099de9c3a951375f /src/demos/es1/cube/CubeImmModeSink.java | |
parent | 516131e6dd5beabc9df6d659c3f7284965bbe537 (diff) |
Adapt to latest JOGL changesv2.0-rc11
Diffstat (limited to 'src/demos/es1/cube/CubeImmModeSink.java')
-rw-r--r-- | src/demos/es1/cube/CubeImmModeSink.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java index 81f89d8..208ed36 100644 --- a/src/demos/es1/cube/CubeImmModeSink.java +++ b/src/demos/es1/cube/CubeImmModeSink.java @@ -59,11 +59,12 @@ public class CubeImmModeSink implements GLEventListener { } if(vboCubeF==null) { - ImmModeSink vbo = ImmModeSink.createFixed(gl, GL.GL_STATIC_DRAW, 36, + ImmModeSink vbo = ImmModeSink.createFixed(36, 3, GL.GL_SHORT, // vertex 4, GL.GL_FLOAT, // color 3, GL.GL_BYTE, // normal - 0, GL.GL_FLOAT); // texture + 0, GL.GL_FLOAT, // texture + GL.GL_STATIC_DRAW); vbo.glBegin(GL.GL_TRIANGLES); @@ -167,7 +168,7 @@ public class CubeImmModeSink implements GLEventListener { } public void init(GLAutoDrawable drawable) { - GL2ES1 gl = FixedFuncUtil.wrapFixedFuncEmul(drawable.getGL()); + GL2ES1 gl = FixedFuncUtil.wrapFixedFuncEmul(drawable.getGL(), ShaderSelectionMode.AUTO, null); glu = GLU.createGLU(); @@ -406,7 +407,7 @@ public class CubeImmModeSink implements GLEventListener { window.setUpdateFPSFrames(FPSCounter.DEFAULT_FRAMES_PER_INTERVAL, System.err); // Size OpenGL to Video Surface window.setSize(width, height); - window.setFullscreen(true); + // window.setFullscreen(true); window.setVisible(true); long curTime; |