eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-15 11:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated date in license notice in opengl renderer files

Browse Source
This commit is contained in:
codeanticode
2021-08-06 23:03:33 -04:00
parent 890d850b26
commit 22e50769b4
29 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/processing/opengl/PShader.java
View File

@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2012-15 The Processing Foundation
Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
@@ -386,7 +386,7 @@ public class PShader implements PConstants {
}
/**
* Sets the uniform variables inside the shader to modify the effect while the
* Sets the uniform variables inside the shader to modify the effect while the
* program is running.
*
* @webref rendering:shaders
@@ -743,7 +743,7 @@ public class PShader implements PConstants {
protected void setUniformImpl(String name, int type, Object value) {
if (uniformValues == null) {
uniformValues = new HashMap<String, UniformValue>();
uniformValues = new HashMap<>();
}
uniformValues.put(name, new UniformValue(type, value));
}
@@ -833,10 +833,10 @@ public class PShader implements PConstants {
PImage img = (PImage)val.value;
Texture tex = currentPG.getTexture(img);
if (textures == null) textures = new HashMap<Integer, Texture>();
if (textures == null) textures = new HashMap<>();
textures.put(loc, tex);
if (texUnits == null) texUnits = new HashMap<Integer, Integer>();
if (texUnits == null) texUnits = new HashMap<>();
if (texUnits.containsKey(loc)) {
unit = texUnits.get(loc);
pgl.uniform1i(loc, unit);