Generalizing the Abbott-Firestone curve by two new surface descriptors