remove solid_torus function
migrate shape matrices to uniforms