sonolus.py 0.6.3__py3-none-any.whl → 0.6.5__py3-none-any.whl

sonolus/script/archetype.py

@@ -1,4 +1,3 @@
-# type: ignore
 from __future__ import annotations
 
 import inspect
@@ -120,7 +119,7 @@ class _ArchetypeField(SonolusDescriptor):
         if ctx():
             return result._get_readonly_()
         else:
-            return result._as_py_()
+            return result._as_py_()  # type: ignore
 
     def __set__(self, instance: _BaseArchetype, value):
         if instance is None:
@@ -207,7 +206,7 @@ class _IsScoredDescriptor(SonolusDescriptor):
         if instance is None:
             return self.value
         elif ctx():
-            raise RuntimeError("Cannot access is_scored from self in a callback, use ArchetypeClass.is_scored")
+            return ctx().global_state.is_scored_by_archetype_id[instance.id]
         else:
             return self.value
 
@@ -237,7 +236,7 @@ class _KeyDescriptor(SonolusDescriptor):
 
     def __get__(self, instance, owner):
         if instance is not None and ctx():
-            return ctx().global_state.keys[instance.id]
+            return ctx().global_state.keys_by_archetype_id[instance.id]
         else:
             return self.value
 
@@ -362,37 +361,6 @@ _annotation_defaults: dict[Callable, _ArchetypeFieldInfo] = {
 }
 
 
-class StandardImport:
-    """Standard import annotations for Archetype fields.
-
-    Usage:
-        ```python
-        class MyArchetype(WatchArchetype):
-            judgment: StandardImport.JUDGMENT
-        ```
-    """
-
-    BEAT = Annotated[float, imported(name="#BEAT")]
-    """The beat of the entity."""
-
-    BPM = Annotated[float, imported(name="#BPM")]
-    """The bpm, for bpm change markers."""
-
-    TIMESCALE = Annotated[float, imported(name="#TIMESCALE")]
-    """The timescale, for timescale change markers."""
-
-    JUDGMENT = Annotated[int, imported(name="#JUDGMENT")]
-    """The judgment of the entity.
-
-    Automatically supported in watch mode for archetypes with a corresponding scored play mode archetype.
-    """
-    ACCURACY = Annotated[float, imported(name="#ACCURACY")]
-    """The accuracy of the entity.
-
-    Automatically supported in watch mode for archetypes with a corresponding scored play mode archetype.
-    """
-
-
 def callback[T: Callable](*, order: int = 0) -> Callable[[T], T]:
     """Annotate a callback with its order.
 
@@ -604,6 +572,7 @@ class _BaseArchetype:
         cls._key_ = cls.key
         cls.key = _KeyDescriptor(cls.key)
         cls.name = _NameDescriptor(cls.name)
+        cls._is_scored_ = cls.is_scored
         cls.is_scored = _IsScoredDescriptor(cls.is_scored)
         cls.life = _ArchetypeLifeDescriptor()
 
@@ -624,6 +593,7 @@ class _BaseArchetype:
                 "life",
                 "is_scored",
                 "_key_",
+                "_is_scored_",
                 "_derived_base_",
                 "_is_derived_",
                 "_default_callbacks_",
@@ -842,12 +812,14 @@ class PlayArchetype(_BaseArchetype):
 
         Runs when the level is loaded after [`preprocess`][sonolus.script.archetype.PlayArchetype.preprocess].
         """
+        return 0.0
 
     def should_spawn(self) -> bool:
         """Return whether the entity should be spawned.
 
         Runs each frame while the entity is the first entity in the spawn queue.
         """
+        return True
 
     def initialize(self):
         """Initialize this entity.
@@ -995,9 +967,11 @@ class WatchArchetype(_BaseArchetype):
 
     def spawn_time(self) -> float:
         """Return the spawn time of the entity."""
+        return 0.0
 
     def despawn_time(self) -> float:
         """Return the despawn time of the entity."""
+        return 0.0
 
     def initialize(self):
         """Initialize this entity.
