More consistent term ordering/variable usage
More consistent term ordering/variable usage

The calculations should be the same, but this makes the code to
set the 4 parameters in this block more consistent.

jstrait/webgl-city,jstrait/webgl-city