Camera overhaul simple

arcade/__init__.py

@@ -79,13 +79,11 @@ def configure_logging(level: Optional[int] = None):
 from .window_commands import schedule
 from .window_commands import run
 from .window_commands import set_background_color
-from .window_commands import set_viewport
 from .window_commands import set_window
 from .window_commands import start_render
 from .window_commands import unschedule
 from .window_commands import schedule_once
 
-from .camera import SimpleCamera, Camera
 from .sections import Section, SectionManager
 
 from .application import MOUSE_BUTTON_LEFT
@@ -221,6 +219,7 @@ def configure_logging(level: Optional[int] = None):
 # Module imports
 from arcade import color as color
 from arcade import csscolor as csscolor
+from arcade import camera as camera
 from arcade import key as key
 from arcade import resources as resources
 from arcade import types as types
@@ -243,8 +242,6 @@ def configure_logging(level: Optional[int] = None):
     'TextureAnimation',
     'TextureKeyframe',
     'ArcadeContext',
-    'Camera',
-    'SimpleCamera',
     'ControllerManager',
     'FACE_DOWN',
     'FACE_LEFT',
@@ -358,7 +355,6 @@ def configure_logging(level: Optional[int] = None):
     'run',
     'schedule',
     'set_background_color',
-    'set_viewport',
     'set_window',
     'start_render',
     'stop_sound',

arcade/application.py

@@ -17,13 +17,14 @@
 
 import arcade
 from arcade import get_display_size
-from arcade import set_viewport
 from arcade import set_window
 from arcade.color import TRANSPARENT_BLACK
 from arcade.context import ArcadeContext
 from arcade.types import Color, RGBOrA255, RGBANormalized
 from arcade import SectionManager
 from arcade.utils import is_raspberry_pi
+from arcade.camera import Projector
+from arcade.camera.default import DefaultProjector
 
 LOG = logging.getLogger(__name__)
 
@@ -211,17 +212,17 @@ def __init__(
         # self.invalid = False
         set_window(self)
 
+        self._ctx: ArcadeContext = ArcadeContext(self, gc_mode=gc_mode, gl_api=gl_api)
+        self._background_color: Color = TRANSPARENT_BLACK
+
         self._current_view: Optional[View] = None
-        self.current_camera: Optional[arcade.SimpleCamera] = None
+        self._default_camera = DefaultProjector(window=self)
+        self.current_camera: Projector = self._default_camera
         self.textbox_time = 0.0
         self.key: Optional[int] = None
         self.flip_count: int = 0
         self.static_display: bool = False
 
-        self._ctx: ArcadeContext = ArcadeContext(self, gc_mode=gc_mode, gl_api=gl_api)
-        set_viewport(0, self.width, 0, self.height)
-        self._background_color: Color = TRANSPARENT_BLACK
-
         # See if we should center the window
         if center_window:
             self.center_window()
@@ -606,13 +607,8 @@ def on_resize(self, width: int, height: int):
         #       The arcade context is not created at that time
         if hasattr(self, "_ctx"):
             # Retain projection scrolling if applied
-            original_viewport = self._ctx.projection_2d
-            self.set_viewport(
-                original_viewport[0],
-                original_viewport[0] + width,
-                original_viewport[2],
-                original_viewport[2] + height
-            )
+            self._ctx.viewport = (0, 0, width, height)
+            self.default_camera.use()
 
     def set_min_size(self, width: int, height: int):
         """ Wrap the Pyglet window call to set minimum size
@@ -676,30 +672,19 @@ def set_visible(self, visible: bool = True):
         """
         super().set_visible(visible)
 
-    # noinspection PyMethodMayBeStatic
-    def set_viewport(self, left: float, right: float, bottom: float, top: float):
-        """
-        Set the viewport. (What coordinates we can see.
-        Used to scale and/or scroll the screen).
-
-        See :py:func:`arcade.set_viewport` for more detailed information.
-
-        :param left:
-        :param right:
-        :param bottom:
-        :param top:
-        """
-        set_viewport(left, right, bottom, top)
-
-    # noinspection PyMethodMayBeStatic
-    def get_viewport(self) -> Tuple[float, float, float, float]:
-        """ Get the viewport. (What coordinates we can see.) """
-        return self.ctx.projection_2d
-
     def use(self):
         """Bind the window's framebuffer for rendering commands"""
         self.ctx.screen.use()
 
+    @property
+    def default_camera(self):
+        """
+        Provides a reference to the default arcade camera.
+        Automatically sets projection and view to the size
+        of the screen. Good for resetting the screen.
+        """
+        return self._default_camera
+
     def test(self, frames: int = 10):
         """
         Used by unit test cases. Runs the event loop a few times and stops.