meta: Re-organize crates

diff --git a/Cargo.lock b/Cargo.lock
index cca78d2b66fe753986c44895a12ab3a58d0209e7..55de7d48c021ea682b9ee9256953e8aa8a1655db 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -30,18 +30,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
-[[package]]
-name = "narcissus"
-version = "0.1.0"
-dependencies = [
- "narcissus-app",
- "narcissus-core",
- "narcissus-font",
- "narcissus-gpu",
- "narcissus-image",
- "narcissus-maths",
-]
-
 [[package]]
 name = "narcissus-app"
 version = "0.1.0"
@@ -110,6 +98,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 name = "sdl2-sys"
 version = "0.1.0"
 
+[[package]]
+name = "shark"
+version = "0.1.0"
+dependencies = [
+ "narcissus-app",
+ "narcissus-core",
+ "narcissus-font",
+ "narcissus-gpu",
+ "narcissus-image",
+ "narcissus-maths",
+]
+
 [[package]]
 name = "stb_image-sys"
 version = "0.1.0"

diff --git a/Cargo.toml b/Cargo.toml
index cc1f8d00af5496d328ac798c3efdd07984be5ad4..c690738929188420ed27bdd533bab383d1da9468 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,19 @@
 [workspace]
 
 members = [
-    "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-font",
-    "libs/narcissus-gpu",
-    "libs/narcissus-image",
-    "libs/narcissus-maths",
-    "libs/narcissus-world",
+    "title/shark",
+    "ext/renderdoc-sys",
+    "ext/sdl2-sys",
+    "ext/stb_image-sys",
+    "ext/stb_truetype-sys",
+    "ext/vulkan-sys",
+    "engine/narcissus-app",
+    "engine/narcissus-core",
+    "engine/narcissus-font",
+    "engine/narcissus-gpu",
+    "engine/narcissus-image",
+    "engine/narcissus-maths",
+    "engine/narcissus-world",
 ]
 
 resolver = "2"

diff --git a/bins/narcissus/Cargo.toml b/bins/narcissus/Cargo.toml
deleted file mode 100644 (file)
index 03e3395..0000000
--- a/bins/narcissus/Cargo.toml
+++ /dev/null
@@ -1,14 +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-app = { path = "../../libs/narcissus-app" }
-narcissus-core = { path = "../../libs/narcissus-core" }
-narcissus-font = { path = "../../libs/narcissus-font" }
-narcissus-maths = { path = "../../libs/narcissus-maths" }
-narcissus-image = { path = "../../libs/narcissus-image" }
-narcissus-gpu = { path = "../../libs/narcissus-gpu" }
\ No newline at end of file

diff --git a/libs/narcissus-app/Cargo.toml b/engine/narcissus-app/Cargo.toml
similarity index 84%
rename from libs/narcissus-app/Cargo.toml
rename to engine/narcissus-app/Cargo.toml
index 73186641f03afc54f3bc9782119a9255ebdee1ca..d3fd54bd3ace0dce37e3dc801d16b02f23e6ec12 100644 (file)
--- a/libs/narcissus-app/Cargo.toml
+++ b/engine/narcissus-app/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 narcissus-core = { path = "../narcissus-core" }
-sdl2-sys = { path = "../ffi/sdl2-sys" }
\ No newline at end of file
+sdl2-sys = { path = "../../ext/sdl2-sys" }
\ No newline at end of file

diff --git a/libs/narcissus-app/src/button.rs b/engine/narcissus-app/src/button.rs
similarity index 100%
rename from libs/narcissus-app/src/button.rs
rename to engine/narcissus-app/src/button.rs

diff --git a/libs/narcissus-app/src/key.rs b/engine/narcissus-app/src/key.rs
similarity index 100%
rename from libs/narcissus-app/src/key.rs
rename to engine/narcissus-app/src/key.rs

diff --git a/libs/narcissus-app/src/lib.rs b/engine/narcissus-app/src/lib.rs
similarity index 100%
rename from libs/narcissus-app/src/lib.rs
rename to engine/narcissus-app/src/lib.rs

diff --git a/libs/narcissus-app/src/sdl.rs b/engine/narcissus-app/src/sdl.rs
similarity index 100%
rename from libs/narcissus-app/src/sdl.rs
rename to engine/narcissus-app/src/sdl.rs

diff --git a/libs/narcissus-core/Cargo.toml b/engine/narcissus-core/Cargo.toml
similarity index 100%
rename from libs/narcissus-core/Cargo.toml
rename to engine/narcissus-core/Cargo.toml

diff --git a/libs/narcissus-core/src/arena.rs b/engine/narcissus-core/src/arena.rs
similarity index 100%
rename from libs/narcissus-core/src/arena.rs
rename to engine/narcissus-core/src/arena.rs

diff --git a/libs/narcissus-core/src/bitset.rs b/engine/narcissus-core/src/bitset.rs
similarity index 100%
rename from libs/narcissus-core/src/bitset.rs
rename to engine/narcissus-core/src/bitset.rs

