diff --git a/jplotter/pom.xml b/jplotter/pom.xml index 0c268235..ed536bba 100644 --- a/jplotter/pom.xml +++ b/jplotter/pom.xml @@ -4,7 +4,7 @@ com.github.hageldave.jplotter jplotter - 0.3.0-SNAPSHOT + 0.3.0 JPlotter https://github.com/hageldave/JPlotter diff --git a/jplotter/src/main/java/hageldave/jplotter/renderables/Points.java b/jplotter/src/main/java/hageldave/jplotter/renderables/Points.java index 55fe2008..11152139 100644 --- a/jplotter/src/main/java/hageldave/jplotter/renderables/Points.java +++ b/jplotter/src/main/java/hageldave/jplotter/renderables/Points.java @@ -15,6 +15,7 @@ import hageldave.jplotter.gl.FBO; import hageldave.jplotter.gl.VertexArray; import hageldave.jplotter.misc.Glyph; +import hageldave.jplotter.renderers.PointsRenderer; import hageldave.jplotter.util.Utils; import hageldave.jplotter.util.Annotations.GLContextRequired; diff --git a/jplotter/src/main/java/hageldave/jplotter/renderers/CoordSysRenderer.java b/jplotter/src/main/java/hageldave/jplotter/renderers/CoordSysRenderer.java index dca019e3..1e25d963 100644 --- a/jplotter/src/main/java/hageldave/jplotter/renderers/CoordSysRenderer.java +++ b/jplotter/src/main/java/hageldave/jplotter/renderers/CoordSysRenderer.java @@ -154,7 +154,7 @@ public CoordSysRenderer() { * Sets the {@link #isDirty} state of this CoordSysRenderer to true. * This indicates that axis locations, tick marks, labels and guides * have to be recomputed. - * This will be done during {@link #paintToFBO(int, int)} which + * The recomputing will be done during {@link #render(int, int, int, int)} which * will set the isDirty state back to false. */ public void setDirty() { diff --git a/jplotter/src/main/java/hageldave/jplotter/renderers/GenericRenderer.java b/jplotter/src/main/java/hageldave/jplotter/renderers/GenericRenderer.java index d34160cd..fb5f1a85 100644 --- a/jplotter/src/main/java/hageldave/jplotter/renderers/GenericRenderer.java +++ b/jplotter/src/main/java/hageldave/jplotter/renderers/GenericRenderer.java @@ -15,7 +15,7 @@ * for rendering some kind of {@link Renderable} (e.g. Points). * It provides some typical attributes such as a List of Renderables to render, * a Shader object, a projection and view matrix. - * It also implements the {@link #render(int, int)} method while exposing + * It also implements the {@link #render(int, int, int, int)} method while exposing * a new interface for implementations of GenericRenderers that need * to implement {@link #renderStart(int, int)} {@link #renderItem(Renderable)} * and {@link #renderEnd()}. @@ -81,7 +81,7 @@ public void render(int vpx, int vpy, int w, int h) { } /** - * Is called during the {@link #render(int, int)} routine before + * Is called during the {@link #render(int, int, int, int)} routine before * {@link #renderItem(Renderable)} is called. * At this stage the {@link #shader} has already been bound, * the projection matrix {@link #orthoMX} been set @@ -97,7 +97,7 @@ public void render(int vpx, int vpy, int w, int h) { protected abstract void renderStart(int w, int h); /** - * Is called during the {@link #render(int, int)} routine after + * Is called during the {@link #render(int, int, int, int)} routine after * {@link #renderStart(int, int)} for every item contained in this renderer. *

* This method should take care of rendering the specified item, i.e. @@ -110,7 +110,7 @@ public void render(int vpx, int vpy, int w, int h) { protected abstract void renderItem(T item); /** - * Is called during the {@link #render(int, int)} routine after + * Is called during the {@link #render(int, int, int, int)} routine after * all items have been rendered ({@link #renderItem(Renderable)}). * This will be called before the {@link #shader} is closed. *

@@ -123,7 +123,7 @@ public void render(int vpx, int vpy, int w, int h) { /** * Adds an item to this renderer's {@link #itemsToRender} list. * The renderer will take care of calling {@link Renderable#initGL()} during - * its {@link #render(int, int)} method and will as well call + * its {@link #render(int, int, int, int)} method and will as well call * {@link Renderable#updateGL()} if {@link Renderable#isDirty()}. * * @param item to add diff --git a/jplotter/src/main/java/hageldave/jplotter/renderers/Renderer.java b/jplotter/src/main/java/hageldave/jplotter/renderers/Renderer.java index a12dde62..e509a899 100644 --- a/jplotter/src/main/java/hageldave/jplotter/renderers/Renderer.java +++ b/jplotter/src/main/java/hageldave/jplotter/renderers/Renderer.java @@ -10,10 +10,11 @@ * The Renderer interface defines methods to * initialize the renderer, * execute a rendering pass, - * closing the renderer. + * close the renderer. *

* Implementation Notice:
- * A renderer's fragment shader is obliged to output color for two + * If this renderer directly uses a shader, + * its fragment shader is obliged to output color for two * buffers, which are the two color attachments of an {@link FBO}. * These have to be written to
* {@code layout(location=0) out vec4 c1;} and
@@ -51,7 +52,7 @@ public interface Renderer extends AutoCloseable, SVGRenderer { /** * En-/Disables this renderer. By default a renderer is enabled and will - * render upon {@link #render(int, int)} or {@link #renderSVG(org.w3c.dom.Document, org.w3c.dom.Element, int, int)}. + * render upon {@link #render(int, int, int, int)} or {@link #renderSVG(org.w3c.dom.Document, org.w3c.dom.Element, int, int)}. * When disabled those methods return right away and will not render anything. * @param enable true when activating, false when deactivating. */ @@ -59,7 +60,7 @@ public interface Renderer extends AutoCloseable, SVGRenderer { /** * Whether this renderer is enabled or not. By default a renderer is enabled and will - * render upon {@link #render(int, int)} or {@link #renderSVG(org.w3c.dom.Document, org.w3c.dom.Element, int, int)}. + * render upon {@link #render(int, int, int, int)} or {@link #renderSVG(org.w3c.dom.Document, org.w3c.dom.Element, int, int)}. * When disabled those methods return right away and will not render anything. * @return true when active */