Merge pull request #8085 from ZappoMan/fixShaders

fix v1 procedural shaders
This commit is contained in:
Brad Hefta-Gaub 2016-06-16 13:06:15 -07:00 committed by GitHub
commit d7cd82a24e

View file

@ -264,12 +264,18 @@ float snoise(vec2 v) {
return 130.0 * dot(m, g);
}
#define PROCEDURAL 1
//PROCEDURAL_VERSION
#ifdef PROCEDURAL_V1
// shader playback time (in seconds)
uniform float iGlobalTime;
// the dimensions of the object being rendered
uniform vec3 iWorldScale;
#else
// Unimplemented uniforms