@@ -1134,16 +1108,16 @@ def get_archetype_by_name(name: str) -> AnyArchetype:
     """Return the archetype with the given name in the current mode."""
     if not ctx():
         raise RuntimeError("Archetypes by name are only available during compilation.")
-    name = validate_value(name)
-    if not name._is_py_():
+    name = validate_value(name)  # type: ignore
+    if not name._is_py_():  # type: ignore
         raise TypeError(f"Invalid name: '{name}'")
-    name = name._as_py_()
+    name = name._as_py_()  # type: ignore
     if not isinstance(name, str):
         raise TypeError(f"Invalid name: '{name}'")
     archetypes_by_name = ctx().global_state.archetypes_by_name
     if name not in archetypes_by_name:
         raise KeyError(f"Unknown archetype: '{name}'")
-    return archetypes_by_name[name]
+    return archetypes_by_name[name]  # type: ignore
 
 
 @meta_fn
@@ -1313,6 +1287,84 @@ class StandardArchetypeName(StrEnum):
     TIMESCALE_CHANGE = "#TIMESCALE_CHANGE"
     """Timescale change marker"""
 
+    TIMESCALE_GROUP = "#TIMESCALE_GROUP"
+    """Entity referenced by the timescale changes in a group"""
+
 
 type AnyArchetype = PlayArchetype | WatchArchetype | PreviewArchetype
 """Union of all archetype types."""
+
+
+class StandardImportName:
+    """Standard import names for Archetype fields.
+
+    Usage:
+        ```python
+        class MyArchetype(WatchArchetype):
+            judgment: int = imported(name=StandardImportName.JUDGMENT)
+        ```
+    """
+
+    BEAT = "#BEAT"
+    """The beat of the entity."""
+
+    BPM = "#BPM"
+    """The bpm, for bpm change markers."""
+
+    TIMESCALE = "#TIMESCALE"
+    """The timescale, for timescale change markers."""
+
+    TIMESCALE_SKIP = "#TIMESCALE_SKIP"
+    """The scaled time to skip, for timescale change markers."""
+
+    TIMESCALE_GROUP = "#TIMESCALE_GROUP"
+    """The timescale group, for timescale change markers."""
+
+    JUDGMENT = "#JUDGMENT"
+    """The judgment of the entity.
+
+    Automatically set in watch mode for archetypes with a corresponding scored play mode archetype.
+    """
+
+    ACCURACY = "#ACCURACY"
+    """The accuracy of the entity.
+
+    Automatically set in watch mode for archetypes with a corresponding scored play mode archetype.
+    """
+
+
+class StandardImport:
+    """Standard import annotations for Archetype fields.
+
+    Usage:
+        ```python
+        class MyArchetype(WatchArchetype):
+            judgment: StandardImport.JUDGMENT
+        ```
+    """
+
+    BEAT = Annotated[float, imported(name=StandardImportName.BEAT)]
+    """The beat of the entity."""
+
+    BPM = Annotated[float, imported(name=StandardImportName.BPM)]
+    """The bpm, for bpm change markers."""
+
+    TIMESCALE = Annotated[float, imported(name=StandardImportName.TIMESCALE)]
+    """The timescale, for timescale change markers."""
+
+    TIMESCALE_SKIP = Annotated[float, imported(name=StandardImportName.TIMESCALE_SKIP)]
+    """The scaled time to skip, for timescale change markers."""
+
+    TIMESCALE_GROUP = Annotated[EntityRef[Any], imported(name=StandardImportName.TIMESCALE_GROUP)]
+    """The timescale group, for timescale change markers."""
+
+    JUDGMENT = Annotated[int, imported(name=StandardImportName.JUDGMENT)]
+    """The judgment of the entity.
+
+    Automatically set in watch mode for archetypes with a corresponding scored play mode archetype.
+    """
+    ACCURACY = Annotated[float, imported(name=StandardImportName.ACCURACY)]
+    """The accuracy of the entity.
+
+    Automatically set in watch mode for archetypes with a corresponding scored play mode archetype.
+    """

sonolus/script/easing.py

