@@ -89,22 +89,29 @@ style(PStyle s)
8989 float x3, float y3)
9090 public void quad(float x1, float y1, float x2, float y2,
9191 float x3, float y3, float x4, float y4)
92+
9293 public void rectMode(int mode)
93- public void rect(float x1, float y1, float x2, float y2)
94+ public void rect(float a, float b, float c, float d)
95+ protected void rectImpl(float x1, float y1, float x2, float y2)
9496
9597 public void ellipseMode(int mode)
9698 public void ellipse(float a, float b, float c, float d)
9799 public void arc(float a, float b, float c, float d,
98100 float start, float stop)
101+ protected void arcImpl(float x, float y, float w, float h,
102+ float start, float stop)
99103
100104 public void box(float size)
101105 public void box(float w, float h, float d)
106+
102107 public void sphereDetail(int res)
103108 public void sphereDetail(int ures, int vres)
104109 public void sphere(float r)
105110
106111 public float bezierPoint(float a, float b, float c, float d, float t)
107112 public float bezierTangent(float a, float b, float c, float d, float t)
113+ protected void bezierInitCheck()
114+ protected void bezierInit()
108115 public void bezierDetail(int detail)
109116 public void bezier(float x1, float y1,
110117 float x2, float y2,
@@ -116,9 +123,11 @@ style(PStyle s)
116123 float x4, float y4, float z4)
117124
118125 public float curvePoint(float a, float b, float c, float d, float t)
119- public float curveTangent(float a, float b, float c, float d,
126+ public float curveTangent(float a, float b, float c, float d, float t)
120127 public void curveDetail(int detail)
121128 public void curveTightness(float tightness)
129+ protected void curveInitCheck()
130+ protected void curveInit()
122131 public void curve(float x1, float y1,
123132 float x2, float y2,
124133 float x3, float y3,
@@ -128,19 +137,21 @@ style(PStyle s)
128137 float x3, float y3, float z3,
129138 float x4, float y4, float z4)
130139
140+ protected void splineForward(int segments, PMatrix3D matrix)
141+
131142 public void image(PImage image, float x, float y)
132- public void image(PImage image,
133- public void image(PImage image,
134- float a, float b, float c, float d)
135- public void image(PImage image,
143+ public void image(PImage image, float x, float y, float c, float d)
136144 public void image(PImage image,
137145 float a, float b, float c, float d,
138146 int u1, int v1, int u2, int v2)
147+ protected void imageImpl(PImage image,
148+ float x1, float y1, float x2, float y2,
149+ int u1, int v1, int u2, int v2)
139150
140151 public void shapeMode(int mode)
141152 public void shape(PShape shape)
142153 public void shape(PShape shape, float x, float y)
143- public void shape(PShape shape, float x, float y, float w , float h )
154+ public void shape(PShape shape, float x, float y, float c , float d )
144155
145156 public void textAlign(int align)
146157 public void textAlign(int alignX, int alignY)
@@ -179,6 +190,12 @@ style(PStyle s)
179190 public void scale(float x, float y, float z)
180191
181192 public void resetMatrix()
193+
194+ public PMatrix getMatrix()
195+ public getMatrix(PMatrix target)
196+ public void setMatrix(PMatrix source)
197+
198+ public void applyMatrix(PMatrix source)
182199 public void applyMatrix(float n00, float n01, float n02,
183200 float n10, float n11, float n12)
184201 public void applyMatrix(float n00, float n01, float n02, float n03,
@@ -219,6 +236,12 @@ style(PStyle s)
219236 public float modelY(float x, float y, float z)
220237 public float modelZ(float x, float y, float z)
221238
239+ public void pushStyle()
240+ public void popStyle()
241+ public void style(PStyle)
242+ public PStyle getStyle()
243+ public void getStyle(PStyle)
244+
222245 public void colorMode(int mode)
223246 public void colorMode(int mode, float max)
224247 public void colorMode(int mode,
@@ -304,6 +327,7 @@ style(PStyle s)
304327 static public int lerpColor(int c1, int c2, float amt, int mode)
305328
306329 public boolean displayable()
330+ public boolean dimensional() // better name for this?
307331
308332//
309333
0 commit comments