More cleanup and make the WaveFrontGeometry aware of multiple shapes
More cleanup and make the WaveFrontGeometry aware of multiple shapes

OpenSpace/OpenSpace,OpenSpace/OpenSpace,OpenSpace/OpenSpace,OpenSpace/OpenSpace