diff --git a/libs/narcissus-core/src/directory.rs b/engine/narcissus-core/src/directory.rs
similarity index 100%
rename from libs/narcissus-core/src/directory.rs
rename to engine/narcissus-core/src/directory.rs

diff --git a/libs/narcissus-core/src/finite.rs b/engine/narcissus-core/src/finite.rs
similarity index 100%
rename from libs/narcissus-core/src/finite.rs
rename to engine/narcissus-core/src/finite.rs

diff --git a/libs/narcissus-core/src/fixed_vec.rs b/engine/narcissus-core/src/fixed_vec.rs
similarity index 100%
rename from libs/narcissus-core/src/fixed_vec.rs
rename to engine/narcissus-core/src/fixed_vec.rs

diff --git a/libs/narcissus-core/src/hybrid_vec.rs b/engine/narcissus-core/src/hybrid_vec.rs
similarity index 100%
rename from libs/narcissus-core/src/hybrid_vec.rs
rename to engine/narcissus-core/src/hybrid_vec.rs

diff --git a/libs/narcissus-core/src/lib.rs b/engine/narcissus-core/src/lib.rs
similarity index 100%
rename from libs/narcissus-core/src/lib.rs
rename to engine/narcissus-core/src/lib.rs

diff --git a/libs/narcissus-core/src/libc.rs b/engine/narcissus-core/src/libc.rs
similarity index 100%
rename from libs/narcissus-core/src/libc.rs
rename to engine/narcissus-core/src/libc.rs

diff --git a/libs/narcissus-core/src/linear_log_binning.rs b/engine/narcissus-core/src/linear_log_binning.rs
similarity index 100%
rename from libs/narcissus-core/src/linear_log_binning.rs
rename to engine/narcissus-core/src/linear_log_binning.rs

diff --git a/libs/narcissus-core/src/manual_arc.rs b/engine/narcissus-core/src/manual_arc.rs
similarity index 100%
rename from libs/narcissus-core/src/manual_arc.rs
rename to engine/narcissus-core/src/manual_arc.rs

diff --git a/libs/narcissus-core/src/mutex.rs b/engine/narcissus-core/src/mutex.rs
similarity index 100%
rename from libs/narcissus-core/src/mutex.rs
rename to engine/narcissus-core/src/mutex.rs

diff --git a/libs/narcissus-core/src/obj.rs b/engine/narcissus-core/src/obj.rs
similarity index 100%
rename from libs/narcissus-core/src/obj.rs
rename to engine/narcissus-core/src/obj.rs

diff --git a/libs/narcissus-core/src/pool.rs b/engine/narcissus-core/src/pool.rs
similarity index 100%
rename from libs/narcissus-core/src/pool.rs
rename to engine/narcissus-core/src/pool.rs

diff --git a/libs/narcissus-core/src/rand.rs b/engine/narcissus-core/src/rand.rs
similarity index 100%
rename from libs/narcissus-core/src/rand.rs
rename to engine/narcissus-core/src/rand.rs

diff --git a/libs/narcissus-core/src/raw_window.rs b/engine/narcissus-core/src/raw_window.rs
similarity index 100%
rename from libs/narcissus-core/src/raw_window.rs
rename to engine/narcissus-core/src/raw_window.rs

diff --git a/libs/narcissus-core/src/ref_count.rs b/engine/narcissus-core/src/ref_count.rs
similarity index 100%
rename from libs/narcissus-core/src/ref_count.rs
rename to engine/narcissus-core/src/ref_count.rs

diff --git a/libs/narcissus-core/src/slice.rs b/engine/narcissus-core/src/slice.rs
similarity index 100%
rename from libs/narcissus-core/src/slice.rs
rename to engine/narcissus-core/src/slice.rs

diff --git a/libs/narcissus-core/src/svg.rs b/engine/narcissus-core/src/svg.rs
similarity index 100%
rename from libs/narcissus-core/src/svg.rs
rename to engine/narcissus-core/src/svg.rs

diff --git a/libs/narcissus-core/src/uuid.rs b/engine/narcissus-core/src/uuid.rs
similarity index 100%
rename from libs/narcissus-core/src/uuid.rs
rename to engine/narcissus-core/src/uuid.rs

diff --git a/libs/narcissus-core/src/virtual_mem.rs b/engine/narcissus-core/src/virtual_mem.rs
similarity index 100%
rename from libs/narcissus-core/src/virtual_mem.rs
rename to engine/narcissus-core/src/virtual_mem.rs

diff --git a/libs/narcissus-core/src/virtual_vec/deque.rs b/engine/narcissus-core/src/virtual_vec/deque.rs
similarity index 100%
rename from libs/narcissus-core/src/virtual_vec/deque.rs
rename to engine/narcissus-core/src/virtual_vec/deque.rs

diff --git a/libs/narcissus-core/src/virtual_vec/mod.rs b/engine/narcissus-core/src/virtual_vec/mod.rs
similarity index 100%
rename from libs/narcissus-core/src/virtual_vec/mod.rs
rename to engine/narcissus-core/src/virtual_vec/mod.rs

