linting, formatting, and fixing reference location for default projector

Author: DragonMoffon

arcade/camera/default.py

@@ -8,9 +8,9 @@
 from pyglet.window.key import F
 from typing_extensions import Self
 
+from arcade.camera.data_types import DEFAULT_FAR, DEFAULT_NEAR_ORTHO
 from arcade.types import LBWH, Point, Rect
 from arcade.window_commands import get_window
-from arcade.camera.data_types import DEFAULT_NEAR_ORTHO, DEFAULT_FAR
 
 if TYPE_CHECKING:
     from arcade.context import ArcadeContext
@@ -51,12 +51,14 @@ def update_viewport(self):
         setting the viewport to match the size of the active
         framebuffer sets the viewport to None.
         """
+
         # If another camera is active then the viewport was probably set
         # by camera.use()
         if self._ctx.current_camera != self or self._updating:
             return
         self._updating = True
 
+        if (
             self._ctx.viewport[2] != self._ctx.fbo.width
             or self._ctx.viewport[3] != self._ctx.fbo.height
         ):
@@ -106,7 +108,6 @@ def width(self) -> int:
     def height(self) -> int:
         if self._viewport is not None:
             return int(self._viewport.height)
-        return self._ctx.active_framebuffer.height
         return self._ctx.fbo.height
 
     def get_current_viewport(self) -> tuple[int, int, int, int]:

arcade/camera/viewport.py

@@ -7,9 +7,9 @@
 from pyglet.math import Mat4, Vec2, Vec3
 from typing_extensions import Self
 
+from arcade.camera.data_types import DEFAULT_FAR, DEFAULT_NEAR_ORTHO
 from arcade.types import LBWH, Point, Rect
 from arcade.window_commands import get_window
-from arcade.camera.data_types import DEFAULT_NEAR_ORTHO, DEFAULT_FAR
 
 if TYPE_CHECKING:
     from arcade.context import ArcadeContext

tests/unit/camera/test_viewport_projector.py

@@ -8,13 +8,13 @@
 
 @pytest.mark.parametrize("wrld_pos", [Vec2(100, 150), Vec2(1280, 720), Vec3(500, 500, -10)])
 def test_viewport_projector_project(window: Window, wrld_pos: Point):
-    cam = camera.default.ViewportProjector()
+    cam = camera.ViewportProjector()
     assert cam.project(wrld_pos) == wrld_pos.xy
 
 
 @pytest.mark.parametrize("wrld_pos", [Vec2(100, 150), Vec2(1280, 720), Vec3(500, 500, -10)])
 def test_viewport_projector_unproject(window: Window, wrld_pos: Point):
-    cam = camera.default.ViewportProjector()
+    cam = camera.ViewportProjector()
     x, y, *z = wrld_pos
 
     assert cam.unproject(wrld_pos) == Vec3(x, y, 0.0 if not z else z[0])
@@ -24,7 +24,7 @@ def test_viewport_projector_unproject(window: Window, wrld_pos: Point):
     "viewport", [LBWH(0.0, 0.0, 100, 200), LBWH(100, 100, 20, 40), LBWH(300, 20, 20, 700)]
 )
 def test_viewport_projector_viewport(window: Window, viewport: Rect):
-    cam = camera.default.ViewportProjector()
+    cam = camera.ViewportProjector()
     assert cam.viewport.lbwh_int == window.ctx.viewport
     cam.viewport = viewport
     assert cam.viewport == viewport