public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-08-05 16:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure cross behaves as expected on 2d arrays

Browse source
This commit is contained in:
Grant Sanderson 2023-01-13 00:05:29 -08:00
parent c9a2971433
commit d2800b6c96
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
manimlib/utils/space_ops.py
View file

@ -22,12 +22,20 @@ if TYPE_CHECKING:
from manimlib.typing import Vect2, Vect3, Vect4, VectN, Matrix3x3, Vect3Array, Vect2Array from manimlib.typing import Vect2, Vect3, Vect4, VectN, Matrix3x3, Vect3Array, Vect2Array
def cross(v1: Vect3 | List[float], v2: Vect3 | List[float]) -> Vect3: def cross(v1: Vect3 | List[float], v2: Vect3 | List[float]) -> Vect3 | Vect3Array:
return np.array([ is2d = isinstance(v1, np.ndarray) and len(v1.shape) == 2
v1[1] * v2[2] - v1[2] * v2[1], if is2d:
v1[2] * v2[0] - v1[0] * v2[2], x1, y1, z1 = v1[:, 0], v1[:, 1], v1[:, 2]
v1[0] * v2[1] - v1[1] * v2[0] x2, y2, z2 = v2[:, 0], v2[:, 1], v2[:, 2]
else:
x1, y1, z1 = v1
x2, y2, z2 = v2
result = np.array([
y1 * z2 - z1 * y2,
z1 * x2 - x1 * z2,
x1 * y2 - y1 * x2,
]) ])
return result.T if is2d else result
def get_norm(vect: VectN | List[float]) -> float: def get_norm(vect: VectN | List[float]) -> float:
@ -292,8 +300,8 @@ def find_intersection(
m, n = np.shape(p0) m, n = np.shape(p0)
assert(n in [2, 3]) assert(n in [2, 3])
numer = np.cross(v1, p1 - p0) numer = cross(v1, p1 - p0)
denom = np.cross(v1, v0) denom = cross(v1, v0)
if n == 3: if n == 3:
d = len(np.shape(numer)) d = len(np.shape(numer))
new_numer = np.multiply(numer, numer).sum(d - 1) new_numer = np.multiply(numer, numer).sum(d - 1)