FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Update for 2.0 reference, including edits to source files · whyi/processing@4b64648 · GitHub

  1. whyi
  2. processing

Repository navigation

Commit 4b64648

Browse files
REAS
committed
Update for 2.0 reference, including edits to source files
1 parent 8cd565f commit 4b64648

4 files changed

Lines changed: 44 additions & 11 deletions

File tree

‎core/src/processing/core/PApplet.java‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10463,7 +10463,7 @@ public void normal(float nx, float ny, float nz) {
1046310463
* NORMAL_SPACE is (0,0) (0,1) (1,1) (0,1).
1046410464
*
1046510465
* ( end auto-generated )
10466-
* @webref shape:vertex
10466+
* @webref image:textures
1046710467
* @param mode either IMAGE or NORMALIZED
1046810468
* @see PGraphics#texture(PImage)
1046910469
*/
@@ -10473,6 +10473,16 @@ public void textureMode(int mode) {
1047310473
}
1047410474

1047510475

10476+
/**
10477+
* ( begin auto-generated from textureWrap.xml )
10478+
*
10479+
* Description to come...
10480+
*
10481+
* ( end auto-generated from textureWrap.xml )
10482+
*
10483+
* @webref image:textures
10484+
* @param wrap Either CLAMP (default) or REPEAT
10485+
*/
1047610486
public void textureWrap(int wrap) {
1047710487
if (recorder != null) recorder.textureWrap(wrap);
1047810488
g.textureWrap(wrap);
@@ -10490,7 +10500,7 @@ public void textureWrap(int wrap) {
1049010500
* to specify the color of the texture as it is applied to the shape.
1049110501
*
1049210502
* ( end auto-generated )
10493-
* @webref shape:vertex
10503+
* @webref image:textures
1049410504
* @param image reference to a PImage object
1049510505
* @see PGraphics#textureMode(int)
1049610506
* @see PGraphics#beginShape(int)
@@ -14090,8 +14100,6 @@ public void background(float v1, float v2, float v3, float alpha) {
1409014100

1409114101

1409214102
/**
14093-
* @param image PImage to set as background (must be same size as the sketch window).<br/>
14094-
* <br/>
1409514103
* Takes an RGB or ARGB image and sets it as the background.
1409614104
* The width and height of the image must be the same size as the sketch.
1409714105
* Use image.resize(width, height) to make short work of such a task.<br/>
@@ -14102,6 +14110,8 @@ public void background(float v1, float v2, float v3, float alpha) {
1410214110
* behavior. Use image.filter(OPAQUE) to handle this easily.<br/>
1410314111
* <br/>
1410414112
* When using 3D, this will also clear the zbuffer (if it exists).
14113+
*
14114+
* @param image PImage to set as background (must be same size as the sketch window)
1410514115
*/
1410614116
public void background(PImage image) {
1410714117
if (recorder != null) recorder.background(image);

‎core/src/processing/core/PGraphics.java‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,7 @@ public void requestDraw() { // ignore
832832
* drawing anything.
833833
*
834834
* @webref pgraphics:method
835+
* @brief Sets the default properties for a PGraphics object
835836
*/
836837
public void beginDraw() { // ignore
837838
}
@@ -849,6 +850,7 @@ public void beginDraw() { // ignore
849850
* you're finished drawing.
850851
*
851852
* @webref pgraphics:method
853+
* @brief Finalizes the rendering of a PGraphics object
852854
*/
853855
public void endDraw() { // ignore
854856
}
@@ -1195,15 +1197,24 @@ public void normal(float nx, float ny, float nz) {
11951197
* NORMAL_SPACE is (0,0) (0,1) (1,1) (0,1).
11961198
*
11971199
* ( end auto-generated )
1198-
* @webref shape:vertex
1200+
* @webref image:textures
11991201
* @param mode either IMAGE or NORMALIZED
12001202
* @see PGraphics#texture(PImage)
12011203
*/
12021204
public void textureMode(int mode) {
12031205
this.textureMode = mode;
12041206
}
12051207

1206-
1208+
/**
1209+
* ( begin auto-generated from textureWrap.xml )
1210+
*
1211+
* Description to come...
1212+
*
1213+
* ( end auto-generated from textureWrap.xml )
1214+
*
1215+
* @webref image:textures
1216+
* @param wrap Either CLAMP (default) or REPEAT
1217+
*/
12071218
public void textureWrap(int wrap) {
12081219
showMissingWarning("textureWrap");
12091220
}
@@ -1220,7 +1231,7 @@ public void textureWrap(int wrap) {
12201231
* to specify the color of the texture as it is applied to the shape.
12211232
*
12221233
* ( end auto-generated )
1223-
* @webref shape:vertex
1234+
* @webref image:textures
12241235
* @param image reference to a PImage object
12251236
* @see PGraphics#textureMode(int)
12261237
* @see PGraphics#beginShape(int)
@@ -6834,8 +6845,6 @@ protected void backgroundFromCalc() {
68346845

68356846

68366847
/**
6837-
* @param image PImage to set as background (must be same size as the sketch window).<br/>
6838-
* <br/>
68396848
* Takes an RGB or ARGB image and sets it as the background.
68406849
* The width and height of the image must be the same size as the sketch.
68416850
* Use image.resize(width, height) to make short work of such a task.<br/>
@@ -6846,6 +6855,8 @@ protected void backgroundFromCalc() {
68466855
* behavior. Use image.filter(OPAQUE) to handle this easily.<br/>
68476856
* <br/>
68486857
* When using 3D, this will also clear the zbuffer (if it exists).
6858+
*
6859+
* @param image PImage to set as background (must be same size as the sketch window)
68496860
*/
68506861
public void background(PImage image) {
68516862
if ((image.width != width) || (image.height != height)) {

‎java/examples/Books/Processing Handbook/Extensions/Print/Ex_05/Ex_05.pde‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PGraphics big; // Declare a PGraphics variable
22

33
void setup() {
4-
big = createGraphics(3000, 3000, JAVA2D); // Create a new PGraphics object
4+
big = createGraphics(3000, 3000); // Create a new PGraphics object
55
big.beginDraw(); // Start drawing to the PGraphics object
66
big.background(128); // Set the background
77
big.line(20, 1800, 1800, 900); // Draw a line

‎java/libraries/video/src/processing/video/Movie.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ protected void finalize() throws Throwable {
158158
* @webref movie
159159
* @usage web_application
160160
* @param ifps speed of the movie in frames per second
161+
* @brief Sets the target frame rate
161162
*/
162163
public void frameRate(float ifps) {
163164
if (seeking) return;
@@ -221,6 +222,7 @@ public void frameRate(float ifps) {
221222
222223
* @usage web_application
223224
* @param irate speed multiplier for movie playback
225+
* @brief Sets the relative playback speed
224226
*/
225227
public void speed(float irate) {
226228
// If the frameRate() method is called continuously with very similar
@@ -243,6 +245,7 @@ public void speed(float irate) {
243245
*
244246
* @webref movie
245247
* @usage web_application
248+
* @brief Returns length of movie in seconds
246249
*/
247250
public float duration() {
248251
float sec = playbin.queryDuration().toSeconds();
@@ -261,6 +264,7 @@ public float duration() {
261264
*
262265
* @webref movie
263266
* @usage web_application
267+
* @brief Returns location of playback head in units of seconds
264268
*/
265269
public float time() {
266270
float sec = playbin.queryPosition().toSeconds();
@@ -281,6 +285,7 @@ public float time() {
281285
* @webref movie
282286
* @usage web_application
283287
* @param where position to jump to specified in seconds
288+
* @brief Jumps to a specific location
284289
*/
285290
public void jump(float where) {
286291
if (seeking) return;
@@ -322,6 +327,7 @@ public void jump(float where) {
322327
*
323328
* @webref movie
324329
* @usage web_application
330+
* @brief Returns "true" when a new movie frame is available to read.
325331
*/
326332
public boolean available() {
327333
return available;
@@ -337,6 +343,7 @@ public boolean available() {
337343
*
338344
* @webref movie
339345
* @usage web_application
346+
* @brief Plays movie one time and stops at the last frame
340347
*/
341348
public void play() {
342349
if (seeking) return;
@@ -355,12 +362,13 @@ public void play() {
355362
/**
356363
* ( begin auto-generated from Movie_loop.xml )
357364
*
358-
* Plays a movie continuously, restarting it when it is over.
365+
* Plays a movie continuously, restarting it when it's over.
359366
*
360367
* ( end auto-generated )
361368
*
362369
* @webref movie
363370
* @usage web_application
371+
* @brief Plays a movie continuously, restarting it when it's over.
364372
*/
365373
public void loop() {
366374
if (seeking) return;
@@ -380,6 +388,7 @@ public void loop() {
380388
*
381389
* @webref movie
382390
* @usage web_application
391+
* @brief Stops the movie from looping
383392
*/
384393
public void noLoop() {
385394
if (seeking) return;
@@ -402,6 +411,7 @@ public void noLoop() {
402411
*
403412
* @webref movie
404413
* @usage web_application
414+
* @brief Pauses the movie
405415
*/
406416
public void pause() {
407417
if (seeking) return;
@@ -427,6 +437,7 @@ public void pause() {
427437
*
428438
* @webref movie
429439
* @usage web_application
440+
* @brief Stops the movie
430441
*/
431442
public void stop() {
432443
if (seeking) return;
@@ -454,6 +465,7 @@ public void stop() {
454465
*
455466
* @webref movie
456467
* @usage web_application
468+
* @brief Reads the current frame
457469
*/
458470
public synchronized void read() {
459471
if (frameRate < 0) {

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL