Commit: 41d171250634ca20db35cab679afc6c030af30ae - mmath (git)

Mercury Geometry and Math Library

Commit MetaInfo

• Revisão: 41d171250634ca20db35cab679afc6c030af30ae (tree)
• Hora: 2022-04-18 04:04:53
• Autor: AlaskanEmily <emily@alas...>
• Commiter: AlaskanEmily

Mensagem de Log

Move the entire library into its own module

Mudança Sumário

• delete: geometry.m => mmath.geometry.m
• delete: geometry.plane.m => mmath.geometry.plane.m
• delete: geometry.segment.m => mmath.geometry.segment.m
• delete: geometry.triangle.m => mmath.geometry.triangle.m
• delete: geometry2d.m => mmath.geometry2d.m
• delete: geometry2d.rtree.m => mmath.geometry2d.rtree.m
• delete: matrix.invert.m => mmath.matrix.invert.m
• delete: matrix.m => mmath.matrix.m
• modified: mmath.m
• delete: multi_math.m => mmath.multi_math.m
• delete: polyhedron.m => mmath.polyhedron.m
• delete: unproject.m => mmath.unproject.m
• delete: vector.m => mmath.vector.m
• delete: vector.vector2.m => mmath.vector.vector2.m
• delete: vector.vector3.m => mmath.vector.vector3.m
• delete: vector.vector4.m => mmath.vector.vector4.m

Diff

--- a/geometry.m
+++ b/mmath.geometry.m
@@ -4,25 +4,25 @@
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module geometry.
+:- module mmath.geometry.
 
 %==============================================================================%
 :- interface.
 %==============================================================================%
 
-:- import_module vector.
+:- import_module mmath.vector.
 
 %------------------------------------------------------------------------------%
 
-:- include_module geometry.triangle.
-:- include_module geometry.segment.
-:- include_module geometry.plane.
+:- include_module mmath.geometry.triangle.
+:- include_module mmath.geometry.segment.
+:- include_module mmath.geometry.plane.
 
 %------------------------------------------------------------------------------%
 
-:- import_module geometry.triangle.
-:- import_module geometry.segment.
-:- import_module geometry.plane.
+:- import_module mmath.geometry.triangle.
+:- import_module mmath.geometry.segment.
+:- import_module mmath.geometry.plane.
 
 %------------------------------------------------------------------------------%
 
@@ -59,7 +59,7 @@
 
 :- import_module float.
 
-:- import_module vector.vector3.
+:- import_module mmath.vector.vector3.
 
 %------------------------------------------------------------------------------%
 

--- a/geometry.plane.m
+++ b/mmath.geometry.plane.m
@@ -4,14 +4,14 @@
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module geometry.plane.
+:- module mmath.geometry.plane.
 
 %==============================================================================%
 % Geometric operations related to a 3D plane.
 :- interface.
 %==============================================================================%
 
-:- import_module vector.
+:- import_module mmath.vector.
 
 %------------------------------------------------------------------------------%
 
@@ -55,8 +55,8 @@
 
 :- use_module math.
 
-:- import_module vector.vector3.
-:- import_module vector.vector4.
+:- import_module mmath.vector.vector3.
+:- import_module mmath.vector.vector4.
 
 %------------------------------------------------------------------------------%
 

--- a/geometry.segment.m
+++ b/mmath.geometry.segment.m
@@ -1,10 +1,10 @@
-% Copyright (C) 2017-2020 AlaskanEmily
+% Copyright (C) 2017-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module geometry.segment.
+:- module mmath.geometry.segment.
 
 %==============================================================================%
 % Geometric operations related to a segment. This is parametric on the vector
@@ -12,9 +12,10 @@
 :- interface.
 %==============================================================================%
 
-:- import_module vector.
 :- import_module pair.
 
+:- import_module mmath.vector.
+
 %------------------------------------------------------------------------------%
 
 :- type segment(V) ---> segment(p1::V, p2::V).
@@ -82,7 +83,8 @@
 %==============================================================================%
 
 :- import_module float.
-:- import_module vector.vector2.
+
+:- import_module mmath.vector.vector2.
 
 %------------------------------------------------------------------------------%
 

