Euclidean and Non-Euclidean Geometries Without Continuity