コミット: 7a859e0ff44c4e07263dd5422aeacebbd64b132a - Saffron (git)

Graphics library for Mercury, including OpenGL bindings, TGA image reading, and X11, Win32, and SDL2 windowing and input.

コミットメタ情報

• リビジョン: 7a859e0ff44c4e07263dd5422aeacebbd64b132a (tree)
• 日時: 2022-04-18 04:20:49
• 作者: AlaskanEmily <emily@alas...>
• コミッター: AlaskanEmily

ログメッセージ

Update mmath

変更サマリ

• modified: demo/saffron_cube_demo.m
• modified: mmath
• modified: saffron.draw.m
• modified: saffron.geometry.m
• modified: saffron.gl.buffer.m
• modified: saffron.gl2.m

差分

--- a/demo/saffron_cube_demo.m
+++ b/demo/saffron_cube_demo.m
@@ -38,10 +38,11 @@
 :- use_module maybe.
 :- use_module time.
 
-:- use_module matrix.
-:- use_module vector.
-:- import_module vector.vector3.
-:- import_module vector.vector4.
+:- use_module mmath.
+:- use_module mmath.matrix.
+:- use_module mmath.vector.
+:- import_module mmath.vector.vector3.
+:- import_module mmath.vector.vector4.
 
 :- use_module saffron.
 :- use_module saffron.draw.
@@ -124,10 +125,10 @@ run(Ctx, Win, Group, !IO) :-
         SpinT = Seconds, % / 0.23,
         Angle = Seconds * 0.87,
         RotateVector =
-            vector.normalize(vector(math.sin(SpinT), 1.0, math.cos(SpinT))),
+            mmath.vector.normalize(vector(math.sin(SpinT), 1.0, math.cos(SpinT))),
         % In general, you should always normalize vectors being used to build
         % transformation matrices.
-        Matrix = matrix.rotate(Angle, RotateVector),
+        Matrix = mmath.matrix.rotate(Angle, RotateVector),
         
         % Here we will push the ortho matrix set in main/2 and then transform
         % it by our rotation. Then, after drawing, we pop the transformed
@@ -290,10 +291,10 @@ main(!IO) :-
     % Set the ortho mode
     AR = float(W) / float(H),
     
-    Matrix = matrix.ortho(-AR, AR, 1.0, -1.0, -1000.0, 1000.0),
+    Matrix = mmath.matrix.ortho(-AR, AR, 1.0, -1.0, -1000.0, 1000.0),
     saffron.draw.set_matrix(Ctx, Matrix, !IO),
     
-    saffron.draw.transform(Ctx, matrix.scale(0.4, 0.4, 0.4), !IO),
+    saffron.draw.transform(Ctx, mmath.matrix.scale(0.4, 0.4, 0.4), !IO),
     
     % Upload the image to create a texture.
     saffron.gl.create_texture_from_bitmap(Ctx, BMP, TexW, TexH, Texture, !IO),

--- a/mmath
+++ b/mmath
@@ -1 +1 @@
-Subproject commit d803d6f195accd635e33c76a2ad3eb7e027cd016
+Subproject commit 41d171250634ca20db35cab679afc6c030af30ae

--- a/saffron.draw.m
+++ b/saffron.draw.m
@@ -15,8 +15,9 @@
 :- use_module thread.
 :- use_module thread.mvar.
 
-:- use_module vector.
-:- use_module matrix.
+:- use_module mmath.
+:- use_module mmath.vector.
+:- use_module mmath.matrix.
 
 %-----------------------------------------------------------------------------%
 
@@ -33,7 +34,7 @@
 %-----------------------------------------------------------------------------%
 
 :- typeclass basic_transform(Ctx) where [
-    pred set_matrix(Ctx::in, matrix.matrix::in, io.io::di, io.io::uo) is det
+    pred set_matrix(Ctx::in, mmath.matrix.matrix::in, io.io::di, io.io::uo) is det
 ].
 
 %-----------------------------------------------------------------------------%
