Skip to content

Commit d8823f8

Browse files
benfrybenfry
committed
cleaning up api naming
1 parent ccc6acf commit d8823f8

4 files changed

Lines changed: 80 additions & 31 deletions

File tree

‎core/api.txt‎

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ depth_sort_lines -> sortLines()
3131
public void beginShape()
3232
public void beginShape(int kind)
3333
public void normal(float nx, float ny, float nz)
34-
3534
public void textureMode(int mode)
3635
public void texture(PImage image)
3736
public void vertex(float x, float y)
@@ -40,6 +39,8 @@ depth_sort_lines -> sortLines()
4039
public void vertex(float x, float y, float z, float u, float v)
4140
public void bezierVertex(float x2, float y2,
4241
public void bezierVertex(float x2, float y2, float z2,
42+
float x3, float y3,
43+
float x4, float y4)
4344
public void curveVertex(float x, float y)
4445
public void curveVertex(float x, float y, float z)
4546
public void breakShape()
@@ -50,14 +51,18 @@ depth_sort_lines -> sortLines()
5051
public void point(float x, float y, float z)
5152
public void line(float x1, float y1, float x2, float y2)
5253
public void line(float x1, float y1, float z1,
53-
public void triangle(float x1, float y1, float x2, float y2,
54+
float x2, float y2, float z2)
55+
public void triangle(float x1, float y1,
56+
float x2, float y2,
57+
float x3, float y3)
5458
public void quad(float x1, float y1, float x2, float y2,
59+
float x3, float y3, float x4, float y4)
5560
public void rectMode(int mode)
5661
public void rect(float x1, float y1, float x2, float y2)
5762
public void ellipseMode(int mode)
5863
public void ellipse(float a, float b, float c, float d)
5964
public void arc(float a, float b, float c, float d,
60-
65+
float start, float stop)
6166
public void box(float size)
6267
public void box(float w, float h, float d)
6368
public void sphereDetail(int res)
@@ -68,18 +73,35 @@ depth_sort_lines -> sortLines()
6873
public float bezierTangent(float a, float b, float c, float d, float t)
6974
public void bezierDetail(int detail)
7075
public void bezier(float x1, float y1,
76+
float x2, float y2,
77+
float x3, float y3,
78+
float x4, float y4)
7179
public void bezier(float x1, float y1, float z1,
80+
float x2, float y2, float z2,
81+
float x3, float y3, float z3,
82+
float x4, float y4, float z4)
7283

7384
public float curvePoint(float a, float b, float c, float d, float t)
7485
public float curveTangent(float a, float b, float c, float d,
7586
public void curveDetail(int detail)
7687
public void curveTightness(float tightness)
7788
public void curve(float x1, float y1,
89+
float x2, float y2,
90+
float x3, float y3,
91+
float x4, float y4)
7892
public void curve(float x1, float y1, float z1,
93+
float x2, float y2, float z2,
94+
float x3, float y3, float z3,
95+
float x4, float y4, float z4)
7996

8097
public void image(PImage image, float x, float y)
8198
public void image(PImage image,
8299
public void image(PImage image,
100+
float a, float b, float c, float d)
101+
public void image(PImage image,
102+
public void image(PImage image,
103+
float a, float b, float c, float d,
104+
int u1, int v1, int u2, int v2)
83105

84106
public void textAlign(int align)
85107
public void textAlign(int alignX, int alignY)
@@ -121,21 +143,32 @@ depth_sort_lines -> sortLines()
121143
public void popMatrix()
122144
public void resetMatrix()
123145
public void applyMatrix(float n00, float n01, float n02,
146+
float n10, float n11, float n12)
124147
public void applyMatrix(float n00, float n01, float n02, float n03,
148+
float n10, float n11, float n12, float n13,
149+
float n20, float n21, float n22, float n23,
150+
float n30, float n31, float n32, float n33)
151+
125152
public void loadMatrix()
126153
public void printMatrix()
127154

128155
public void beginCamera()
129156
public void endCamera()
130157
public void camera()
131158
public void camera(float eyeX, float eyeY, float eyeZ,
159+
float centerX, float centerY, float centerZ,
160+
float upX, float upY, float upZ)
132161
public void printCamera()
133162

134163
public void ortho()
135164
public void ortho(float left, float right,
165+
float bottom, float top,
166+
float near, float far)
136167
public void perspective()
137-
public void perspective(float fovy, float aspect, float zNear, float zFar)
138-
public void frustum(float left, float right, float bottom,
168+
public void perspective(float fov, float aspect, float near, float far)
169+
public void frustum(float left, float right,
170+
float bottom, float top,
171+
float near, float far)
139172
public void printProjection()
140173

141174
public float screenX(float x, float y)
@@ -150,7 +183,9 @@ depth_sort_lines -> sortLines()
150183
public void colorMode(int mode)
151184
public void colorMode(int mode, float max)
152185
public void colorMode(int mode,
186+
float maxX, float maxY, float maxZ)
153187
public void colorMode(int mode,
188+
float maxX, float maxY, float maxZ, float maxA)
154189

155190
public void noStroke()
156191
public void stroke(int rgb)
@@ -197,9 +232,15 @@ depth_sort_lines -> sortLines()
197232
public void noLights()
198233
public void ambientLight(float red, float green, float blue)
199234
public void ambientLight(float red, float green, float blue,
235+
float x, float y, float z)
200236
public void directionalLight(float red, float green, float blue,
237+
float nx, float ny, float nz)
201238
public void pointLight(float red, float green, float blue,
239+
float x, float y, float z)
202240
public void spotLight(float red, float green, float blue,
241+
float x, float y, float z,
242+
float nx, float ny, float nz,
243+
float angle, float concentration)
203244
public void lightFalloff(float constant, float linear, float quadratic)
204245
public void lightSpecular(float x, float y, float z)
205246

@@ -239,7 +280,7 @@ depth_sort_lines -> sortLines()
239280
public PImage get(int x, int y, int w, int h)
240281
public PImage get()
241282
public void set(int x, int y, int c)
242-
public void set(int dx, int dy, PImage src)
283+
public void set(int x, int y, PImage src)
243284

244285
public void mask(int alpha[])
245286
public void mask(PImage alpha)
@@ -248,8 +289,14 @@ depth_sort_lines -> sortLines()
248289
public void filter(int kind, float param)
249290

250291
public void copy(int sx1, int sy1, int sx2, int sy2,
292+
int dx1, int dy1, int dx2, int dy2)
251293
public void copy(PImage src,
294+
int sx1, int sy1, int sx2, int sy2,
295+
int dx1, int dy1, int dx2, int dy2)
252296

253297
static public int blendColor(int c1, int c2, int mode)
254298
public void blend(int sx1, int sy1, int sx2, int sy2,
299+
int dx1, int dy1, int dx2, int dy2, int mode)
255300
public void blend(PImage src,
301+
int sx1, int sy1, int sx2, int sy2,
302+
int dx1, int dy1, int dx2, int dy2, int mode)

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7239,10 +7239,11 @@ public void perspective(float fovy, float aspect, float zNear, float zFar) {
72397239
}
72407240

72417241

7242-
public void frustum(float left, float right, float bottom,
7243-
float top, float znear, float zfar) {
7244-
if (recorder != null) recorder.frustum(left, right, bottom, top, znear, zfar);
7245-
g.frustum(left, right, bottom, top, znear, zfar);
7242+
public void frustum(float left, float right,
7243+
float bottom, float top,
7244+
float near, float far) {
7245+
if (recorder != null) recorder.frustum(left, right, bottom, top, near, far);
7246+
g.frustum(left, right, bottom, top, near, far);
72467247
}
72477248

72487249

@@ -7713,9 +7714,9 @@ public void set(int x, int y, int c) {
77137714
}
77147715

77157716

7716-
public void set(int dx, int dy, PImage src) {
7717-
if (recorder != null) recorder.set(dx, dy, src);
7718-
g.set(dx, dy, src);
7717+
public void set(int x, int y, PImage src) {
7718+
if (recorder != null) recorder.set(x, y, src);
7719+
g.set(x, y, src);
77197720
}
77207721

77217722

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3103,8 +3103,9 @@ public void perspective(float fovy, float aspect, float zNear, float zFar) {
31033103
depthError("perspective");
31043104
}
31053105

3106-
public void frustum(float left, float right, float bottom,
3107-
float top, float znear, float zfar) {
3106+
public void frustum(float left, float right,
3107+
float bottom, float top,
3108+
float near, float far) {
31083109
depthError("frustum");
31093110
}
31103111

‎core/src/processing/core/PImage.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -412,37 +412,37 @@ public void set(int x, int y, int c) {
412412
}
413413

414414

415-
public void set(int dx, int dy, PImage src) {
415+
public void set(int x, int y, PImage src) {
416416
int sx = 0;
417417
int sy = 0;
418418
int sw = src.width;
419419
int sh = src.height;
420420

421421
if (imageMode == CENTER) {
422-
dx -= src.width/2;
423-
dy -= src.height/2;
422+
x -= src.width/2;
423+
y -= src.height/2;
424424
}
425-
if (dx < 0) { // off left edge
426-
sx -= dx;
427-
sw += dx;
428-
dx = 0;
425+
if (x < 0) { // off left edge
426+
sx -= x;
427+
sw += x;
428+
x = 0;
429429
}
430-
if (dy < 0) { // off top edge
431-
sy -= dy;
432-
sh += dy;
433-
dy = 0;
430+
if (y < 0) { // off top edge
431+
sy -= y;
432+
sh += y;
433+
y = 0;
434434
}
435-
if (dx + sw > width) { // off right edge
436-
sw = width - dx;
435+
if (x + sw > width) { // off right edge
436+
sw = width - x;
437437
}
438-
if (dy + sh > height) { // off bottom edge
439-
sh = height - dy;
438+
if (y + sh > height) { // off bottom edge
439+
sh = height - y;
440440
}
441441

442442
// this could be nonexistant
443443
if ((sw <= 0) || (sh <= 0)) return;
444444

445-
setImpl(dx, dy, sx, sy, sw, sh, src);
445+
setImpl(x, y, sx, sy, sw, sh, src);
446446
}
447447

448448

0 commit comments

Comments
 (0)