eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 18:35:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup of naming in PGraphics

Browse Source
This commit is contained in:
benfry
2004-11-10 18:10:33 +00:00
parent 94ec30830f
commit 10f68c42fe
5 changed files with 272 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
processing/core/PApplet.java
View File

@@ -4180,7 +4180,7 @@ public class PApplet extends Applet
}
public void copy(int sx1, int sy1, int sx2, int sy2,
public void copy(int sx1, int sy1, int sx2, int sy2,
int dx1, int dy1, int dx2, int dy2) {
g.copy(sx1, sy1, sx2, sy2, dx1, dy1, dx2, dy2);
}
@@ -4207,13 +4207,13 @@ public class PApplet extends Applet
}
public void blend(int sx1, int sy1, int sx2, int sy2,
public void blend(int sx1, int sy1, int sx2, int sy2,
int dx1, int dy1, int dx2, int dy2, int mode) {
g.blend(sx1, sy1, sx2, sy2, dx1, dy1, dx2, dy2, mode);
}
public void blend(PImage src, int sx1, int sy1, int sx2, int sy2,
public void blend(PImage src, int sx1, int sy1, int sx2, int sy2,
int dx1, int dy1, int dx2, int dy2, int mode) {
g.blend(src, sx1, sy1, sx2, sy2, dx1, dy1, dx2, dy2, mode);
}
@@ -4274,8 +4274,8 @@ public class PApplet extends Applet
}
public void textureMode(int texture_mode) {
g.textureMode(texture_mode);
public void textureMode(int textureMode) {
g.textureMode(textureMode);
}

14
processing/core/PFont.java
View File

@@ -416,14 +416,12 @@ public class PFont implements PConstants {
float lextent = (float) leftExtent[glyph] / fwidth;
float textent = (float) topExtent[glyph] / fheight;
int savedTextureMode = parent.texture_mode;
//boolean savedSmooth = parent.smooth;
boolean savedStroke = parent._stroke;
int savedTextureMode = parent.textureMode;
boolean savedStroke = parent.stroke;
parent.texture_mode = IMAGE_SPACE;
//parent.smooth = true;
parent.textureMode = IMAGE_SPACE;
parent.drawing_text = true;
parent._stroke = false;
parent.stroke = false;
float x1 = x + lextent * size;
float y1 = y - textent * size;
@@ -447,9 +445,9 @@ public class PFont implements PConstants {
parent.vertex(x2, y1, z, width[glyph], 0);
parent.endShape();
parent.texture_mode = savedTextureMode;
parent.textureMode = savedTextureMode;
parent.drawing_text = false;
parent._stroke = savedStroke;
parent.stroke = savedStroke;
} else { // SCREEN_SPACE
int xx = (int) x + leftExtent[glyph];;

489
processing/core/PGraphics.java
View File

File diff suppressed because it is too large Load Diff

2
processing/core/PMethods.java
View File

@@ -60,7 +60,7 @@ public interface PMethods {
public void texture(PImage image);
public void textureMode(int texture_mode);
public void textureMode(int textureMode);
public void normal(float nx, float ny, float nz);

5
processing/core/todo.txt
View File

@@ -1,6 +1,9 @@
0073
X textureMode(NORMAL_SPACE) screws up the image() command
X image() appears to require IMAGE_SPACE to function properly.
X added focusGained() and focusLost()
_ add to preprocessor
X lots of changes to internal naming of vars
_ image("blah.jpg");
_ loadImage() is broken on some machines
@@ -8,8 +11,6 @@ _ hacked for a fix in 72, but need to better coordinate with openStream()
_ uv coords > 1 shouldn't clamp, they should just repeat ala opengl
_ actually i think opengl has a setting for it
_ textureMode(NORMAL_SPACE) screws up the image() command
_ image() appears to require IMAGE_SPACE to function properly.
_ fishwick bug with text() and shapes
_ ellipses no longer completed when g.dimensions = 2 or 3,