diff --git a/src/bsr/__init__.py b/src/bsr/__init__.py index 4b160c4..d42be1e 100644 --- a/src/bsr/__init__.py +++ b/src/bsr/__init__.py @@ -16,7 +16,8 @@ ) from .camera import CameraManager from .frame import FrameManager -from .geometry.composite.rod import Rod +from .geometry.composite.pose import Pose +from .geometry.composite.rod import Rod, RodWithBox, RodWithCylinder from .geometry.composite.stack import RodStack, create_rod_collection from .geometry.primitives.simple import Cylinder, Sphere from .viewport import find_area, set_view_distance diff --git a/src/bsr/geometry/composite/stack.py b/src/bsr/geometry/composite/stack.py index e7dd216..ac2b82c 100644 --- a/src/bsr/geometry/composite/stack.py +++ b/src/bsr/geometry/composite/stack.py @@ -1,7 +1,13 @@ __all__ = ["BaseStack", "RodStack", "create_rod_collection"] from typing import TYPE_CHECKING, Any, Protocol, Type, overload -from typing_extensions import Self +import sys + +# Check python version +if sys.version_info < (3, 11): + from typing_extensions import Self +else: + from typing import Self from collections.abc import Sequence diff --git a/src/bsr/geometry/protocol.py b/src/bsr/geometry/protocol.py index 7c330a0..4ac3069 100644 --- a/src/bsr/geometry/protocol.py +++ b/src/bsr/geometry/protocol.py @@ -13,7 +13,13 @@ TypeAlias, TypeVar, ) -from typing_extensions import Self +import sys + +# Check python version +if sys.version_info < (3, 11): + from typing_extensions import Self +else: + from typing import Self from abc import ABC, abstractmethod