Skip to content

Camera code reorganization into SimpleCamera and Camera #1354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
einarf merged 6 commits into from
Oct 11, 2022
Merged

Camera code reorganization into SimpleCamera and Camera #1354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65a3cca
Camera code reorganization into SimpleCamera and Camera
Oct 11, 2022
f12fc15
Changed Window.on_resize width and height to integers
Oct 11, 2022
b8aaffc
Added SimpleCamera to init __all__.
Oct 11, 2022
d12f764
Changed on_resize argument types to integers
Oct 11, 2022
913adf4
shake velocity type improved
Oct 11, 2022
1c2f547
Just force a new round as the last one failed on building the docs
Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion arcade/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def configure_logging(level: int = None):
from .window_commands import start_render
from .window_commands import unschedule

from .camera import Camera, BaseCamera, AdvanceCamera
from .camera import SimpleCamera, Camera
from .sections import Section, SectionManager

from .application import MOUSE_BUTTON_LEFT
Expand Down Expand Up @@ -348,6 +348,7 @@ def configure_logging(level: int = None):
'ArcadeContext',
'AtlasRegion',
'Camera',
'SimpleCamera',
'Color',
'DEFAULT_FONT_NAMES',
'EasingData',
Expand Down
8 changes: 3 additions & 5 deletions arcade/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import os
import sys
import time
from typing import Tuple, Optional, Union
from typing import Tuple, Optional

import pyglet

Expand All @@ -29,8 +29,6 @@

_window: 'Window'

ArcadeCameras = Union[arcade.Camera, arcade.BaseCamera, arcade.AdvanceCamera] # type alias


def get_screens():
"""
Expand Down Expand Up @@ -170,7 +168,7 @@ def __init__(
set_window(self)

self._current_view: Optional[View] = None
self.current_camera: Optional[ArcadeCameras] = None
self.current_camera: Optional[arcade.SimpleCamera] = None
self.textbox_time = 0.0
self.key: Optional[int] = None
self.flip_count: int = 0
Expand Down Expand Up @@ -528,7 +526,7 @@ def on_draw(self):
"""
pass

def on_resize(self, width: float, height: float):
def on_resize(self, width: int, height: int):
"""
Override this function to add custom code to be called any time the window
is resized. The main responsibility of this method is updating
Expand Down
Loading