fixed all shapes draw
Merge branch 'develope' of https://github.com/kokhong20/SEPT-Assg