From 22c2e35dbd9220e463a00937a1a59e7c86148a13 Mon Sep 17 00:00:00 2001 From: Casey Reas Date: Mon, 26 Nov 2012 05:56:51 +0000 Subject: [PATCH] keywords.txt file for 215 --- core/src/processing/core/PApplet.java | 13 +++++-- core/src/processing/core/PGraphics.java | 15 +++++--- java/keywords.txt | 50 +++++++++++++------------ 3 files changed, 46 insertions(+), 32 deletions(-) diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 28f3af5b2..ca1070f2c 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -10790,9 +10790,6 @@ public class PApplet extends Applet } - /** - * @param source - */ public PShape createShape(PShape source) { return g.createShape(source); } @@ -10896,12 +10893,22 @@ public class PApplet extends Applet } + /* + * @webref rendering:shaders + * @param a x-coordinate of the rectangle by default + * @param b y-coordinate of the rectangle by default + * @param c width of the rectangle by default + * @param d height of the rectangle by default + */ public void clip(float a, float b, float c, float d) { if (recorder != null) recorder.clip(a, b, c, d); g.clip(a, b, c, d); } + /* + * @webref rendering:shaders + */ public void noClip() { if (recorder != null) recorder.noClip(); g.noClip(); diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java index 312e72a13..2828296a5 100644 --- a/core/src/processing/core/PGraphics.java +++ b/core/src/processing/core/PGraphics.java @@ -1611,9 +1611,6 @@ public class PGraphics extends PImage implements PConstants { } - /** - * @param source - */ public PShape createShape(PShape source) { showMissingWarning("createShape"); return null; @@ -1725,7 +1722,13 @@ public class PGraphics extends PImage implements PConstants { // CLIPPING - + /* + * @webref rendering:shaders + * @param a x-coordinate of the rectangle by default + * @param b y-coordinate of the rectangle by default + * @param c width of the rectangle by default + * @param d height of the rectangle by default + */ public void clip(float a, float b, float c, float d) { if (imageMode == CORNER) { if (c < 0) { // reset a negative width @@ -1763,7 +1766,9 @@ public class PGraphics extends PImage implements PConstants { showMissingWarning("clip"); } - + /* + * @webref rendering:shaders + */ public void noClip() { showMissingWarning("noClip"); } diff --git a/java/keywords.txt b/java/keywords.txt index 28a15ed3b..ab17e0c49 100644 --- a/java/keywords.txt +++ b/java/keywords.txt @@ -377,6 +377,7 @@ box KEYWORD2 box_ brightness KEYWORD2 brightness_ camera KEYWORD2 camera_ ceil KEYWORD2 ceil_ +clip KEYWORD2 clip_ color KEYWORD2 color_ colorMode KEYWORD2 colorMode_ concat KEYWORD2 concat_ @@ -401,8 +402,8 @@ curveVertex KEYWORD2 curveVertex_ day KEYWORD2 day_ degrees KEYWORD2 degrees_ directionalLight KEYWORD2 directionalLight_ -displayHeight KEYWORD5 displayHeight -displayWidth KEYWORD5 displayWidth +displayHeight LITERAL2 displayHeight +displayWidth LITERAL2 displayWidth dist KEYWORD2 dist_ draw KEYWORD2 draw_ ellipse KEYWORD2 ellipse_ @@ -418,15 +419,15 @@ expand KEYWORD2 expand_ fill KEYWORD2 fill_ filter KEYWORD2 filter_ floor KEYWORD2 floor_ -focused KEYWORD5 focused -frameCount KEYWORD5 frameCount -frameRate KEYWORD5 frameRate +focused LITERAL2 focused +frameCount LITERAL2 frameCount +frameRate LITERAL2 frameRate frameRate KEYWORD2 frameRate_ frustum KEYWORD2 frustum_ get KEYWORD2 get_ green KEYWORD2 green_ HALF_PI LITERAL2 HALF_PI -height KEYWORD5 height +height LITERAL2 height hex KEYWORD2 hex_ hint KEYWORD2 hint_ hour KEYWORD2 hour_ @@ -434,10 +435,10 @@ hue KEYWORD2 hue_ image KEYWORD2 image_ imageMode KEYWORD2 imageMode_ join KEYWORD2 join_ -key KEYWORD5 key -keyCode KEYWORD5 keyCode +key LITERAL2 key +keyCode LITERAL2 keyCode keyPressed KEYWORD2 keyPressed_ -keyPressed KEYWORD5 keyPressed +keyPressed LITERAL2 keyPressed keyReleased KEYWORD2 keyReleased_ keyTyped KEYWORD2 keyTyped_ lerp KEYWORD2 lerp_ @@ -469,19 +470,20 @@ modelX KEYWORD2 modelX_ modelY KEYWORD2 modelY_ modelZ KEYWORD2 modelZ_ month KEYWORD2 month_ -mouseButton KEYWORD5 mouseButton +mouseButton LITERAL2 mouseButton mouseClicked KEYWORD2 mouseClicked_ mouseDragged KEYWORD2 mouseDragged_ mouseMoved KEYWORD2 mouseMoved_ mousePressed KEYWORD2 mousePressed_ -mousePressed KEYWORD5 mousePressed +mousePressed LITERAL2 mousePressed mouseReleased KEYWORD2 mouseReleased_ -mouseX KEYWORD5 mouseX -mouseY KEYWORD5 mouseY +mouseX LITERAL2 mouseX +mouseY LITERAL2 mouseY nf KEYWORD2 nf_ nfc KEYWORD2 nfc_ nfp KEYWORD2 nfp_ nfs KEYWORD2 nfs_ +noClip KEYWORD2 noClip_ noCursor KEYWORD2 noCursor_ noFill KEYWORD2 noFill_ noise KEYWORD2 noise_ @@ -509,18 +511,18 @@ blend KEYWORD3 PImage_blend_ copy KEYWORD3 PImage_copy_ filter KEYWORD3 PImage_filter_ get KEYWORD3 PImage_get_ -height KEYWORD4 PImage_height +height KEYWORD3 PImage_height_ loadPixels KEYWORD3 PImage_loadPixels_ mask KEYWORD3 PImage_mask_ -pixels KEYWORD4 PImage_pixels +pixels KEYWORD3 PImage_pixels_ resize KEYWORD3 PImage_resize_ save KEYWORD3 PImage_save_ set KEYWORD3 PImage_set_ updatePixels KEYWORD3 PImage_updatePixels_ -width KEYWORD4 PImage_width -pixels KEYWORD5 pixels -pmouseX KEYWORD5 pmouseX -pmouseY KEYWORD5 pmouseY +width KEYWORD3 PImage_width_ +pixels LITERAL2 pixels +pmouseX LITERAL2 pmouseX +pmouseY LITERAL2 pmouseY point KEYWORD2 point_ pointLight KEYWORD2 pointLight_ popMatrix KEYWORD2 popMatrix_ @@ -543,7 +545,7 @@ endContour KEYWORD3 PShape_endContour_ getChild KEYWORD3 PShape_getChild_ getVertex KEYWORD3 PShape_getVertex_ getVertexCount KEYWORD3 PShape_getVertexCount_ -height KEYWORD4 PShape_height +height KEYWORD3 PShape_height_ isVisible KEYWORD3 PShape_isVisible_ resetMatrix KEYWORD3 PShape_resetMatrix_ rotate KEYWORD3 PShape_rotate_ @@ -554,7 +556,7 @@ scale KEYWORD3 PShape_scale_ setVertex KEYWORD3 PShape_setVertex_ setVisible KEYWORD3 PShape_setVisible_ translate KEYWORD3 PShape_translate_ -width KEYWORD4 PShape_width +width KEYWORD3 PShape_width_ pushMatrix KEYWORD2 pushMatrix_ pushStyle KEYWORD2 pushStyle_ PVector KEYWORD1 PVector @@ -600,8 +602,8 @@ saveFrame KEYWORD2 saveFrame_ saveStream KEYWORD2 saveStream_ saveStrings KEYWORD2 saveStrings_ scale KEYWORD2 scale_ -screenHeight KEYWORD5 screenHeight -screenWidth KEYWORD5 screenWidth +screenHeight LITERAL2 screenHeight +screenWidth LITERAL2 screenWidth screenX KEYWORD2 screenX_ screenY KEYWORD2 screenY_ screenZ KEYWORD2 screenZ_ @@ -659,7 +661,7 @@ unbinary KEYWORD2 unbinary_ unhex KEYWORD2 unhex_ updatePixels KEYWORD2 updatePixels_ vertex KEYWORD2 vertex_ -width KEYWORD5 width +width LITERAL2 width XML KEYWORD2 XML_ addChild KEYWORD3 XML_addChild_ getAttributeCount KEYWORD3 XML_getAttributeCount_