Restored Java constants, updated GLSL Macros