eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix broken merge (but losing docs?)

Browse Source
This commit is contained in:
Ben Fry
2015-06-06 19:10:48 -04:00
parent 6ae240a038 cfcbc85b8a
commit 9c73bf00ce
2 changed files with 5 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/core/PApplet.java
+2 -2
View File
@@ -1569,7 +1569,7 @@ public class PApplet implements PConstants {
*
* ( end auto-generated )
* @webref environment
* @param renderer the renderer to use, e.g. P2D, P2D_2X, P3D...
* @param renderer the renderer to use, e.g. JAVA2D, JAVA2D_2X, P2D, P2D_2X, P3D, P3D_2X
* @see PApplet#settings()
* @see PApplet#setup()
* @see PApplet#size()
@@ -10657,7 +10657,7 @@ public class PApplet implements PConstants {
*
* ( end auto-generated )
*
* @webref Rendering
* @webref rendering
* @param mode the blending mode to use
*/
public void blendMode(int mode) {
core/src/processing/core/PGraphics.java
+3 -54
View File
@@ -1099,6 +1099,7 @@ public class PGraphics extends PImage implements PConstants {
* enabled or disabled.
*
* ( end auto-generated )
*
* @webref rendering
* @param which name of the hint to be enabled or disabled
* @see PGraphics
@@ -1953,7 +1954,7 @@ public class PGraphics extends PImage implements PConstants {
*
* ( end auto-generated )
*
* @webref Rendering
* @webref rendering
* @param mode the blending mode to use
*/
public void blendMode(int mode) {
@@ -3559,53 +3560,6 @@ public class PGraphics extends PImage implements PConstants {
// SMOOTHING
// /**
// * If true in PImage, use bilinear interpolation for copy()
// * operations. When inherited by PGraphics, also controls shapes.
// */
//
// /**
// * ( begin auto-generated from smooth.xml )
// *
// * Draws all geometry with smooth (anti-aliased) edges. This will sometimes
// * slow down the frame rate of the application, but will enhance the visual
// * refinement. Note that <b>smooth()</b> will also improve image quality of
// * resized images, and <b>noSmooth()</b> will disable image (and font)
// * smoothing altogether.
// *
// * ( end auto-generated )
// *
// * @webref shape:attributes
// * @see PGraphics#noSmooth()
// * @see PGraphics#hint(int)
// * @see PApplet#size(int, int, String)
// */
// public void smooth() {
// smooth = true;
// }
//
// /**
// *
// * @param level either 2, 4, or 8
// */
// public void smooth(int level) {
// smooth = true;
// }
//
// /**
// * ( begin auto-generated from noSmooth.xml )
// *
// * Draws all geometry with jagged (aliased) edges.
// *
// * ( end auto-generated )
// * @webref shape:attributes
// * @see PGraphics#smooth()
// */
// public void noSmooth() {
// smooth = false;
// }
final public void smooth() { // ignore
smooth(1);
}
@@ -3630,12 +3584,6 @@ public class PGraphics extends PImage implements PConstants {
final public void noSmooth() { // ignore
smooth(0);
/*
if (primarySurface) {
parent.noSmooth();
} else {
}
*/
}
@@ -3644,6 +3592,7 @@ public class PGraphics extends PImage implements PConstants {
}
//////////////////////////////////////////////////////////////
// IMAGE