finished 2dcamera refactoring