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

Added queryTexture() to avoid creating new texture in vertexImpl()

Browse Source
This commit is contained in:
codeanticode
2012-01-17 22:56:06 +00:00
parent 8c1c63a772
commit 767e559adf
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+16 -7
View File
@@ -2041,13 +2041,10 @@ public class PGraphicsOpenGL extends PGraphics {
u /= textureImage.width;
v /= textureImage.height;
// TODO: GL texture shouldn't be retrieved
// until rendering. So how to know if it
// is flipped?
// PTexture tex = getTexture(textureImage);
// if (tex.isFlippedY()) {
// v = 1 - v;
// }
PTexture tex = queryTexture(textureImage);
if (tex != null && tex.isFlippedY()) {
v = 1 - v;
}
}
inGeo.addVertex(x, y, z,
@@ -5639,6 +5636,18 @@ public class PGraphicsOpenGL extends PGraphics {
}
return tex;
}
/**
* This utility method returns the texture associated to the image,
* but it doesn't create a new texture if the image has no texture.
* @param img the image to have a texture metadata associated to it
*/
protected PTexture queryTexture(PImage img) {
PTexture tex = (PTexture)img.getCache(renderer);
return tex;
}
/**
* This utility method creates a texture for the provided image, and adds it
java/libraries/opengl/src/processing/opengl/PShape3D.java
+4 -7
View File
@@ -623,13 +623,10 @@ public class PShape3D extends PShape {
u /= texture.width;
v /= texture.height;
// TODO: GL texture shouldn't be retrieved
// until rendering. So how to know if it
// is flipped?
// PTexture tex = ogl.getTexture(texture);
// if (tex.isFlippedY()) {
// v = 1 - v;
// }
PTexture tex = renderer.queryTexture(texture);
if (tex != null && tex.isFlippedY()) {
v = 1 - v;
}
}
float sR, sG, sB, sA, sW;