Skip to content

Commit 7acae3b

Browse files
committed
more work on color functions, error messages, and the PGraphics API
1 parent 8efb80f commit 7acae3b

5 files changed

Lines changed: 587 additions & 539 deletions

File tree

core/api.txt

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ style(PStyle s)
3939
public void setPath(String path)
4040
public void setSize(int iwidth, int iheight)
4141
protected void allocate()
42+
public void dispose()
4243

4344
public boolean canDraw()
4445
public void beginDraw()
@@ -203,7 +204,6 @@ style(PStyle s)
203204
public void pushMatrix()
204205
public void popMatrix()
205206

206-
public void resetMatrix()
207207
public void translate(float tx, float ty)
208208
public void translate(float tx, float ty, float tz)
209209
public void rotate(float angle)
@@ -214,6 +214,8 @@ style(PStyle s)
214214
public void scale(float s)
215215
public void scale(float sx, float sy)
216216
public void scale(float x, float y, float z)
217+
218+
public void resetMatrix()
217219
public void applyMatrix(PMatrix2D source)
218220
public void applyMatrix(PMatrix3D source)
219221
public void applyMatrix(float n00, float n01, float n02,
@@ -223,11 +225,11 @@ style(PStyle s)
223225
float n20, float n21, float n22, float n23,
224226
float n30, float n31, float n32, float n33)
225227

226-
public void printMatrix()
227228
public getMatrix(PMatrix2D target)
228229
public getMatrix(PMatrix3D target)
229230
public void setMatrix(PMatrix2D source)
230231
public void setMatrix(PMatrix3D source)
232+
public void printMatrix()
231233

232234
public void beginCamera()
233235
public void endCamera()
@@ -236,6 +238,7 @@ style(PStyle s)
236238
float centerX, float centerY, float centerZ,
237239
float upX, float upY, float upZ)
238240
public void printCamera()
241+
239242
public void ortho()
240243
public void ortho(float left, float right,
241244
float bottom, float top,
@@ -264,10 +267,20 @@ style(PStyle s)
264267

265268
public void colorMode(int mode)
266269
public void colorMode(int mode, float max)
267-
public void colorMode(int mode,
268-
float maxX, float maxY, float maxZ)
269-
public void colorMode(int mode,
270-
float maxX, float maxY, float maxZ, float maxA)
270+
public void colorMode(int mode, float mx, float my, float mz);
271+
public void colorMode(int mode, float mx, float my, float mz, float ma);
272+
273+
protected void colorCalc(int rgb)
274+
protected void colorCalc(int rgb, float alpha)
275+
protected void colorCalc(float gray)
276+
protected void colorCalc(float gray, float alpha)
277+
protected void colorCalc(float x, float y, float z)
278+
protected void colorCalc(float x, float y, float z, float a)
279+
protected void colorCalcARGB(int argb, float alpha)
280+
281+
public void strokeCap(int cap)
282+
public void strokeJoin(int join)
283+
public void strokeWeight(float weight)
271284

272285
public void noStroke()
273286
public void stroke(int rgb)
@@ -276,10 +289,7 @@ style(PStyle s)
276289
public void stroke(float gray, float alpha)
277290
public void stroke(float x, float y, float z)
278291
public void stroke(float x, float y, float z, float a)
279-
280-
public void strokeCap(int cap)
281-
public void strokeJoin(int join)
282-
public void strokeWeight(float weight)
292+
protected void strokeFromCalc()
283293

284294
public void noTint()
285295
public void tint(int rgb)
@@ -288,6 +298,7 @@ style(PStyle s)
288298
public void tint(float gray, float alpha)
289299
public void tint(float x, float y, float z)
290300
public void tint(float x, float y, float z, float a)
301+
protected void tintFromCalc()
291302

292303
public void noFill()
293304
public void fill(int rgb)
@@ -296,19 +307,21 @@ style(PStyle s)
296307
public void fill(float gray, float alpha)
297308
public void fill(float x, float y, float z)
298309
public void fill(float x, float y, float z, float a)
310+
protected void fillFromCalc()
299311

300312
public void ambient(int rgb)
301313
public void ambient(float gray)
302314
public void ambient(float x, float y, float z)
303-
315+
protected void ambientFromCalc()
304316
public void specular(int rgb)
305317
public void specular(float gray)
306318
public void specular(float x, float y, float z)
319+
protected void specularFromCalc()
307320
public void shininess(float shine)
308-
309321
public void emissive(int rgb)
310322
public void emissive(float gray)
311323
public void emissive(float x, float y, float z )
324+
protected void emissiveFromCalc()
312325

313326
public void lights()
314327
public void noLights()
@@ -333,6 +346,7 @@ style(PStyle s)
333346
public void background(float x, float y, float z)
334347
public void background(float x, float y, float z, float a)
335348
public void background(PImage image)
349+
protected void backgroundFromCalc()
336350
protected void backgroundImpl()
337351

338352
public final float alpha(int what)

0 commit comments

Comments
 (0)