Merge branch 'development' into box

arcade/camera/camera_2d.py

@@ -262,8 +262,8 @@ def use(self) -> None:
         _projection = generate_orthographic_matrix(self.projection_data, self.zoom)
         _view = generate_view_matrix(self.view_data)
 
-        self._window.ctx.viewport = self.viewport.viewport
-        self._window.ctx.scissor = None if not self.scissor else self.scissor.viewport
+        self._window.ctx.viewport = self.viewport.lbwh_int
+        self._window.ctx.scissor = None if not self.scissor else self.scissor.lbwh_int
         self._window.projection = _projection
         self._window.view = _view
 
@@ -295,7 +295,7 @@ def project(self, world_coordinate: Point) -> Vec2:
 
         return project_orthographic(
             world_coordinate,
-            self.viewport.viewport,
+            self.viewport.lbwh_int,
             _view,
             _projection,
         )
@@ -318,7 +318,7 @@ def unproject(self, screen_coordinate: Point) -> Vec3:
 
         _projection = generate_orthographic_matrix(self.projection_data, self.zoom)
         _view = generate_view_matrix(self.view_data)
-        return unproject_orthographic(screen_coordinate, self.viewport.viewport, _view, _projection)
+        return unproject_orthographic(screen_coordinate, self.viewport.lbwh_int, _view, _projection)
 
     def equalise(self) -> None:
         """

arcade/camera/default.py

@@ -60,7 +60,7 @@ def use(self) -> None:
         """
         self._ctx.current_camera = self
 
-        self._ctx.viewport = self.viewport.viewport  # get the integer 4-tuple LBWH
+        self._ctx.viewport = self.viewport.lbwh_int  # get the integer 4-tuple LBWH
 
         self._ctx.view_matrix = Mat4()
         self._ctx.projection_matrix = self._projection_matrix
@@ -121,7 +121,7 @@ def use(self) -> None:
         cache's the window viewport to determine the projection matrix.
         """
 
-        viewport = self.viewport.viewport
+        viewport = self.viewport.lbwh_int
         # If the viewport is correct and the default camera is in use,
         # then don't waste time resetting the view and projection matrices
         if self._ctx.viewport == viewport and self._ctx.current_camera == self:

arcade/camera/orthographic.py

@@ -126,8 +126,8 @@ def use(self) -> None:
         _projection = generate_orthographic_matrix(self._projection, self._view.zoom)
         _view = generate_view_matrix(self._view)
 
-        self._window.ctx.viewport = self.viewport.viewport
-        self._window.ctx.scissor = None if not self.scissor else self.scissor.viewport
+        self._window.ctx.viewport = self.viewport.lbwh_int
+        self._window.ctx.scissor = None if not self.scissor else self.scissor.lbwh_int
         self._window.projection = _projection
         self._window.view = _view
 
@@ -165,7 +165,7 @@ def project(self, world_coordinate: Point) -> Vec2:
 
         return project_orthographic(
             world_coordinate,
-            self.viewport.viewport,
+            self.viewport.lbwh_int,
             _view,
             _projection,
         )
@@ -188,4 +188,4 @@ def unproject(self, screen_coordinate: Point) -> Vec3:
 
         _projection = generate_orthographic_matrix(self._projection, self._view.zoom)
         _view = generate_view_matrix(self._view)
-        return unproject_orthographic(screen_coordinate, self.viewport.viewport, _view, _projection)
+        return unproject_orthographic(screen_coordinate, self.viewport.lbwh_int, _view, _projection)

arcade/camera/perspective.py

@@ -162,8 +162,8 @@ def use(self) -> None:
         _projection = generate_perspective_matrix(self._projection, self._view.zoom)
         _view = generate_view_matrix(self._view)
 
-        self._window.ctx.viewport = self.viewport.viewport
-        self._window.ctx.scissor = None if not self.scissor else self.scissor.viewport
+        self._window.ctx.viewport = self.viewport.lbwh_int
+        self._window.ctx.scissor = None if not self.scissor else self.scissor.lbwh_int
         self._window.projection = _projection
         self._window.view = _view
 
@@ -196,7 +196,7 @@ def project(self, world_coordinate: Point) -> Vec2:
         _projection = generate_perspective_matrix(self._projection, self._view.zoom)
         _view = generate_view_matrix(self._view)
 
-        pos = project_perspective(Vec3(x, y, z), self.viewport.viewport, _view, _projection)
+        pos = project_perspective(Vec3(x, y, z), self.viewport.lbwh_int, _view, _projection)
 
         return pos
 
@@ -228,5 +228,5 @@ def unproject(self, screen_coordinate: Point) -> Vec3:
         _projection = generate_perspective_matrix(self._projection, self._view.zoom)
         _view = generate_view_matrix(self._view)
 
-        pos = unproject_perspective(Vec3(x, y, z), self.viewport.viewport, _view, _projection)
+        pos = unproject_perspective(Vec3(x, y, z), self.viewport.lbwh_int, _view, _projection)
         return pos