diff options
-rw-r--r-- | src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java | 5 | ||||
-rw-r--r-- | src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java index 43a322a2d..0a8f4482e 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java @@ -133,11 +133,6 @@ public final class RegionRenderer { } }; - public static RegionRenderer create(final Vertex.Factory<? extends Vertex> pointFactory, final RenderState rs, - final GLCallback enableCallback, final GLCallback disableCallback) { - return null; - } - /** * Create a hardware accelerated RegionRenderer including its {@link RenderState} composition. * <p> diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java index 09486874d..6e1886c73 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java @@ -44,6 +44,12 @@ import com.jogamp.opengl.util.GLArrayDataServer; import com.jogamp.opengl.util.PMVMatrix; import com.jogamp.opengl.util.glsl.ShaderProgram; +/** + * The RenderState is owned by {@link RegionRenderer}. + * + * It holds rendering state data like {@link PMVMatrix}, viewport, + * but also the current {@link #getColorStatic(float[]) static color}. + */ public class RenderState { private static final String thisKey = "jogamp.graph.curve.RenderState" ; @@ -102,7 +108,7 @@ public class RenderState { private static int nextID = 1; /** - * Representation of {@link RenderState} data for one {@link ShaderProgram} + * Representation of {@link RenderState} data per {@link ShaderProgram} * as {@link GLUniformData}. * <p> * FIXME: Utilize 'ARB_Uniform_Buffer_Object' where available! @@ -135,6 +141,7 @@ public class RenderState { */ public final boolean update(final GL2ES2 gl, final RenderState rs, final boolean updateLocation, final int renderModes, final boolean pass1, final boolean throwOnError) { if( rs.id() != rsId ) { + // Assignment of Renderstate buffers to uniforms (no copy, direct reference) gcu_PMVMatrix01.setData(rs.pmvMatrix.glGetPMvMatrixf()); gcu_Weight.setData(rs.weightBuffer); gcu_ColorStatic.setData(rs.colorStaticBuffer); |