Added sampler objects and a couple of new uniform types.