Update shapes.cpp

Updated with what I had. Haven't gotten ring correct yet.