diff options
author | Julien Gouesse <[email protected]> | 2015-09-25 19:29:52 +0200 |
---|---|---|
committer | Julien Gouesse <[email protected]> | 2015-09-25 19:29:52 +0200 |
commit | 04fd80aa74facff1f969259cafeda4cd06c41ad5 (patch) | |
tree | de47021e38df1f6bfafc020ec05465297235ab53 /ardor3d-jogl/src/main/java | |
parent | 3fc6b65f6ac04631d3ec0b317f5b8a02a2534813 (diff) |
Fixes the OpenGL ES 2 support, not exposed yet anyway
Diffstat (limited to 'ardor3d-jogl/src/main/java')
3 files changed, 9 insertions, 5 deletions
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglRenderer.java b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglRenderer.java index 2aeafa9..0016c51 100644 --- a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglRenderer.java +++ b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglRenderer.java @@ -122,6 +122,7 @@ public class JoglRenderer extends AbstractRenderer { * Constructor instantiates a new <code>JoglRenderer</code> object. */ public JoglRenderer() { + super(); logger.fine("JoglRenderer created."); } diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/state/record/JoglRendererRecord.java b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/state/record/JoglRendererRecord.java index 4f2fce9..16ba413 100644 --- a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/state/record/JoglRendererRecord.java +++ b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/state/record/JoglRendererRecord.java @@ -3,17 +3,18 @@ * * This file is part of Ardor3D. * - * Ardor3D is free software: you can redistribute it and/or modify it + * Ardor3D is free software: you can redistribute it and/or modify it * under the terms of its license which may be found in the accompanying * LICENSE file or at <http://www.ardor3d.com/LICENSE>. */ package com.ardor3d.renderer.jogl.state.record; +import com.ardor3d.renderer.state.record.RendererRecord; import com.jogamp.opengl.GL; import com.jogamp.opengl.GLContext; - -import com.ardor3d.renderer.state.record.RendererRecord; +import com.jogamp.opengl.util.glsl.fixedfunc.FixedFuncUtil; +import com.jogamp.opengl.util.glsl.fixedfunc.ShaderSelectionMode; public class JoglRendererRecord extends RendererRecord { @@ -25,6 +26,8 @@ public class JoglRendererRecord extends RendererRecord { _matrixBackend = new JoglRealMatrixBackend(); } else { _matrixBackend = new JoglSimulatedMatrixBackend(); + FixedFuncUtil.wrapFixedFuncEmul(gl, ShaderSelectionMode.AUTO, + ((JoglSimulatedMatrixBackend) _matrixBackend)._matrix); } } diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/state/record/JoglSimulatedMatrixBackend.java b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/state/record/JoglSimulatedMatrixBackend.java index 441f786..98fa638 100644 --- a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/state/record/JoglSimulatedMatrixBackend.java +++ b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/state/record/JoglSimulatedMatrixBackend.java @@ -3,7 +3,7 @@ * * This file is part of Ardor3D. * - * Ardor3D is free software: you can redistribute it and/or modify it + * Ardor3D is free software: you can redistribute it and/or modify it * under the terms of its license which may be found in the accompanying * LICENSE file or at <http://www.ardor3d.com/LICENSE>. */ @@ -16,7 +16,7 @@ import com.jogamp.opengl.util.PMVMatrix; public class JoglSimulatedMatrixBackend implements JoglMatrixBackend { - private final PMVMatrix _matrix; + final PMVMatrix _matrix; public JoglSimulatedMatrixBackend() { super(); |