Water and shapes

My entry for the A Glass of Water challenge on DPChallenge.com
Place 12 out of 27 with a score of 5.8684