From a3637d1569de932824a86c3db2901fc7af33f063 Mon Sep 17 00:00:00 2001 From: Charles Averill Date: Wed, 11 Oct 2023 01:33:05 -0500 Subject: [PATCH] Restructure --- bin/argparse.ml | 2 +- bin/dune | 2 +- bin/main.ml | 5 ++--- lib/config.ml | 2 +- lib/dune | 4 ++-- lib/input.ml | 6 ------ lib/logging/dune | 4 ++++ lib/{ => logging}/logging.ml | 0 lib/{ => math}/constants.ml | 0 lib/math/dune | 5 +++++ lib/{ => math}/matrix.ml | 0 lib/{ => math}/vector.ml | 0 lib/mesh.ml | 2 +- lib/{obj.ml => objloader.ml} | 2 +- lib/{render.ml => renderer.ml} | 6 +++--- test/dune | 2 +- test/zenith.ml | 4 ++-- 17 files changed, 24 insertions(+), 22 deletions(-) delete mode 100644 lib/input.ml create mode 100644 lib/logging/dune rename lib/{ => logging}/logging.ml (100%) rename lib/{ => math}/constants.ml (100%) create mode 100644 lib/math/dune rename lib/{ => math}/matrix.ml (100%) rename lib/{ => math}/vector.ml (100%) rename lib/{obj.ml => objloader.ml} (98%) rename lib/{render.ml => renderer.ml} (98%) diff --git a/bin/argparse.ml b/bin/argparse.ml index 1c6f31c..8485bdf 100644 --- a/bin/argparse.ml +++ b/bin/argparse.ml @@ -1,5 +1,5 @@ open Zenith.Mesh -open Zenith.Obj +open Zenith.Objloader type arguments = { obj_mesh : mesh } diff --git a/bin/dune b/bin/dune index 8345979..d56967d 100644 --- a/bin/dune +++ b/bin/dune @@ -1,4 +1,4 @@ (executable (public_name zenith) (name main) - (libraries zenith graphics)) + (libraries zenith zenith.logging graphics)) diff --git a/bin/main.ml b/bin/main.ml index aaff682..de95806 100644 --- a/bin/main.ml +++ b/bin/main.ml @@ -1,9 +1,8 @@ open Graphics +open Logging open Zenith.Config -open Zenith.Logging open Zenith.Mesh -open Zenith.Render -open List +open Zenith.Renderer let clear_window color = let fg = foreground in diff --git a/lib/config.ml b/lib/config.ml index 9eecbc9..d1bc9d8 100644 --- a/lib/config.ml +++ b/lib/config.ml @@ -1,4 +1,4 @@ -open Vector +open Math.Vector open Graphics let viewportw, viewporth = (700, 700) diff --git a/lib/dune b/lib/dune index 4927e3e..1c82941 100644 --- a/lib/dune +++ b/lib/dune @@ -1,4 +1,4 @@ (library (name zenith) - (modules render vector matrix mesh obj config input constants logging) - (libraries graphics)) + (modules renderer mesh objloader config) + (libraries graphics zenith.logging zenith.math)) diff --git a/lib/input.ml b/lib/input.ml deleted file mode 100644 index efddb29..0000000 --- a/lib/input.ml +++ /dev/null @@ -1,6 +0,0 @@ -let key_q = char_of_int 113 -and key_w = char_of_int 119 -and key_e = char_of_int 101 -and key_a = char_of_int 97 -and key_s = char_of_int 115 -and key_d = char_of_int 100 diff --git a/lib/logging/dune b/lib/logging/dune new file mode 100644 index 0000000..4d1e2c8 --- /dev/null +++ b/lib/logging/dune @@ -0,0 +1,4 @@ +(library + (name logging) + (public_name zenith.logging) + (modules logging)) diff --git a/lib/logging.ml b/lib/logging/logging.ml similarity index 100% rename from lib/logging.ml rename to lib/logging/logging.ml diff --git a/lib/constants.ml b/lib/math/constants.ml similarity index 100% rename from lib/constants.ml rename to lib/math/constants.ml diff --git a/lib/math/dune b/lib/math/dune new file mode 100644 index 0000000..1b1cfb8 --- /dev/null +++ b/lib/math/dune @@ -0,0 +1,5 @@ +(library + (name math) + (public_name zenith.math) + (libraries zenith.logging) + (modules matrix vector constants)) diff --git a/lib/matrix.ml b/lib/math/matrix.ml similarity index 100% rename from lib/matrix.ml rename to lib/math/matrix.ml diff --git a/lib/vector.ml b/lib/math/vector.ml similarity index 100% rename from lib/vector.ml rename to lib/math/vector.ml diff --git a/lib/mesh.ml b/lib/mesh.ml index 9110ba9..ce054b0 100644 --- a/lib/mesh.ml +++ b/lib/mesh.ml @@ -1,4 +1,4 @@ -open Vector +open Math.Vector type mesh = vec list * (int * int) list diff --git a/lib/obj.ml b/lib/objloader.ml similarity index 98% rename from lib/obj.ml rename to lib/objloader.ml index 876e175..b6ee490 100644 --- a/lib/obj.ml +++ b/lib/objloader.ml @@ -1,5 +1,5 @@ open Mesh -open Vector +open Math.Vector type vernacular = Vertex of vec | Edge of (int * int) diff --git a/lib/render.ml b/lib/renderer.ml similarity index 98% rename from lib/render.ml rename to lib/renderer.ml index 76b3e82..a6a1f39 100644 --- a/lib/render.ml +++ b/lib/renderer.ml @@ -1,9 +1,9 @@ -open Constants +open Math.Constants open Config open Graphics -open Matrix +open Math.Matrix open Mesh -open Vector +open Math.Vector let draw_line a b = moveto (int_of_float a.x) (int_of_float a.y); diff --git a/test/dune b/test/dune index 9545e6d..9db9881 100644 --- a/test/dune +++ b/test/dune @@ -1,3 +1,3 @@ (test (name zenith) - (libraries zenith alcotest)) + (libraries zenith.math alcotest)) diff --git a/test/zenith.ml b/test/zenith.ml index dd7de63..2069a9f 100644 --- a/test/zenith.ml +++ b/test/zenith.ml @@ -1,5 +1,5 @@ -open Zenith.Matrix -open Zenith.Vector +open Math.Matrix +open Math.Vector (* Functions to test *) module To_test = struct