sonolus.py 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

sonolus/script/range.py

@@ -1,58 +1,58 @@
-from sonolus.script.iterator import ArrayLike, SonolusIterator
-from sonolus.script.num import Num
-from sonolus.script.record import Record
-
-
-class Range(Record, ArrayLike[Num]):
-    start: int
-    end: int
-    step: int
-
-    def __new__(cls, start: Num, end: Num | None = None, step: Num = 1):
-        if end is None:
-            start, end = 0, start
-        return super().__new__(cls, start, end, step)
-
-    def __iter__(self) -> SonolusIterator:
-        return RangeIterator(self.start, self.end, self.step)
-
-    def __contains__(self, item):
-        if self.step > 0:
-            return self.start <= item < self.end and (item - self.start) % self.step == 0
-        else:
-            return self.end < item <= self.start and (self.start - item) % -self.step == 0
-
-    def size(self) -> int:
-        if self.step > 0:
-            diff = self.end - self.start
-            if diff <= 0:
-                return 0
-            return (diff + self.step - 1) // self.step
-        else:
-            diff = self.start - self.end
-            if diff <= 0:
-                return 0
-            return (diff - self.step - 1) // -self.step
-
-    def __getitem__(self, index: Num) -> Num:
-        return self.start + index * self.step
-
-    def __setitem__(self, index: Num, value: Num):
-        raise TypeError("Range does not support item assignment")
-
-
-class RangeIterator(Record, SonolusIterator):
-    value: int
-    end: int
-    step: int
-
-    def has_next(self) -> bool:
-        if self.step > 0:
-            return self.value < self.end
-        else:
-            return self.value > self.end
-
-    def next(self) -> Num:
-        value = self.value
-        self.value += self.step
-        return value
+from sonolus.script.iterator import ArrayLike, SonolusIterator
+from sonolus.script.num import Num
+from sonolus.script.record import Record
+
+
+class Range(Record, ArrayLike[Num]):
+    start: int
+    end: int
+    step: int
+
+    def __new__(cls, start: Num, end: Num | None = None, step: Num = 1):
+        if end is None:
+            start, end = 0, start
+        return super().__new__(cls, start, end, step)
+
+    def __iter__(self) -> SonolusIterator:
+        return RangeIterator(self.start, self.end, self.step)
+
+    def __contains__(self, item):
+        if self.step > 0:
+            return self.start <= item < self.end and (item - self.start) % self.step == 0
+        else:
+            return self.end < item <= self.start and (self.start - item) % -self.step == 0
+
+    def size(self) -> int:
+        if self.step > 0:
+            diff = self.end - self.start
+            if diff <= 0:
+                return 0
+            return (diff + self.step - 1) // self.step
+        else:
+            diff = self.start - self.end
+            if diff <= 0:
+                return 0
+            return (diff - self.step - 1) // -self.step
+
+    def __getitem__(self, index: Num) -> Num:
+        return self.start + index * self.step
+
+    def __setitem__(self, index: Num, value: Num):
+        raise TypeError("Range does not support item assignment")
+
+
+class RangeIterator(Record, SonolusIterator):
+    value: int
+    end: int
+    step: int
+
+    def has_next(self) -> bool:
+        if self.step > 0:
+            return self.value < self.end
+        else:
+            return self.value > self.end
+
+    def next(self) -> Num:
+        value = self.value
+        self.value += self.step
+        return value

sonolus/script/record.py

@@ -111,7 +111,7 @@ class Record(GenericValue):
             values[field.name] = value._get_()
         for type_param in cls.__type_params__:
             if type_param not in type_vars:
-                raise TypeError(f"Type parameter {type_param} is not used")
+                raise TypeError(f"Type parameter {type_param} cannot be inferred and must be provided explicitly")
         type_args = tuple(type_vars[type_param] for type_param in cls.__type_params__)
         if cls._type_args_ is not None:
             parameterized = cls
@@ -168,10 +168,10 @@ class Record(GenericValue):
         iterator = iter(values)
         return cls(**{field.name: field.type._from_list_(iterator) for field in cls._fields})
 
-    def _to_list_(self) -> list[float | BlockPlace]:
+    def _to_list_(self, level_refs: dict[Any, int] | None = None) -> list[float | BlockPlace]:
         result = []
         for field in self._fields:
-            result.extend(self._value[field.name]._to_list_())
+            result.extend(self._value[field.name]._to_list_(level_refs))
         return result
 
     @classmethod

sonolus/script/runtime.py

@@ -308,6 +308,7 @@ class _SkinTransform:
             a12=Num(values[1 * 4 + 3]),
             a20=Num(values[3 * 4 + 0]),
             a21=Num(values[3 * 4 + 1]),
+            a22=Num(values[3 * 4 + 3]),
         )
 
 
@@ -328,6 +329,7 @@ class _ParticleTransform:
             a12=Num(values[1 * 4 + 3]),
             a20=Num(values[3 * 4 + 0]),
             a21=Num(values[3 * 4 + 1]),
+            a22=Num(values[3 * 4 + 3]),
         )