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

Address issue #1758

Browse Source
This commit is contained in:
codeanticode
2013-05-18 06:49:54 -04:00
parent 7a7b49af6b
commit 2d3db38cb8
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PGraphicsOpenGL.java
+22
View File
@@ -2395,6 +2395,8 @@ public class PGraphicsOpenGL extends PGraphics {
}
if (tex != null) {
shader.setNormalAttribute(glPolyNormal, 3, PGL.FLOAT, 0,
3 * voffset * PGL.SIZEOF_FLOAT);
shader.setTexcoordAttribute(glPolyTexcoord, 2, PGL.FLOAT, 0,
2 * voffset * PGL.SIZEOF_FLOAT);
shader.setTexture(tex);
@@ -6829,6 +6831,9 @@ public class PGraphicsOpenGL extends PGraphics {
protected int texMatrixLoc;
protected int texOffsetLoc;
protected int normalMatrixLoc;
protected int normalLoc;
protected float[] tcmat;
public TexureShader(PApplet parent) {
@@ -6851,6 +6856,8 @@ public class PGraphicsOpenGL extends PGraphics {
textureLoc = getUniformLoc("texture");
texMatrixLoc = getUniformLoc("texMatrix");
texOffsetLoc = getUniformLoc("texOffset");
normalMatrixLoc = getUniformLoc("normalMatrix");
}
@Override
@@ -6858,6 +6865,14 @@ public class PGraphicsOpenGL extends PGraphics {
super.loadAttributes();
texCoordLoc = getAttributeLoc("texCoord");
normalLoc = getAttributeLoc("normal");
}
@Override
public void setNormalAttribute(int vboId, int size, int type,
int stride, int offset) {
setAttributeVBO(normalLoc, vboId, size, type, false, stride, offset);
}
@Override
@@ -6911,11 +6926,18 @@ public class PGraphicsOpenGL extends PGraphics {
super.bind();
if (-1 < texCoordLoc) pgl.enableVertexAttribArray(texCoordLoc);
if (-1 < normalLoc) pgl.enableVertexAttribArray(normalLoc);
if (-1 < normalMatrixLoc) {
pgCurrent.updateGLNormal();
setUniformMatrix(normalMatrixLoc, pgCurrent.glNormal);
}
}
@Override
public void unbind() {
if (-1 < texCoordLoc) pgl.disableVertexAttribArray(texCoordLoc);
if (-1 < normalLoc) pgl.disableVertexAttribArray(normalLoc);
super.unbind();
}
core/src/processing/opengl/PShapeOpenGL.java
+2
View File
@@ -4191,6 +4191,8 @@ public class PShapeOpenGL extends PShape {
}
if (tex != null) {
shader.setNormalAttribute(root.glPolyNormal, 3, PGL.FLOAT,
0, 3 * voffset * PGL.SIZEOF_FLOAT);
shader.setTexcoordAttribute(root.glPolyTexcoord, 2, PGL.FLOAT,
0, 2 * voffset * PGL.SIZEOF_FLOAT);
shader.setTexture(tex);