@@ -41,7 +42,7 @@
 % It will often be handled fully in software, where only set_matrix is actually
 % used, but for GL2 we can just implement this with the GL2 calls.
 :- typeclass transform_stack(Ctx) where [
-    pred transform(Ctx::in, matrix.matrix::in, io.io::di, io.io::uo) is det,
+    pred transform(Ctx::in, mmath.matrix.matrix::in, io.io::di, io.io::uo) is det,
     pred identity(Ctx::in, io.io::di, io.io::uo) is det,
     pred push_matrix(Ctx::in, io.io::di, io.io::uo) is det,
     % Should throw exception if the matrix stack is empty.
@@ -57,8 +58,8 @@
 % Use a type here just to make it structurally required that there is always
 % one matrix.
 :- type transform_state ---> transform_state(
-    matrix.matrix,
-    stack::list.list(matrix.matrix)).
+    mmath.matrix.matrix,
+    stack::list.list(mmath.matrix.matrix)).
 
 %-----------------------------------------------------------------------------%
 % Used to implement transform wiht a stack of matrices and basic_transform.
@@ -68,11 +69,11 @@
 
 %-----------------------------------------------------------------------------%
 
-:- func top_matrix(transform_state) = matrix.matrix.
+:- func top_matrix(transform_state) = mmath.matrix.matrix.
 
 %-----------------------------------------------------------------------------%
 
-:- func 'top_matrix :='(transform_state, matrix.matrix) = transform_state.
+:- func 'top_matrix :='(transform_state, mmath.matrix.matrix) = transform_state.
 
 %-----------------------------------------------------------------------------%
 
