torus ported. All shapes drawn with glDrawArrays and glDrawElements now.