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

Solved some inconsistency in the multitexturing API

Browse Source
This commit is contained in:
codeanticode
2011-03-24 12:22:42 +00:00
parent a43b6e3d68
commit 243804a86d
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/core/PApplet.java
+6 -12
View File
@@ -7860,9 +7860,9 @@ public class PApplet extends Applet
* formatted vertex information.
* @param v vertex parameters, as a float array of length VERTEX_FIELD_COUNT
*/
public void vertex(float[] v) {
if (recorder != null) recorder.vertex(v);
g.vertex(v);
public void vertexFields(float[] v) {
if (recorder != null) recorder.vertexFields(v);
g.vertexFields(v);
}
@@ -10225,15 +10225,9 @@ public class PApplet extends Applet
}
public void vertex(float x, float y, float... uv) {
if (recorder != null) recorder.vertex(x, y, uv);
g.vertex(x, y, uv);
}
public void vertex(float x, float y, float z, float... uv) {
if (recorder != null) recorder.vertex(x, y, z, uv);
g.vertex(x, y, z, uv);
public void vertex(float... values) {
if (recorder != null) recorder.vertex(values);
g.vertex(values);
}
core/src/processing/core/PGraphics.java
+4 -10
View File
@@ -1166,14 +1166,14 @@ public class PGraphics extends PImage implements PConstants {
* formatted vertex information.
* @param v vertex parameters, as a float array of length VERTEX_FIELD_COUNT
*/
public void vertex(float[] v) {
public void vertexFields(float[] v) {
vertexCheck();
curveVertexCount = 0;
float[] vertex = vertices[vertexCount];
System.arraycopy(v, 0, vertex, 0, VERTEX_FIELD_COUNT);
vertexCount++;
}
public void vertex(float x, float y, float u, float v) {
vertexTexture(u, v);
@@ -6007,13 +6007,7 @@ public class PGraphics extends PImage implements PConstants {
showMissingWarning("texture");
}
public void vertex(float x, float y, float... uv) {
public void vertex(float... values) {
showMissingWarning("vertex");
}
public void vertex(float x, float y, float z, float... uv) {
showMissingWarning("vertex");
}
}
}