Moved all the 2d shape drawing from 2d into 2d_util.