Reimplemented ZoomedScene, using a new MultiCamera

This commit is contained in:
Grant Sanderson
2018-05-10 15:55:31 -07:00
parent 1f394ca2eb
commit 7ee85faadd
6 changed files with 249 additions and 38 deletions

View File

@ -44,7 +44,7 @@ class MappingCamera(Camera):
# CameraPlusOverlay class)
class MultiCamera(Camera):
class OldMultiCamera(Camera):
def __init__(self, *cameras_with_start_positions, **kwargs):
self.shifted_cameras = [
DictAsObject(
@ -92,11 +92,11 @@ class MultiCamera(Camera):
for shifted_camera in self.shifted_cameras:
shifted_camera.camera.init_background()
# A MultiCamera which, when called with two full-size cameras, initializes itself
# A OldMultiCamera which, when called with two full-size cameras, initializes itself
# as a splitscreen, also taking care to resize each individual camera within it
class SplitScreenCamera(MultiCamera):
class SplitScreenCamera(OldMultiCamera):
def __init__(self, left_camera, right_camera, **kwargs):
digest_config(self, kwargs)
self.left_camera = left_camera
@ -110,5 +110,8 @@ class SplitScreenCamera(MultiCamera):
camera.resize_frame_shape()
camera.reset()
MultiCamera.__init__(self, (left_camera, (0, 0)),
(right_camera, (0, half_width)))
OldMultiCamera.__init__(
self,
(left_camera, (0, 0)),
(right_camera, (0, half_width)),
)