Revert "Remove windowWidth and aspectRatio from BuildScales"

This reverts commit 04105a9414fb68a95667812184e89cb937e858d5.