Added Cone,Torus and base shape class

Finished converting current shapes