From ff0b8e7877f42e7f2ec40ffe0919fdfdd2e6b358 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Sun, 12 Feb 2012 21:09:16 +0000 Subject: [PATCH] added shader.setTexture() call in PShape3D.renderFill() --- android/core/src/processing/core/PShape3D.java | 1 + java/libraries/opengl/src/processing/opengl/PShape3D.java | 1 + 2 files changed, 2 insertions(+) diff --git a/android/core/src/processing/core/PShape3D.java b/android/core/src/processing/core/PShape3D.java index c5bf03c11..a5eebb668 100644 --- a/android/core/src/processing/core/PShape3D.java +++ b/android/core/src/processing/core/PShape3D.java @@ -3727,6 +3727,7 @@ public class PShape3D extends PShape { if (tex != null) { shader.setTexCoordAttribute(root.glFillTexCoordBufferID, 2, PGL.GL_FLOAT, 0, 2 * first * PGL.SIZEOF_FLOAT); + shader.setTexture(tex); } pgl.glBindBuffer(PGL.GL_ELEMENT_ARRAY_BUFFER, root.glFillIndexBufferID); diff --git a/java/libraries/opengl/src/processing/opengl/PShape3D.java b/java/libraries/opengl/src/processing/opengl/PShape3D.java index 06e7fc565..1e16f3cda 100644 --- a/java/libraries/opengl/src/processing/opengl/PShape3D.java +++ b/java/libraries/opengl/src/processing/opengl/PShape3D.java @@ -3744,6 +3744,7 @@ public class PShape3D extends PShape { if (tex != null) { shader.setTexCoordAttribute(root.glFillTexCoordBufferID, 2, PGL.GL_FLOAT, 0, 2 * first * PGL.SIZEOF_FLOAT); + shader.setTexture(tex); } pgl.glBindBuffer(PGL.GL_ELEMENT_ARRAY_BUFFER, root.glFillIndexBufferID);