From b45d85a8c773d5c91f7ec612895deecfe355fde4 Mon Sep 17 00:00:00 2001 From: snowy Date: Tue, 27 Aug 2024 21:58:24 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20fix=20=CE=B5=20accuracy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mbcp/mp_math/vector.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/mbcp/mp_math/vector.py b/mbcp/mp_math/vector.py index dcfec2c..fe89f74 100644 --- a/mbcp/mp_math/vector.py +++ b/mbcp/mp_math/vector.py @@ -170,15 +170,15 @@ class Vector3: else: raise TypeError(f"unsupported operand type(s) for -: '{type(other)}' and 'Vector3'") - @overload - def __mul__(self, other: RealNumber) -> 'Vector3': - ... - @overload def __mul__(self, other: 'Vector3') -> 'Vector3': ... - def __mul__(self, other: 'RealNumber | Vector3') -> 'Vector3': + @overload + def __mul__(self, other: RealNumber) -> 'Vector3': + ... + + def __mul__(self, other: 'int | float | Vector3') -> 'Vector3': """ 数组运算 非点乘。点乘使用@，叉乘使用cross。 Args: @@ -186,15 +186,16 @@ class Vector3: Returns: """ - if isinstance(other, RealNumber): - return Vector3(self.x * other, self.y * other, self.z * other) - elif isinstance(other, Vector3): + + if isinstance(other, Vector3): return Vector3(self.x * other.x, self.y * other.y, self.z * other.z) + elif isinstance(other, (float, int)): + return Vector3(self.x * other, self.y * other, self.z * other) else: raise TypeError(f"unsupported operand type(s) for *: 'Vector3' and '{type(other)}'") - def __rmul__(self, other: RealNumber) -> 'Vector3': - return Vector3(self.x * other, self.y * other, self.z * other) + def __rmul__(self, other: float | int) -> 'Vector3': + return self.__mul__(other) def __matmul__(self, other: 'Vector3') -> float: """ @@ -226,6 +227,3 @@ y_axis = Vector3(0, 1, 0) """y轴单位向量""" z_axis = Vector3(0, 0, 1) """z轴单位向量""" - -v1: Vector3 = Vector3(1, 2, 3) * 3.0 -v2: Vector3 = 3.0 * Vector3(1, 2, 3)