diff --git a/.gitignore b/.gitignore index 539a3f4..3e57027 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ *.cmxa _build .vscode/* +*.mtl +.ocamlformat diff --git a/.ocamlformat b/.ocamlformat index b73a05f..6f6dd85 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1 +1 @@ -version=0.25.1 +version=0.26.0 diff --git a/README.md b/README.md index 7537900..47ffc4f 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,20 @@ -# ZENITH -Zen Engine for Navigating wIreframes In Three-dimensional Holographic space +![ZENITH Logo](media/logo.png) -![demo](media/demo.gif) +"Zen Engine for Navigating wIreframes In Three-dimensional Holographic space" ## Usage ZENITH is built with [dune](https://dune.build), and depends on the OCaml `Graphics` library. To run: ``` -make run # Will render the Utah teapot .obj file -OBJ=path_to_obj make run # Will override teapot path +make run # Will render the Utah teapot .obj file +OBJS="path_to_obj path_to_another_obj ..." make run # Will render each object around a circle +# Renders the demo shown below +OBJS="objs/uv_sphere.obj objs/torus.obj objs/star_destroyer.obj objs/pyramid.obj objs/cube.obj objs/blender_monkey.obj objs/arwing.obj" make run ``` +![demo](media/demo.gif) + ## Writeups | Checkpoint | Summary | @@ -21,14 +24,35 @@ OBJ=path_to_obj make run # Will override teapot path | [Success 2](media/success2/Success2.md) | I can now load meshes from `.obj` files | ## Notes + +### Blender + +If you're using Blender to create 3D models for ZENITH, ensure that, in the export window under `Geometry`, the options "Write Normals," "Include UVs," and "Write Materials" are deactivated. These options generate vernacular in the output `.obj` file that my loader does not support. + +### Supported .OBJ Vernacular + +```obj +# Comments +# Vertices +v 0.0 1.9 -5.8 +v 1.1 0.4 -0.7 +v 38.4 0.2 7.1 +# Lines +l 1 2 +l 2 3 +# Faces +f 1 2 3 +``` + +### Axis configuration ``` - Y - | - | - | - --------- X + Y + | + | + | + --------- X + / / / -/ Z ``` diff --git a/bin/driver.ml b/bin/driver.ml index e129157..b35586f 100644 --- a/bin/driver.ml +++ b/bin/driver.ml @@ -13,7 +13,9 @@ let clear_window color = let evenly_spaced_positions meshes = let n = List.length meshes in - let radius = if n > 1 then 1. +. largest_distance meshes else 0. in + let largest_dist = largest_distance meshes in + _log Log_Debug (string_of_float largest_dist); + let radius = if n > 1 then 1. +. largest_dist else 0. in let delta_theta = 2.0 *. Float.pi /. float_of_int n in let rec generate_positions theta count acc = @@ -21,7 +23,7 @@ let evenly_spaced_positions meshes = else let x = radius *. Float.cos theta in let y = radius *. Float.sin theta in - generate_positions (theta +. delta_theta) (count - 1) (v3 x y 0. :: acc) + generate_positions (theta +. delta_theta) (count - 1) (acc @ [ v3 x y 0. ]) in generate_positions 0.0 n [] @@ -89,7 +91,6 @@ let draw_scene () = display_mode false; clear_window black; (* Draw each mesh at their offset *) - (* print_endline (string_of_int (List.length !to_draw - 1)); *) for i = 0 to List.length !to_draw - 1 do let mesh, offset = List.nth !to_draw i in draw_mesh mesh !euler (v3_add !translation offset) @@ -105,7 +106,6 @@ let rec main_loop () = let start meshes = (* Evenly-space meshes *) - _log Log_Debug (string_of_float (largest_distance meshes)); let mesh_positions = evenly_spaced_positions meshes in to_draw := List.combine meshes mesh_positions; auto_synchronize false; diff --git a/lib/config.ml b/lib/config.ml index a05f5d7..523172a 100644 --- a/lib/config.ml +++ b/lib/config.ml @@ -1,7 +1,7 @@ open Math.Vector open Graphics -let viewportw, viewporth = (1000, 1000) +let viewportw, viewporth = (1080, 1080) let viewpoint = v3 0. 0. 30. let fov = 45.0 let aspect_ratio = 1. diff --git a/lib/objloader.ml b/lib/objloader.ml index b6ee490..f3a5957 100644 --- a/lib/objloader.ml +++ b/lib/objloader.ml @@ -3,16 +3,30 @@ open Math.Vector type vernacular = Vertex of vec | Edge of (int * int) -let parse_obj_line line : vernacular option = +let pairs_of_consecutive_elements lst = + let rec aux first = function + | [] -> [] + | [ x ] -> + [ (x, first) ] + (* Empty list or a list with only one element cannot form pairs. *) + | x :: y :: rest -> (x, y) :: aux first (y :: rest) + in + match lst with [] | [ _ ] -> [] | h :: _ :: _ -> aux h lst + +let parse_obj_line line : vernacular list option = match String.split_on_char ' ' line with | [] -> None | [ "#" ] -> None (* Comment line *) | "v" :: xs -> let v = List.map float_of_string xs in - Some (Vertex (v3 (List.nth v 0) (List.nth v 1) (List.nth v 2))) + Some [ Vertex (v3 (List.nth v 0) (List.nth v 1) (List.nth v 2)) ] | "l" :: xs -> let edge = List.map (fun s -> int_of_string s - 1) xs in - Some (Edge (List.nth edge 0, List.nth edge 1)) + Some [ Edge (List.nth edge 0, List.nth edge 1) ] + | "f" :: xs -> + let vertices = List.map (fun s -> int_of_string s - 1) xs in + let edges = pairs_of_consecutive_elements vertices in + Some (List.map (fun x -> Edge x) edges) | _ -> None let rec parse_obj_lines lines vertices edges = @@ -20,9 +34,15 @@ let rec parse_obj_lines lines vertices edges = | [] -> (vertices, edges) | line :: rest -> ( match parse_obj_line line with - | Some (Vertex v) -> parse_obj_lines rest (v :: vertices) edges - | Some (Edge e) -> parse_obj_lines rest vertices (e :: edges) - | None -> parse_obj_lines rest vertices edges) + | Some [ Vertex v ] -> parse_obj_lines rest (v :: vertices) edges + | Some [ Edge e ] -> parse_obj_lines rest vertices (e :: edges) + | Some (Edge e :: t) -> + parse_obj_lines rest vertices + (List.map + (fun x -> match x with Edge _e -> _e | _ -> (0, 0)) + (Edge e :: t) + @ edges) + | _ -> parse_obj_lines rest vertices edges) let parse_obj_file filename = let lines = ref [] in diff --git a/media/logo.png b/media/logo.png new file mode 100644 index 0000000..7c4bcb8 Binary files /dev/null and b/media/logo.png differ diff --git a/media/tt_octosquares/Bonuses and services.pdf b/media/tt_octosquares/Bonuses and services.pdf new file mode 100644 index 0000000..018ee9f Binary files /dev/null and b/media/tt_octosquares/Bonuses and services.pdf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Black Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Black Italic.ttf new file mode 100644 index 0000000..02923c9 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Black Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Black.ttf b/media/tt_octosquares/TT Octosquares Trial Black.ttf new file mode 100644 index 0000000..ff86e13 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Black.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Bold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Bold Italic.ttf new file mode 100644 index 0000000..1ac6c32 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Bold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Bold.ttf b/media/tt_octosquares/TT Octosquares Trial Bold.ttf new file mode 100644 index 0000000..5da72a0 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Bold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Black Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Black Italic.ttf new file mode 100644 index 0000000..410b1fd Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Black Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Black.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Black.ttf new file mode 100644 index 0000000..387208e Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Black.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Bold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Bold Italic.ttf new file mode 100644 index 0000000..7c68d7a Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Bold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Bold.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Bold.ttf new file mode 100644 index 0000000..5ffd244 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Bold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed DemiBold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed DemiBold Italic.ttf new file mode 100644 index 0000000..95ba39e Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed DemiBold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed DemiBold.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed DemiBold.ttf new file mode 100644 index 0000000..8781f11 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed DemiBold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed ExtraBold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed ExtraBold Italic.ttf new file mode 100644 index 0000000..a961bbc Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed ExtraBold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed ExtraBold.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed ExtraBold.ttf new file mode 100644 index 0000000..1e32fdf Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed ExtraBold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed ExtraLight Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed ExtraLight Italic.ttf new file mode 100644 index 0000000..65ac75f Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed ExtraLight Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed ExtraLight.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed ExtraLight.ttf new file mode 100644 index 0000000..b8296d3 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed ExtraLight.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Italic.ttf new file mode 100644 index 0000000..93f746a Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Light Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Light Italic.ttf new file mode 100644 index 0000000..25aab86 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Light Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Light.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Light.ttf new file mode 100644 index 0000000..2860829 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Light.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Medium Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Medium Italic.ttf new file mode 100644 index 0000000..a5867e0 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Medium Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Medium.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Medium.ttf new file mode 100644 index 0000000..f527f1b Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Medium.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Regular.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Regular.ttf new file mode 100644 index 0000000..47df409 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Regular.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Thin Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Thin Italic.ttf new file mode 100644 index 0000000..46b03ce Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Thin Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Compressed Thin.ttf b/media/tt_octosquares/TT Octosquares Trial Compressed Thin.ttf new file mode 100644 index 0000000..b6f3904 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Compressed Thin.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Black Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Black Italic.ttf new file mode 100644 index 0000000..4e811f0 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Black Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Black.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Black.ttf new file mode 100644 index 0000000..580e51c Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Black.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Bold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Bold Italic.ttf new file mode 100644 index 0000000..1dd8dc3 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Bold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Bold.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Bold.ttf new file mode 100644 index 0000000..157d4f4 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Bold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed DemiBold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed DemiBold Italic.ttf new file mode 100644 index 0000000..66ef732 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed DemiBold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed DemiBold.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed DemiBold.ttf new file mode 100644 index 0000000..f71ff11 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed DemiBold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed ExtraBold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed ExtraBold Italic.ttf new file mode 100644 index 0000000..e17a737 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed ExtraBold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed ExtraBold.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed ExtraBold.ttf new file mode 100644 index 0000000..34f2fa2 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed ExtraBold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed ExtraLight Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed ExtraLight Italic.ttf new file mode 100644 index 0000000..f81deec Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed ExtraLight Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed ExtraLight.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed ExtraLight.ttf new file mode 100644 index 0000000..12ed5a6 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed ExtraLight.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Italic.ttf new file mode 100644 index 0000000..ac12905 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Light Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Light Italic.ttf new file mode 100644 index 0000000..6b32a4a Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Light Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Light.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Light.ttf new file mode 100644 index 0000000..515356f Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Light.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Medium Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Medium Italic.ttf new file mode 100644 index 0000000..ca27e57 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Medium Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Medium.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Medium.ttf new file mode 100644 index 0000000..cc5e51c Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Medium.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Regular.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Regular.ttf new file mode 100644 index 0000000..accba5b Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Regular.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Thin Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Thin Italic.ttf new file mode 100644 index 0000000..600fe3a Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Thin Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Condensed Thin.ttf b/media/tt_octosquares/TT Octosquares Trial Condensed Thin.ttf new file mode 100644 index 0000000..460ed9d Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Condensed Thin.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial DemiBold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial DemiBold Italic.ttf new file mode 100644 index 0000000..9fb3b6d Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial DemiBold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial DemiBold.ttf b/media/tt_octosquares/TT Octosquares Trial DemiBold.ttf new file mode 100644 index 0000000..1190a14 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial DemiBold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Black Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Black Italic.ttf new file mode 100644 index 0000000..5e900b8 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Black Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Black.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Black.ttf new file mode 100644 index 0000000..3161b91 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Black.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Bold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Bold Italic.ttf new file mode 100644 index 0000000..8458ba3 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Bold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Bold.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Bold.ttf new file mode 100644 index 0000000..2e37fd4 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Bold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded DemiBold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded DemiBold Italic.ttf new file mode 100644 index 0000000..683453e Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded DemiBold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded DemiBold.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded DemiBold.ttf new file mode 100644 index 0000000..b6f5776 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded DemiBold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded ExtraBold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded ExtraBold Italic.ttf new file mode 100644 index 0000000..1fd3128 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded ExtraBold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded ExtraBold.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded ExtraBold.ttf new file mode 100644 index 0000000..0ef3257 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded ExtraBold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded ExtraLight Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded ExtraLight Italic.ttf new file mode 100644 index 0000000..0193052 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded ExtraLight Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded ExtraLight.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded ExtraLight.ttf new file mode 100644 index 0000000..e674c07 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded ExtraLight.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Italic.ttf new file mode 100644 index 0000000..dedec29 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Light Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Light Italic.ttf new file mode 100644 index 0000000..97e4e4a Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Light Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Light.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Light.ttf new file mode 100644 index 0000000..eb04455 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Light.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Medium Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Medium Italic.ttf new file mode 100644 index 0000000..0f179d6 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Medium Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Medium.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Medium.ttf new file mode 100644 index 0000000..7c83c24 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Medium.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Regular.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Regular.ttf new file mode 100644 index 0000000..dc68be4 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Regular.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Thin Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Thin Italic.ttf new file mode 100644 index 0000000..1e40d02 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Thin Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Expanded Thin.ttf b/media/tt_octosquares/TT Octosquares Trial Expanded Thin.ttf new file mode 100644 index 0000000..3ce358b Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Expanded Thin.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial ExtraBold Italic.ttf b/media/tt_octosquares/TT Octosquares Trial ExtraBold Italic.ttf new file mode 100644 index 0000000..9abe671 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial ExtraBold Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial ExtraBold.ttf b/media/tt_octosquares/TT Octosquares Trial ExtraBold.ttf new file mode 100644 index 0000000..b207fb5 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial ExtraBold.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial ExtraLight Italic.ttf b/media/tt_octosquares/TT Octosquares Trial ExtraLight Italic.ttf new file mode 100644 index 0000000..ebeae71 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial ExtraLight Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial ExtraLight.ttf b/media/tt_octosquares/TT Octosquares Trial ExtraLight.ttf new file mode 100644 index 0000000..377ffcb Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial ExtraLight.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Italic.ttf new file mode 100644 index 0000000..e0aaf64 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Light Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Light Italic.ttf new file mode 100644 index 0000000..06b2e6c Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Light Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Light.ttf b/media/tt_octosquares/TT Octosquares Trial Light.ttf new file mode 100644 index 0000000..6735234 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Light.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Medium Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Medium Italic.ttf new file mode 100644 index 0000000..d21f070 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Medium Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Medium.ttf b/media/tt_octosquares/TT Octosquares Trial Medium.ttf new file mode 100644 index 0000000..c3d5bd7 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Medium.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Regular.ttf b/media/tt_octosquares/TT Octosquares Trial Regular.ttf new file mode 100644 index 0000000..2265d9e Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Regular.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Thin Italic.ttf b/media/tt_octosquares/TT Octosquares Trial Thin Italic.ttf new file mode 100644 index 0000000..b4a7b30 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Thin Italic.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Thin.ttf b/media/tt_octosquares/TT Octosquares Trial Thin.ttf new file mode 100644 index 0000000..fac6132 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Thin.ttf differ diff --git a/media/tt_octosquares/TT Octosquares Trial Variable.ttf b/media/tt_octosquares/TT Octosquares Trial Variable.ttf new file mode 100644 index 0000000..901c451 Binary files /dev/null and b/media/tt_octosquares/TT Octosquares Trial Variable.ttf differ diff --git a/media/tt_octosquares/TypeType Trial License.pdf b/media/tt_octosquares/TypeType Trial License.pdf new file mode 100644 index 0000000..9e2d3c4 Binary files /dev/null and b/media/tt_octosquares/TypeType Trial License.pdf differ diff --git a/objs/star_destroyer.mtl b/objs/star_destroyer.mtl deleted file mode 100644 index 5b165d4..0000000 --- a/objs/star_destroyer.mtl +++ /dev/null @@ -1,2 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 0 diff --git a/objs/zenith.obj b/objs/zenith.obj new file mode 100644 index 0000000..4752d2e --- /dev/null +++ b/objs/zenith.obj @@ -0,0 +1,320 @@ +# Blender v3.0.1 OBJ File: '' +# www.blender.org +o Text +v 6.430280 -1.504543 -0.625003 +v 6.430280 1.402433 -0.625002 +v 7.136259 1.402433 -0.625002 +v 7.136259 0.260407 -0.625002 +v 8.531609 0.260407 -0.625002 +v 8.531609 1.402433 -0.625002 +v 9.237590 1.402433 -0.625002 +v 9.237590 -1.504543 -0.625003 +v 8.531609 -1.504543 -0.625003 +v 8.531609 -0.354211 -0.625002 +v 7.136259 -0.354211 -0.625002 +v 7.136259 -1.504543 -0.625003 +v 4.212673 -1.504543 -0.625003 +v 4.212673 0.800274 -0.625002 +v 3.120480 0.800274 -0.625002 +v 3.120480 1.402433 -0.625002 +v 6.010845 1.402433 -0.625002 +v 6.010845 0.800274 -0.625002 +v 4.918653 0.800274 -0.625002 +v 4.918653 -1.504543 -0.625003 +v 0.998387 -1.504543 -0.625003 +v 0.998387 -0.952218 -0.625003 +v 1.579782 -0.952218 -0.625003 +v 1.579782 0.850108 -0.625002 +v 0.998387 0.850108 -0.625002 +v 0.998387 1.402433 -0.625002 +v 2.867157 1.402433 -0.625002 +v 2.867157 0.850108 -0.625002 +v 2.285762 0.850108 -0.625002 +v 2.285762 -0.952218 -0.625003 +v 2.867157 -0.952218 -0.625003 +v 2.867157 -1.504543 -0.625003 +v -2.523208 -1.504543 -0.625003 +v -2.523208 1.402433 -0.625002 +v -1.443474 1.402433 -0.625002 +v -0.334669 -0.748729 -0.625003 +v -0.264072 -0.748729 -0.625003 +v -0.264072 1.402433 -0.625002 +v 0.408686 1.402433 -0.625002 +v 0.408686 -1.504543 -0.625003 +v -0.671048 -1.504543 -0.625003 +v -1.779853 0.646619 -0.625002 +v -1.850451 0.646619 -0.625002 +v -1.850451 -1.504543 -0.625003 +v -5.666895 -1.504543 -0.625003 +v -5.666895 1.402433 -0.625002 +v -3.108755 1.402433 -0.625002 +v -3.108755 0.800274 -0.625002 +v -4.960915 0.800274 -0.625002 +v -4.960915 0.239643 -0.625002 +v -3.565567 0.239643 -0.625002 +v -3.565567 -0.316836 -0.625002 +v -4.960915 -0.316836 -0.625002 +v -4.960915 -0.902384 -0.625003 +v -3.067228 -0.902384 -0.625003 +v -3.067228 -1.504543 -0.625003 +v -8.852111 -1.504543 -0.625003 +v -8.852111 -0.694743 -0.625002 +v -7.103772 0.683995 -0.625002 +v -7.103772 0.800274 -0.625002 +v -8.802277 0.800274 -0.625002 +v -8.802277 1.402433 -0.625002 +v -6.231679 1.402433 -0.625002 +v -6.231679 0.592633 -0.625002 +v -7.980018 -0.786105 -0.625003 +v -7.980018 -0.902384 -0.625003 +v -6.219220 -0.902384 -0.625003 +v -6.219220 -1.504543 -0.625003 +v 6.430280 -1.504543 0.624998 +v 6.430280 1.402433 0.624998 +v 7.136259 1.402433 0.624998 +v 7.136259 0.260407 0.624998 +v 8.531609 0.260407 0.624998 +v 8.531609 1.402433 0.624998 +v 9.237590 1.402433 0.624998 +v 9.237590 -1.504543 0.624998 +v 8.531609 -1.504543 0.624998 +v 8.531609 -0.354211 0.624998 +v 7.136259 -0.354211 0.624998 +v 7.136259 -1.504543 0.624998 +v 4.212673 -1.504543 0.624998 +v 4.212673 0.800274 0.624998 +v 3.120480 0.800274 0.624998 +v 3.120480 1.402433 0.624998 +v 6.010845 1.402433 0.624998 +v 6.010845 0.800274 0.624998 +v 4.918653 0.800274 0.624998 +v 4.918653 -1.504543 0.624998 +v 0.998387 -1.504543 0.624998 +v 0.998387 -0.952218 0.624998 +v 1.579782 -0.952218 0.624998 +v 1.579782 0.850108 0.624998 +v 0.998387 0.850108 0.624998 +v 0.998387 1.402433 0.624998 +v 2.867157 1.402433 0.624998 +v 2.867157 0.850108 0.624998 +v 2.285762 0.850108 0.624998 +v 2.285762 -0.952218 0.624998 +v 2.867157 -0.952218 0.624998 +v 2.867157 -1.504543 0.624998 +v -2.523208 -1.504543 0.624998 +v -2.523208 1.402433 0.624998 +v -1.443474 1.402433 0.624998 +v -0.334669 -0.748730 0.624998 +v -0.264072 -0.748730 0.624998 +v -0.264072 1.402433 0.624998 +v 0.408686 1.402433 0.624998 +v 0.408686 -1.504543 0.624998 +v -0.671048 -1.504543 0.624998 +v -1.779853 0.646619 0.624998 +v -1.850451 0.646619 0.624998 +v -1.850451 -1.504543 0.624998 +v -5.666895 -1.504543 0.624998 +v -5.666895 1.402433 0.624998 +v -3.108755 1.402433 0.624998 +v -3.108755 0.800274 0.624998 +v -4.960915 0.800274 0.624998 +v -4.960915 0.239643 0.624998 +v -3.565567 0.239643 0.624998 +v -3.565567 -0.316836 0.624998 +v -4.960915 -0.316836 0.624998 +v -4.960915 -0.902384 0.624998 +v -3.067228 -0.902384 0.624998 +v -3.067228 -1.504543 0.624998 +v -8.852111 -1.504543 0.624998 +v -8.852111 -0.694743 0.624998 +v -7.103772 0.683995 0.624998 +v -7.103772 0.800274 0.624998 +v -8.802277 0.800274 0.624998 +v -8.802277 1.402433 0.624998 +v -6.231679 1.402433 0.624998 +v -6.231679 0.592633 0.624998 +v -7.980018 -0.786105 0.624998 +v -7.980018 -0.902384 0.624998 +v -6.219220 -0.902384 0.624998 +v -6.219220 -1.504543 0.624998 +s off +f 1 2 3 +f 1 3 4 +f 5 6 7 +f 5 7 8 +f 1 4 11 +f 11 4 5 +f 11 5 10 +f 10 5 8 +f 1 11 12 +f 9 10 8 +f 15 16 17 +f 15 17 18 +f 14 15 18 +f 13 14 19 +f 19 14 18 +f 13 19 20 +f 25 26 27 +f 25 27 28 +f 24 25 28 +f 23 24 29 +f 29 24 28 +f 23 29 30 +f 21 22 23 +f 21 23 30 +f 21 30 31 +f 21 31 32 +f 33 34 43 +f 43 34 35 +f 43 35 42 +f 42 35 36 +f 37 38 39 +f 37 39 40 +f 33 43 44 +f 41 42 36 +f 41 36 37 +f 41 37 40 +f 45 46 49 +f 49 46 47 +f 49 47 48 +f 45 49 50 +f 45 50 53 +f 53 50 51 +f 53 51 52 +f 45 53 54 +f 45 54 55 +f 45 55 56 +f 61 62 63 +f 61 63 60 +f 60 63 64 +f 59 60 64 +f 58 59 64 +f 58 64 65 +f 57 58 65 +f 57 65 66 +f 57 66 67 +f 57 67 68 +f 69 71 70 +f 69 72 71 +f 73 75 74 +f 73 76 75 +f 69 79 72 +f 79 73 72 +f 79 78 73 +f 78 76 73 +f 69 80 79 +f 77 76 78 +f 83 85 84 +f 83 86 85 +f 82 86 83 +f 81 87 82 +f 87 86 82 +f 81 88 87 +f 93 95 94 +f 93 96 95 +f 92 96 93 +f 91 97 92 +f 97 96 92 +f 91 98 97 +f 89 91 90 +f 89 98 91 +f 89 99 98 +f 89 100 99 +f 101 111 102 +f 111 103 102 +f 111 110 103 +f 110 104 103 +f 105 107 106 +f 105 108 107 +f 101 112 111 +f 109 104 110 +f 109 105 104 +f 109 108 105 +f 113 117 114 +f 117 115 114 +f 117 116 115 +f 113 118 117 +f 113 121 118 +f 121 119 118 +f 121 120 119 +f 113 122 121 +f 113 123 122 +f 113 124 123 +f 129 131 130 +f 129 128 131 +f 128 132 131 +f 127 132 128 +f 126 132 127 +f 126 133 132 +f 125 133 126 +f 125 134 133 +f 125 135 134 +f 125 136 135 +f 61 60 128 129 +f 37 36 104 105 +f 41 40 108 109 +f 23 22 90 91 +f 17 16 84 85 +f 46 45 113 114 +f 64 63 131 132 +f 18 17 85 86 +f 60 59 127 128 +f 31 30 98 99 +f 15 14 82 83 +f 2 1 69 70 +f 21 32 100 89 +f 59 58 126 127 +f 47 46 114 115 +f 32 31 99 100 +f 14 13 81 82 +f 3 2 70 71 +f 49 48 116 117 +f 34 33 101 102 +f 48 47 115 116 +f 4 3 71 72 +f 65 64 132 133 +f 19 18 86 87 +f 6 5 73 74 +f 58 57 125 126 +f 50 49 117 118 +f 13 20 88 81 +f 35 34 102 103 +f 20 19 87 88 +f 7 6 74 75 +f 43 42 110 111 +f 26 25 93 94 +f 66 65 133 134 +f 8 7 75 76 +f 51 50 118 119 +f 27 26 94 95 +f 67 66 134 135 +f 53 52 120 121 +f 36 35 103 104 +f 57 68 136 125 +f 52 51 119 120 +f 38 37 105 106 +f 28 27 95 96 +f 68 67 135 136 +f 25 24 92 93 +f 5 4 72 73 +f 54 53 121 122 +f 39 38 106 107 +f 11 10 78 79 +f 24 23 91 92 +f 55 54 122 123 +f 40 39 107 108 +f 45 56 124 113 +f 33 44 112 101 +f 1 12 80 69 +f 56 55 123 124 +f 44 43 111 112 +f 29 28 96 97 +f 12 11 79 80 +f 62 61 129 130 +f 42 41 109 110 +f 10 9 77 78 +f 30 29 97 98 +f 9 8 76 77 +f 63 62 130 131 +f 22 21 89 90 +f 16 15 83 84