public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-11-14 16:57:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace np.<trig> with math.<trig>

Browse source
This commit is contained in:
Grant Sanderson 2020-02-21 10:57:10 -08:00
parent ea59950b2c
commit fa7f340cd3
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
manimlib/utils/space_ops.py
View file

@ -1,4 +1,5 @@
import numpy as np import numpy as np
import math
import itertools as it import itertools as it
from mapbox_earcut import triangulate_float32 as earcut from mapbox_earcut import triangulate_float32 as earcut
@ -35,8 +36,8 @@ def quaternion_mult(*quats):
def quaternion_from_angle_axis(angle, axis): def quaternion_from_angle_axis(angle, axis):
return [ return [
np.cos(angle / 2), math.cos(angle / 2),
*(np.sin(angle / 2) * normalize(axis)) *(math.sin(angle / 2) * normalize(axis))
] ]
@ -84,8 +85,8 @@ def rotation_matrix_transpose(angle, axis):
# axis = [0, 0, z] case is common enough it's worth # axis = [0, 0, z] case is common enough it's worth
# having a shortcut # having a shortcut
sgn = 1 if axis[2] > 0 else -1 sgn = 1 if axis[2] > 0 else -1
cos_a = np.cos(angle) cos_a = math.cos(angle)
sin_a = np.sin(angle) * sgn sin_a = math.sin(angle) * sgn
return [ return [
[cos_a, sin_a, 0], [cos_a, sin_a, 0],
[-sin_a, cos_a, 0], [-sin_a, cos_a, 0],
@ -112,8 +113,8 @@ def rotation_matrix(angle, axis):
def rotation_about_z(angle): def rotation_about_z(angle):
return [ return [
[np.cos(angle), -np.sin(angle), 0], [math.cos(angle), -math.sin(angle), 0],
[np.sin(angle), np.cos(angle), 0], [math.sin(angle), math.cos(angle), 0],
[0, 0, 1] [0, 0, 1]
] ]
@ -137,9 +138,9 @@ def z_to_vector(vector):
else: else:
theta = 0 theta = 0
phi_down = np.array([ phi_down = np.array([
[np.cos(phi), 0, np.sin(phi)], [math.cos(phi), 0, math.sin(phi)],
[0, 1, 0], [0, 1, 0],
[-np.sin(phi), 0, np.cos(phi)] [-math.sin(phi), 0, math.cos(phi)]
]) ])
return np.dot(rotation_about_z(theta), phi_down) return np.dot(rotation_about_z(theta), phi_down)
@ -169,8 +170,7 @@ def normalize(vect, fall_back=None):
norm = get_norm(vect) norm = get_norm(vect)
if norm > 0: if norm > 0:
return np.array(vect) / norm return np.array(vect) / norm
else: elif fall_back is not None:
if fall_back is not None:
return fall_back return fall_back
else: else:
return np.zeros(len(vect)) return np.zeros(len(vect))