Readded WorldViewport, with slight changes.