diff --git a/app/src/processing/app/syntax/Token.java b/app/src/processing/app/syntax/Token.java index 2ffad1ec2..6bf1b8b1e 100644 --- a/app/src/processing/app/syntax/Token.java +++ b/app/src/processing/app/syntax/Token.java @@ -42,7 +42,7 @@ public class Token { */ public static final byte LABEL = 5; - /** Datatypes and keywords (void, int, boolean, etc.) */ + /** Keywords (void, int, boolean, etc.) */ public static final byte KEYWORD1 = 6; /** Fields [variables within a class] */ @@ -51,8 +51,10 @@ public class Token { /** Processing variables (width, height, focused, etc.) */ public static final byte KEYWORD3 = 8; + /** Flow structures (if, else, while, for, etc.) */ public static final byte KEYWORD4 = 9; + /** Datatypes (int, boolean, etc.) */ public static final byte KEYWORD5 = 10; /** Functions */ diff --git a/java/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde b/java/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde index 8143bffc1..d30698f1f 100644 --- a/java/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde +++ b/java/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde @@ -16,7 +16,7 @@ // The next line is needed if running in JavaScript Mode with Processing.js /* @pjs font="Georgia.ttf"; */ -HashMap words; // HashMap object +HashMap words; // HashMap object String[] tokens; // Array of all words from input file int counter; @@ -46,7 +46,7 @@ void draw() { if (words.containsKey(s)) { // Get the word object and increase the count // We access objects from a HashMap via its key, the String - Word w = (Word) words.get(s); + Word w = words.get(s); w.count(); } else { // Otherwise make a new word @@ -57,16 +57,12 @@ void draw() { words.put(s, w); } - // Make an iterator to look at all the things in the HashMap - Iterator i = words.values().iterator(); - // x and y will be used to locate each word float x = 0; float y = height-10; - while (i.hasNext()) { - // Look at each word - Word w = (Word) i.next(); + // Look at each word + for (Word w : words.values()) { // Only display words that appear 3 times if (w.count > 3) { @@ -89,3 +85,4 @@ void draw() { } } } + diff --git a/java/examples/Topics/Advanced Data/LoadingXMLObjects/Bubble.pde b/java/examples/Topics/Advanced Data/LoadingXMLObjects/Bubble.pde index 0f7605ebb..40517b5dd 100644 --- a/java/examples/Topics/Advanced Data/LoadingXMLObjects/Bubble.pde +++ b/java/examples/Topics/Advanced Data/LoadingXMLObjects/Bubble.pde @@ -9,26 +9,27 @@ class Bubble { float x,y; float diameter; -color c; + color c; + Bubble(float r,float g, float b, float d) { x = width/2; y = height/2; - c = color(r,g,b,150); + c = color(r, g, b, 204); diameter = d; } // Display Bubble void display() { - stroke(0); + noStroke(); fill(c); - ellipse(x,y,diameter,diameter); + ellipse(x, y, diameter, diameter); } // Bubble drifts upwards void drift() { - x += random(-1,1); - y += random(-1,1); - x = constrain(x,0,width); - y = constrain(y,0,height); + x += random(-1, 1); + y += random(-1, 1); + x = constrain(x, 0, width); + y = constrain(y, 0, height); } } diff --git a/java/examples/Topics/Advanced Data/LoadingXMLObjects/LoadingXMLObjects.pde b/java/examples/Topics/Advanced Data/LoadingXMLObjects/LoadingXMLObjects.pde index b1be5d564..d3fb2ef85 100644 --- a/java/examples/Topics/Advanced Data/LoadingXMLObjects/LoadingXMLObjects.pde +++ b/java/examples/Topics/Advanced Data/LoadingXMLObjects/LoadingXMLObjects.pde @@ -21,7 +21,7 @@ Bubble[] bubbles; void setup() { size(640, 360); - smooth(); + // Load an XML document XML xml = loadXML("bubbles.xml"); @@ -31,7 +31,7 @@ void setup() { // Make an array of objects the same size bubbles = new Bubble[children.length]; - for (int i = 0; i < children.length; i ++ ) { + for (int i = 0; i < children.length; i++ ) { // The diameter is the content of the child named "Diamater" XML diameterElement = children[i].getChild("diameter"); diff --git a/java/examples/Topics/Advanced Data/XMLYahooWeather/XMLYahooWeather.pde b/java/examples/Topics/Advanced Data/XMLYahooWeather/XMLYahooWeather.pde index fd3199634..211a51595 100644 --- a/java/examples/Topics/Advanced Data/XMLYahooWeather/XMLYahooWeather.pde +++ b/java/examples/Topics/Advanced Data/XMLYahooWeather/XMLYahooWeather.pde @@ -14,8 +14,13 @@ String weather = ""; // The zip code we'll check for String zip = "10003"; +PFont font; + void setup() { - size(200, 200); + size(600, 360); + + font = createFont("Merriweather-Light.ttf", 28); + textFont(font); // The URL for the XML document String url = "http://xml.weather.yahoo.com/forecastrss?p=" + zip; @@ -36,12 +41,8 @@ void draw() { fill(0); // Display all the stuff we want to display - text("Zip code: " + zip, 10, 160); - text("Today's high: " + temperature, 10, 40); - text("Forecast: " + weather, 10, 90); + text("Zip code: " + zip, width*0.15, height*0.33); + text("Today’s high: " + temperature, width*0.15, height*0.5); + text("Forecast: " + weather, width*0.15, height*0.66); - // Draw a little thermometer based on the temperature - stroke(0); - fill(175); - rect(10, 50, temperature*2, 20); } diff --git a/java/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde b/java/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde index 4c589b47e..e60421de1 100644 --- a/java/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde +++ b/java/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde @@ -15,13 +15,10 @@ void setup() { s.stroke(255); s.strokeWeight(2); // Exterior part of shape - s.beginContour(); s.vertex(-100,-100); s.vertex(100,-100); s.vertex(100,100); s.vertex(-100,100); - s.vertex(-100,-100); - s.endContour(); // Interior part of shape s.beginContour(); @@ -29,11 +26,10 @@ void setup() { s.vertex(10,-10); s.vertex(10,10); s.vertex(-10,10); - s.vertex(-10,-10); s.endContour(); // Finishing off shape - s.end(); + s.end(CLOSE); } void draw() { diff --git a/java/examples/Topics/Create Shapes/PolygonPShapeOOP/PolygonPShapeOOP.pde b/java/examples/Topics/Create Shapes/PolygonPShapeOOP/PolygonPShapeOOP.pde index 4e0a228fd..83effe867 100644 --- a/java/examples/Topics/Create Shapes/PolygonPShapeOOP/PolygonPShapeOOP.pde +++ b/java/examples/Topics/Create Shapes/PolygonPShapeOOP/PolygonPShapeOOP.pde @@ -6,21 +6,25 @@ // A Star object -Star s; +Star s1, s2; void setup() { size(640, 360, P2D); smooth(); // Make a new Star - s = new Star(); + s1 = new Star(); + s2 = new Star(); } void draw() { background(51); - // Display the star - s.display(); - // Move the star - s.move(); + + s1.display(); // Display the first star + s1.move(); // Move the first star + + s2.display(); // Display the second star + s2.move(); // Move the second star + } diff --git a/java/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde b/java/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde index 9899910d1..55d130f53 100644 --- a/java/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde +++ b/java/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde @@ -6,16 +6,17 @@ class Star { PShape s; // The location where we will draw the shape float x, y; + float speed; Star() { - x = 0; - y = height/2; + x = random(100, width-100); + y = random(100, height-100); + speed = random(0.5, 3); // First create the shape s = createShape(); // You can set fill and stroke - s.fill(102); - s.stroke(255); - s.strokeWeight(2); + s.fill(255, 204); + s.noStroke(); // Here, we are hardcoding a series of vertices s.vertex(0, -50); s.vertex(14, -20); @@ -33,7 +34,7 @@ class Star { void move() { // Demonstrating some simple motion - x++; + x += speed; if (x > width+100) { x = -100; } diff --git a/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/Polygon.pde b/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/Polygon.pde index e775fb436..f5bfac3ab 100644 --- a/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/Polygon.pde +++ b/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/Polygon.pde @@ -17,7 +17,7 @@ class Polygon { // Simple motion void move() { - y+=speed; + y += speed; if (y > height+100) { y = -100; } diff --git a/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde b/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde index 723da5c64..03a8570d0 100644 --- a/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde +++ b/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde @@ -15,8 +15,8 @@ void setup() { smooth(); // Make a PShape PShape star = createShape(); + star.noStroke(); star.fill(0,127); - star.stroke(0); star.vertex(0, -50); star.vertex(14, -20); star.vertex(47, -15); diff --git a/java/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde b/java/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde index 534848ae6..6027f5e49 100644 --- a/java/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde +++ b/java/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde @@ -19,13 +19,13 @@ void setup() { shapes[0] = createShape(ELLIPSE,0,0,100,100); shapes[0].fill(255,127); - shapes[0].stroke(0); + shapes[0].noStroke(); shapes[1] = createShape(RECT,0,0,100,100); shapes[1].fill(255,127); - shapes[1].stroke(0); + shapes[1].noStroke(); shapes[2] = createShape(); shapes[2].fill(0,127); - shapes[2].stroke(0); + shapes[2].noStroke(); shapes[2].vertex(0, -50); shapes[2].vertex(14, -20); shapes[2].vertex(47, -15); @@ -38,7 +38,6 @@ void setup() { shapes[2].vertex(-14, -20); shapes[2].end(CLOSE); - // Make an ArrayList polygons = new ArrayList(); @@ -52,7 +51,7 @@ void setup() { } void draw() { - background(51); + background(102); // Display and move them all for (Polygon poly : polygons) { diff --git a/java/examples/Topics/File IO/DirectoryList/DirectoryList.pde b/java/examples/Topics/File IO/DirectoryList/DirectoryList.pde index bb8c364d2..426421511 100644 --- a/java/examples/Topics/File IO/DirectoryList/DirectoryList.pde +++ b/java/examples/Topics/File IO/DirectoryList/DirectoryList.pde @@ -55,7 +55,6 @@ void draw() { } - // This function returns all the files in a directory as an array of Strings String[] listFileNames(String dir) { File file = new File(dir); @@ -81,7 +80,7 @@ File[] listFiles(String dir) { } } -// Function to get a list ofall files in a directory and all subdirectories +// Function to get a list of all files in a directory and all subdirectories ArrayList listFilesRecursive(String dir) { ArrayList fileList = new ArrayList(); recurseDir(fileList,dir); diff --git a/java/examples/Topics/Geometry/SpaceJunk/SpaceJunk.pde b/java/examples/Topics/Geometry/SpaceJunk/SpaceJunk.pde index d47f91652..d13b5dc33 100644 --- a/java/examples/Topics/Geometry/SpaceJunk/SpaceJunk.pde +++ b/java/examples/Topics/Geometry/SpaceJunk/SpaceJunk.pde @@ -8,13 +8,13 @@ */ // Used for oveall rotation -float ang; +float angle; // Cube count-lower/raise to test performance int limit = 500; // Array for all cubes -Cube[]cubes = new Cube[limit]; +Cube[] cubes = new Cube[limit]; void setup() { size(640, 360, P3D); @@ -22,7 +22,7 @@ void setup() { noStroke(); // Instantiate cubes, passing in random vals for size and postion - for (int i = 0; i< cubes.length; i++){ + for (int i = 0; i < cubes.length; i++){ cubes[i] = new Cube(int(random(-10, 10)), int(random(-10, 10)), int(random(-10, 10)), int(random(-140, 140)), int(random(-140, 140)), int(random(-140, 140))); @@ -41,13 +41,13 @@ void draw(){ ambientLight(70, 70, 10); // Center geometry in display windwow. - // you can change 3rd argument ('0') - // to move block group closer(+)/further(-) + // you can changlee 3rd argument ('0') + // to move block group closer(+) / further(-) translate(width/2, height/2, -200 + mouseX * 0.65); // Rotate around y and x axes - rotateY(radians(ang)); - rotateX(radians(ang)); + rotateY(radians(angle)); + rotateX(radians(angle)); // Draw cubes for (int i = 0; i < cubes.length; i++){ @@ -55,7 +55,7 @@ void draw(){ } // Used in rotate function calls above - ang += 0.2; + angle += 0.2; } diff --git a/java/keywords.txt b/java/keywords.txt index 409618b1c..96a96e35c 100644 --- a/java/keywords.txt +++ b/java/keywords.txt @@ -1,16 +1,5 @@ -# KEY 2.0b7+ - -# LITERAL1 - Strings in quotes -# LITERAL2 - Constants (QUARTER_PI, CORNERS, etc.) -# KEYWORD1 - Datatypes and keywords (void, int, boolean, etc.) -# KEYWORD2 - Fields [variables within a class] -# KEYWORD3 - Processing variables (width, height, focused, etc.) -# FUNCTION1 - Functions -# FUNCTION2 - Methods (functions inside a class) - -# - -# LITERAL2 - Constants (QUARTER_PI, CORNERS, etc.) +# For an explanation of these tags, see Token.java +# trunk/processing/app/src/processing/app/syntax/Token.java ADD LITERAL2 blend_ ALIGN_CENTER LITERAL2 @@ -177,49 +166,25 @@ WAIT LITERAL2 cursor_ WHITESPACE LITERAL2 -# KEYWORD1 - Java datatypes and keywords (void, int, boolean, etc.) - -Array KEYWORD1 Array -ArrayList KEYWORD1 ArrayList -Boolean KEYWORD1 -Byte KEYWORD1 -BufferedReader KEYWORD1 BufferedReader -Character KEYWORD1 -Class KEYWORD1 class -Double KEYWORD1 -Float KEYWORD1 -Integer KEYWORD1 -HashMap KEYWORD1 HashMap -PrintWriter KEYWORD1 PrintWriter -String KEYWORD1 String -StringBuffer KEYWORD1 -Thread KEYWORD1 +# Java keywords (void, import, , etc.) + abstract KEYWORD1 assert KEYWORD1 boolean KEYWORD1 boolean break KEYWORD1 break -byte KEYWORD1 byte case KEYWORD1 case -catch KEYWORD1 catch -char KEYWORD1 char class KEYWORD1 class continue KEYWORD1 continue -default KEYWORD1 default -do KEYWORD1 -double KEYWORD1 double -else KEYWORD1 else +default KEYWORD1 default enum KEYWORD1 extends KEYWORD1 extends false KEYWORD1 false final KEYWORD1 final finally KEYWORD1 -float KEYWORD1 float implements KEYWORD1 implements import KEYWORD1 import instanceof KEYWORD1 -int KEYWORD1 int interface KEYWORD1 -long KEYWORD1 long native KEYWORD1 new KEYWORD1 new null KEYWORD1 null @@ -227,8 +192,7 @@ package KEYWORD1 private KEYWORD1 private protected KEYWORD1 public KEYWORD1 public -return KEYWORD1 return -short KEYWORD1 +return KEYWORD1 return static KEYWORD1 static strictfp KEYWORD1 super KEYWORD1 super @@ -237,20 +201,50 @@ throw KEYWORD1 throws KEYWORD1 transient KEYWORD1 true KEYWORD1 true -try KEYWORD1 try void KEYWORD1 void volatile KEYWORD1 -# Special cases for color coding -for FUNCTION1 for -if FUNCTION1 if -switch FUNCTION1 switch -synchronized FUNCTION1 -while FUNCTION1 while +# Datatypes + +Array KEYWORD5 Array +ArrayList KEYWORD5 ArrayList +Boolean KEYWORD5 +Byte KEYWORD5 +BufferedReader KEYWORD5 BufferedReader +Character KEYWORD5 +Class KEYWORD5 class +Double KEYWORD5 +Float KEYWORD5 +Integer KEYWORD5 +HashMap KEYWORD5 HashMap +PrintWriter KEYWORD5 PrintWriter +String KEYWORD5 String +StringBuffer KEYWORD5 +Thread KEYWORD5 +byte KEYWORD5 byte +char KEYWORD5 char +double KEYWORD5 double +float KEYWORD5 float +int KEYWORD5 int +long KEYWORD5 long +short KEYWORD5 -# These items are a part of Processing but are not included in the reference +# Flow structures + +catch KEYWORD4 catch +do KEYWORD4 +for KEYWORD4 for +if KEYWORD4 if +else KEYWORD4 else +switch KEYWORD4 switch +synchronized KEYWORD4 +while KEYWORD4 while +try KEYWORD4 try + + +# These items are a part of Processing but, but pages don't generate color KEYWORD1 color_datatype @@ -277,7 +271,6 @@ sketchFile FUNCTION1 sketchPath FUNCTION1 string KEYWORD2 strconvert_ - readLine FUNCTION2 BufferedReader_readLine_ close FUNCTION2 PrintWriter_close_ flush FUNCTION2 PrintWriter_flush_ @@ -294,12 +287,9 @@ toUpperCase FUNCTION2 String_toUpperCase_ # Temporary additions 3 September 2012 as the reference is getting updated -beginContour FUNCTION1 -endContour FUNCTION1 end FUNCTION1 addChild FUNCTION1 - # Operators are without KEYWORDS += addassign @@ -350,338 +340,344 @@ HashMap FUNCTION1 HashMap # THE TEXT ABOVE IS HAND-WRITTEN AND FOUND IN THE FILE "keywords_base.txt" # THE TEXT BELOW IS AUTO-GENERATED +# +# SO DON'T +# TOUCH IT -abs FUNCTION1 abs -acos FUNCTION1 acos -alpha FUNCTION1 alpha -ambient FUNCTION1 ambient -ambientLight FUNCTION1 ambientLight -append FUNCTION1 append -applyMatrix FUNCTION1 applyMatrix -arc FUNCTION1 arc -arrayCopy FUNCTION1 arrayCopy -asin FUNCTION1 asin -atan FUNCTION1 atan -atan2 FUNCTION1 atan2 -background FUNCTION1 background -beginCamera FUNCTION1 beginCamera -beginRaw FUNCTION1 beginRaw -beginRecord FUNCTION1 beginRecord -beginShape FUNCTION1 beginShape -bezier FUNCTION1 bezier -bezierDetail FUNCTION1 bezierDetail -bezierPoint FUNCTION1 bezierPoint -bezierTangent FUNCTION1 bezierTangent -bezierVertex FUNCTION1 bezierVertex -binary FUNCTION1 binary -blend FUNCTION1 blend -blendColor FUNCTION1 blendColor -blendMode FUNCTION1 blendMode -blue FUNCTION1 blue -box FUNCTION1 box -brightness FUNCTION1 brightness -camera FUNCTION1 camera -ceil FUNCTION1 ceil -clip FUNCTION1 clip -color FUNCTION1 color -colorMode FUNCTION1 colorMode -concat FUNCTION1 concat -constrain FUNCTION1 constrain -copy FUNCTION1 copy -cos FUNCTION1 cos -createFont FUNCTION1 createFont -createGraphics FUNCTION1 createGraphics -createImage FUNCTION1 createImage -createInput FUNCTION1 createInput -createOutput FUNCTION1 createOutput -createReader FUNCTION1 createReader -createShape FUNCTION1 createShape -createWriter FUNCTION1 createWriter -cursor FUNCTION1 cursor -curve FUNCTION1 curve -curveDetail FUNCTION1 curveDetail -curvePoint FUNCTION1 curvePoint -curveTangent FUNCTION1 curveTangent -curveTightness FUNCTION1 curveTightness -curveVertex FUNCTION1 curveVertex -day FUNCTION1 day -degrees FUNCTION1 degrees -directionalLight FUNCTION1 directionalLight -displayHeight KEYWORD3 displayHeight_ -displayWidth KEYWORD3 displayWidth_ -dist FUNCTION1 dist -draw FUNCTION1 draw -ellipse FUNCTION1 ellipse -ellipseMode FUNCTION1 ellipseMode -emissive FUNCTION1 emissive -endCamera FUNCTION1 endCamera -endRaw FUNCTION1 endRaw -endRecord FUNCTION1 endRecord -endShape FUNCTION1 endShape -exit FUNCTION1 exit -exp FUNCTION1 exp -expand FUNCTION1 expand -fill FUNCTION1 fill -filter FUNCTION1 filter -floor FUNCTION1 floor -focused KEYWORD3 focused_ -frameCount KEYWORD3 frameCount_ -frameRate KEYWORD3 frameRate_ -frameRate FUNCTION1 frameRate -frustum FUNCTION1 frustum -get FUNCTION1 get -green FUNCTION1 green +abs FUNCTION1 abs_ +acos FUNCTION1 acos_ +alpha FUNCTION1 alpha_ +ambient FUNCTION1 ambient_ +ambientLight FUNCTION1 ambientLight_ +append FUNCTION1 append_ +applyMatrix FUNCTION1 applyMatrix_ +arc FUNCTION1 arc_ +arrayCopy FUNCTION1 arrayCopy_ +asin FUNCTION1 asin_ +atan FUNCTION1 atan_ +atan2 FUNCTION1 atan2_ +background FUNCTION1 background_ +beginCamera FUNCTION1 beginCamera_ +beginContour FUNCTION1 beginContour_ +beginRaw FUNCTION1 beginRaw_ +beginRecord FUNCTION1 beginRecord_ +beginShape FUNCTION1 beginShape_ +bezier FUNCTION1 bezier_ +bezierDetail FUNCTION1 bezierDetail_ +bezierPoint FUNCTION1 bezierPoint_ +bezierTangent FUNCTION1 bezierTangent_ +bezierVertex FUNCTION1 bezierVertex_ +binary FUNCTION1 binary_ +blend FUNCTION1 blend_ +blendColor FUNCTION1 blendColor_ +blendMode FUNCTION1 blendMode_ +blue FUNCTION1 blue_ +box FUNCTION1 box_ +brightness FUNCTION1 brightness_ +camera FUNCTION1 camera_ +ceil FUNCTION1 ceil_ +clear FUNCTION1 clear_ +clip FUNCTION1 clip_ +color FUNCTION1 color_ +colorMode FUNCTION1 colorMode_ +concat FUNCTION1 concat_ +constrain FUNCTION1 constrain_ +copy FUNCTION1 copy_ +cos FUNCTION1 cos_ +createFont FUNCTION1 createFont_ +createGraphics FUNCTION1 createGraphics_ +createImage FUNCTION1 createImage_ +createInput FUNCTION1 createInput_ +createOutput FUNCTION1 createOutput_ +createReader FUNCTION1 createReader_ +createShape FUNCTION1 createShape_ +createWriter FUNCTION1 createWriter_ +cursor FUNCTION1 cursor_ +curve FUNCTION1 curve_ +curveDetail FUNCTION1 curveDetail_ +curvePoint FUNCTION1 curvePoint_ +curveTangent FUNCTION1 curveTangent_ +curveTightness FUNCTION1 curveTightness_ +curveVertex FUNCTION1 curveVertex_ +day FUNCTION1 day_ +degrees FUNCTION1 degrees_ +directionalLight FUNCTION1 directionalLight_ +displayHeight KEYWORD3 displayHeight +displayWidth KEYWORD3 displayWidth +dist FUNCTION1 dist_ +draw FUNCTION1 draw_ +ellipse FUNCTION1 ellipse_ +ellipseMode FUNCTION1 ellipseMode_ +emissive FUNCTION1 emissive_ +endCamera FUNCTION1 endCamera_ +endContour FUNCTION1 endContour_ +endRaw FUNCTION1 endRaw_ +endRecord FUNCTION1 endRecord_ +endShape FUNCTION1 endShape_ +exit FUNCTION1 exit_ +exp FUNCTION1 exp_ +expand FUNCTION1 expand_ +fill FUNCTION1 fill_ +filter FUNCTION1 filter_ +floor FUNCTION1 floor_ +focused KEYWORD3 focused +frameCount KEYWORD3 frameCount +frameRate KEYWORD3 frameRate +frameRate FUNCTION1 frameRate_ +frustum FUNCTION1 frustum_ +get FUNCTION1 get_ +green FUNCTION1 green_ HALF_PI LITERAL2 HALF_PI -hex FUNCTION1 hex -hint FUNCTION1 hint -hour FUNCTION1 hour -hue FUNCTION1 hue -image FUNCTION1 image -imageMode FUNCTION1 imageMode -join FUNCTION1 join -key KEYWORD3 key_ -keyCode KEYWORD3 keyCode_ -keyPressed FUNCTION1 keyPressed -keyPressed KEYWORD3 keyPressed_ -keyReleased FUNCTION1 keyReleased -keyTyped FUNCTION1 keyTyped -lerp FUNCTION1 lerp -lerpColor FUNCTION1 lerpColor -lightFalloff FUNCTION1 lightFalloff -lights FUNCTION1 lights -lightSpecular FUNCTION1 lightSpecular -line FUNCTION1 line -loadBytes FUNCTION1 loadBytes -loadFont FUNCTION1 loadFont -loadImage FUNCTION1 loadImage -loadPixels FUNCTION1 loadPixels -loadShader FUNCTION1 loadShader -loadShape FUNCTION1 loadShape -loadStrings FUNCTION1 loadStrings -loadTable FUNCTION1 loadTable -loadXML FUNCTION1 loadXML -log FUNCTION1 log -loop FUNCTION1 loop -mag FUNCTION1 mag -map FUNCTION1 map -match FUNCTION1 match -matchAll FUNCTION1 matchAll -max FUNCTION1 max -millis FUNCTION1 millis -min FUNCTION1 min -minute FUNCTION1 minute -modelX FUNCTION1 modelX -modelY FUNCTION1 modelY -modelZ FUNCTION1 modelZ -month FUNCTION1 month -mouseButton KEYWORD3 mouseButton_ -mouseClicked FUNCTION1 mouseClicked -mouseDragged FUNCTION1 mouseDragged -mouseMoved FUNCTION1 mouseMoved -mousePressed FUNCTION1 mousePressed -mousePressed KEYWORD3 mousePressed_ -mouseReleased FUNCTION1 mouseReleased -mouseX KEYWORD3 mouseX_ -mouseY KEYWORD3 mouseY_ -nf FUNCTION1 nf -nfc FUNCTION1 nfc -nfp FUNCTION1 nfp -nfs FUNCTION1 nfs -noClip FUNCTION1 noClip -noCursor FUNCTION1 noCursor -noFill FUNCTION1 noFill -noise FUNCTION1 noise -noiseDetail FUNCTION1 noiseDetail -noiseSeed FUNCTION1 noiseSeed -noLights FUNCTION1 noLights -noLoop FUNCTION1 noLoop -norm FUNCTION1 norm -normal FUNCTION1 normal -noSmooth FUNCTION1 noSmooth -noStroke FUNCTION1 noStroke -noTint FUNCTION1 noTint -open FUNCTION1 open -ortho FUNCTION1 ortho -perspective FUNCTION1 perspective +hex FUNCTION1 hex_ +hint FUNCTION1 hint_ +hour FUNCTION1 hour_ +hue FUNCTION1 hue_ +image FUNCTION1 image_ +imageMode FUNCTION1 imageMode_ +join FUNCTION1 join_ +key KEYWORD3 key +keyCode KEYWORD3 keyCode +keyPressed FUNCTION1 keyPressed_ +keyPressed KEYWORD3 keyPressed +keyReleased FUNCTION1 keyReleased_ +keyTyped FUNCTION1 keyTyped_ +lerp FUNCTION1 lerp_ +lerpColor FUNCTION1 lerpColor_ +lightFalloff FUNCTION1 lightFalloff_ +lights FUNCTION1 lights_ +lightSpecular FUNCTION1 lightSpecular_ +line FUNCTION1 line_ +loadBytes FUNCTION1 loadBytes_ +loadFont FUNCTION1 loadFont_ +loadImage FUNCTION1 loadImage_ +loadPixels FUNCTION1 loadPixels_ +loadShader FUNCTION1 loadShader_ +loadShape FUNCTION1 loadShape_ +loadStrings FUNCTION1 loadStrings_ +loadTable FUNCTION1 loadTable_ +loadXML FUNCTION1 loadXML_ +log FUNCTION1 log_ +loop FUNCTION1 loop_ +mag FUNCTION1 mag_ +map FUNCTION1 map_ +match FUNCTION1 match_ +matchAll FUNCTION1 matchAll_ +max FUNCTION1 max_ +millis FUNCTION1 millis_ +min FUNCTION1 min_ +minute FUNCTION1 minute_ +modelX FUNCTION1 modelX_ +modelY FUNCTION1 modelY_ +modelZ FUNCTION1 modelZ_ +month FUNCTION1 month_ +mouseButton KEYWORD3 mouseButton +mouseClicked FUNCTION1 mouseClicked_ +mouseDragged FUNCTION1 mouseDragged_ +mouseMoved FUNCTION1 mouseMoved_ +mousePressed FUNCTION1 mousePressed_ +mousePressed KEYWORD3 mousePressed +mouseReleased FUNCTION1 mouseReleased_ +mouseX KEYWORD3 mouseX +mouseY KEYWORD3 mouseY +nf FUNCTION1 nf_ +nfc FUNCTION1 nfc_ +nfp FUNCTION1 nfp_ +nfs FUNCTION1 nfs_ +noClip FUNCTION1 noClip_ +noCursor FUNCTION1 noCursor_ +noFill FUNCTION1 noFill_ +noise FUNCTION1 noise_ +noiseDetail FUNCTION1 noiseDetail_ +noiseSeed FUNCTION1 noiseSeed_ +noLights FUNCTION1 noLights_ +noLoop FUNCTION1 noLoop_ +norm FUNCTION1 norm_ +normal FUNCTION1 normal_ +noSmooth FUNCTION1 noSmooth_ +noStroke FUNCTION1 noStroke_ +noTint FUNCTION1 noTint_ +open FUNCTION1 open_ +ortho FUNCTION1 ortho_ +perspective FUNCTION1 perspective_ PFont KEYWORD1 PFont -list FUNCTION1 PFont_list -PGraphics FUNCTION1 PGraphics -beginDraw FUNCTION2 PGraphics_beginDraw -endDraw FUNCTION2 PGraphics_endDraw +list FUNCTION1 PFont_list_ +PGraphics FUNCTION1 PGraphics_ +beginDraw FUNCTION2 PGraphics_beginDraw_ +endDraw FUNCTION2 PGraphics_endDraw_ PI LITERAL2 PI PImage KEYWORD1 PImage -alpha FUNCTION2 PImage_alpha -blend FUNCTION2 PImage_blend -copy FUNCTION2 PImage_copy -filter FUNCTION2 PImage_filter -get FUNCTION2 PImage_get -loadPixels FUNCTION2 PImage_loadPixels -mask FUNCTION2 PImage_mask -pixels KEYWORD2 PImage_pixels_ -resize FUNCTION2 PImage_resize -save FUNCTION2 PImage_save -set FUNCTION2 PImage_set -updatePixels FUNCTION2 PImage_updatePixels -pixels KEYWORD3 pixels_ -pmouseX KEYWORD3 pmouseX_ -pmouseY KEYWORD3 pmouseY_ -point FUNCTION1 point -pointLight FUNCTION1 pointLight -popMatrix FUNCTION1 popMatrix -popStyle FUNCTION1 popStyle -pow FUNCTION1 pow -print FUNCTION1 print -printCamera FUNCTION1 printCamera -println FUNCTION1 println -printMatrix FUNCTION1 printMatrix -printProjection FUNCTION1 printProjection -PShader FUNCTION1 PShader -PShader FUNCTION2 PShader_set +alpha FUNCTION2 PImage_alpha_ +blend FUNCTION2 PImage_blend_ +copy FUNCTION2 PImage_copy_ +filter FUNCTION2 PImage_filter_ +get FUNCTION2 PImage_get_ +loadPixels FUNCTION2 PImage_loadPixels_ +mask FUNCTION2 PImage_mask_ +pixels KEYWORD2 PImage_pixels +resize FUNCTION2 PImage_resize_ +save FUNCTION2 PImage_save_ +set FUNCTION2 PImage_set_ +updatePixels FUNCTION2 PImage_updatePixels_ +pixels KEYWORD3 pixels +pmouseX KEYWORD3 pmouseX +pmouseY KEYWORD3 pmouseY +point FUNCTION1 point_ +pointLight FUNCTION1 pointLight_ +popMatrix FUNCTION1 popMatrix_ +popStyle FUNCTION1 popStyle_ +pow FUNCTION1 pow_ +print FUNCTION1 print_ +printCamera FUNCTION1 printCamera_ +println FUNCTION1 println_ +printMatrix FUNCTION1 printMatrix_ +printProjection FUNCTION1 printProjection_ +PShader FUNCTION1 PShader_ +PShader FUNCTION2 PShader_set_ PShape KEYWORD1 PShape -addChild FUNCTION2 PShape_addChild -beginContour FUNCTION2 PShape_beginContour -disableStyle FUNCTION2 PShape_disableStyle -enableStyle FUNCTION2 PShape_enableStyle -end FUNCTION2 PShape_end -endContour FUNCTION2 PShape_endContour -getChild FUNCTION2 PShape_getChild -getVertex FUNCTION2 PShape_getVertex -getVertexCount FUNCTION2 PShape_getVertexCount -isVisible FUNCTION2 PShape_isVisible -resetMatrix FUNCTION2 PShape_resetMatrix -rotate FUNCTION2 PShape_rotate -rotateX FUNCTION2 PShape_rotateX -rotateY FUNCTION2 PShape_rotateY -rotateZ FUNCTION2 PShape_rotateZ -scale FUNCTION2 PShape_scale -setVertex FUNCTION2 PShape_setVertex -setVisible FUNCTION2 PShape_setVisible -translate FUNCTION2 PShape_translate -pushMatrix FUNCTION1 pushMatrix -pushStyle FUNCTION1 pushStyle +addChild FUNCTION2 PShape_addChild_ +beginContour FUNCTION2 PShape_beginContour_ +disableStyle FUNCTION2 PShape_disableStyle_ +enableStyle FUNCTION2 PShape_enableStyle_ +end FUNCTION2 PShape_end_ +endContour FUNCTION2 PShape_endContour_ +getChild FUNCTION2 PShape_getChild_ +getVertex FUNCTION2 PShape_getVertex_ +getVertexCount FUNCTION2 PShape_getVertexCount_ +isVisible FUNCTION2 PShape_isVisible_ +resetMatrix FUNCTION2 PShape_resetMatrix_ +rotate FUNCTION2 PShape_rotate_ +rotateX FUNCTION2 PShape_rotateX_ +rotateY FUNCTION2 PShape_rotateY_ +rotateZ FUNCTION2 PShape_rotateZ_ +scale FUNCTION2 PShape_scale_ +setVertex FUNCTION2 PShape_setVertex_ +setVisible FUNCTION2 PShape_setVisible_ +translate FUNCTION2 PShape_translate_ +pushMatrix FUNCTION1 pushMatrix_ +pushStyle FUNCTION1 pushStyle_ PVector KEYWORD1 PVector -add FUNCTION2 PVector_add -angleBetween FUNCTION2 PVector_angleBetween -array FUNCTION2 PVector_array -copy FUNCTION2 PVector_copy -cross FUNCTION2 PVector_cross -dist FUNCTION2 PVector_dist -div FUNCTION2 PVector_div -dot FUNCTION2 PVector_dot -get FUNCTION2 PVector_get -limit FUNCTION2 PVector_limit -mag FUNCTION2 PVector_mag -mult FUNCTION2 PVector_mult -normalize FUNCTION2 PVector_normalize -set FUNCTION2 PVector_set -setMag FUNCTION2 PVector_setMag -sub FUNCTION2 PVector_sub -quad FUNCTION1 quad -quadraticVertex FUNCTION1 quadraticVertex +add FUNCTION2 PVector_add_ +angleBetween FUNCTION2 PVector_angleBetween_ +array FUNCTION2 PVector_array_ +copy FUNCTION2 PVector_copy_ +cross FUNCTION2 PVector_cross_ +dist FUNCTION2 PVector_dist_ +div FUNCTION2 PVector_div_ +dot FUNCTION2 PVector_dot_ +get FUNCTION2 PVector_get_ +limit FUNCTION2 PVector_limit_ +mag FUNCTION2 PVector_mag_ +mult FUNCTION2 PVector_mult_ +normalize FUNCTION2 PVector_normalize_ +set FUNCTION2 PVector_set_ +setMag FUNCTION2 PVector_setMag_ +sub FUNCTION2 PVector_sub_ +quad FUNCTION1 quad_ +quadraticVertex FUNCTION1 quadraticVertex_ QUARTER_PI LITERAL2 QUARTER_PI -radians FUNCTION1 radians -random FUNCTION1 random -randomSeed FUNCTION1 randomSeed -rect FUNCTION1 rect -rectMode FUNCTION1 rectMode -red FUNCTION1 red -redraw FUNCTION1 redraw -requestImage FUNCTION1 requestImage -resetMatrix FUNCTION1 resetMatrix -resetShader FUNCTION1 resetShader -reverse FUNCTION1 reverse -rotate FUNCTION1 rotate -rotateX FUNCTION1 rotateX -rotateY FUNCTION1 rotateY -rotateZ FUNCTION1 rotateZ -round FUNCTION1 round -saturation FUNCTION1 saturation -save FUNCTION1 save -saveBytes FUNCTION1 saveBytes -saveFrame FUNCTION1 saveFrame -saveStream FUNCTION1 saveStream -saveStrings FUNCTION1 saveStrings -scale FUNCTION1 scale -screenHeight KEYWORD3 screenHeight_ -screenWidth KEYWORD3 screenWidth_ -screenX FUNCTION1 screenX -screenY FUNCTION1 screenY -screenZ FUNCTION1 screenZ -second FUNCTION1 second -selectFolder FUNCTION1 selectFolder -selectInput FUNCTION1 selectInput -selectOutput FUNCTION1 selectOutput -set FUNCTION1 set -setup FUNCTION1 setup -shader FUNCTION1 shader -shape FUNCTION1 shape -shapeMode FUNCTION1 shapeMode -shearX FUNCTION1 shearX -shearY FUNCTION1 shearY -shininess FUNCTION1 shininess -shorten FUNCTION1 shorten -sin FUNCTION1 sin -size FUNCTION1 size -smooth FUNCTION1 smooth -sort FUNCTION1 sort -specular FUNCTION1 specular -sphere FUNCTION1 sphere -sphereDetail FUNCTION1 sphereDetail -splice FUNCTION1 splice -split FUNCTION1 split -splitTokens FUNCTION1 splitTokens -spotLight FUNCTION1 spotLight -sq FUNCTION1 sq -sqrt FUNCTION1 sqrt -stroke FUNCTION1 stroke -strokeCap FUNCTION1 strokeCap -strokeJoin FUNCTION1 strokeJoin -strokeWeight FUNCTION1 strokeWeight -subset FUNCTION1 subset -Table FUNCTION1 Table -tan FUNCTION1 tan -text FUNCTION1 text -textAlign FUNCTION1 textAlign -textAscent FUNCTION1 textAscent -textDescent FUNCTION1 textDescent -textFont FUNCTION1 textFont -textLeading FUNCTION1 textLeading -textMode FUNCTION1 textMode -textSize FUNCTION1 textSize -texture FUNCTION1 texture -textureMode FUNCTION1 textureMode -textureWrap FUNCTION1 textureWrap -textWidth FUNCTION1 textWidth -tint FUNCTION1 tint -translate FUNCTION1 translate -triangle FUNCTION1 triangle -trim FUNCTION1 trim +radians FUNCTION1 radians_ +random FUNCTION1 random_ +randomSeed FUNCTION1 randomSeed_ +rect FUNCTION1 rect_ +rectMode FUNCTION1 rectMode_ +red FUNCTION1 red_ +redraw FUNCTION1 redraw_ +requestImage FUNCTION1 requestImage_ +resetMatrix FUNCTION1 resetMatrix_ +resetShader FUNCTION1 resetShader_ +reverse FUNCTION1 reverse_ +rotate FUNCTION1 rotate_ +rotateX FUNCTION1 rotateX_ +rotateY FUNCTION1 rotateY_ +rotateZ FUNCTION1 rotateZ_ +round FUNCTION1 round_ +saturation FUNCTION1 saturation_ +save FUNCTION1 save_ +saveBytes FUNCTION1 saveBytes_ +saveFrame FUNCTION1 saveFrame_ +saveStream FUNCTION1 saveStream_ +saveStrings FUNCTION1 saveStrings_ +scale FUNCTION1 scale_ +screenHeight KEYWORD3 screenHeight +screenWidth KEYWORD3 screenWidth +screenX FUNCTION1 screenX_ +screenY FUNCTION1 screenY_ +screenZ FUNCTION1 screenZ_ +second FUNCTION1 second_ +selectFolder FUNCTION1 selectFolder_ +selectInput FUNCTION1 selectInput_ +selectOutput FUNCTION1 selectOutput_ +set FUNCTION1 set_ +setup FUNCTION1 setup_ +shader FUNCTION1 shader_ +shape FUNCTION1 shape_ +shapeMode FUNCTION1 shapeMode_ +shearX FUNCTION1 shearX_ +shearY FUNCTION1 shearY_ +shininess FUNCTION1 shininess_ +shorten FUNCTION1 shorten_ +sin FUNCTION1 sin_ +size FUNCTION1 size_ +smooth FUNCTION1 smooth_ +sort FUNCTION1 sort_ +specular FUNCTION1 specular_ +sphere FUNCTION1 sphere_ +sphereDetail FUNCTION1 sphereDetail_ +splice FUNCTION1 splice_ +split FUNCTION1 split_ +splitTokens FUNCTION1 splitTokens_ +spotLight FUNCTION1 spotLight_ +sq FUNCTION1 sq_ +sqrt FUNCTION1 sqrt_ +stroke FUNCTION1 stroke_ +strokeCap FUNCTION1 strokeCap_ +strokeJoin FUNCTION1 strokeJoin_ +strokeWeight FUNCTION1 strokeWeight_ +subset FUNCTION1 subset_ +Table FUNCTION1 Table_ +tan FUNCTION1 tan_ +text FUNCTION1 text_ +textAlign FUNCTION1 textAlign_ +textAscent FUNCTION1 textAscent_ +textDescent FUNCTION1 textDescent_ +textFont FUNCTION1 textFont_ +textLeading FUNCTION1 textLeading_ +textMode FUNCTION1 textMode_ +textSize FUNCTION1 textSize_ +texture FUNCTION1 texture_ +textureMode FUNCTION1 textureMode_ +textureWrap FUNCTION1 textureWrap_ +textWidth FUNCTION1 textWidth_ +tint FUNCTION1 tint_ +translate FUNCTION1 translate_ +triangle FUNCTION1 triangle_ +trim FUNCTION1 trim_ TWO_PI LITERAL2 TWO_PI -unbinary FUNCTION1 unbinary -unhex FUNCTION1 unhex -updatePixels FUNCTION1 updatePixels -vertex FUNCTION1 vertex -XML FUNCTION1 XML -addChild FUNCTION2 XML_addChild -getAttributeCount FUNCTION2 XML_getAttributeCount -getChild FUNCTION2 XML_getChild -getChildCount FUNCTION2 XML_getChildCount -getChildren FUNCTION2 XML_getChildren -getContent FUNCTION2 XML_getContent -getFloat FUNCTION2 XML_getFloat -getInt FUNCTION2 XML_getInt -getName FUNCTION2 XML_getName -getParent FUNCTION2 XML_getParent -getString FUNCTION2 XML_getString -hasAttribute FUNCTION2 XML_hasAttribute -hasChildren FUNCTION2 XML_hasChildren -listAttributes FUNCTION2 XML_listAttributes -listChildren FUNCTION2 XML_listChildren -removeChild FUNCTION2 XML_removeChild -setContent FUNCTION2 XML_setContent -setFloat FUNCTION2 XML_setFloat -setInt FUNCTION2 XML_setInt -setName FUNCTION2 XML_setName -setString FUNCTION2 XML_setString -year FUNCTION1 year +unbinary FUNCTION1 unbinary_ +unhex FUNCTION1 unhex_ +updatePixels FUNCTION1 updatePixels_ +vertex FUNCTION1 vertex_ +XML FUNCTION1 XML_ +addChild FUNCTION2 XML_addChild_ +getAttributeCount FUNCTION2 XML_getAttributeCount_ +getChild FUNCTION2 XML_getChild_ +getChildCount FUNCTION2 XML_getChildCount_ +getChildren FUNCTION2 XML_getChildren_ +getContent FUNCTION2 XML_getContent_ +getFloat FUNCTION2 XML_getFloat_ +getInt FUNCTION2 XML_getInt_ +getName FUNCTION2 XML_getName_ +getParent FUNCTION2 XML_getParent_ +getString FUNCTION2 XML_getString_ +hasAttribute FUNCTION2 XML_hasAttribute_ +hasChildren FUNCTION2 XML_hasChildren_ +listAttributes FUNCTION2 XML_listAttributes_ +listChildren FUNCTION2 XML_listChildren_ +removeChild FUNCTION2 XML_removeChild_ +setContent FUNCTION2 XML_setContent_ +setFloat FUNCTION2 XML_setFloat_ +setInt FUNCTION2 XML_setInt_ +setName FUNCTION2 XML_setName_ +setString FUNCTION2 XML_setString_ +year FUNCTION1 year_ diff --git a/java/theme/theme.txt b/java/theme/theme.txt index 36180aa53..b4c9b9102 100644 --- a/java/theme/theme.txt +++ b/java/theme/theme.txt @@ -71,31 +71,18 @@ editor.eolmarkers.color = #999999 editor.brackethighlight = true editor.brackethighlight.color = #006699 +# TEXT - KEYWORDS, LITERALS +# For an explanation of these tags, see Token.java +# trunk/processing/app/src/processing/app/syntax/Token.java -# TEXT - KEYWORDS - -# e.g. Functions editor.function1.style = #006699,plain - -# e.g. Methods (functions inside a class) editor.function2.style = #006699,plain - -# e.g. Datatypes and keywords (void, int, boolean, etc.) editor.keyword1.style = #D86736,plain - -# e.g. Processing fields [variables within a class] editor.keyword2.style = #EE3C96,plain - -# e.g. Processing variables (width, height, focused, etc.) editor.keyword3.style = #EE3C96,plain - - -# TEXT - LITERALS - -# e.g. Strings (text in quotes) +editor.keyword4.style = #FF0000,plain +editor.keyword5.style = #00FF00,plain editor.literal1.style = #7D4793,plain - -# e.g. Constants (QUARTER_PI, CORNERS, etc.) editor.literal2.style = #669933,plain # e.g. + - = / @@ -105,12 +92,10 @@ editor.operator.style = #006699,plain # like in case statements or goto editor.label.style = #7e7e7e,bold - # TEXT - COMMENTS editor.comment1.style = #7e7e7e,plain editor.comment2.style = #7e7e7e,plain - # LINE STATUS - editor line number status bar at the bottom of the screen linestatus.font = SansSerif,plain,10 #linestatus.font.macosx = Helvetica,plain,10