Restructure

CharlesAverill · Oct 11, 2023 · a3637d1 · a3637d1
1 parent 217dc8e
commit a3637d1
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-open Vector
+open Math.Vector
 open Graphics
 
 let viewportw, viewporth = (700, 700)

diff --git 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
diff --git a/lib/logging/dune b/lib/logging/dune
@@ -0,0 +1,4 @@
+(library
+ (name logging)
+ (public_name zenith.logging)
+ (modules logging))
diff --git a/lib/logging.ml → lib/logging/logging.ml b/lib/logging.ml → lib/logging/logging.ml
diff --git a/lib/constants.ml → lib/math/constants.ml b/lib/constants.ml → lib/math/constants.ml
diff --git a/lib/math/dune 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 → lib/math/matrix.ml b/lib/matrix.ml → lib/math/matrix.ml
diff --git a/lib/vector.ml → lib/math/vector.ml b/lib/vector.ml → lib/math/vector.ml
diff --git 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 → lib/objloader.ml b/lib/obj.ml → 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 → lib/renderer.ml b/lib/render.ml → 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
@@ -1,3 +1,3 @@
 (test
  (name zenith)
- (libraries zenith alcotest))
+ (libraries zenith.math alcotest))
diff --git 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