diff --git a/libs/narcissus-core/src/virtual_vec/raw_vec.rs b/engine/narcissus-core/src/virtual_vec/raw_vec.rs
similarity index 100%
rename from libs/narcissus-core/src/virtual_vec/raw_vec.rs
rename to engine/narcissus-core/src/virtual_vec/raw_vec.rs

diff --git a/libs/narcissus-core/src/virtual_vec/vec.rs b/engine/narcissus-core/src/virtual_vec/vec.rs
similarity index 100%
rename from libs/narcissus-core/src/virtual_vec/vec.rs
rename to engine/narcissus-core/src/virtual_vec/vec.rs

diff --git a/libs/narcissus-core/src/waiter.rs b/engine/narcissus-core/src/waiter.rs
similarity index 100%
rename from libs/narcissus-core/src/waiter.rs
rename to engine/narcissus-core/src/waiter.rs

diff --git a/libs/narcissus-core/src/widen.rs b/engine/narcissus-core/src/widen.rs
similarity index 100%
rename from libs/narcissus-core/src/widen.rs
rename to engine/narcissus-core/src/widen.rs

diff --git a/libs/narcissus-font/Cargo.toml b/engine/narcissus-font/Cargo.toml
similarity index 80%
rename from libs/narcissus-font/Cargo.toml
rename to engine/narcissus-font/Cargo.toml
index abe74b3b4343344f616abb8517c057ec70fc72f5..bf0e7e43b37244568b867bcb2d7a10f64fdb1cbf 100644 (file)
--- a/libs/narcissus-font/Cargo.toml
+++ b/engine/narcissus-font/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-stb_truetype-sys = { path = "../ffi/stb_truetype-sys" }
+stb_truetype-sys = { path = "../../ext/stb_truetype-sys" }
 narcissus-core = { path = "../narcissus-core" }
 rustc-hash = "1.1.0"
\ No newline at end of file

diff --git a/libs/narcissus-font/src/cache.rs b/engine/narcissus-font/src/cache.rs
similarity index 100%
rename from libs/narcissus-font/src/cache.rs
rename to engine/narcissus-font/src/cache.rs

diff --git a/libs/narcissus-font/src/font.rs b/engine/narcissus-font/src/font.rs
similarity index 100%
rename from libs/narcissus-font/src/font.rs
rename to engine/narcissus-font/src/font.rs

diff --git a/libs/narcissus-font/src/lib.rs b/engine/narcissus-font/src/lib.rs
similarity index 100%
rename from libs/narcissus-font/src/lib.rs
rename to engine/narcissus-font/src/lib.rs

diff --git a/libs/narcissus-font/src/packer.rs b/engine/narcissus-font/src/packer.rs
similarity index 100%
rename from libs/narcissus-font/src/packer.rs
rename to engine/narcissus-font/src/packer.rs

diff --git a/libs/narcissus-gpu/Cargo.toml b/engine/narcissus-gpu/Cargo.toml
similarity index 83%
rename from libs/narcissus-gpu/Cargo.toml
rename to engine/narcissus-gpu/Cargo.toml
index 77fc3855d37032ed49f70ad39819e864a90ef89d..5feb1aedd38eac0c76251073ab954d0da46a631b 100644 (file)
--- a/libs/narcissus-gpu/Cargo.toml
+++ b/engine/narcissus-gpu/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 narcissus-core = { path = "../narcissus-core" }
-vulkan-sys = { path = "../ffi/vulkan-sys" }
\ No newline at end of file
+vulkan-sys = { path = "../../ext/vulkan-sys" }
\ No newline at end of file

diff --git a/libs/narcissus-gpu/src/backend/mod.rs b/engine/narcissus-gpu/src/backend/mod.rs
similarity index 100%
rename from libs/narcissus-gpu/src/backend/mod.rs
rename to engine/narcissus-gpu/src/backend/mod.rs

diff --git a/libs/narcissus-gpu/src/backend/vulkan/allocator.rs b/engine/narcissus-gpu/src/backend/vulkan/allocator.rs
similarity index 100%
rename from libs/narcissus-gpu/src/backend/vulkan/allocator.rs
rename to engine/narcissus-gpu/src/backend/vulkan/allocator.rs

diff --git a/libs/narcissus-gpu/src/backend/vulkan/barrier.rs b/engine/narcissus-gpu/src/backend/vulkan/barrier.rs
similarity index 100%
rename from libs/narcissus-gpu/src/backend/vulkan/barrier.rs
rename to engine/narcissus-gpu/src/backend/vulkan/barrier.rs

diff --git a/libs/narcissus-gpu/src/backend/vulkan/convert.rs b/engine/narcissus-gpu/src/backend/vulkan/convert.rs
similarity index 100%
rename from libs/narcissus-gpu/src/backend/vulkan/convert.rs
rename to engine/narcissus-gpu/src/backend/vulkan/convert.rs

