Osx9 changes part2

Forgot to request this pull a while ago. Some formatting changes to get rid of warning messages, and added GLHeightmap.
I would remove this one space and bump the `{` up to the preceding line.