From 11ca3752fe3a53e3d416e763c95e727c83c7e863 Mon Sep 17 00:00:00 2001 From: Casey Reas Date: Mon, 19 Nov 2012 06:25:57 +0000 Subject: [PATCH] Reference update for PShader and util functions. More coming... --- core/src/processing/opengl/PShader.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/core/src/processing/opengl/PShader.java b/core/src/processing/opengl/PShader.java index 0a4827981..4ddbdfad6 100644 --- a/core/src/processing/opengl/PShader.java +++ b/core/src/processing/opengl/PShader.java @@ -34,6 +34,8 @@ import java.util.HashMap; * and a fragment shader. Based on the GLSLShader class from GLGraphics, which * in turn was originally based in the code by JohnG: * http://processing.org/discourse/beta/num_1159494801.html + * + * @webref rendering:shaders */ public class PShader { // shaders constants @@ -113,9 +115,9 @@ public class PShader { * Creates a shader program using the specified vertex and fragment * shaders. * - * @param parent PApplet - * @param vertexFN String - * @param fragmentFN String + * @param parent the parent program + * @param vertFilename name of the vertex shader + * @param fragFilename name of the fragment shader */ public PShader(PApplet parent, String vertFilename, String fragFilename) { this.parent = parent; @@ -132,7 +134,10 @@ public class PShader { glFragment = 0; } - + /** + * @param vertURL network location of the vertex shader + * @param fragURL network location of the fragment shader + */ public PShader(PApplet parent, URL vertURL, URL fragURL) { this.parent = parent; pgMain = (PGraphicsOpenGL) parent.g; @@ -216,7 +221,9 @@ public class PShader { return bound; } - + /** + * @webref rendering:shaders + */ public void set(String name, int x) { setUniformImpl(name, UniformValue.INT1, new int[] { x }); }