diff --git a/libs/narcissus-gpu/src/backend/vulkan/libc.rs b/engine/narcissus-gpu/src/backend/vulkan/libc.rs
similarity index 100%
rename from libs/narcissus-gpu/src/backend/vulkan/libc.rs
rename to engine/narcissus-gpu/src/backend/vulkan/libc.rs

diff --git a/libs/narcissus-gpu/src/backend/vulkan/mod.rs b/engine/narcissus-gpu/src/backend/vulkan/mod.rs
similarity index 100%
rename from libs/narcissus-gpu/src/backend/vulkan/mod.rs
rename to engine/narcissus-gpu/src/backend/vulkan/mod.rs

diff --git a/libs/narcissus-gpu/src/backend/vulkan/wsi.rs b/engine/narcissus-gpu/src/backend/vulkan/wsi.rs
similarity index 100%
rename from libs/narcissus-gpu/src/backend/vulkan/wsi.rs
rename to engine/narcissus-gpu/src/backend/vulkan/wsi.rs

diff --git a/libs/narcissus-gpu/src/delay_queue.rs b/engine/narcissus-gpu/src/delay_queue.rs
similarity index 100%
rename from libs/narcissus-gpu/src/delay_queue.rs
rename to engine/narcissus-gpu/src/delay_queue.rs

diff --git a/libs/narcissus-gpu/src/frame_counter.rs b/engine/narcissus-gpu/src/frame_counter.rs
similarity index 100%
rename from libs/narcissus-gpu/src/frame_counter.rs
rename to engine/narcissus-gpu/src/frame_counter.rs

diff --git a/libs/narcissus-gpu/src/lib.rs b/engine/narcissus-gpu/src/lib.rs
similarity index 100%
rename from libs/narcissus-gpu/src/lib.rs
rename to engine/narcissus-gpu/src/lib.rs

diff --git a/libs/narcissus-gpu/src/mapped_buffer.rs b/engine/narcissus-gpu/src/mapped_buffer.rs
similarity index 100%
rename from libs/narcissus-gpu/src/mapped_buffer.rs
rename to engine/narcissus-gpu/src/mapped_buffer.rs

diff --git a/libs/narcissus-gpu/src/tlsf.rs b/engine/narcissus-gpu/src/tlsf.rs
similarity index 100%
rename from libs/narcissus-gpu/src/tlsf.rs
rename to engine/narcissus-gpu/src/tlsf.rs

diff --git a/libs/narcissus-image/Cargo.toml b/engine/narcissus-image/Cargo.toml
similarity index 77%
rename from libs/narcissus-image/Cargo.toml
rename to engine/narcissus-image/Cargo.toml
index f1435d467e0200cac127ee50eb93c4a1b723db05..f2e034b45748fc73788584a499759aa3399d24cc 100644 (file)
--- a/libs/narcissus-image/Cargo.toml
+++ b/engine/narcissus-image/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-stb_image-sys = { path = "../ffi/stb_image-sys" }
\ No newline at end of file
+stb_image-sys = { path = "../../ext/stb_image-sys" }
\ No newline at end of file

diff --git a/libs/narcissus-image/src/lib.rs b/engine/narcissus-image/src/lib.rs
similarity index 100%
rename from libs/narcissus-image/src/lib.rs
rename to engine/narcissus-image/src/lib.rs

diff --git a/libs/narcissus-maths/Cargo.toml b/engine/narcissus-maths/Cargo.toml
similarity index 100%
rename from libs/narcissus-maths/Cargo.toml
rename to engine/narcissus-maths/Cargo.toml

diff --git a/libs/narcissus-maths/doc/sincostan.m b/engine/narcissus-maths/doc/sincostan.m
similarity index 100%
rename from libs/narcissus-maths/doc/sincostan.m
rename to engine/narcissus-maths/doc/sincostan.m

diff --git a/libs/narcissus-maths/doc/sincostan.sollya b/engine/narcissus-maths/doc/sincostan.sollya
similarity index 100%
rename from libs/narcissus-maths/doc/sincostan.sollya
rename to engine/narcissus-maths/doc/sincostan.sollya

diff --git a/libs/narcissus-maths/src/affine2.rs b/engine/narcissus-maths/src/affine2.rs
similarity index 100%
rename from libs/narcissus-maths/src/affine2.rs
rename to engine/narcissus-maths/src/affine2.rs

diff --git a/libs/narcissus-maths/src/affine3.rs b/engine/narcissus-maths/src/affine3.rs
similarity index 100%
rename from libs/narcissus-maths/src/affine3.rs
rename to engine/narcissus-maths/src/affine3.rs

diff --git a/libs/narcissus-maths/src/lib.rs b/engine/narcissus-maths/src/lib.rs
similarity index 100%
rename from libs/narcissus-maths/src/lib.rs
rename to engine/narcissus-maths/src/lib.rs

diff --git a/libs/narcissus-maths/src/mat2.rs b/engine/narcissus-maths/src/mat2.rs
similarity index 100%
rename from libs/narcissus-maths/src/mat2.rs
rename to engine/narcissus-maths/src/mat2.rs

