Update for 2.0 reference, including edits to source files

This commit is contained in:
Casey Reas
2012-09-12 05:17:16 +00:00
parent 5d4b6f229f
commit 252ce74acf
4 changed files with 44 additions and 11 deletions
+14 -4
View File
@@ -10463,7 +10463,7 @@ public class PApplet extends Applet
* NORMAL_SPACE is (0,0) (0,1) (1,1) (0,1).
*
* ( end auto-generated )
* @webref shape:vertex
* @webref image:textures
* @param mode either IMAGE or NORMALIZED
* @see PGraphics#texture(PImage)
*/
@@ -10473,6 +10473,16 @@ public class PApplet extends Applet
}
/**
* ( begin auto-generated from textureWrap.xml )
*
* Description to come...
*
* ( end auto-generated from textureWrap.xml )
*
* @webref image:textures
* @param wrap Either CLAMP (default) or REPEAT
*/
public void textureWrap(int wrap) {
if (recorder != null) recorder.textureWrap(wrap);
g.textureWrap(wrap);
@@ -10490,7 +10500,7 @@ public class PApplet extends Applet
* to specify the color of the texture as it is applied to the shape.
*
* ( end auto-generated )
* @webref shape:vertex
* @webref image:textures
* @param image reference to a PImage object
* @see PGraphics#textureMode(int)
* @see PGraphics#beginShape(int)
@@ -14090,8 +14100,6 @@ public class PApplet extends Applet
/**
* @param image PImage to set as background (must be same size as the sketch window).<br/>
* <br/>
* Takes an RGB or ARGB image and sets it as the background.
* The width and height of the image must be the same size as the sketch.
* Use image.resize(width, height) to make short work of such a task.<br/>
@@ -14102,6 +14110,8 @@ public class PApplet extends Applet
* behavior. Use image.filter(OPAQUE) to handle this easily.<br/>
* <br/>
* When using 3D, this will also clear the zbuffer (if it exists).
*
* @param image PImage to set as background (must be same size as the sketch window)
*/
public void background(PImage image) {
if (recorder != null) recorder.background(image);
+16 -5
View File
@@ -832,6 +832,7 @@ public class PGraphics extends PImage implements PConstants {
* drawing anything.
*
* @webref pgraphics:method
* @brief Sets the default properties for a PGraphics object
*/
public void beginDraw() { // ignore
}
@@ -849,6 +850,7 @@ public class PGraphics extends PImage implements PConstants {
* you're finished drawing.
*
* @webref pgraphics:method
* @brief Finalizes the rendering of a PGraphics object
*/
public void endDraw() { // ignore
}
@@ -1195,7 +1197,7 @@ public class PGraphics extends PImage implements PConstants {
* NORMAL_SPACE is (0,0) (0,1) (1,1) (0,1).
*
* ( end auto-generated )
* @webref shape:vertex
* @webref image:textures
* @param mode either IMAGE or NORMALIZED
* @see PGraphics#texture(PImage)
*/
@@ -1203,7 +1205,16 @@ public class PGraphics extends PImage implements PConstants {
this.textureMode = mode;
}
/**
* ( begin auto-generated from textureWrap.xml )
*
* Description to come...
*
* ( end auto-generated from textureWrap.xml )
*
* @webref image:textures
* @param wrap Either CLAMP (default) or REPEAT
*/
public void textureWrap(int wrap) {
showMissingWarning("textureWrap");
}
@@ -1220,7 +1231,7 @@ public class PGraphics extends PImage implements PConstants {
* to specify the color of the texture as it is applied to the shape.
*
* ( end auto-generated )
* @webref shape:vertex
* @webref image:textures
* @param image reference to a PImage object
* @see PGraphics#textureMode(int)
* @see PGraphics#beginShape(int)
@@ -6834,8 +6845,6 @@ public class PGraphics extends PImage implements PConstants {
/**
* @param image PImage to set as background (must be same size as the sketch window).<br/>
* <br/>
* Takes an RGB or ARGB image and sets it as the background.
* The width and height of the image must be the same size as the sketch.
* Use image.resize(width, height) to make short work of such a task.<br/>
@@ -6846,6 +6855,8 @@ public class PGraphics extends PImage implements PConstants {
* behavior. Use image.filter(OPAQUE) to handle this easily.<br/>
* <br/>
* When using 3D, this will also clear the zbuffer (if it exists).
*
* @param image PImage to set as background (must be same size as the sketch window)
*/
public void background(PImage image) {
if ((image.width != width) || (image.height != height)) {
@@ -1,7 +1,7 @@
PGraphics big; // Declare a PGraphics variable
void setup() {
big = createGraphics(3000, 3000, JAVA2D); // Create a new PGraphics object
big = createGraphics(3000, 3000); // Create a new PGraphics object
big.beginDraw(); // Start drawing to the PGraphics object
big.background(128); // Set the background
big.line(20, 1800, 1800, 900); // Draw a line
@@ -158,6 +158,7 @@ public class Movie extends PImage implements PConstants {
* @webref movie
* @usage web_application
* @param ifps speed of the movie in frames per second
* @brief Sets the target frame rate
*/
public void frameRate(float ifps) {
if (seeking) return;
@@ -221,6 +222,7 @@ public class Movie extends PImage implements PConstants {
* @usage web_application
* @param irate speed multiplier for movie playback
* @brief Sets the relative playback speed
*/
public void speed(float irate) {
// If the frameRate() method is called continuously with very similar
@@ -243,6 +245,7 @@ public class Movie extends PImage implements PConstants {
*
* @webref movie
* @usage web_application
* @brief Returns length of movie in seconds
*/
public float duration() {
float sec = playbin.queryDuration().toSeconds();
@@ -261,6 +264,7 @@ public class Movie extends PImage implements PConstants {
*
* @webref movie
* @usage web_application
* @brief Returns location of playback head in units of seconds
*/
public float time() {
float sec = playbin.queryPosition().toSeconds();
@@ -281,6 +285,7 @@ public class Movie extends PImage implements PConstants {
* @webref movie
* @usage web_application
* @param where position to jump to specified in seconds
* @brief Jumps to a specific location
*/
public void jump(float where) {
if (seeking) return;
@@ -322,6 +327,7 @@ public class Movie extends PImage implements PConstants {
*
* @webref movie
* @usage web_application
* @brief Returns "true" when a new movie frame is available to read.
*/
public boolean available() {
return available;
@@ -337,6 +343,7 @@ public class Movie extends PImage implements PConstants {
*
* @webref movie
* @usage web_application
* @brief Plays movie one time and stops at the last frame
*/
public void play() {
if (seeking) return;
@@ -355,12 +362,13 @@ public class Movie extends PImage implements PConstants {
/**
* ( begin auto-generated from Movie_loop.xml )
*
* Plays a movie continuously, restarting it when it is over.
* Plays a movie continuously, restarting it when it's over.
*
* ( end auto-generated )
*
* @webref movie
* @usage web_application
* @brief Plays a movie continuously, restarting it when it's over.
*/
public void loop() {
if (seeking) return;
@@ -380,6 +388,7 @@ public class Movie extends PImage implements PConstants {
*
* @webref movie
* @usage web_application
* @brief Stops the movie from looping
*/
public void noLoop() {
if (seeking) return;
@@ -402,6 +411,7 @@ public class Movie extends PImage implements PConstants {
*
* @webref movie
* @usage web_application
* @brief Pauses the movie
*/
public void pause() {
if (seeking) return;
@@ -427,6 +437,7 @@ public class Movie extends PImage implements PConstants {
*
* @webref movie
* @usage web_application
* @brief Stops the movie
*/
public void stop() {
if (seeking) return;
@@ -454,6 +465,7 @@ public class Movie extends PImage implements PConstants {
*
* @webref movie
* @usage web_application
* @brief Reads the current frame
*/
public synchronized void read() {
if (frameRate < 0) {