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

clean up code in PShader

Browse Source
This commit is contained in:
codeanticode
2013-05-18 20:14:16 -04:00
parent 7c82286fe8
commit 113883293a
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PShader.java
+6 -8
View File
@@ -79,8 +79,6 @@ public class PShader {
protected HashMap<Integer, Texture> textures;
protected HashMap<Integer, Integer> texUnits;
// protected int firstTexUnit;
protected int lastTexUnit;
// Direct buffers to pass shader data to GL
protected IntBuffer intBuffer;
@@ -554,7 +552,7 @@ public class PShader {
protected void consumeUniforms() {
if (uniformValues != null && 0 < uniformValues.size()) {
lastTexUnit = 0; //firstTexUnit;
int unit = 0;
for (Integer loc: uniformValues.keySet()) {
UniformValue val = uniformValues.get(loc);
if (val.type == UniformValue.INT1) {
@@ -634,13 +632,13 @@ public class PShader {
if (texUnits == null) texUnits = new HashMap<Integer, Integer>();
if (texUnits.containsKey(loc)) {
lastTexUnit = texUnits.get(loc);
pgl.uniform1i(loc, lastTexUnit);
unit = texUnits.get(loc);
pgl.uniform1i(loc, unit);
} else {
texUnits.put(loc, lastTexUnit);
pgl.uniform1i(loc, lastTexUnit);
texUnits.put(loc, unit);
pgl.uniform1i(loc, unit);
}
lastTexUnit++;
unit++;
}
}
uniformValues.clear();