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

Synch changes with PTexture in OPENGL2

Browse Source
This commit is contained in:
codeanticode
2011-06-12 12:14:47 +00:00
parent 23be566650
commit 38b0064fb5
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl2/src/processing/opengl2/PTexture.java
+13 -5
View File
@@ -271,6 +271,7 @@ public class PTexture implements PConstants {
convertToRGBA(pixels, rgbaPixels, format, w, h);
getGl().glTexParameteri(GL.GL_TEXTURE_2D, GL2.GL_GENERATE_MIPMAP, GL.GL_TRUE);
setTexels(x, y, w, h, rgbaPixels);
rgbaPixels = null;
} else {
// TODO: Manual mipmap generation.
// Open source implementation of gluBuild2DMipmaps here:
@@ -280,6 +281,7 @@ public class PTexture implements PConstants {
int[] rgbaPixels = new int[w * h];
convertToRGBA(pixels, rgbaPixels, format, w, h);
setTexels(x, y, w, h, rgbaPixels);
rgbaPixels = null;
}
getGl().glBindTexture(glTarget, 0);
@@ -718,12 +720,18 @@ public class PTexture implements PConstants {
getGl().glTexParameteri(glTarget, GL.GL_TEXTURE_WRAP_S, glWrapS);
getGl().glTexParameteri(glTarget, GL.GL_TEXTURE_WRAP_T, glWrapT);
// This array is used to make sure that the texture doesn't contain any
// garbage.
int[] initArray = new int[glWidth * glHeight];
java.util.Arrays.fill(initArray, 0, glWidth * glHeight, 0x00000000);
//First, we use glTexImage2D to set the full size of the texture (glW/H might be diff from
// w/h in the case that the GPU doesn't support NPOT textures)
getGl().glTexImage2D(glTarget, 0, glFormat, glWidth, glHeight, 0, GL.GL_RGBA,
GL.GL_UNSIGNED_BYTE, IntBuffer.wrap(initArray));
GL.GL_UNSIGNED_BYTE, null);
// Once OpenGL knows the size of the new texture, we make sure it doesn't
// contain any garbage in the region of interest (0, 0, w, h):
int[] texels = new int[w * h];
java.util.Arrays.fill(texels, 0, w * h, 0x00000000);
setTexels(0, 0, w, h, texels);
texels = null;
getGl().glBindTexture(glTarget, 0);
getGl().glDisable(glTarget);