--- a/geometry.triangle.m
+++ b/mmath.geometry.triangle.m
@@ -1,10 +1,10 @@
-% Copyright (C) 2017-2020 AlaskanEmily
+% Copyright (C) 2017-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module geometry.triangle.
+:- module mmath.geometry.triangle.
 
 %==============================================================================%
 % Geometric operations related to a triangle. This is parametric on the vector
@@ -12,7 +12,7 @@
 :- interface.
 %==============================================================================%
 
-:- import_module vector.
+:- import_module mmath.vector.
 
 %------------------------------------------------------------------------------%
 
@@ -33,8 +33,8 @@
 
 %------------------------------------------------------------------------------%
 
-:- pragma type_spec(collinear/5, V = vector.vector2).
-:- pragma type_spec(collinear/5, V = vector.vector3).
+:- pragma type_spec(collinear/5, V = mmath.vector.vector2).
+:- pragma type_spec(collinear/5, V = mmath.vector.vector3).
 
 %==============================================================================%
 :- implementation.

--- a/geometry2d.m
+++ b/mmath.geometry2d.m
@@ -1,21 +1,22 @@
-% Copyright (C) 2017-2020 AlaskanEmily
+% Copyright (C) 2017-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module geometry2d.
+:- module mmath.geometry2d.
 
 %==============================================================================%
 :- interface.
 %==============================================================================%
 
 :- import_module list.
-:- import_module vector.
+
+:- import_module mmath.vector.
 
 %------------------------------------------------------------------------------%
 
-:- include_module geometry2d.rtree.
+:- include_module mmath.geometry2d.rtree.
 
 %------------------------------------------------------------------------------%
 
@@ -224,10 +225,10 @@
 :- use_module math.
 :- import_module float.
 
-:- use_module geometry.
-:- use_module geometry.segment.
-:- use_module multi_math.
-:- import_module vector.vector2.
+:- use_module mmath.geometry.
+:- use_module mmath.geometry.segment.
+:- use_module mmath.multi_math.
+:- import_module mmath.vector.vector2.
 
 %------------------------------------------------------------------------------%
 
@@ -284,8 +285,8 @@ rectangle_intersection(rectangle(X1, Y1, W1, H1),
     rectangle(X2, Y2, W2, H2),
     rectangle(Left + 0.0, Top + 0.0, OutW, OutH)) :-
     
-    multi_math.sub(Right, Left, OutW),
-    multi_math.sub(Bottom, Top, OutH),
+    mmath.multi_math.sub(Right, Left, OutW),
+    mmath.multi_math.sub(Bottom, Top, OutH),
     
     % Logically required for an intersection to have occurred
     Bottom >= Top,
@@ -307,8 +308,8 @@ rectangle_union(rectangle(X1, Y1, W1, H1),
     rectangle(X2, Y2, W2, H2),
     rectangle(Left + 0.0, Top + 0.0, OutW, OutH)) :-
     
-    multi_math.sub(Right, Left, OutW),
-    multi_math.sub(Bottom, Top, OutH),
+    mmath.multi_math.sub(Right, Left, OutW),
+    mmath.multi_math.sub(Bottom, Top, OutH),
     
     Left = min(X1, X2),
     Top = min(Y1, Y2),
@@ -388,8 +389,8 @@ collide_segments(S1, S2, Point) :-
     S1 = segment(S1X1, S1Y1, S1X2, S1Y2),
     S2 = segment(S2X1, S2Y1, S2X2, S2Y2),
     
-    Box1 = grow_rectangle(float.epsilon, geometry2d.bounding_box(S1)),
-    Box2 = grow_rectangle(float.epsilon, geometry2d.bounding_box(S2)),
+    Box1 = grow_rectangle(float.epsilon, mmath.geometry2d.bounding_box(S1)),
+    Box2 = grow_rectangle(float.epsilon, mmath.geometry2d.bounding_box(S2)),
     rectangle_intersection(Box1, Box2, IntersectedBox),
     grow_rectangle(float.epsilon, IntersectedBox, GrownIntersectedBox),
     point_inside(GrownIntersectedBox, Point),
@@ -585,7 +586,7 @@ triangle_intersects_segments(Triangle, Segments, OutPoint) :-
 
 %------------------------------------------------------------------------------%
 
-point_to_vector(geometry2d.point(X, Y)) = vector.vector2.vector(X, Y).
+point_to_vector(geometry2d.point(X, Y)) = vector(X, Y).
 
 %------------------------------------------------------------------------------%
 