diff --git a/libs/narcissus-maths/src/mat3.rs b/engine/narcissus-maths/src/mat3.rs
similarity index 100%
rename from libs/narcissus-maths/src/mat3.rs
rename to engine/narcissus-maths/src/mat3.rs

diff --git a/libs/narcissus-maths/src/mat4.rs b/engine/narcissus-maths/src/mat4.rs
similarity index 100%
rename from libs/narcissus-maths/src/mat4.rs
rename to engine/narcissus-maths/src/mat4.rs

diff --git a/libs/narcissus-maths/src/next_after_f32.rs b/engine/narcissus-maths/src/next_after_f32.rs
similarity index 100%
rename from libs/narcissus-maths/src/next_after_f32.rs
rename to engine/narcissus-maths/src/next_after_f32.rs

diff --git a/libs/narcissus-maths/src/point2.rs b/engine/narcissus-maths/src/point2.rs
similarity index 100%
rename from libs/narcissus-maths/src/point2.rs
rename to engine/narcissus-maths/src/point2.rs

diff --git a/libs/narcissus-maths/src/point3.rs b/engine/narcissus-maths/src/point3.rs
similarity index 100%
rename from libs/narcissus-maths/src/point3.rs
rename to engine/narcissus-maths/src/point3.rs

diff --git a/libs/narcissus-maths/src/quat.rs b/engine/narcissus-maths/src/quat.rs
similarity index 100%
rename from libs/narcissus-maths/src/quat.rs
rename to engine/narcissus-maths/src/quat.rs

diff --git a/libs/narcissus-maths/src/sin_cos_pi.rs b/engine/narcissus-maths/src/sin_cos_pi.rs
similarity index 100%
rename from libs/narcissus-maths/src/sin_cos_pi.rs
rename to engine/narcissus-maths/src/sin_cos_pi.rs

diff --git a/libs/narcissus-maths/src/tan_pi.rs b/engine/narcissus-maths/src/tan_pi.rs
similarity index 100%
rename from libs/narcissus-maths/src/tan_pi.rs
rename to engine/narcissus-maths/src/tan_pi.rs

diff --git a/libs/narcissus-maths/src/vec2.rs b/engine/narcissus-maths/src/vec2.rs
similarity index 100%
rename from libs/narcissus-maths/src/vec2.rs
rename to engine/narcissus-maths/src/vec2.rs

diff --git a/libs/narcissus-maths/src/vec3.rs b/engine/narcissus-maths/src/vec3.rs
similarity index 100%
rename from libs/narcissus-maths/src/vec3.rs
rename to engine/narcissus-maths/src/vec3.rs

diff --git a/libs/narcissus-maths/src/vec4.rs b/engine/narcissus-maths/src/vec4.rs
similarity index 100%
rename from libs/narcissus-maths/src/vec4.rs
rename to engine/narcissus-maths/src/vec4.rs

diff --git a/libs/narcissus-maths/tests/exhaustive_f32.rs b/engine/narcissus-maths/tests/exhaustive_f32.rs
similarity index 100%
rename from libs/narcissus-maths/tests/exhaustive_f32.rs
rename to engine/narcissus-maths/tests/exhaustive_f32.rs

diff --git a/libs/narcissus-maths/tests/next_after_f32.rs b/engine/narcissus-maths/tests/next_after_f32.rs
similarity index 100%
rename from libs/narcissus-maths/tests/next_after_f32.rs
rename to engine/narcissus-maths/tests/next_after_f32.rs

diff --git a/libs/narcissus-world/Cargo.toml b/engine/narcissus-world/Cargo.toml
similarity index 100%
rename from libs/narcissus-world/Cargo.toml
rename to engine/narcissus-world/Cargo.toml

diff --git a/libs/narcissus-world/src/lib.rs b/engine/narcissus-world/src/lib.rs
similarity index 100%
rename from libs/narcissus-world/src/lib.rs
rename to engine/narcissus-world/src/lib.rs

diff --git a/libs/ffi/renderdoc-sys/Cargo.toml b/ext/renderdoc-sys/Cargo.toml
similarity index 100%
rename from libs/ffi/renderdoc-sys/Cargo.toml
rename to ext/renderdoc-sys/Cargo.toml

diff --git a/libs/ffi/renderdoc-sys/src/helpers.rs b/ext/renderdoc-sys/src/helpers.rs
similarity index 100%
rename from libs/ffi/renderdoc-sys/src/helpers.rs
rename to ext/renderdoc-sys/src/helpers.rs

diff --git a/libs/ffi/renderdoc-sys/src/lib.rs b/ext/renderdoc-sys/src/lib.rs
similarity index 100%
rename from libs/ffi/renderdoc-sys/src/lib.rs
rename to ext/renderdoc-sys/src/lib.rs

diff --git a/libs/ffi/sdl2-sys/Cargo.toml b/ext/sdl2-sys/Cargo.toml
similarity index 100%
rename from libs/ffi/sdl2-sys/Cargo.toml
rename to ext/sdl2-sys/Cargo.toml

