From efbe419ec4b083757d89cfc06bde291a91eeb8bf Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Thu, 23 Feb 2023 12:49:40 +0100 Subject: [PATCH] Re-organize directory structure --- Cargo.toml | 24 +++++++++--------- bins/narcissus/Cargo.toml | 13 ++++++++++ .../narcissus/data/bl\303\245haj.mtl" | 0 .../narcissus/data/bl\303\245haj.obj" | 0 .../narcissus/data/bl\303\245haj.png" | Bin {narcissus => bins/narcissus}/src/main.rs | 4 +-- .../narcissus}/src/shaders/basic.frag.glsl | 0 .../narcissus}/src/shaders/basic.frag.spv | Bin .../narcissus}/src/shaders/basic.vert.glsl | 0 .../narcissus}/src/shaders/basic.vert.spv | Bin .../narcissus}/src/shaders/build.sh | 0 {ffi => libs/ffi}/renderdoc-sys/Cargo.toml | 0 .../ffi}/renderdoc-sys/src/helpers.rs | 0 {ffi => libs/ffi}/renderdoc-sys/src/lib.rs | 0 {ffi => libs/ffi}/sdl2-sys/Cargo.toml | 0 {ffi => libs/ffi}/sdl2-sys/build.rs | 0 {ffi => libs/ffi}/sdl2-sys/src/lib.rs | 0 {ffi => libs/ffi}/stb_image-sys/Cargo.toml | 0 {ffi => libs/ffi}/stb_image-sys/build.rs | 0 {ffi => libs/ffi}/stb_image-sys/src/lib.rs | 0 .../ffi}/stb_image-sys/src/stb_image.c | 0 .../ffi}/stb_image-sys/src/stb_image.h | 0 {ffi => libs/ffi}/stb_truetype-sys/Cargo.toml | 0 {ffi => libs/ffi}/stb_truetype-sys/build.rs | 0 {ffi => libs/ffi}/stb_truetype-sys/src/lib.rs | 0 .../ffi}/stb_truetype-sys/src/stb_rect_pack.h | 0 .../ffi}/stb_truetype-sys/src/stb_truetype.c | 0 .../ffi}/stb_truetype-sys/src/stb_truetype.h | 0 {ffi => libs/ffi}/vulkan-sys/.gitignore | 0 {ffi => libs/ffi}/vulkan-sys/Cargo.toml | 0 .../vulkan-sys/examples/triangle.frag.glsl | 0 .../vulkan-sys/examples/triangle.frag.spv | Bin .../ffi}/vulkan-sys/examples/triangle.rs | 0 .../vulkan-sys/examples/triangle.vert.glsl | 0 .../vulkan-sys/examples/triangle.vert.spv | Bin {ffi => libs/ffi}/vulkan-sys/src/enums.rs | 0 {ffi => libs/ffi}/vulkan-sys/src/flags.rs | 0 {ffi => libs/ffi}/vulkan-sys/src/functions.rs | 0 {ffi => libs/ffi}/vulkan-sys/src/handles.rs | 0 {ffi => libs/ffi}/vulkan-sys/src/helpers.rs | 0 {ffi => libs/ffi}/vulkan-sys/src/lib.rs | 0 {ffi => libs/ffi}/vulkan-sys/src/structs.rs | 0 .../narcissus-app}/Cargo.toml | 0 .../narcissus-app}/src/button.rs | 0 .../narcissus-app}/src/key.rs | 0 .../narcissus-app}/src/lib.rs | 0 .../narcissus-app}/src/sdl.rs | 0 .../narcissus-core}/Cargo.toml | 0 .../narcissus-core}/src/arena.rs | 0 .../narcissus-core}/src/bitset.rs | 0 .../narcissus-core}/src/fixed_vec.rs | 0 .../narcissus-core}/src/hybrid_vec.rs | 0 .../narcissus-core}/src/lib.rs | 0 .../narcissus-core}/src/libc.rs | 0 .../narcissus-core}/src/manual_arc.rs | 0 .../narcissus-core}/src/mutex.rs | 0 .../narcissus-core}/src/obj.rs | 0 .../narcissus-core}/src/pool.rs | 0 .../narcissus-core}/src/rand.rs | 0 .../narcissus-core}/src/raw_window.rs | 0 .../narcissus-core}/src/ref_count.rs | 0 .../narcissus-core}/src/slice.rs | 0 .../narcissus-core}/src/uuid.rs | 0 .../narcissus-core}/src/virtual_mem.rs | 0 .../narcissus-core}/src/virtual_vec/deque.rs | 0 .../narcissus-core}/src/virtual_vec/mod.rs | 0 .../src/virtual_vec/raw_vec.rs | 0 .../narcissus-core}/src/virtual_vec/vec.rs | 0 .../narcissus-core}/src/waiter.rs | 0 .../narcissus-gpu}/Cargo.toml | 0 .../narcissus-gpu}/src/backend/mod.rs | 0 .../narcissus-gpu}/src/backend/vulkan/mod.rs | 0 .../narcissus-gpu}/src/delay_queue.rs | 0 .../narcissus-gpu}/src/frame_counter.rs | 0 .../narcissus-gpu}/src/lib.rs | 0 .../narcissus-image}/Cargo.toml | 0 .../narcissus-image}/src/lib.rs | 0 .../narcissus-maths}/Cargo.toml | 0 .../narcissus-maths}/doc/sincostan.m | 0 .../narcissus-maths}/doc/sincostan.sollya | 0 .../narcissus-maths}/src/affine2.rs | 0 .../narcissus-maths}/src/affine3.rs | 0 .../narcissus-maths}/src/lib.rs | 0 .../narcissus-maths}/src/mat2.rs | 0 .../narcissus-maths}/src/mat3.rs | 0 .../narcissus-maths}/src/mat4.rs | 0 .../narcissus-maths}/src/next_after_f32.rs | 0 .../narcissus-maths}/src/point2.rs | 0 .../narcissus-maths}/src/point3.rs | 0 .../narcissus-maths}/src/quat.rs | 0 .../narcissus-maths}/src/sin_cos_pi.rs | 0 .../narcissus-maths}/src/tan_pi.rs | 0 .../narcissus-maths}/src/vec2.rs | 0 .../narcissus-maths}/src/vec3.rs | 0 .../narcissus-maths}/src/vec4.rs | 0 .../narcissus-maths}/tests/exhaustive_f32.rs | 0 .../narcissus-maths}/tests/next_after_f32.rs | 0 .../narcissus-world}/Cargo.toml | 0 .../narcissus-world}/src/lib.rs | 0 narcissus/Cargo.toml | 13 ---------- 100 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 bins/narcissus/Cargo.toml rename "narcissus/data/bl\303\245haj.mtl" => "bins/narcissus/data/bl\303\245haj.mtl" (100%) rename "narcissus/data/bl\303\245haj.obj" => "bins/narcissus/data/bl\303\245haj.obj" (100%) rename "narcissus/data/bl\303\245haj.png" => "bins/narcissus/data/bl\303\245haj.png" (100%) rename {narcissus => bins/narcissus}/src/main.rs (99%) rename {narcissus => bins/narcissus}/src/shaders/basic.frag.glsl (100%) rename {narcissus => bins/narcissus}/src/shaders/basic.frag.spv (100%) rename {narcissus => bins/narcissus}/src/shaders/basic.vert.glsl (100%) rename {narcissus => bins/narcissus}/src/shaders/basic.vert.spv (100%) rename {narcissus => bins/narcissus}/src/shaders/build.sh (100%) rename {ffi => libs/ffi}/renderdoc-sys/Cargo.toml (100%) rename {ffi => libs/ffi}/renderdoc-sys/src/helpers.rs (100%) rename {ffi => libs/ffi}/renderdoc-sys/src/lib.rs (100%) rename {ffi => libs/ffi}/sdl2-sys/Cargo.toml (100%) rename {ffi => libs/ffi}/sdl2-sys/build.rs (100%) rename {ffi => libs/ffi}/sdl2-sys/src/lib.rs (100%) rename {ffi => libs/ffi}/stb_image-sys/Cargo.toml (100%) rename {ffi => libs/ffi}/stb_image-sys/build.rs (100%) rename {ffi => libs/ffi}/stb_image-sys/src/lib.rs (100%) rename {ffi => libs/ffi}/stb_image-sys/src/stb_image.c (100%) rename {ffi => libs/ffi}/stb_image-sys/src/stb_image.h (100%) rename {ffi => libs/ffi}/stb_truetype-sys/Cargo.toml (100%) rename {ffi => libs/ffi}/stb_truetype-sys/build.rs (100%) rename {ffi => libs/ffi}/stb_truetype-sys/src/lib.rs (100%) rename {ffi => libs/ffi}/stb_truetype-sys/src/stb_rect_pack.h (100%) rename {ffi => libs/ffi}/stb_truetype-sys/src/stb_truetype.c (100%) rename {ffi => libs/ffi}/stb_truetype-sys/src/stb_truetype.h (100%) rename {ffi => libs/ffi}/vulkan-sys/.gitignore (100%) rename {ffi => libs/ffi}/vulkan-sys/Cargo.toml (100%) rename {ffi => libs/ffi}/vulkan-sys/examples/triangle.frag.glsl (100%) rename {ffi => libs/ffi}/vulkan-sys/examples/triangle.frag.spv (100%) rename {ffi => libs/ffi}/vulkan-sys/examples/triangle.rs (100%) rename {ffi => libs/ffi}/vulkan-sys/examples/triangle.vert.glsl (100%) rename {ffi => libs/ffi}/vulkan-sys/examples/triangle.vert.spv (100%) rename {ffi => libs/ffi}/vulkan-sys/src/enums.rs (100%) rename {ffi => libs/ffi}/vulkan-sys/src/flags.rs (100%) rename {ffi => libs/ffi}/vulkan-sys/src/functions.rs (100%) rename {ffi => libs/ffi}/vulkan-sys/src/handles.rs (100%) rename {ffi => libs/ffi}/vulkan-sys/src/helpers.rs (100%) rename {ffi => libs/ffi}/vulkan-sys/src/lib.rs (100%) rename {ffi => libs/ffi}/vulkan-sys/src/structs.rs (100%) rename {narcissus-app => libs/narcissus-app}/Cargo.toml (100%) rename {narcissus-app => libs/narcissus-app}/src/button.rs (100%) rename {narcissus-app => libs/narcissus-app}/src/key.rs (100%) rename {narcissus-app => libs/narcissus-app}/src/lib.rs (100%) rename {narcissus-app => libs/narcissus-app}/src/sdl.rs (100%) rename {narcissus-core => libs/narcissus-core}/Cargo.toml (100%) rename {narcissus-core => libs/narcissus-core}/src/arena.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/bitset.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/fixed_vec.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/hybrid_vec.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/lib.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/libc.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/manual_arc.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/mutex.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/obj.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/pool.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/rand.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/raw_window.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/ref_count.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/slice.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/uuid.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/virtual_mem.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/virtual_vec/deque.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/virtual_vec/mod.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/virtual_vec/raw_vec.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/virtual_vec/vec.rs (100%) rename {narcissus-core => libs/narcissus-core}/src/waiter.rs (100%) rename {narcissus-gpu => libs/narcissus-gpu}/Cargo.toml (100%) rename {narcissus-gpu => libs/narcissus-gpu}/src/backend/mod.rs (100%) rename {narcissus-gpu => libs/narcissus-gpu}/src/backend/vulkan/mod.rs (100%) rename {narcissus-gpu => libs/narcissus-gpu}/src/delay_queue.rs (100%) rename {narcissus-gpu => libs/narcissus-gpu}/src/frame_counter.rs (100%) rename {narcissus-gpu => libs/narcissus-gpu}/src/lib.rs (100%) rename {narcissus-image => libs/narcissus-image}/Cargo.toml (100%) rename {narcissus-image => libs/narcissus-image}/src/lib.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/Cargo.toml (100%) rename {narcissus-maths => libs/narcissus-maths}/doc/sincostan.m (100%) rename {narcissus-maths => libs/narcissus-maths}/doc/sincostan.sollya (100%) rename {narcissus-maths => libs/narcissus-maths}/src/affine2.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/affine3.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/lib.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/mat2.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/mat3.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/mat4.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/next_after_f32.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/point2.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/point3.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/quat.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/sin_cos_pi.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/tan_pi.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/vec2.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/vec3.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/src/vec4.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/tests/exhaustive_f32.rs (100%) rename {narcissus-maths => libs/narcissus-maths}/tests/next_after_f32.rs (100%) rename {narcissus-world => libs/narcissus-world}/Cargo.toml (100%) rename {narcissus-world => libs/narcissus-world}/src/lib.rs (100%) delete mode 100644 narcissus/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml index f4a9be4..934a857 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,18 +1,18 @@ [workspace] members = [ - "ffi/renderdoc-sys", - "ffi/sdl2-sys", - "ffi/stb_image-sys", - "ffi/stb_truetype-sys", - "ffi/vulkan-sys", - "narcissus", - "narcissus-app", - "narcissus-core", - "narcissus-gpu", - "narcissus-image", - "narcissus-maths", - "narcissus-world", + "bins/narcissus", + "libs/ffi/renderdoc-sys", + "libs/ffi/sdl2-sys", + "libs/ffi/stb_image-sys", + "libs/ffi/stb_truetype-sys", + "libs/ffi/vulkan-sys", + "libs/narcissus-app", + "libs/narcissus-core", + "libs/narcissus-gpu", + "libs/narcissus-image", + "libs/narcissus-maths", + "libs/narcissus-world", ] [profile.release] diff --git a/bins/narcissus/Cargo.toml b/bins/narcissus/Cargo.toml new file mode 100644 index 0000000..4768c83 --- /dev/null +++ b/bins/narcissus/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "narcissus" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +narcissus-core = { path = "../../libs/narcissus-core" } +narcissus-maths = { path = "../../libs/narcissus-maths" } +narcissus-image = { path = "../../libs/narcissus-image" } +narcissus-app = { path = "../../libs/narcissus-app" } +narcissus-gpu = { path = "../../libs/narcissus-gpu" } \ No newline at end of file diff --git "a/narcissus/data/bl\303\245haj.mtl" "b/bins/narcissus/data/bl\303\245haj.mtl" similarity index 100% rename from "narcissus/data/bl\303\245haj.mtl" rename to "bins/narcissus/data/bl\303\245haj.mtl" diff --git "a/narcissus/data/bl\303\245haj.obj" "b/bins/narcissus/data/bl\303\245haj.obj" similarity index 100% rename from "narcissus/data/bl\303\245haj.obj" rename to "bins/narcissus/data/bl\303\245haj.obj" diff --git "a/narcissus/data/bl\303\245haj.png" "b/bins/narcissus/data/bl\303\245haj.png" similarity index 100% rename from "narcissus/data/bl\303\245haj.png" rename to "bins/narcissus/data/bl\303\245haj.png" diff --git a/narcissus/src/main.rs b/bins/narcissus/src/main.rs similarity index 99% rename from narcissus/src/main.rs rename to bins/narcissus/src/main.rs index b3d47b8..1f18062 100644 --- a/narcissus/src/main.rs +++ b/bins/narcissus/src/main.rs @@ -367,8 +367,8 @@ pub fn main() { stencil_front: default(), }); - let blåhaj_image = load_image("narcissus/data/blåhaj.png"); - let (blåhaj_vertices, blåhaj_indices) = load_obj("narcissus/data/blåhaj.obj"); + let blåhaj_image = load_image("bins/narcissus/data/blåhaj.png"); + let (blåhaj_vertices, blåhaj_indices) = load_obj("bins/narcissus/data/blåhaj.obj"); let blåhaj_vertex_buffer = create_buffer_with_data( device.as_ref(), diff --git a/narcissus/src/shaders/basic.frag.glsl b/bins/narcissus/src/shaders/basic.frag.glsl similarity index 100% rename from narcissus/src/shaders/basic.frag.glsl rename to bins/narcissus/src/shaders/basic.frag.glsl diff --git a/narcissus/src/shaders/basic.frag.spv b/bins/narcissus/src/shaders/basic.frag.spv similarity index 100% rename from narcissus/src/shaders/basic.frag.spv rename to bins/narcissus/src/shaders/basic.frag.spv diff --git a/narcissus/src/shaders/basic.vert.glsl b/bins/narcissus/src/shaders/basic.vert.glsl similarity index 100% rename from narcissus/src/shaders/basic.vert.glsl rename to bins/narcissus/src/shaders/basic.vert.glsl diff --git a/narcissus/src/shaders/basic.vert.spv b/bins/narcissus/src/shaders/basic.vert.spv similarity index 100% rename from narcissus/src/shaders/basic.vert.spv rename to bins/narcissus/src/shaders/basic.vert.spv diff --git a/narcissus/src/shaders/build.sh b/bins/narcissus/src/shaders/build.sh similarity index 100% rename from narcissus/src/shaders/build.sh rename to bins/narcissus/src/shaders/build.sh diff --git a/ffi/renderdoc-sys/Cargo.toml b/libs/ffi/renderdoc-sys/Cargo.toml similarity index 100% rename from ffi/renderdoc-sys/Cargo.toml rename to libs/ffi/renderdoc-sys/Cargo.toml diff --git a/ffi/renderdoc-sys/src/helpers.rs b/libs/ffi/renderdoc-sys/src/helpers.rs similarity index 100% rename from ffi/renderdoc-sys/src/helpers.rs rename to libs/ffi/renderdoc-sys/src/helpers.rs diff --git a/ffi/renderdoc-sys/src/lib.rs b/libs/ffi/renderdoc-sys/src/lib.rs similarity index 100% rename from ffi/renderdoc-sys/src/lib.rs rename to libs/ffi/renderdoc-sys/src/lib.rs diff --git a/ffi/sdl2-sys/Cargo.toml b/libs/ffi/sdl2-sys/Cargo.toml similarity index 100% rename from ffi/sdl2-sys/Cargo.toml rename to libs/ffi/sdl2-sys/Cargo.toml diff --git a/ffi/sdl2-sys/build.rs b/libs/ffi/sdl2-sys/build.rs similarity index 100% rename from ffi/sdl2-sys/build.rs rename to libs/ffi/sdl2-sys/build.rs diff --git a/ffi/sdl2-sys/src/lib.rs b/libs/ffi/sdl2-sys/src/lib.rs similarity index 100% rename from ffi/sdl2-sys/src/lib.rs rename to libs/ffi/sdl2-sys/src/lib.rs diff --git a/ffi/stb_image-sys/Cargo.toml b/libs/ffi/stb_image-sys/Cargo.toml similarity index 100% rename from ffi/stb_image-sys/Cargo.toml rename to libs/ffi/stb_image-sys/Cargo.toml diff --git a/ffi/stb_image-sys/build.rs b/libs/ffi/stb_image-sys/build.rs similarity index 100% rename from ffi/stb_image-sys/build.rs rename to libs/ffi/stb_image-sys/build.rs diff --git a/ffi/stb_image-sys/src/lib.rs b/libs/ffi/stb_image-sys/src/lib.rs similarity index 100% rename from ffi/stb_image-sys/src/lib.rs rename to libs/ffi/stb_image-sys/src/lib.rs diff --git a/ffi/stb_image-sys/src/stb_image.c b/libs/ffi/stb_image-sys/src/stb_image.c similarity index 100% rename from ffi/stb_image-sys/src/stb_image.c rename to libs/ffi/stb_image-sys/src/stb_image.c diff --git a/ffi/stb_image-sys/src/stb_image.h b/libs/ffi/stb_image-sys/src/stb_image.h similarity index 100% rename from ffi/stb_image-sys/src/stb_image.h rename to libs/ffi/stb_image-sys/src/stb_image.h diff --git a/ffi/stb_truetype-sys/Cargo.toml b/libs/ffi/stb_truetype-sys/Cargo.toml similarity index 100% rename from ffi/stb_truetype-sys/Cargo.toml rename to libs/ffi/stb_truetype-sys/Cargo.toml diff --git a/ffi/stb_truetype-sys/build.rs b/libs/ffi/stb_truetype-sys/build.rs similarity index 100% rename from ffi/stb_truetype-sys/build.rs rename to libs/ffi/stb_truetype-sys/build.rs diff --git a/ffi/stb_truetype-sys/src/lib.rs b/libs/ffi/stb_truetype-sys/src/lib.rs similarity index 100% rename from ffi/stb_truetype-sys/src/lib.rs rename to libs/ffi/stb_truetype-sys/src/lib.rs diff --git a/ffi/stb_truetype-sys/src/stb_rect_pack.h b/libs/ffi/stb_truetype-sys/src/stb_rect_pack.h similarity index 100% rename from ffi/stb_truetype-sys/src/stb_rect_pack.h rename to libs/ffi/stb_truetype-sys/src/stb_rect_pack.h diff --git a/ffi/stb_truetype-sys/src/stb_truetype.c b/libs/ffi/stb_truetype-sys/src/stb_truetype.c similarity index 100% rename from ffi/stb_truetype-sys/src/stb_truetype.c rename to libs/ffi/stb_truetype-sys/src/stb_truetype.c diff --git a/ffi/stb_truetype-sys/src/stb_truetype.h b/libs/ffi/stb_truetype-sys/src/stb_truetype.h similarity index 100% rename from ffi/stb_truetype-sys/src/stb_truetype.h rename to libs/ffi/stb_truetype-sys/src/stb_truetype.h diff --git a/ffi/vulkan-sys/.gitignore b/libs/ffi/vulkan-sys/.gitignore similarity index 100% rename from ffi/vulkan-sys/.gitignore rename to libs/ffi/vulkan-sys/.gitignore diff --git a/ffi/vulkan-sys/Cargo.toml b/libs/ffi/vulkan-sys/Cargo.toml similarity index 100% rename from ffi/vulkan-sys/Cargo.toml rename to libs/ffi/vulkan-sys/Cargo.toml diff --git a/ffi/vulkan-sys/examples/triangle.frag.glsl b/libs/ffi/vulkan-sys/examples/triangle.frag.glsl similarity index 100% rename from ffi/vulkan-sys/examples/triangle.frag.glsl rename to libs/ffi/vulkan-sys/examples/triangle.frag.glsl diff --git a/ffi/vulkan-sys/examples/triangle.frag.spv b/libs/ffi/vulkan-sys/examples/triangle.frag.spv similarity index 100% rename from ffi/vulkan-sys/examples/triangle.frag.spv rename to libs/ffi/vulkan-sys/examples/triangle.frag.spv diff --git a/ffi/vulkan-sys/examples/triangle.rs b/libs/ffi/vulkan-sys/examples/triangle.rs similarity index 100% rename from ffi/vulkan-sys/examples/triangle.rs rename to libs/ffi/vulkan-sys/examples/triangle.rs diff --git a/ffi/vulkan-sys/examples/triangle.vert.glsl b/libs/ffi/vulkan-sys/examples/triangle.vert.glsl similarity index 100% rename from ffi/vulkan-sys/examples/triangle.vert.glsl rename to libs/ffi/vulkan-sys/examples/triangle.vert.glsl diff --git a/ffi/vulkan-sys/examples/triangle.vert.spv b/libs/ffi/vulkan-sys/examples/triangle.vert.spv similarity index 100% rename from ffi/vulkan-sys/examples/triangle.vert.spv rename to libs/ffi/vulkan-sys/examples/triangle.vert.spv diff --git a/ffi/vulkan-sys/src/enums.rs b/libs/ffi/vulkan-sys/src/enums.rs similarity index 100% rename from ffi/vulkan-sys/src/enums.rs rename to libs/ffi/vulkan-sys/src/enums.rs diff --git a/ffi/vulkan-sys/src/flags.rs b/libs/ffi/vulkan-sys/src/flags.rs similarity index 100% rename from ffi/vulkan-sys/src/flags.rs rename to libs/ffi/vulkan-sys/src/flags.rs diff --git a/ffi/vulkan-sys/src/functions.rs b/libs/ffi/vulkan-sys/src/functions.rs similarity index 100% rename from ffi/vulkan-sys/src/functions.rs rename to libs/ffi/vulkan-sys/src/functions.rs diff --git a/ffi/vulkan-sys/src/handles.rs b/libs/ffi/vulkan-sys/src/handles.rs similarity index 100% rename from ffi/vulkan-sys/src/handles.rs rename to libs/ffi/vulkan-sys/src/handles.rs diff --git a/ffi/vulkan-sys/src/helpers.rs b/libs/ffi/vulkan-sys/src/helpers.rs similarity index 100% rename from ffi/vulkan-sys/src/helpers.rs rename to libs/ffi/vulkan-sys/src/helpers.rs diff --git a/ffi/vulkan-sys/src/lib.rs b/libs/ffi/vulkan-sys/src/lib.rs similarity index 100% rename from ffi/vulkan-sys/src/lib.rs rename to libs/ffi/vulkan-sys/src/lib.rs diff --git a/ffi/vulkan-sys/src/structs.rs b/libs/ffi/vulkan-sys/src/structs.rs similarity index 100% rename from ffi/vulkan-sys/src/structs.rs rename to libs/ffi/vulkan-sys/src/structs.rs diff --git a/narcissus-app/Cargo.toml b/libs/narcissus-app/Cargo.toml similarity index 100% rename from narcissus-app/Cargo.toml rename to libs/narcissus-app/Cargo.toml diff --git a/narcissus-app/src/button.rs b/libs/narcissus-app/src/button.rs similarity index 100% rename from narcissus-app/src/button.rs rename to libs/narcissus-app/src/button.rs diff --git a/narcissus-app/src/key.rs b/libs/narcissus-app/src/key.rs similarity index 100% rename from narcissus-app/src/key.rs rename to libs/narcissus-app/src/key.rs diff --git a/narcissus-app/src/lib.rs b/libs/narcissus-app/src/lib.rs similarity index 100% rename from narcissus-app/src/lib.rs rename to libs/narcissus-app/src/lib.rs diff --git a/narcissus-app/src/sdl.rs b/libs/narcissus-app/src/sdl.rs similarity index 100% rename from narcissus-app/src/sdl.rs rename to libs/narcissus-app/src/sdl.rs diff --git a/narcissus-core/Cargo.toml b/libs/narcissus-core/Cargo.toml similarity index 100% rename from narcissus-core/Cargo.toml rename to libs/narcissus-core/Cargo.toml diff --git a/narcissus-core/src/arena.rs b/libs/narcissus-core/src/arena.rs similarity index 100% rename from narcissus-core/src/arena.rs rename to libs/narcissus-core/src/arena.rs diff --git a/narcissus-core/src/bitset.rs b/libs/narcissus-core/src/bitset.rs similarity index 100% rename from narcissus-core/src/bitset.rs rename to libs/narcissus-core/src/bitset.rs diff --git a/narcissus-core/src/fixed_vec.rs b/libs/narcissus-core/src/fixed_vec.rs similarity index 100% rename from narcissus-core/src/fixed_vec.rs rename to libs/narcissus-core/src/fixed_vec.rs diff --git a/narcissus-core/src/hybrid_vec.rs b/libs/narcissus-core/src/hybrid_vec.rs similarity index 100% rename from narcissus-core/src/hybrid_vec.rs rename to libs/narcissus-core/src/hybrid_vec.rs diff --git a/narcissus-core/src/lib.rs b/libs/narcissus-core/src/lib.rs similarity index 100% rename from narcissus-core/src/lib.rs rename to libs/narcissus-core/src/lib.rs diff --git a/narcissus-core/src/libc.rs b/libs/narcissus-core/src/libc.rs similarity index 100% rename from narcissus-core/src/libc.rs rename to libs/narcissus-core/src/libc.rs diff --git a/narcissus-core/src/manual_arc.rs b/libs/narcissus-core/src/manual_arc.rs similarity index 100% rename from narcissus-core/src/manual_arc.rs rename to libs/narcissus-core/src/manual_arc.rs diff --git a/narcissus-core/src/mutex.rs b/libs/narcissus-core/src/mutex.rs similarity index 100% rename from narcissus-core/src/mutex.rs rename to libs/narcissus-core/src/mutex.rs diff --git a/narcissus-core/src/obj.rs b/libs/narcissus-core/src/obj.rs similarity index 100% rename from narcissus-core/src/obj.rs rename to libs/narcissus-core/src/obj.rs diff --git a/narcissus-core/src/pool.rs b/libs/narcissus-core/src/pool.rs similarity index 100% rename from narcissus-core/src/pool.rs rename to libs/narcissus-core/src/pool.rs diff --git a/narcissus-core/src/rand.rs b/libs/narcissus-core/src/rand.rs similarity index 100% rename from narcissus-core/src/rand.rs rename to libs/narcissus-core/src/rand.rs diff --git a/narcissus-core/src/raw_window.rs b/libs/narcissus-core/src/raw_window.rs similarity index 100% rename from narcissus-core/src/raw_window.rs rename to libs/narcissus-core/src/raw_window.rs diff --git a/narcissus-core/src/ref_count.rs b/libs/narcissus-core/src/ref_count.rs similarity index 100% rename from narcissus-core/src/ref_count.rs rename to libs/narcissus-core/src/ref_count.rs diff --git a/narcissus-core/src/slice.rs b/libs/narcissus-core/src/slice.rs similarity index 100% rename from narcissus-core/src/slice.rs rename to libs/narcissus-core/src/slice.rs diff --git a/narcissus-core/src/uuid.rs b/libs/narcissus-core/src/uuid.rs similarity index 100% rename from narcissus-core/src/uuid.rs rename to libs/narcissus-core/src/uuid.rs diff --git a/narcissus-core/src/virtual_mem.rs b/libs/narcissus-core/src/virtual_mem.rs similarity index 100% rename from narcissus-core/src/virtual_mem.rs rename to libs/narcissus-core/src/virtual_mem.rs diff --git a/narcissus-core/src/virtual_vec/deque.rs b/libs/narcissus-core/src/virtual_vec/deque.rs similarity index 100% rename from narcissus-core/src/virtual_vec/deque.rs rename to libs/narcissus-core/src/virtual_vec/deque.rs diff --git a/narcissus-core/src/virtual_vec/mod.rs b/libs/narcissus-core/src/virtual_vec/mod.rs similarity index 100% rename from narcissus-core/src/virtual_vec/mod.rs rename to libs/narcissus-core/src/virtual_vec/mod.rs diff --git a/narcissus-core/src/virtual_vec/raw_vec.rs b/libs/narcissus-core/src/virtual_vec/raw_vec.rs similarity index 100% rename from narcissus-core/src/virtual_vec/raw_vec.rs rename to libs/narcissus-core/src/virtual_vec/raw_vec.rs diff --git a/narcissus-core/src/virtual_vec/vec.rs b/libs/narcissus-core/src/virtual_vec/vec.rs similarity index 100% rename from narcissus-core/src/virtual_vec/vec.rs rename to libs/narcissus-core/src/virtual_vec/vec.rs diff --git a/narcissus-core/src/waiter.rs b/libs/narcissus-core/src/waiter.rs similarity index 100% rename from narcissus-core/src/waiter.rs rename to libs/narcissus-core/src/waiter.rs diff --git a/narcissus-gpu/Cargo.toml b/libs/narcissus-gpu/Cargo.toml similarity index 100% rename from narcissus-gpu/Cargo.toml rename to libs/narcissus-gpu/Cargo.toml diff --git a/narcissus-gpu/src/backend/mod.rs b/libs/narcissus-gpu/src/backend/mod.rs similarity index 100% rename from narcissus-gpu/src/backend/mod.rs rename to libs/narcissus-gpu/src/backend/mod.rs diff --git a/narcissus-gpu/src/backend/vulkan/mod.rs b/libs/narcissus-gpu/src/backend/vulkan/mod.rs similarity index 100% rename from narcissus-gpu/src/backend/vulkan/mod.rs rename to libs/narcissus-gpu/src/backend/vulkan/mod.rs diff --git a/narcissus-gpu/src/delay_queue.rs b/libs/narcissus-gpu/src/delay_queue.rs similarity index 100% rename from narcissus-gpu/src/delay_queue.rs rename to libs/narcissus-gpu/src/delay_queue.rs diff --git a/narcissus-gpu/src/frame_counter.rs b/libs/narcissus-gpu/src/frame_counter.rs similarity index 100% rename from narcissus-gpu/src/frame_counter.rs rename to libs/narcissus-gpu/src/frame_counter.rs diff --git a/narcissus-gpu/src/lib.rs b/libs/narcissus-gpu/src/lib.rs similarity index 100% rename from narcissus-gpu/src/lib.rs rename to libs/narcissus-gpu/src/lib.rs diff --git a/narcissus-image/Cargo.toml b/libs/narcissus-image/Cargo.toml similarity index 100% rename from narcissus-image/Cargo.toml rename to libs/narcissus-image/Cargo.toml diff --git a/narcissus-image/src/lib.rs b/libs/narcissus-image/src/lib.rs similarity index 100% rename from narcissus-image/src/lib.rs rename to libs/narcissus-image/src/lib.rs diff --git a/narcissus-maths/Cargo.toml b/libs/narcissus-maths/Cargo.toml similarity index 100% rename from narcissus-maths/Cargo.toml rename to libs/narcissus-maths/Cargo.toml diff --git a/narcissus-maths/doc/sincostan.m b/libs/narcissus-maths/doc/sincostan.m similarity index 100% rename from narcissus-maths/doc/sincostan.m rename to libs/narcissus-maths/doc/sincostan.m diff --git a/narcissus-maths/doc/sincostan.sollya b/libs/narcissus-maths/doc/sincostan.sollya similarity index 100% rename from narcissus-maths/doc/sincostan.sollya rename to libs/narcissus-maths/doc/sincostan.sollya diff --git a/narcissus-maths/src/affine2.rs b/libs/narcissus-maths/src/affine2.rs similarity index 100% rename from narcissus-maths/src/affine2.rs rename to libs/narcissus-maths/src/affine2.rs diff --git a/narcissus-maths/src/affine3.rs b/libs/narcissus-maths/src/affine3.rs similarity index 100% rename from narcissus-maths/src/affine3.rs rename to libs/narcissus-maths/src/affine3.rs diff --git a/narcissus-maths/src/lib.rs b/libs/narcissus-maths/src/lib.rs similarity index 100% rename from narcissus-maths/src/lib.rs rename to libs/narcissus-maths/src/lib.rs diff --git a/narcissus-maths/src/mat2.rs b/libs/narcissus-maths/src/mat2.rs similarity index 100% rename from narcissus-maths/src/mat2.rs rename to libs/narcissus-maths/src/mat2.rs diff --git a/narcissus-maths/src/mat3.rs b/libs/narcissus-maths/src/mat3.rs similarity index 100% rename from narcissus-maths/src/mat3.rs rename to libs/narcissus-maths/src/mat3.rs diff --git a/narcissus-maths/src/mat4.rs b/libs/narcissus-maths/src/mat4.rs similarity index 100% rename from narcissus-maths/src/mat4.rs rename to libs/narcissus-maths/src/mat4.rs diff --git a/narcissus-maths/src/next_after_f32.rs b/libs/narcissus-maths/src/next_after_f32.rs similarity index 100% rename from narcissus-maths/src/next_after_f32.rs rename to libs/narcissus-maths/src/next_after_f32.rs diff --git a/narcissus-maths/src/point2.rs b/libs/narcissus-maths/src/point2.rs similarity index 100% rename from narcissus-maths/src/point2.rs rename to libs/narcissus-maths/src/point2.rs diff --git a/narcissus-maths/src/point3.rs b/libs/narcissus-maths/src/point3.rs similarity index 100% rename from narcissus-maths/src/point3.rs rename to libs/narcissus-maths/src/point3.rs diff --git a/narcissus-maths/src/quat.rs b/libs/narcissus-maths/src/quat.rs similarity index 100% rename from narcissus-maths/src/quat.rs rename to libs/narcissus-maths/src/quat.rs diff --git a/narcissus-maths/src/sin_cos_pi.rs b/libs/narcissus-maths/src/sin_cos_pi.rs similarity index 100% rename from narcissus-maths/src/sin_cos_pi.rs rename to libs/narcissus-maths/src/sin_cos_pi.rs diff --git a/narcissus-maths/src/tan_pi.rs b/libs/narcissus-maths/src/tan_pi.rs similarity index 100% rename from narcissus-maths/src/tan_pi.rs rename to libs/narcissus-maths/src/tan_pi.rs diff --git a/narcissus-maths/src/vec2.rs b/libs/narcissus-maths/src/vec2.rs similarity index 100% rename from narcissus-maths/src/vec2.rs rename to libs/narcissus-maths/src/vec2.rs diff --git a/narcissus-maths/src/vec3.rs b/libs/narcissus-maths/src/vec3.rs similarity index 100% rename from narcissus-maths/src/vec3.rs rename to libs/narcissus-maths/src/vec3.rs diff --git a/narcissus-maths/src/vec4.rs b/libs/narcissus-maths/src/vec4.rs similarity index 100% rename from narcissus-maths/src/vec4.rs rename to libs/narcissus-maths/src/vec4.rs diff --git a/narcissus-maths/tests/exhaustive_f32.rs b/libs/narcissus-maths/tests/exhaustive_f32.rs similarity index 100% rename from narcissus-maths/tests/exhaustive_f32.rs rename to libs/narcissus-maths/tests/exhaustive_f32.rs diff --git a/narcissus-maths/tests/next_after_f32.rs b/libs/narcissus-maths/tests/next_after_f32.rs similarity index 100% rename from narcissus-maths/tests/next_after_f32.rs rename to libs/narcissus-maths/tests/next_after_f32.rs diff --git a/narcissus-world/Cargo.toml b/libs/narcissus-world/Cargo.toml similarity index 100% rename from narcissus-world/Cargo.toml rename to libs/narcissus-world/Cargo.toml diff --git a/narcissus-world/src/lib.rs b/libs/narcissus-world/src/lib.rs similarity index 100% rename from narcissus-world/src/lib.rs rename to libs/narcissus-world/src/lib.rs diff --git a/narcissus/Cargo.toml b/narcissus/Cargo.toml deleted file mode 100644 index 2332c3a..0000000 --- a/narcissus/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "narcissus" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -narcissus-core = { path = "../narcissus-core" } -narcissus-maths = { path = "../narcissus-maths" } -narcissus-image = { path = "../narcissus-image" } -narcissus-app = { path = "../narcissus-app" } -narcissus-gpu = { path = "../narcissus-gpu" } \ No newline at end of file -- 2.49.0