Commit: d323ee155d290dba44be27ee757af6962141d106 - mmath (git)

Mercury Geometry and Math Library

Commit MetaInfo

• Revisión: d323ee155d290dba44be27ee757af6962141d106 (tree)
• Tiempo: 2022-01-24 09:26:57
• Autor: AlaskanEmily <emily@alas...>
• Commiter: AlaskanEmily

Log Message

Add matrix.destructure_matrix and matrix.ortho

Cambiar Resumen

• modified: matrix.m

Diferencia incremental

--- a/matrix.m
+++ b/matrix.m
@@ -28,6 +28,10 @@
 :- func frustum(float, float, float, float, float, float) = matrix.
 
 %-----------------------------------------------------------------------------%
+% ortho(Left, Right, Top, Bottom, Near, Far) = Ortho.
+:- func ortho(float, float, float, float, float, float) = matrix.
+
+%-----------------------------------------------------------------------------%
 
 :- func translate(float, float, float) = matrix.
 
@@ -104,6 +108,20 @@
 :- func column_c(matrix::in) = (vector.vector4::uo) is det.
 :- func column_d(matrix::in) = (vector.vector4::uo) is det.
 
+%-----------------------------------------------------------------------------%
+
+:- pred destructure_matrix(matrix,
+    float, float, float, float,
+    float, float, float, float,
+    float, float, float, float,
+    float, float, float, float).
+
+:- mode destructure_matrix(in,
+    out, out, out, out,
+    out, out, out, out,
+    out, out, out, out,
+    out, out, out, out) is det.
+
 %=============================================================================%
 :- implementation.
 %=============================================================================%
@@ -130,6 +148,17 @@ frustum(Left, Right, Top, Bottom, Near, Far) = matrix(
 
 %-----------------------------------------------------------------------------%
 
+ortho(Left, Right, Top, Bottom, Near, Far) = matrix(
+    vector(2.0 / (Right - Left), 0.0, 0.0, A),
+    vector(0.0, 2.0 / (Top - Bottom), 0.0, B),
+    vector(0.0, 0.0, -2.0 / (Far - Near), C),
+    vector(0.0, 0.0, 0.0, 1.0)) :-
+    A = (Right + Left) / (Right - Left),
+    B = (Top + Bottom) / (Top - Bottom),
+    C = -(Far + Near) / (Far - Near).
+
+%-----------------------------------------------------------------------------%
+
 translate(X, Y, Z) = matrix(
     vector(1.0, 0.0, 0.0, X),
     vector(0.0, 1.0, 0.0, Y),
@@ -225,3 +254,16 @@ column_b(M) = vector(M ^ a ^ y + 0.0, M ^ b ^ y + 0.0, M ^ c ^ y + 0.0, M ^ d ^
 column_c(M) = vector(M ^ a ^ z + 0.0, M ^ b ^ z + 0.0, M ^ c ^ z + 0.0, M ^ d ^ z + 0.0).
 column_d(M) = vector(M ^ a ^ w + 0.0, M ^ b ^ w + 0.0, M ^ c ^ w + 0.0, M ^ d ^ w + 0.0).
 
+%-----------------------------------------------------------------------------%
+
+destructure_matrix(
+    matrix(
+        vector(V0,  V1,  V2,  V3),
+        vector(V4,  V5,  V6,  V7),
+        vector(V8,  V9,  V10, V11),
+        vector(V12, V13, V14, V15)),
+    V0,  V1,  V2,  V3,
+    V4,  V5,  V6,  V7,
+    V8,  V9,  V10, V11,
+    V12, V13, V14, V15).
+