A Novel Optical Stylus Probe for the Measurement of Surface Roughness and Waviness