diff --git a/libs/ffi/sdl2-sys/build.rs b/ext/sdl2-sys/build.rs
similarity index 100%
rename from libs/ffi/sdl2-sys/build.rs
rename to ext/sdl2-sys/build.rs

diff --git a/libs/ffi/sdl2-sys/src/lib.rs b/ext/sdl2-sys/src/lib.rs
similarity index 100%
rename from libs/ffi/sdl2-sys/src/lib.rs
rename to ext/sdl2-sys/src/lib.rs

diff --git a/libs/ffi/stb_image-sys/Cargo.toml b/ext/stb_image-sys/Cargo.toml
similarity index 100%
rename from libs/ffi/stb_image-sys/Cargo.toml
rename to ext/stb_image-sys/Cargo.toml

diff --git a/libs/ffi/stb_image-sys/build.rs b/ext/stb_image-sys/build.rs
similarity index 100%
rename from libs/ffi/stb_image-sys/build.rs
rename to ext/stb_image-sys/build.rs

diff --git a/libs/ffi/stb_image-sys/src/lib.rs b/ext/stb_image-sys/src/lib.rs
similarity index 100%
rename from libs/ffi/stb_image-sys/src/lib.rs
rename to ext/stb_image-sys/src/lib.rs

diff --git a/libs/ffi/stb_image-sys/src/stb_image.c b/ext/stb_image-sys/src/stb_image.c
similarity index 100%
rename from libs/ffi/stb_image-sys/src/stb_image.c
rename to ext/stb_image-sys/src/stb_image.c

diff --git a/libs/ffi/stb_image-sys/src/stb_image.h b/ext/stb_image-sys/src/stb_image.h
similarity index 100%
rename from libs/ffi/stb_image-sys/src/stb_image.h
rename to ext/stb_image-sys/src/stb_image.h

diff --git a/libs/ffi/stb_truetype-sys/Cargo.toml b/ext/stb_truetype-sys/Cargo.toml
similarity index 100%
rename from libs/ffi/stb_truetype-sys/Cargo.toml
rename to ext/stb_truetype-sys/Cargo.toml

diff --git a/libs/ffi/stb_truetype-sys/build.rs b/ext/stb_truetype-sys/build.rs
similarity index 100%
rename from libs/ffi/stb_truetype-sys/build.rs
rename to ext/stb_truetype-sys/build.rs

diff --git a/libs/ffi/stb_truetype-sys/src/lib.rs b/ext/stb_truetype-sys/src/lib.rs
similarity index 100%
rename from libs/ffi/stb_truetype-sys/src/lib.rs
rename to ext/stb_truetype-sys/src/lib.rs

diff --git a/libs/ffi/stb_truetype-sys/src/stb_rect_pack.h b/ext/stb_truetype-sys/src/stb_rect_pack.h
similarity index 100%
rename from libs/ffi/stb_truetype-sys/src/stb_rect_pack.h
rename to ext/stb_truetype-sys/src/stb_rect_pack.h

diff --git a/libs/ffi/stb_truetype-sys/src/stb_truetype.c b/ext/stb_truetype-sys/src/stb_truetype.c
similarity index 100%
rename from libs/ffi/stb_truetype-sys/src/stb_truetype.c
rename to ext/stb_truetype-sys/src/stb_truetype.c

diff --git a/libs/ffi/stb_truetype-sys/src/stb_truetype.h b/ext/stb_truetype-sys/src/stb_truetype.h
similarity index 100%
rename from libs/ffi/stb_truetype-sys/src/stb_truetype.h
rename to ext/stb_truetype-sys/src/stb_truetype.h

diff --git a/libs/ffi/vulkan-sys/.gitignore b/ext/vulkan-sys/.gitignore
similarity index 100%
rename from libs/ffi/vulkan-sys/.gitignore
rename to ext/vulkan-sys/.gitignore

diff --git a/libs/ffi/vulkan-sys/Cargo.toml b/ext/vulkan-sys/Cargo.toml
similarity index 100%
rename from libs/ffi/vulkan-sys/Cargo.toml
rename to ext/vulkan-sys/Cargo.toml

diff --git a/libs/ffi/vulkan-sys/examples/triangle.frag.glsl b/ext/vulkan-sys/examples/triangle.frag.glsl
similarity index 100%
rename from libs/ffi/vulkan-sys/examples/triangle.frag.glsl
rename to ext/vulkan-sys/examples/triangle.frag.glsl

diff --git a/libs/ffi/vulkan-sys/examples/triangle.frag.spv b/ext/vulkan-sys/examples/triangle.frag.spv
similarity index 100%
rename from libs/ffi/vulkan-sys/examples/triangle.frag.spv
rename to ext/vulkan-sys/examples/triangle.frag.spv

diff --git a/libs/ffi/vulkan-sys/examples/triangle.rs b/ext/vulkan-sys/examples/triangle.rs
similarity index 100%
rename from libs/ffi/vulkan-sys/examples/triangle.rs
rename to ext/vulkan-sys/examples/triangle.rs

