Skip to content

Commit 44530db

Browse files
committed
merged matrices into algebra
1 parent 2bfca2c commit 44530db

File tree

4 files changed

+1600
-1655
lines changed

4 files changed

+1600
-1655
lines changed

src/compas/geometry/__init__.py

Lines changed: 33 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,41 @@
5858
vector_component_xy,
5959
vector_standard_deviation,
6060
vector_variance,
61+
axis_and_angle_from_matrix,
62+
axis_angle_from_quaternion,
63+
axis_angle_vector_from_matrix,
64+
basis_vectors_from_matrix,
65+
compose_matrix,
66+
decompose_matrix,
67+
euler_angles_from_matrix,
68+
euler_angles_from_quaternion,
69+
identity_matrix,
70+
is_matrix_square,
71+
matrix_determinant,
72+
matrix_from_axis_and_angle,
73+
matrix_from_axis_angle_vector,
74+
matrix_from_basis_vectors,
75+
matrix_from_change_of_basis,
76+
matrix_from_euler_angles,
77+
matrix_from_frame,
78+
matrix_from_frame_to_frame,
79+
matrix_from_orthogonal_projection,
80+
matrix_from_parallel_projection,
81+
matrix_from_perspective_entries,
82+
matrix_from_perspective_projection,
83+
matrix_from_quaternion,
84+
matrix_from_scale_factors,
85+
matrix_from_shear,
86+
matrix_from_shear_entries,
87+
matrix_from_translation,
88+
matrix_inverse,
89+
matrix_minor,
90+
quaternion_from_axis_angle,
91+
quaternion_from_euler_angles,
92+
quaternion_from_matrix,
93+
translation_from_matrix,
6194
)
6295

63-
from ._core.analytical import (
64-
archimedean_spiral_evaluate,
65-
circle_evaluate,
66-
ellipse_evaluate,
67-
helix_evaluate,
68-
logarithmic_spiral_evaluate,
69-
)
7096
from ._core.angles import (
7197
angle_planes,
7298
angle_points,
@@ -95,7 +121,6 @@
95121
midpoint_point_point,
96122
midpoint_point_point_xy,
97123
)
98-
from ._core.constructors import circle_from_points, circle_from_points_xy
99124
from ._core.distance import (
100125
closest_line_to_point,
101126
closest_point_in_cloud,
@@ -144,41 +169,6 @@
144169
volume_polyhedron,
145170
)
146171
from ._core.tangent import tangent_points_to_circle_xy
147-
from ._core.matrices import (
148-
axis_and_angle_from_matrix,
149-
axis_angle_from_quaternion,
150-
axis_angle_vector_from_matrix,
151-
basis_vectors_from_matrix,
152-
compose_matrix,
153-
decompose_matrix,
154-
euler_angles_from_matrix,
155-
euler_angles_from_quaternion,
156-
identity_matrix,
157-
is_matrix_square,
158-
matrix_determinant,
159-
matrix_from_axis_and_angle,
160-
matrix_from_axis_angle_vector,
161-
matrix_from_basis_vectors,
162-
matrix_from_change_of_basis,
163-
matrix_from_euler_angles,
164-
matrix_from_frame,
165-
matrix_from_frame_to_frame,
166-
matrix_from_orthogonal_projection,
167-
matrix_from_parallel_projection,
168-
matrix_from_perspective_entries,
169-
matrix_from_perspective_projection,
170-
matrix_from_quaternion,
171-
matrix_from_scale_factors,
172-
matrix_from_shear,
173-
matrix_from_shear_entries,
174-
matrix_from_translation,
175-
matrix_inverse,
176-
matrix_minor,
177-
quaternion_from_axis_angle,
178-
quaternion_from_euler_angles,
179-
quaternion_from_matrix,
180-
translation_from_matrix,
181-
)
182172
from ._core.transformations import (
183173
local_axes,
184174
local_to_world_coordinates,
@@ -503,7 +493,6 @@
503493
"angles_points_xy",
504494
"angles_vectors",
505495
"angles_vectors_xy",
506-
"archimedean_spiral_evaluate",
507496
"area_polygon",
508497
"area_polygon_xy",
509498
"area_triangle",
@@ -535,9 +524,6 @@
535524
"centroid_polygon_vertices_xy",
536525
"centroid_polygon_xy",
537526
"centroid_polyhedron",
538-
"circle_evaluate",
539-
"circle_from_points",
540-
"circle_from_points_xy",
541527
"close",
542528
"closest_line_to_point",
543529
"closest_point_in_cloud",
@@ -580,11 +566,9 @@
580566
"dot_vectors",
581567
"dot_vectors_xy",
582568
"earclip_polygon",
583-
"ellipse_evaluate",
584569
"euler_angles_from_matrix",
585570
"euler_angles_from_quaternion",
586571
"find_span",
587-
"helix_evaluate",
588572
"homogenize_vectors",
589573
"identity_matrix",
590574
"intersection_circle_circle_xy",
@@ -645,7 +629,6 @@
645629
"length_vector_xy",
646630
"local_axes",
647631
"local_to_world_coordinates",
648-
"logarithmic_spiral_evaluate",
649632
"matrix_determinant",
650633
"matrix_from_axis_and_angle",
651634
"matrix_from_axis_angle_vector",

0 commit comments

Comments
 (0)