@@ -146,13 +147,13 @@ top_matrix(transform_state(_, [Matrix|_])) = Matrix.
     (transform(Ctx, Matrix, !IO) :-
         MVar = Ctx ^ transform_state,
         thread.mvar.take(MVar, State, !IO),
-        NewMatrix = matrix.multiply(State ^ top_matrix, Matrix),
+        NewMatrix = mmath.matrix.multiply(State ^ top_matrix, Matrix),
         thread.mvar.put(MVar, State ^ top_matrix := NewMatrix, !IO) ),
     
     (identity(Ctx, !IO) :-
         MVar = Ctx ^ transform_state,
         thread.mvar.take(MVar, State, !IO),
-        thread.mvar.put(MVar, State ^ top_matrix := matrix.identity, !IO) ),
+        thread.mvar.put(MVar, State ^ top_matrix := mmath.matrix.identity, !IO) ),
     
     (push_matrix(Ctx, !IO) :-
         MVar = Ctx ^ transform_state,

--- a/saffron.geometry.m
+++ b/saffron.geometry.m
@@ -13,15 +13,16 @@
 :- use_module array.
 :- use_module list.
 
-:- use_module vector.
+:- use_module mmath.
+:- use_module mmath.vector.
 
 :- use_module saffron.texture.
 
 %-----------------------------------------------------------------------------%
 
 :- type vertex(Vec) ---> vertex(vec::Vec, u::float, v::float).
-:- type vertex2d == vertex(vector.vector2).
-:- type vertex3d == vertex(vector.vector3).
+:- type vertex2d == vertex(mmath.vector.vector2).
+:- type vertex3d == vertex(mmath.vector.vector3).
 
 %-----------------------------------------------------------------------------%
 % This is intended to be used as if it was a functor for vertex, to construct
@@ -187,8 +188,8 @@
 :- implementation.
 %=============================================================================%
 
-:- use_module vector.vector2.
-:- use_module vector.vector3.
+:- use_module mmath.vector.vector2.
+:- use_module mmath.vector.vector3.
 
 %-----------------------------------------------------------------------------%
 
@@ -216,13 +217,13 @@
 
 %-----------------------------------------------------------------------------%
 
-vertex(X, Y, U, V) = vertex(vector.vector2.vector(X, Y), U, V).
-vertex(X, Y, U, V, vertex(vector.vector2.vector(X, Y), U, V)).
+vertex(X, Y, U, V) = vertex(mmath.vector.vector2.vector(X, Y), U, V).
+vertex(X, Y, U, V, vertex(mmath.vector.vector2.vector(X, Y), U, V)).
 
 %-----------------------------------------------------------------------------%
 
-vertex(X, Y, Z, U, V) = vertex(vector.vector3.vector(X, Y, Z), U, V).
-vertex(X, Y, Z, U, V, vertex(vector.vector3.vector(X, Y, Z), U, V)).
+vertex(X, Y, Z, U, V) = vertex(mmath.vector.vector3.vector(X, Y, Z), U, V).
+vertex(X, Y, Z, U, V, vertex(mmath.vector.vector3.vector(X, Y, Z), U, V)).
 
 %-----------------------------------------------------------------------------%
 

--- a/saffron.gl.buffer.m
+++ b/saffron.gl.buffer.m
@@ -102,9 +102,10 @@
 :- implementation.
 %=============================================================================%
 
-:- use_module vector.
-:- use_module vector.vector2.
-:- use_module vector.vector3.
+:- use_module mmath.
+:- use_module mmath.vector.
+:- use_module mmath.vector.vector2.
+:- use_module mmath.vector.vector3.
 
 :- pragma foreign_import_module("C", saffron.gl).
 :- pragma foreign_import_module("C", saffron.geometry).

--- a/saffron.gl2.m
+++ b/saffron.gl2.m
@@ -15,7 +15,8 @@
 :- interface.
 %=============================================================================%
 
-:- use_module vector.
+:- use_module mmath.
+:- use_module mmath.vector.
 
 :- use_module saffron.draw.
 :- use_module saffron.geometry.
@@ -79,14 +80,14 @@
 %-----------------------------------------------------------------------------%
 
 :- type vertex(Vec) == saffron.geometry.vertex(Vec).
-:- type vertex2d == vertex(vector.vector2).
-:- type vertex3d == vertex(vector.vector3).
+:- type vertex2d == vertex(mmath.vector.vector2).
+:- type vertex3d == vertex(mmath.vector.vector3).
 
 %-----------------------------------------------------------------------------%
 
 :- type buffer(Vec) == saffron.soft.buffer(vertex(Vec)).
-:- type buffer2d ---> buffer(buffer(vector.vector2)).
-:- type buffer3d ---> buffer(buffer(vector.vector3)).
+:- type buffer2d ---> buffer(buffer(mmath.vector.vector2)).
+:- type buffer3d ---> buffer(buffer(mmath.vector.vector3)).
 
 %-----------------------------------------------------------------------------%
 
@@ -100,12 +101,12 @@
 
 %-----------------------------------------------------------------------------%
 
-:- instance saffron.geometry.buffer(context(Ctx), buffer2d, vector.vector2)
+:- instance saffron.geometry.buffer(context(Ctx), buffer2d, mmath.vector.vector2)
     <= saffron.gl.context(Ctx).
 
 %-----------------------------------------------------------------------------%
 
-:- instance saffron.geometry.buffer(context(Ctx), buffer3d, vector.vector3)
+:- instance saffron.geometry.buffer(context(Ctx), buffer3d, mmath.vector.vector3)
     <= saffron.gl.context(Ctx).
 
 %-----------------------------------------------------------------------------%
@@ -125,8 +126,8 @@
 %-----------------------------------------------------------------------------%
 
 :- type shape(Vec) == saffron.soft.shape(Vec, texture).
-:- type shape2d ---> shape(shape(vector.vector2)).
-:- type shape3d ---> shape(shape(vector.vector3)).
+:- type shape2d ---> shape(shape(mmath.vector.vector2)).
+:- type shape3d ---> shape(shape(mmath.vector.vector3)).
 
 %-----------------------------------------------------------------------------%
 
@@ -151,8 +152,8 @@
 %-----------------------------------------------------------------------------%
 
 :- type group(Vec) == saffron.soft.group(Vec, texture).
-:- type group2d ---> group(group(vector.vector2)).
-:- type group3d ---> group(group(vector.vector3)).
+:- type group2d ---> group(group(mmath.vector.vector2)).
+:- type group3d ---> group(group(mmath.vector.vector3)).
 
 %-----------------------------------------------------------------------------%
 
@@ -197,9 +198,9 @@
 :- use_module array.
  :- use_module list.
 
-:- use_module matrix.
-:- import_module vector.vector2.
-:- import_module vector.vector3.
+:- use_module mmath.matrix.
+:- import_module mmath.vector.vector2.
+:- import_module mmath.vector.vector3.
 
 %-----------------------------------------------------------------------------%
 
@@ -385,10 +386,10 @@ supports_extension(_, _) :- false.
 
 %-----------------------------------------------------------------------------%
 
-:- pred transform(matrix.matrix::in, io.io::di, io.io::uo) is det.
+:- pred transform(mmath.matrix.matrix::in, io.io::di, io.io::uo) is det.
 
 transform(Matrix, !IO) :-
-    matrix.destructure_matrix(Matrix,
+    mmath.matrix.destructure_matrix(Matrix,
         V0,  V1,  V2,  V3,
         V4,  V5,  V6,  V7,
         V8,  V9,  V10, V11,
@@ -443,7 +444,7 @@ transform(Matrix, !IO) :-
     <= saffron.gl.context(Ctx) where [
     
     (saffron.draw.set_matrix(_, Matrix, !IO) :-
-        matrix.destructure_matrix(Matrix,
+        mmath.matrix.destructure_matrix(Matrix,
             V0,  V1,  V2,  V3,
             V4,  V5,  V6,  V7,
             V8,  V9,  V10, V11,
@@ -506,7 +507,7 @@ transform(Matrix, !IO) :-
 
 %-----------------------------------------------------------------------------%
 
-:- instance saffron.geometry.buffer(context(Ctx), buffer2d, vector.vector2)
+:- instance saffron.geometry.buffer(context(Ctx), buffer2d, mmath.vector.vector2)
     <= saffron.gl.context(Ctx) where [
     
     create_buffer_list(_, Vertices, buffer(array.from_list(Vertices)), !IO),
@@ -515,7 +516,7 @@ transform(Matrix, !IO) :-
 
 %-----------------------------------------------------------------------------%
 
-:- instance saffron.geometry.buffer(context(Ctx), buffer3d, vector.vector3)
+:- instance saffron.geometry.buffer(context(Ctx), buffer3d, mmath.vector.vector3)
     <= saffron.gl.context(Ctx) where [
     
     create_buffer_list(_, Vertices, buffer(array.from_list(Vertices)), !IO),
@@ -600,12 +601,12 @@ transform(Matrix, !IO) :-
 
 %-----------------------------------------------------------------------------%
 
-:- func get_shape2d(shape2d) = shape(vector.vector2).
+:- func get_shape2d(shape2d) = shape(mmath.vector.vector2).
 get_shape2d(shape(Shape)) = Shape.
 
 %-----------------------------------------------------------------------------%
 
-:- func get_shape3d(shape3d) = shape(vector.vector3).
+:- func get_shape3d(shape3d) = shape(mmath.vector.vector3).
 get_shape3d(shape(Shape)) = Shape.
 
 %-----------------------------------------------------------------------------%
@@ -746,7 +747,7 @@ draw_vertex3d(saffron.geometry.vertex(vector(X, Y, Z), U, V), C, !IO) :-
 
 %-----------------------------------------------------------------------------%
 
-:- pred draw_shape2d(shape(vector.vector2)::in, io.io::di, io.io::uo) is det.
+:- pred draw_shape2d(shape(mmath.vector.vector2)::in, io.io::di, io.io::uo) is det.
 draw_shape2d(Shape, !IO) :-
     saffron.gl.bind_texture(Shape ^ saffron.soft.texture, !IO),
     saffron.gl.primitive_type(Shape ^ saffron.soft.primitive_type, Type),
@@ -756,7 +757,7 @@ draw_shape2d(Shape, !IO) :-
 
 %-----------------------------------------------------------------------------%
 
-:- pred draw_shape3d(shape(vector.vector3)::in, io.io::di, io.io::uo) is det.
+:- pred draw_shape3d(shape(mmath.vector.vector3)::in, io.io::di, io.io::uo) is det.
 draw_shape3d(Shape, !IO) :-
     saffron.gl.bind_texture(Shape ^ saffron.soft.texture, !IO),
     saffron.gl.primitive_type(Shape ^ saffron.soft.primitive_type, Type),