diff --git a/libs/ffi/vulkan-sys/examples/triangle.vert.glsl b/ext/vulkan-sys/examples/triangle.vert.glsl
similarity index 100%
rename from libs/ffi/vulkan-sys/examples/triangle.vert.glsl
rename to ext/vulkan-sys/examples/triangle.vert.glsl

diff --git a/libs/ffi/vulkan-sys/examples/triangle.vert.spv b/ext/vulkan-sys/examples/triangle.vert.spv
similarity index 100%
rename from libs/ffi/vulkan-sys/examples/triangle.vert.spv
rename to ext/vulkan-sys/examples/triangle.vert.spv

diff --git a/libs/ffi/vulkan-sys/src/enums.rs b/ext/vulkan-sys/src/enums.rs
similarity index 100%
rename from libs/ffi/vulkan-sys/src/enums.rs
rename to ext/vulkan-sys/src/enums.rs

diff --git a/libs/ffi/vulkan-sys/src/flags.rs b/ext/vulkan-sys/src/flags.rs
similarity index 100%
rename from libs/ffi/vulkan-sys/src/flags.rs
rename to ext/vulkan-sys/src/flags.rs

diff --git a/libs/ffi/vulkan-sys/src/functions.rs b/ext/vulkan-sys/src/functions.rs
similarity index 100%
rename from libs/ffi/vulkan-sys/src/functions.rs
rename to ext/vulkan-sys/src/functions.rs

diff --git a/libs/ffi/vulkan-sys/src/handles.rs b/ext/vulkan-sys/src/handles.rs
similarity index 100%
rename from libs/ffi/vulkan-sys/src/handles.rs
rename to ext/vulkan-sys/src/handles.rs

diff --git a/libs/ffi/vulkan-sys/src/helpers.rs b/ext/vulkan-sys/src/helpers.rs
similarity index 100%
rename from libs/ffi/vulkan-sys/src/helpers.rs
rename to ext/vulkan-sys/src/helpers.rs

diff --git a/libs/ffi/vulkan-sys/src/lib.rs b/ext/vulkan-sys/src/lib.rs
similarity index 100%
rename from libs/ffi/vulkan-sys/src/lib.rs
rename to ext/vulkan-sys/src/lib.rs

diff --git a/libs/ffi/vulkan-sys/src/structs.rs b/ext/vulkan-sys/src/structs.rs
similarity index 100%
rename from libs/ffi/vulkan-sys/src/structs.rs
rename to ext/vulkan-sys/src/structs.rs

diff --git a/title/shark/Cargo.toml b/title/shark/Cargo.toml
new file mode 100644 (file)
index 0000000..85b4ca5
--- /dev/null
+++ b/title/shark/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "shark"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+narcissus-app = { path = "../../engine/narcissus-app" }
+narcissus-core = { path = "../../engine/narcissus-core" }
+narcissus-font = { path = "../../engine/narcissus-font" }
+narcissus-maths = { path = "../../engine/narcissus-maths" }
+narcissus-image = { path = "../../engine/narcissus-image" }
+narcissus-gpu = { path = "../../engine/narcissus-gpu" }
\ No newline at end of file

diff --git a/bins/narcissus/data/blåhaj.mtl b/title/shark/data/blåhaj.mtl
similarity index 100%
rename from bins/narcissus/data/blåhaj.mtl
rename to title/shark/data/blåhaj.mtl

diff --git a/bins/narcissus/data/blåhaj.obj b/title/shark/data/blåhaj.obj
similarity index 100%
rename from bins/narcissus/data/blåhaj.obj
rename to title/shark/data/blåhaj.obj

diff --git a/bins/narcissus/data/blåhaj.png b/title/shark/data/blåhaj.png
similarity index 100%
rename from bins/narcissus/data/blåhaj.png
rename to title/shark/data/blåhaj.png

diff --git a/bins/narcissus/src/fonts.rs b/title/shark/src/fonts.rs
similarity index 100%
rename from bins/narcissus/src/fonts.rs
rename to title/shark/src/fonts.rs

diff --git a/bins/narcissus/src/fonts/LICENSE.txt b/title/shark/src/fonts/LICENSE.txt
similarity index 100%
rename from bins/narcissus/src/fonts/LICENSE.txt
rename to title/shark/src/fonts/LICENSE.txt

diff --git a/bins/narcissus/src/fonts/NotoSansJP-Medium.otf b/title/shark/src/fonts/NotoSansJP-Medium.otf
similarity index 100%
rename from bins/narcissus/src/fonts/NotoSansJP-Medium.otf
rename to title/shark/src/fonts/NotoSansJP-Medium.otf

diff --git a/bins/narcissus/src/fonts/OFL.txt b/title/shark/src/fonts/OFL.txt
similarity index 100%
rename from bins/narcissus/src/fonts/OFL.txt
rename to title/shark/src/fonts/OFL.txt

diff --git a/bins/narcissus/src/fonts/Roboto-Bold.ttf b/title/shark/src/fonts/Roboto-Bold.ttf
similarity index 100%
rename from bins/narcissus/src/fonts/Roboto-Bold.ttf
rename to title/shark/src/fonts/Roboto-Bold.ttf

