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

recalculate mipmaps in Texture.setNative()

Browse Source
This commit is contained in:
codeanticode
2012-08-08 18:10:43 +00:00
parent ac9cf6cf30
commit 801a8f0579
7 changed files with 92 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/core/src/processing/opengl/PFontTexture.java
+1 -1
View File
@@ -376,7 +376,7 @@ class PFontTexture implements PConstants {
void updateTex() {
textures[texIndex].setNative(pixels, 0, crop[0] - 1, crop[1] + crop[3] - 1, crop[2] + 2, -crop[3] + 2);
textures[texIndex].setNative(pixels, crop[0] - 1, crop[1] + crop[3] - 1, crop[2] + 2, -crop[3] + 2);
}
}
}
android/core/src/processing/opengl/PGraphicsOpenGL.java
+1 -2
View File
@@ -5577,7 +5577,6 @@ public class PGraphicsOpenGL extends PGraphics {
params.sampling = textureSampling;
if (params.sampling == Texture.TRILINEAR && !params.mipmaps) {
params.sampling = Texture.BILINEAR;
PGraphics.showWarning("TRILINEAR texture sampling requires mipmaps, which are disabled. I will use BILINEAR instead.");
}
params.wrapU = textureWrap;
params.wrapV = textureWrap;
@@ -6312,7 +6311,7 @@ public class PGraphicsOpenGL extends PGraphics {
tcmat[3] = 0; tcmat[7] = 0; tcmat[11] = 0; tcmat[15] = 0;
setUniformMatrix(texcoordMatrixLoc, tcmat);
}
setUniformValue(texcoordOffsetLoc, 1.0f / tex.width, 1.0f / tex.height);
}
android/core/src/processing/opengl/Texture.java
+39 -17
View File
@@ -381,42 +381,64 @@ public class Texture implements PConstants {
updateTexels(x, y, w, h);
}
////////////////////////////////////////////////////////////
// Native set methods
public void setNative(int[] pix, int x, int y, int w, int h) {
setNative(pix, 0, x, y, w, h);
}
public void setNative(int[] pix, int level, int x, int y, int w, int h) {
setNative(IntBuffer.wrap(pix), level, x, y, w, h);
}
public void setNative(IntBuffer buffer, int x, int y, int w, int h) {
setNative(buffer, 0, x, y, w, h);
}
public void setNative(int[] pixels) {
setNative(pixels, 0, 0, width, height);
}
public void setNative(IntBuffer buffer, int level, int x, int y, int w, int h) {
public void setNative(int[] pixels, int x, int y, int w, int h) {
setNative(IntBuffer.wrap(pixels), x, y, w, h);
}
public void setNative(IntBuffer pixels, int x, int y, int w, int h) {
if (pixels == null) {
pixels = null;
PGraphics.showWarning("The pixel buffer is null.");
return;
}
if (pixels.capacity() != w * h) {
PGraphics.showWarning("The pixels array has a length of " + pixels.capacity() + ", but it should be " + w * h);
return;
}
if (pixels.capacity() == 0) {
// Nothing to do (means that w == h == 0) but not an erroneous situation
return;
}
boolean enabledTex = false;
if (!pgl.texturingIsEnabled(glTarget)) {
pgl.enableTexturing(glTarget);
enabledTex = true;
}
pgl.glBindTexture(glTarget, glName);
pgl.glTexSubImage2D(glTarget, level, x, y, w, h, PGL.GL_RGBA, PGL.GL_UNSIGNED_BYTE, buffer);
if (usingMipmaps) {
if (PGraphicsOpenGL.autoMipmapGenSupported) {
pgl.glTexSubImage2D(glTarget, 0, x, y, w, h, PGL.GL_RGBA, PGL.GL_UNSIGNED_BYTE, pixels);
pgl.glGenerateMipmap(glTarget);
} else {
pgl.glTexSubImage2D(glTarget, 0, x, y, w, h, PGL.GL_RGBA, PGL.GL_UNSIGNED_BYTE, pixels);
}
} else {
pgl.glTexSubImage2D(glTarget, 0, x, y, w, h, PGL.GL_RGBA, PGL.GL_UNSIGNED_BYTE, pixels);
}
pgl.glBindTexture(glTarget, 0);
if (enabledTex) {
pgl.disableTexturing(glTarget);
}
updateTexels(x, y, w, h);
}
}
////////////////////////////////////////////////////////////