Add polygon perimeter drawing

Why mix x, y, r, c here? I would be consistent and use rp, cp. Otherwise, this is confusing.