Geometry of ripples under regular and irregular waves