eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

simpler API for setting uniform values in PShader

Browse Source
This commit is contained in:
codeanticode
2012-06-28 21:14:22 +00:00
parent fed3562cc7
commit ba57434e3c
6 changed files with 490 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/core/src/processing/opengl/PGraphicsOpenGL.java
View File

@@ -5895,7 +5895,7 @@ public class PGraphicsOpenGL extends PGraphics {
pgCurrent.updateGLNormal();
set3x3MatUniform(normalMatrixLoc, pgCurrent.glNormal);
setIntUniform(lightCountLoc, pgCurrent.lightCount);
set1IntUniform(lightCountLoc, pgCurrent.lightCount);
set4FloatVecUniform(lightPositionLoc, pgCurrent.lightPosition);
set3FloatVecUniform(lightNormalLoc, pgCurrent.lightNormal);
set3FloatVecUniform(lightAmbientLoc, pgCurrent.lightAmbient);
@@ -6166,9 +6166,9 @@ public class PGraphicsOpenGL extends PGraphics {
set4FloatUniform(viewportLoc, pgCurrent.viewport[0], pgCurrent.viewport[1], pgCurrent.viewport[2], pgCurrent.viewport[3]);
if (pgCurrent.hintEnabled(ENABLE_PERSPECTIVE_CORRECTED_LINES)) {
setIntUniform(perspectiveLoc, 1);
set1IntUniform(perspectiveLoc, 1);
} else {
setIntUniform(perspectiveLoc, 0);
set1IntUniform(perspectiveLoc, 0);
}
if (pgCurrent.hintEnabled(ENABLE_ACCURATE_2D)) {