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

removed quality constants from Texture

Browse Source
This commit is contained in:
codeanticode
2012-06-14 18:29:53 +00:00
parent 39bd4a3c8b
commit aa94623ac2
2 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+11 -20
View File
@@ -292,8 +292,8 @@ public class PGraphicsOpenGL extends PGraphics {
// Texturing:
public int textureWrap = Texture.CLAMP;
public int textureQuality = Texture.BEST;
public int textureWrap = Texture.CLAMP;
public int textureSampling = Texture.TRILINEAR;
// ........................................................
@@ -2050,13 +2050,13 @@ public class PGraphicsOpenGL extends PGraphics {
public void textureWrap(int wrap) {
this.textureWrap = wrap;
}
public void textureQuality(int quality) {
this.textureQuality = quality;
}
public void textureSampling(int sampling) {
this.textureSampling = sampling;
}
public void texture(PImage image) {
if (flushMode == FLUSH_WHEN_FULL && hints[DISABLE_TEXTURE_CACHE] &&
image != textureImage0) {
@@ -5256,19 +5256,10 @@ public class PGraphicsOpenGL extends PGraphics {
} else {
params.mipmaps = true;
}
if (textureQuality == Texture.LOW) {
params.sampling = POINT;
} else if (textureQuality == Texture.MEDIUM) {
params.sampling = Texture.LINEAR;
} else if (textureQuality == Texture.HIGH) {
params.sampling = textureSampling;
if (params.sampling == Texture.TRILINEAR && !params.mipmaps) {
params.sampling = Texture.BILINEAR;
} else if (textureQuality == Texture.BEST) {
if (params.mipmaps) {
params.sampling = Texture.TRILINEAR;
} else {
params.sampling = Texture.BILINEAR;
PGraphics.showWarning("BEST texture quality requires mipmaps, will switch to HIGH.");
}
PGraphics.showWarning("TRILINEAR texture sampling requires mipmaps, which are disabled. Will use BILINEAR instead.");
}
params.wrapU = textureWrap;
params.wrapV = textureWrap;
java/libraries/opengl/src/processing/opengl/Texture.java
+14 -16
View File
@@ -40,17 +40,15 @@ import java.util.NoSuchElementException;
*/
public class Texture implements PConstants {
// texture constants
/**
* This constant identifies the texture target GL_TEXTURE_2D, that is,
* textures with normalized coordinates
*/
public static final int TEXTURE2D = 0;
/** Texture quality constants */
public static final int LOW = 0;
public static final int MEDIUM = 1;
public static final int HIGH = 2;
public static final int BEST = 3;
/**
* Texture with normalized UV.
*/
public static final int TEX2D = 0;
/**
* Texture with un-normalized UV.
*/
public static final int TEXRECT = 1;
/** Point sampling: both magnification and minification filtering are set to nearest */
//public static final int POINT = 2; // shared with shape feature
@@ -1026,7 +1024,7 @@ public class Texture implements PConstants {
Parameters res = new Parameters();
if (glTarget == PGL.GL_TEXTURE_2D) {
res.target = TEXTURE2D;
res.target = TEX2D;
}
if (glFormat == PGL.GL_RGB) {
@@ -1079,7 +1077,7 @@ public class Texture implements PConstants {
* @param params GLTextureParameters
*/
protected void setParameters(Parameters params) {
if (params.target == TEXTURE2D) {
if (params.target == TEX2D) {
glTarget = PGL.GL_TEXTURE_2D;
} else {
throw new RuntimeException("Unknown texture target");
@@ -1179,7 +1177,7 @@ public class Texture implements PConstants {
* Sets all the parameters to default values.
*/
public Parameters() {
this.target = TEXTURE2D;
this.target = TEX2D;
this.format = ARGB;
this.sampling = BILINEAR;
this.mipmaps = true;
@@ -1188,7 +1186,7 @@ public class Texture implements PConstants {
}
public Parameters(int format) {
this.target = TEXTURE2D;
this.target = TEX2D;
this.format = format;
this.sampling = BILINEAR;
this.mipmaps = true;
@@ -1197,7 +1195,7 @@ public class Texture implements PConstants {
}
public Parameters(int format, int sampling) {
this.target = TEXTURE2D;
this.target = TEX2D;
this.format = format;
this.sampling = sampling;
this.mipmaps = true;
@@ -1206,7 +1204,7 @@ public class Texture implements PConstants {
}
public Parameters(int format, int sampling, boolean mipmaps) {
this.target = TEXTURE2D;
this.target = TEX2D;
this.format = format;
this.sampling = sampling;
this.mipmaps = mipmaps;