diff --git a/bins/narcissus/src/fonts/Roboto-Regular.ttf b/title/shark/src/fonts/Roboto-Regular.ttf
similarity index 100%
rename from bins/narcissus/src/fonts/Roboto-Regular.ttf
rename to title/shark/src/fonts/Roboto-Regular.ttf

diff --git a/bins/narcissus/src/helpers.rs b/title/shark/src/helpers.rs
similarity index 100%
rename from bins/narcissus/src/helpers.rs
rename to title/shark/src/helpers.rs

diff --git a/bins/narcissus/src/main.rs b/title/shark/src/main.rs
similarity index 98%
rename from bins/narcissus/src/main.rs
rename to title/shark/src/main.rs
index 33ef153239f890015466da2dff762d4ab3052165..271c7ebad680716ae13e294e53b6ea327d97e92b 100644 (file)
--- a/bins/narcissus/src/main.rs
+++ b/title/shark/src/main.rs
@@ -27,7 +27,7 @@ const GLYPH_CACHE_SIZE: usize = 1024;
 pub fn main() {
     let app = create_app();
     let main_window = app.create_window(&WindowDesc {
-        title: "narcissus",
+        title: "shark",
         width: 800,
         height: 600,
     });
@@ -41,8 +41,8 @@ pub fn main() {
     let fonts = Fonts::new();
     let mut glyph_cache = GlyphCache::new(&fonts, GLYPH_CACHE_SIZE, GLYPH_CACHE_SIZE, 1);
 
-    let blåhaj_image_data = 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_image_data = load_image("title/shark/data/blåhaj.png");
+    let (blåhaj_vertices, blåhaj_indices) = load_obj("title/shark/data/blåhaj.obj");
 
     let blåhaj_vertex_buffer = device.create_persistent_buffer_with_data(
         MemoryLocation::Device,

diff --git a/bins/narcissus/src/pipelines/basic.rs b/title/shark/src/pipelines/basic.rs
similarity index 100%
rename from bins/narcissus/src/pipelines/basic.rs
rename to title/shark/src/pipelines/basic.rs

diff --git a/bins/narcissus/src/pipelines/mod.rs b/title/shark/src/pipelines/mod.rs
similarity index 100%
rename from bins/narcissus/src/pipelines/mod.rs
rename to title/shark/src/pipelines/mod.rs

diff --git a/bins/narcissus/src/pipelines/text.rs b/title/shark/src/pipelines/text.rs
similarity index 100%
rename from bins/narcissus/src/pipelines/text.rs
rename to title/shark/src/pipelines/text.rs

diff --git a/bins/narcissus/src/shaders/basic.frag.glsl b/title/shark/src/shaders/basic.frag.glsl
similarity index 100%
rename from bins/narcissus/src/shaders/basic.frag.glsl
rename to title/shark/src/shaders/basic.frag.glsl

diff --git a/bins/narcissus/src/shaders/basic.frag.spv b/title/shark/src/shaders/basic.frag.spv
similarity index 100%
rename from bins/narcissus/src/shaders/basic.frag.spv
rename to title/shark/src/shaders/basic.frag.spv

diff --git a/bins/narcissus/src/shaders/basic.vert.glsl b/title/shark/src/shaders/basic.vert.glsl
similarity index 100%
rename from bins/narcissus/src/shaders/basic.vert.glsl
rename to title/shark/src/shaders/basic.vert.glsl

diff --git a/bins/narcissus/src/shaders/basic.vert.spv b/title/shark/src/shaders/basic.vert.spv
similarity index 100%
rename from bins/narcissus/src/shaders/basic.vert.spv
rename to title/shark/src/shaders/basic.vert.spv

diff --git a/bins/narcissus/src/shaders/build.sh b/title/shark/src/shaders/build.sh
similarity index 100%
rename from bins/narcissus/src/shaders/build.sh
rename to title/shark/src/shaders/build.sh

diff --git a/bins/narcissus/src/shaders/text.frag.glsl b/title/shark/src/shaders/text.frag.glsl
similarity index 100%
rename from bins/narcissus/src/shaders/text.frag.glsl
rename to title/shark/src/shaders/text.frag.glsl

diff --git a/bins/narcissus/src/shaders/text.frag.spv b/title/shark/src/shaders/text.frag.spv
similarity index 100%
rename from bins/narcissus/src/shaders/text.frag.spv
rename to title/shark/src/shaders/text.frag.spv

diff --git a/bins/narcissus/src/shaders/text.vert.glsl b/title/shark/src/shaders/text.vert.glsl
similarity index 100%
rename from bins/narcissus/src/shaders/text.vert.glsl
rename to title/shark/src/shaders/text.vert.glsl

diff --git a/bins/narcissus/src/shaders/text.vert.spv b/title/shark/src/shaders/text.vert.spv
similarity index 100%
rename from bins/narcissus/src/shaders/text.vert.spv
rename to title/shark/src/shaders/text.vert.spv