eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-29 03:11:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated multitexture API in opengl2

Browse Source
This commit is contained in:
codeanticode
2011-02-22 14:33:35 +00:00
parent ad03f360c9
commit 2d7143dbde
1 changed files with 24 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
java/libraries/opengl2/src/processing/opengl2/PGraphicsOpenGL2.java
View File

@@ -1418,6 +1418,7 @@ public class PGraphicsOpenGL2 extends PGraphics {
// public void normal(float nx, float ny, float nz)
// public void textureMode(int mode)
public void texture(PImage image) {
super.texture(image);
textureImages[0] = image;
@@ -1425,55 +1426,8 @@ public class PGraphicsOpenGL2 extends PGraphics {
numTextures = 1;
}
public void texture(PImage image0, PImage image1) {
if (1 < maxTextureUnits) {
super.texture(image0);
textureImages[0] = image0;
textureImages[1] = image1;
java.util.Arrays.fill(textureImages, 2, maxTextureUnits, null);
numTextures = 2;
if (numTexBuffers < 2) {
addTexBuffers(2 - numTexBuffers);
}
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
public void texture(PImage image0, PImage image1, PImage image2) {
if (2 < maxTextureUnits) {
super.texture(image0);
textureImages[0] = image0;
textureImages[1] = image1;
textureImages[2] = image2;
java.util.Arrays.fill(textureImages, 3, maxTextureUnits, null);
numTextures = 3;
if (numTexBuffers < 3) {
addTexBuffers(3 - numTexBuffers);
}
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
public void texture(PImage image0, PImage image1, PImage image2, PImage image3) {
if (3 < maxTextureUnits) {
super.texture(image0);
textureImages[0] = image0;
textureImages[1] = image1;
textureImages[2] = image2;
textureImages[3] = image3;
java.util.Arrays.fill(textureImages, 4, maxTextureUnits, null);
numTextures = 4;
if (numTexBuffers < 4) {
addTexBuffers(4 - numTexBuffers);
}
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
public void texture(PImage[] images) {
public void texture(PImage... images) {
int len = images.length;
if (len <= maxTextureUnits) {
super.texture(images[0]);
@@ -1485,9 +1439,10 @@ public class PGraphicsOpenGL2 extends PGraphics {
}
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
}
}
public void noTexture() {
super.noTexture();
numTextures = 0;
@@ -1495,6 +1450,7 @@ public class PGraphicsOpenGL2 extends PGraphics {
clearTextures0();
}
public void vertex(float x, float y, float u, float v) {
vertexTexture(u, v, 0);
vertex(x, y);
@@ -1504,60 +1460,25 @@ public class PGraphicsOpenGL2 extends PGraphics {
vertexU[n][i] = texturesU[0];
vertexV[n][i] = texturesV[0];
}
}
public void vertex(float x, float y, float u0, float v0, float u1, float v1) {
//public void vertex(float x, float y, float texcoords...) {
//for (float tc : texcoords)
//
}
if (2 <= maxTextureUnits) {
vertexTexture(u0, v0, 0);
vertexTexture(u1, v1, 1);
vertex(x, y);
setTextureData(2);
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
public void vertex(float x, float y, float u0, float v0, float u1, float v1, float u2, float v2) {
if (3 <= maxTextureUnits) {
vertexTexture(u0, v0, 0);
vertexTexture(u1, v1, 1);
vertexTexture(u2, v2, 2);
vertex(x, y);
setTextureData(3);
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
public void vertex(float x, float y, float u0, float v0, float u1, float v1, float u2, float v2, float u3, float v3) {
if (4 <= maxTextureUnits) {
vertexTexture(u0, v0, 0);
vertexTexture(u1, v1, 1);
vertexTexture(u2, v2, 2);
vertexTexture(u2, v2, 3);
vertex(x, y);
setTextureData(4);
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
public void vertex(float x, float y, float[] u, float[] v) {
int len = PApplet.min(u.length, v.length);
public void vertex(float x, float y, float... uv) {
int len = uv.length / 2;
if (len <= maxTextureUnits) {
float u, v;
for (int t = 0; t < len; t++) {
vertexTexture(u[t], v[t], t);
u = uv[t];
v = uv[2 * t];
vertexTexture(u, v, t);
}
vertex(x, y);
setTextureData(len);
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
}
}
public void vertex(float x, float y, float z, float u, float v) {
vertexTexture(u, v, 0);
@@ -1570,54 +1491,22 @@ public class PGraphicsOpenGL2 extends PGraphics {
}
}
public void vertex(float x, float y, float z, float u0, float v0, float u1, float v1) {
if (2 <= maxTextureUnits) {
vertexTexture(u0, v0, 0);
vertexTexture(u1, v1, 1);
vertex(x, y, z);
setTextureData(2);
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
public void vertex(float x, float y, float z, float u0, float v0, float u1, float v1, float u2, float v2) {
if (3 <= maxTextureUnits) {
vertexTexture(u0, v0, 0);
vertexTexture(u1, v1, 1);
vertexTexture(u2, v2, 2);
vertex(x, y, z);
setTextureData(3);
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
public void vertex(float x, float y, float z, float u0, float v0, float u1, float v1, float u2, float v2, float u3, float v3) {
if (4 <= maxTextureUnits) {
vertexTexture(u0, v0, 0);
vertexTexture(u1, v1, 1);
vertexTexture(u2, v2, 2);
vertexTexture(u2, v2, 3);
vertex(x, y, z);
setTextureData(4);
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
public void vertex(float x, float y, float z, float[] u, float[] v) {
int len = PApplet.min(u.length, v.length);
public void vertex(float x, float y, float z, float... uv) {
int len = uv.length / 2;
if (len <= maxTextureUnits) {
float u, v;
for (int t = 0; t < len; t++) {
vertexTexture(u[t], v[t], t);
u = uv[t];
v = uv[2 * t];
vertexTexture(u, v, t);
}
vertex(x, y, z);
setTextureData(len);
} else {
System.err.println("OPENGL2: insufficient texture units.");
}
}
}
}
protected void vertexCheck() {