@@ -659,8 +660,8 @@ point_to_vector(geometry2d.point(X, Y)) = vector.vector2.vector(X, Y).
     (bounding_box(point(X, Y)) = rectangle(X, Y, 0.0, 0.0)),
     (point_inside(P, P)),
     (translate(point(XT, YT), point(XIn, YIn), point(XOut, YOut)) :-
-        multi_math.add(XT, XIn, XOut),
-        multi_math.add(YT, YIn, YOut)),
+        mmath.multi_math.add(XT, XIn, XOut),
+        mmath.multi_math.add(YT, YIn, YOut)),
     (convex(Point, 0.0, [Point|[]])),
 	scale(ScaleX, ScaleY, point(X, Y)) = point(ScaleX*X, ScaleY*Y)
 ].
@@ -678,26 +679,26 @@ point_to_vector(geometry2d.point(X, Y)) = vector.vector2.vector(X, Y).
         H = max(max(Y1, Y2), Y3) - Y),
     (point_inside(triangle(X1, Y1, X2, Y2, X3, Y3), point(PX, PY)) :-
         % Find the side of the point for each segment
-        Pos = vector.vector2.vector(PX, PY),
-        Vector1 = vector.vector2.vector(X1, Y1),
-        Vector2 = vector.vector2.vector(X2, Y2),
-        Vector3 = vector.vector2.vector(X3, Y3),
-        Segment1 = geometry.segment.segment(Vector1, Vector2),
-        Segment2 = geometry.segment.segment(Vector2, Vector3),
-        Segment3 = geometry.segment.segment(Vector3, Vector1),
+        Pos = vector(PX, PY),
+        Vector1 = vector(X1, Y1),
+        Vector2 = vector(X2, Y2),
+        Vector3 = vector(X3, Y3),
+        Segment1 = mmath.geometry.segment.segment(Vector1, Vector2),
+        Segment2 = mmath.geometry.segment.segment(Vector2, Vector3),
+        Segment3 = mmath.geometry.segment.segment(Vector3, Vector1),
         
-        Side1 = geometry.segment.side(Segment1, Pos),
-        Side2 = geometry.segment.side(Segment2, Pos),
-        Side3 = geometry.segment.side(Segment3, Pos),
+        Side1 = mmath.geometry.segment.side(Segment1, Pos),
+        Side2 = mmath.geometry.segment.side(Segment2, Pos),
+        Side3 = mmath.geometry.segment.side(Segment3, Pos),
         
         % Either the point must be colinear, or we must be on the same side of
         % all three segments.
         (
-            Side1 = geometry.segment.colinear
+            Side1 = mmath.geometry.segment.colinear
         ;
-            Side2 = geometry.segment.colinear
+            Side2 = mmath.geometry.segment.colinear
         ;
-            Side3 = geometry.segment.colinear
+            Side3 = mmath.geometry.segment.colinear
         ;
             Side1 = Side2,
             Side2 = Side3

--- a/geometry2d.rtree.m
+++ b/mmath.geometry2d.rtree.m
@@ -1,10 +1,10 @@
-% Copyright (C) 2018-2020 AlaskanEmily
+% Copyright (C) 2018-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module geometry2d.rtree.
+:- module mmath.geometry2d.rtree.
 
 %==============================================================================%
 % Implements rtree typeclass for the geometry2d.rectangle type
@@ -16,20 +16,20 @@
 
 %------------------------------------------------------------------------------%
 
-:- instance rtree.region(geometry2d.rectangle).
+:- instance rtree.region(rectangle).
 
 %------------------------------------------------------------------------------%
 
-:- type geometry2d.rtree.rtree(T) == rtree.rtree(geometry2d.rectangle, T).
+:- type geometry2d.rtree.rtree(T) == rtree.rtree(rectangle, T).
 
 %------------------------------------------------------------------------------%
 
-:- pred find(rtree.rtree(geometry2d.rectangle, T), geometry2d.point, T).
+:- pred find(rtree.rtree(rectangle, T), point, T).
 :- mode find(in, in, out) is semidet.
 
 %------------------------------------------------------------------------------%
 
-:- pred find_all(rtree.rtree(geometry2d.rectangle, T), geometry2d.point, list(T)).
+:- pred find_all(rtree.rtree(rectangle, T), point, list(T)).
 :- mode find_all(in, in, out) is semidet.
 
 %==============================================================================%
@@ -44,15 +44,15 @@ find(Tree, Point, Out) :- find_all(Tree, Point, [Out|_]).
 
 %------------------------------------------------------------------------------%
 
-find_all(Tree, geometry2d.point(X, Y),
-    rtree.search_contains(Tree, geometry2d.rectangle(X, Y, 1.0, 1.0))).
+find_all(Tree, point(X, Y),
+    rtree.search_contains(Tree, rectangle(X, Y, 1.0, 1.0))).
 
 %------------------------------------------------------------------------------%
 
 :- instance rtree.region(rectangle) where [
-    (intersects(R1, R2) :- geometry2d.rectangles_intersect(R1, R2)),
-    rtree.bounding_region(R1, R2) = geometry2d.rectangle_union(R1, R2),
-    (contains(R1, R2) :- geometry2d.rectangle_contains(R1, R2)),
+    (intersects(R1, R2) :- rectangles_intersect(R1, R2)),
+    rtree.bounding_region(R1, R2) = rectangle_union(R1, R2),
+    (contains(R1, R2) :- rectangle_contains(R1, R2)),
     rtree.size(rectangle(_, _, W, H)) = (W * H),
     (rtree.bounding_region_size(
         rectangle(X1, Y1, W1, H1),

--- a/mmath.m
+++ b/mmath.m
@@ -12,17 +12,9 @@
 :- interface.
 %==============================================================================%
 
-% This exists to satisfy the 2019-10-16 rotd, which had a bug/unintended-feature
-% that prevented a module that only did imports from working.
-:- pred dummy(T::in) is semidet.
+:- include_module mmath.vector.
+:- include_module mmath.geometry.
+:- include_module mmath.matrix.
+:- include_module mmath.geometry2d.
+:- include_module mmath.multi_math.
 
-:- implementation.
-
-:- import_module vector.
-:- import_module geometry.
-:- import_module matrix.
-:- import_module geometry2d.
-:- import_module multi_math.
-
-:- pragma no_inline(dummy/1).
-dummy(_).

--- a/matrix.invert.m
+++ b/mmath.matrix.invert.m
@@ -1,10 +1,10 @@
-% Copyright (C) 2017-2020 AlaskanEmily
+% Copyright (C) 2017-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module matrix.invert.
+:- module mmath.matrix.invert.
 
 %==============================================================================%
 % Inversion operations on matrices.
@@ -21,8 +21,8 @@
 :- implementation.
 %==============================================================================%
 
-:- import_module vector.
-:- import_module vector.vector4.
+:- import_module mmath.vector.
+:- import_module mmath.vector.vector4.
 
 % Input
 %  0-A  1-B  2-C  3-D
@@ -39,7 +39,7 @@
 invert(In) = matrix(OutA * Det, OutB * Det, OutC * Det, OutD * Det) :-
     
     % Compute the determinant.
-    Det = (1.0 / vector.dot(column_a(In), OutA)),
+    Det = (1.0 / dot(column_a(In), OutA)),
     
     % Calculate the cofactors for the first two rows
     A = (In ^ c ^ z) * (In ^ d ^ w), % 0
@@ -56,7 +56,7 @@ invert(In) = matrix(OutA * Det, OutB * Det, OutC * Det, OutD * Det) :-
     L = (In ^ b ^ z) * (In ^ a ^ w), % 11
     
     % Calculate the first two rows using the cofactors.
-    OutA = vector.vector4.vector(
+    OutA = mmath.vector.vector4.vector(
         (A * In ^ b ^ y) + (D * In ^ c ^ y) + (E * In ^ d ^ y)
       -((B * In ^ b ^ y) + (C * In ^ c ^ y) + (F * In ^ d ^ y)),
         (B * In ^ a ^ y) + (G * In ^ c ^ y) + (J * In ^ d ^ y)
@@ -66,7 +66,7 @@ invert(In) = matrix(OutA * Det, OutB * Det, OutC * Det, OutD * Det) :-
         (F * In ^ a ^ y) + (I * In ^ b ^ y) + (L * In ^ c ^ y)
       -((E * In ^ a ^ y) + (J * In ^ b ^ y) + (K * In ^ c ^ y))),
     
-    OutB = vector.vector4.vector(
+    OutB = mmath.vector.vector4.vector(
         (B * In ^ b ^ x) + (C * In ^ c ^ x) + (F * In ^ d ^ x)
       -((A * In ^ b ^ x) + (D * In ^ c ^ x) + (E * In ^ d ^ x)),
         (A * In ^ a ^ x) + (H * In ^ c ^ x) + (I * In ^ d ^ x)
@@ -90,7 +90,7 @@ invert(In) = matrix(OutA * Det, OutB * Det, OutC * Det, OutD * Det) :-
     W = (In ^ a ^ x) * (In ^ b ^ y), % 10
     X = (In ^ b ^ x) * (In ^ a ^ y), % 11
     
-    OutC = vector.vector4.vector(
+    OutC = mmath.vector.vector4.vector(
         (M * In ^ b ^ w) + (P * In ^ c ^ w) + (Q * In ^ d ^ w)
       -((N * In ^ b ^ w) + (O * In ^ c ^ w) + (R * In ^ d ^ w)),
         (N * In ^ a ^ w) + (S * In ^ c ^ w) + (V * In ^ d ^ w)
@@ -100,7 +100,7 @@ invert(In) = matrix(OutA * Det, OutB * Det, OutC * Det, OutD * Det) :-
         (R * In ^ a ^ w) + (U * In ^ b ^ w) + (X * In ^ c ^ w)
       -((Q * In ^ a ^ w) + (V * In ^ b ^ w) + (W * In ^ c ^ w))),
     
-    OutD = vector.vector4.vector(
+    OutD = mmath.vector.vector4.vector(
         (N * In ^ b ^ z) + (O * In ^ c ^ z) + (R * In ^ d ^ z)
       -((M * In ^ b ^ z) + (P * In ^ c ^ z) + (Q * In ^ d ^ z)),
         (M * In ^ a ^ z) + (T * In ^ c ^ z) + (U * In ^ d ^ z)

--- a/matrix.m
+++ b/mmath.matrix.m
@@ -1,27 +1,27 @@
-% Copyright (C) 2017-2020 AlaskanEmily
+% Copyright (C) 2017-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module matrix.
+:- module mmath.matrix.
 
 %=============================================================================%
 :- interface.
 %=============================================================================%
 
-:- use_module vector.
+:- use_module mmath.vector.
 
-:- include_module matrix.invert.
-:- use_module matrix.invert.
+:- include_module mmath.matrix.invert.
+:- use_module mmath.matrix.invert.
 
 %-----------------------------------------------------------------------------%
 
 :- type matrix ---> matrix(
-    a::vector.vector4,
-    b::vector.vector4,
-    c::vector.vector4,
-    d::vector.vector4).
+    a::mmath.vector.vector4,
+    b::mmath.vector.vector4,
+    c::mmath.vector.vector4,
+    d::mmath.vector.vector4).
 
 %-----------------------------------------------------------------------------%
 % frustum(Left, Right, Top, Bottom, Near, Far) = Frustum.
@@ -34,23 +34,39 @@
 %-----------------------------------------------------------------------------%
 
 :- func translate(float, float, float) = matrix.
+:- mode translate(in, in, in) = (out) is det.
+:- mode translate(di, di, di) = (uo) is det.
+:- mode translate(mdi, mdi, mdi) = (muo) is det.
 
 %-----------------------------------------------------------------------------%
 
-:- func translate(vector.vector3) = matrix.
+:- func translate(mmath.vector.vector3) = matrix.
+:- mode translate(in) = (out) is det.
+:- mode translate(di) = (uo) is det.
+:- mode translate(mdi) = (muo) is det.
 
 %-----------------------------------------------------------------------------%
 
 :- func scale(float, float, float) = matrix.
+:- mode scale(in, in, in) = (out) is det.
+:- mode scale(di, di, di) = (uo) is det.
+:- mode scale(mdi, mdi, mdi) = (muo) is det.
 
 %-----------------------------------------------------------------------------%
 
-:- func scale(vector.vector3) = matrix.
+:- func scale(mmath.vector.vector3) = matrix.
+:- mode scale(in) = (out) is det.
+:- mode scale(di) = (uo) is det.
+:- mode scale(mdi) = (muo) is det.
 
 %-----------------------------------------------------------------------------%
 
-:- func rotate(float::in, vector.vector3::in) = (matrix::uo) is det.
-:- func rotate_old(float::in, vector.vector3::in) = (matrix::uo) is det.
+:- func rotate(float, mmath.vector.vector3) = matrix.
+:- mode rotate(in, in) = (uo) is det.
+:- mode rotate(di, di) = (uo) is det.
+:- mode rotate(mdi, mdi) = (muo) is det.
+
+:- func rotate_old(float::in, mmath.vector.vector3::in) = (matrix::uo) is det.
 
 %-----------------------------------------------------------------------------%
 
@@ -59,6 +75,9 @@
 %-----------------------------------------------------------------------------%
 
 :- func transpose(matrix) = matrix.
+:- mode transpose(in) = (out) is det.
+:- mode transpose(di) = (uo) is det.
+:- mode transpose(mdi) = (muo) is det.
 
 %-----------------------------------------------------------------------------%
 
@@ -73,11 +92,11 @@
 
 %-----------------------------------------------------------------------------%
 
-:- func (matrix::in) * (vector.vector4::in) = (vector.vector4::uo) is det.
+:- func (matrix::in) * (mmath.vector.vector4::in) = (mmath.vector.vector4::uo) is det.
 
 %-----------------------------------------------------------------------------%
 
-:- func transform(matrix::in, vector.vector4::in) = (vector.vector4::uo) is det.
+:- func transform(matrix::in, mmath.vector.vector4::in) = (mmath.vector.vector4::uo) is det.
 
 %-----------------------------------------------------------------------------%
 
@@ -103,10 +122,10 @@
 
 %-----------------------------------------------------------------------------%
 
-:- func column_a(matrix::in) = (vector.vector4::uo) is det.
-:- func column_b(matrix::in) = (vector.vector4::uo) is det.
-:- func column_c(matrix::in) = (vector.vector4::uo) is det.
-:- func column_d(matrix::in) = (vector.vector4::uo) is det.
+:- func column_a(matrix::in) = (mmath.vector.vector4::uo) is det.
+:- func column_b(matrix::in) = (mmath.vector.vector4::uo) is det.
+:- func column_c(matrix::in) = (mmath.vector.vector4::uo) is det.
+:- func column_d(matrix::in) = (mmath.vector.vector4::uo) is det.
 
 %-----------------------------------------------------------------------------%
 
@@ -131,8 +150,8 @@
 :- import_module int.
 :- use_module math.
 
-:- import_module vector.vector3.
-:- import_module vector.vector4.
+:- import_module mmath.vector.vector3.
+:- import_module mmath.vector.vector4.
 
 %-----------------------------------------------------------------------------%
 
@@ -192,7 +211,7 @@ rotate(A, Vec) = matrix(
     vector(Y*X*(1.0-C)+Z*S, Y*Y*(1.0-C)+C,   Y*Z*(1.0-C)-X*S, 0.0),
     vector(Z*X*(1.0-C)-Y*S, Z*Y*(1.0-C)+X*S, Z*Z*(1.0-C)+C,   0.0),
     vector(0.0, 0.0, 0.0, 1.0)) :-
-    vector(X, Y, Z) = vector.normalize(Vec),
+    vector(X, Y, Z) = mmath.vector.normalize(Vec),
     S = math.sin(A),
     C = math.cos(A).
 
@@ -207,7 +226,7 @@ identity = matrix(
 %-----------------------------------------------------------------------------%
 
 (matrix(V1, V2, V3, V4)) * (V) =
-    vector(vector.dot(V, V1), vector.dot(V, V2), vector.dot(V, V3), vector.dot(V, V4)).
+    vector(mmath.vector.dot(V, V1), mmath.vector.dot(V, V2), mmath.vector.dot(V, V3), mmath.vector.dot(V, V4)).
 
 %-----------------------------------------------------------------------------%
 
@@ -234,10 +253,10 @@ transpose(
 %-----------------------------------------------------------------------------%
 
 multiply(matrix(A, B, C, D), matrix(AIn, BIn, CIn, DIn)) = matrix(
-    vector(vector.dot(A, E), vector.dot(A, F), vector.dot(A, G), vector.dot(A, H)),
-    vector(vector.dot(B, E), vector.dot(B, F), vector.dot(B, G), vector.dot(B, H)),
-    vector(vector.dot(C, E), vector.dot(C, F), vector.dot(C, G), vector.dot(C, H)),
-    vector(vector.dot(D, E), vector.dot(D, F), vector.dot(D, G), vector.dot(D, H))) :-
+    vector(mmath.vector.dot(A, E), mmath.vector.dot(A, F), mmath.vector.dot(A, G), mmath.vector.dot(A, H)),
+    vector(mmath.vector.dot(B, E), mmath.vector.dot(B, F), mmath.vector.dot(B, G), mmath.vector.dot(B, H)),
+    vector(mmath.vector.dot(C, E), mmath.vector.dot(C, F), mmath.vector.dot(C, G), mmath.vector.dot(C, H)),
+    vector(mmath.vector.dot(D, E), mmath.vector.dot(D, F), mmath.vector.dot(D, G), mmath.vector.dot(D, H))) :-
     E = vector(AIn ^ x, BIn ^ x, CIn ^ x, DIn ^ x),
     F = vector(AIn ^ y, BIn ^ y, CIn ^ y, DIn ^ y),
     G = vector(AIn ^ z, BIn ^ z, CIn ^ z, DIn ^ z),

--- a/multi_math.m
+++ b/mmath.multi_math.m
@@ -1,10 +1,10 @@
-% Copyright (C) 2018-2020 AlaskanEmily
+% Copyright (C) 2018-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module multi_math.
+:- module mmath.multi_math.
 
 %==============================================================================%
 :- interface.

--- a/vector.m
+++ b/mmath.vector.m
@@ -1,28 +1,28 @@
-% Copyright (C) 2017-2020 AlaskanEmily
+% Copyright (C) 2017-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module vector.
+:- module mmath.vector.
 
 %==============================================================================%
 :- interface.
 %==============================================================================%
 
-:- include_module vector.vector2.
-:- include_module vector.vector3.
-:- include_module vector.vector4.
+:- include_module mmath.vector.vector2.
+:- include_module mmath.vector.vector3.
+:- include_module mmath.vector.vector4.
 
-:- use_module vector.vector2.
-:- use_module vector.vector3.
-:- use_module vector.vector4.
+:- use_module mmath.vector.vector2.
+:- use_module mmath.vector.vector3.
+:- use_module mmath.vector.vector4.
 
 %------------------------------------------------------------------------------%
 
-:- type vector2 == vector.vector2.vector.
-:- type vector3 == vector.vector3.vector.
-:- type vector4 == vector.vector4.vector.
+:- type vector2 == mmath.vector.vector2.vector.
+:- type vector3 == mmath.vector.vector3.vector.
+:- type vector4 == mmath.vector.vector4.vector.
 
 %------------------------------------------------------------------------------%
 

--- a/vector.vector2.m
+++ b/mmath.vector.vector2.m
@@ -4,20 +4,18 @@
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module vector.vector2.
+:- module mmath.vector.vector2.
 
 %==============================================================================%
 % 2D vector implementation.
 :- interface.
 %==============================================================================%
 
-:- use_module vector.
-
 :- type vector ---> vector(x::float, y::float).
 
 %------------------------------------------------------------------------------%
 
-:- instance vector.vector(vector2).
+:- instance vector(vector2).
 
 %------------------------------------------------------------------------------%
 
@@ -132,7 +130,7 @@ cross(vector(X1, Y1), vector(X2, Y2)) = (X1 * Y2) - (Y1 * X2).
 
 %------------------------------------------------------------------------------%
 
-:- instance vector.vector(vector2) where [
+:- instance vector(vector2) where [
     magnitude_squared(vector(X, Y)) = ((X*X) + (Y*Y)),
     scale(vector(X, Y), S) = vector(X*S, Y*S),
     multiply(vector(X1, Y1), vector(X2, Y2)) = vector(X1*X2, Y1*Y2),

--- a/vector.vector3.m
+++ b/mmath.vector.vector3.m
@@ -1,10 +1,10 @@
-% Copyright (C) 2017-2020 AlaskanEmily
+% Copyright (C) 2017-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module vector.vector3.
+:- module mmath.vector.vector3.
 
 %==============================================================================%
 % 3D vector implementation.

--- a/vector.vector4.m
+++ b/mmath.vector.vector4.m
@@ -1,10 +1,10 @@
-% Copyright (C) 2017-2020 AlaskanEmily
+% Copyright (C) 2017-2022 AlaskanEmily
 %
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-:- module vector.vector4.
+:- module mmath.vector.vector4.
 
 %==============================================================================%
 % 4D vector implementation.