@@ -355,8 +355,8 @@ def smootherstep(x: float) -> float:
 
 
 def step_start(x: float) -> float:
-    """Step function returning 1.0 if x > 0, otherwise 0.0."""
-    return 1.0 if x > 0 else 0.0
+    """Step function returning 1.0 if x >= 0, otherwise 0.0."""
+    return 1.0 if x >= 0 else 0.0
 
 
 def step_end(x: float) -> float:

sonolus/script/internal/context.py

@@ -42,7 +42,8 @@ debug_var = ContextVar("debug_var", default=_disabled_debug_config)
 class GlobalContextState:
     archetypes: dict[type, int]
     archetypes_by_name: dict[str, type]
-    keys: Sequence[int] | None
+    keys_by_archetype_id: Sequence[int]
+    is_scored_by_archetype_id: Sequence[bool]
     rom: ReadOnlyMemory
     const_mappings: dict[Any, int]
     environment_mappings: dict[_GlobalInfo, int]
@@ -55,10 +56,14 @@ class GlobalContextState:
 
         self.archetypes = archetypes or {}
         self.archetypes_by_name = {type_.name: type_ for type_, _ in self.archetypes.items()}  # type: ignore
-        self.keys = (
-            Array(*((getattr(a, "_key_", -1)) for a in sorted(self.archetypes, key=lambda a: archetypes[a])))
+        ordered_archetypes = sorted(self.archetypes, key=lambda a: self.archetypes[a])
+        self.keys_by_archetype_id = (
+            Array(*((getattr(a, "_key_", -1)) for a in ordered_archetypes)) if archetypes else Array[int, Literal[0]]()
+        )
+        self.is_scored_by_archetype_id = (
+            Array(*((getattr(a, "_is_scored_", False)) for a in ordered_archetypes))
             if archetypes
-            else Array[int, Literal[0]]()
+            else Array[bool, Literal[0]]()
         )
         self.rom = ReadOnlyMemory() if rom is None else rom
         self.const_mappings = {}

{sonolus_py-0.6.3.dist-info → sonolus_py-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sonolus.py
-Version: 0.6.3
+Version: 0.6.5
 Summary: Sonolus engine development in Python
 License-File: LICENSE
 Requires-Python: >=3.12

{sonolus_py-0.6.3.dist-info → sonolus_py-0.6.5.dist-info}/RECORD

@@ -34,13 +34,13 @@ sonolus/build/level.py,sha256=yXsQtnabkJK0vuVmZ_Wr1jx37jFLgInCS7lTlXjkv9Q,706
 sonolus/build/node.py,sha256=gnX71RYDUOK_gYMpinQi-bLWO4csqcfiG5gFmhxzSec,1330
 sonolus/build/project.py,sha256=eHh4ioOjaFtt26bcefUuDZhMhFw8NXnjRTYPiEInQV8,6505
 sonolus/script/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sonolus/script/archetype.py,sha256=DMtg-wWId6UAoh1L_jbMq4EMwLuY6tPY29wVoB8oD6A,47279
+sonolus/script/archetype.py,sha256=HBg2cS6ZDy0zBbHH8Ieke5QOWR71PwFCmtJie8zDXiI,48957
 sonolus/script/array.py,sha256=9uOUHZIDMyMT9q3APcXJWXWt97yG-AZoRlxwrvSY6SU,12367
 sonolus/script/array_like.py,sha256=hUDdDaP306kflVv9YomdHIMXogrVjxsBXCrLvB9QpuE,9681
 sonolus/script/bucket.py,sha256=SNqnfLGpnO_u-3LFFazdgzNk332OdDUIlmZHsuoVZuE,7674
 sonolus/script/containers.py,sha256=L3rzPfN1cDb2m02k9qRyjnGxJx07X3q3MccCaL5tNJ8,18773
 sonolus/script/debug.py,sha256=Vi97opuk9fMB5bdpzPCBpa2oZeTff7FQ4WzdeDE5trk,4557
-sonolus/script/easing.py,sha256=txf0OPFP5v7cOFDvJKCyKLK-d2uKIOu56ntLEHfD9QI,11377
+sonolus/script/easing.py,sha256=2FUJI_nfp990P_armCcRqHm2329O985glJAhSC6tnxs,11379
 sonolus/script/effect.py,sha256=RQdsABqfi3sIku1jJDwyeD81devVyBhWQ47HIjfiMy0,5978
 sonolus/script/engine.py,sha256=etI9dJsQ7V9YZICVNZg54WqpLijPxG8eTPHiV-_EiG8,10687
 sonolus/script/globals.py,sha256=nlXSNS4NRXsgQU2AJImVIs752h1WqsMnShSKgU011c4,10270
@@ -71,7 +71,7 @@ sonolus/script/internal/__init__.py,sha256=T6rzLoiOUaiSQtaHMZ88SNO-ijSjSSv33TKtU
 sonolus/script/internal/builtin_impls.py,sha256=R1h3IOlWzolPfc9yoma2cBN0F5cBhj_JNP-TTdKoBlc,13186
 sonolus/script/internal/callbacks.py,sha256=vWzJG8uiJoEtsNnbeZPqOHogCwoLpz2D1MnHY2wVV8s,2801
 sonolus/script/internal/constant.py,sha256=3ycbGkDJVUwcrCZ96vLjAoAARgsvaqDM8rJ_YCrLrvo,4289
-sonolus/script/internal/context.py,sha256=jto68tBpmF3As_h22tNVNP7ctJjt4S0HySF_DbFhbok,17361
+sonolus/script/internal/context.py,sha256=Cd9US3GNHxs_96UcVdBAXGD-H4gCNnV9h5OfCWbtoOg,17668
 sonolus/script/internal/descriptor.py,sha256=XRFey-EjiAm_--KsNl-8N0Mi_iyQwlPh68gDp0pKf3E,392
 sonolus/script/internal/dict_impl.py,sha256=alu_wKGSk1kZajNf64qbe7t71shEzD4N5xNIATH8Swo,1885
 sonolus/script/internal/error.py,sha256=ZNnsvQVQAnFKzcvsm6-sste2lo-tP5pPI8sD7XlAZWc,490
@@ -86,8 +86,8 @@ sonolus/script/internal/simulation_context.py,sha256=LGxLTvxbqBIhoe1R-SfwGajNIDw
 sonolus/script/internal/transient.py,sha256=y2AWABqF1aoaP6H4_2u4MMpNioC4OsZQCtPyNI0txqo,1634
 sonolus/script/internal/tuple_impl.py,sha256=DPNdmmRmupU8Ah4_XKq6-PdT336l4nt15_uCJKQGkkk,3587
 sonolus/script/internal/value.py,sha256=OngrCdmY_h6mV2Zgwqhuo4eYFad0kTk6263UAxctZcY,6963
-sonolus_py-0.6.3.dist-info/METADATA,sha256=HQELwglqS5CrpBjb6LhWu_Me95xkfIPothRlru-QuWI,302
-sonolus_py-0.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sonolus_py-0.6.3.dist-info/entry_points.txt,sha256=oTYspY_b7SA8TptEMTDxh4-Aj-ZVPnYC9f1lqH6s9G4,54
-sonolus_py-0.6.3.dist-info/licenses/LICENSE,sha256=JEKpqVhQYfEc7zg3Mj462sKbKYmO1K7WmvX1qvg9IJk,1067
-sonolus_py-0.6.3.dist-info/RECORD,,
+sonolus_py-0.6.5.dist-info/METADATA,sha256=cU1Ruyl2Nt__z5kalCBRw6jvSiIyq-WcShZvUyM8KgY,302
+sonolus_py-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sonolus_py-0.6.5.dist-info/entry_points.txt,sha256=oTYspY_b7SA8TptEMTDxh4-Aj-ZVPnYC9f1lqH6s9G4,54
+sonolus_py-0.6.5.dist-info/licenses/LICENSE,sha256=JEKpqVhQYfEc7zg3Mj462sKbKYmO1K7WmvX1qvg9IJk,1067
+sonolus_py-0.6.5.dist-info/RECORD,,