Split up korangar_procedural crate

vE5li · Apr 16, 2024 · 76a41cb · 76a41cb
1 parent 1783fd9
commit 76a41cb
Show file tree

Hide file tree

Showing 124 changed files with 558 additions and 612 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,6 @@ cgmath = { version = "0.18", features = ["serde"] }
 chrono = "0.4"
 derive-new = "0.6.0"
 korangar_interface = { path = "korangar_interface" }
-korangar_procedural = { path = "korangar_procedural" }
 korangar_debug = { path = "korangar_debug" }
 num = "0.4.1"
 ragnarok_bytes = { path = "ragnarok_bytes" }

diff --git a/korangar/Cargo.toml b/korangar/Cargo.toml
@@ -19,7 +19,6 @@ num = { workspace = true }
 option-ext = "0.2.0"
 pathfinding = "2.2.2"
 korangar_debug = { workspace = true, optional = true }
-korangar_procedural = { workspace = true }
 ragnarok_bytes = { workspace = true, features = ["derive", "cgmath"] }
 ragnarok_networking = { workspace = true, features = ["derive", "interface"] }
 rand = "0.8.5"

diff --git a/korangar/src/graphics/memory.rs b/korangar/src/graphics/memory.rs
@@ -132,7 +132,7 @@ unsafe impl CommandBufferAllocator for MemoryAllocator {
     }
 }
 
-#[korangar_procedural::profile]
+#[korangar_debug::profile]
 pub(super) fn allocate_descriptor_set(
     pipeline: &Arc<GraphicsPipeline>,
     memory_allocator: &Arc<MemoryAllocator>,

diff --git a/korangar/src/graphics/particles/mod.rs b/korangar/src/graphics/particles/mod.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use cgmath::{Vector2, Vector3};
 use derive_new::new;
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use ragnarok_networking::{EntityId, QuestColor, QuestEffectPacket};
 use rand::{thread_rng, Rng};
 

diff --git a/korangar/src/graphics/renderers/deferred/ambient/mod.rs b/korangar/src/graphics/renderers/deferred/ambient/mod.rs
@@ -3,7 +3,7 @@ fragment_shader!("src/graphics/renderers/deferred/ambient/fragment_shader.glsl")
 
 use std::sync::Arc;
 
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use vulkano::descriptor_set::WriteDescriptorSet;
 use vulkano::device::{Device, DeviceOwned};
 use vulkano::pipeline::graphics::viewport::Viewport;
@@ -38,7 +38,7 @@ impl AmbientLightRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(&mut self, device: Arc<Device>, subpass: Subpass, viewport: Viewport) {
         self.pipeline = Self::create_pipeline(device, subpass, viewport, &self.vertex_shader, &self.fragment_shader);
     }
@@ -57,7 +57,7 @@ impl AmbientLightRenderer {
             .build(device, subpass)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target) {
         render_target
             .state

diff --git a/korangar/src/graphics/renderers/deferred/box/mod.rs b/korangar/src/graphics/renderers/deferred/box/mod.rs
@@ -4,7 +4,7 @@ fragment_shader!("src/graphics/renderers/deferred/box/fragment_shader.glsl");
 use std::sync::Arc;
 
 use cgmath::Vector3;
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use vulkano::descriptor_set::WriteDescriptorSet;
 use vulkano::device::{Device, DeviceOwned};
 use vulkano::pipeline::graphics::input_assembly::PrimitiveTopology;
@@ -71,7 +71,7 @@ impl BoxRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(&mut self, device: Arc<Device>, subpass: Subpass, viewport: Viewport) {
         self.pipeline = Self::create_pipeline(device, subpass, viewport, &self.vertex_shader, &self.fragment_shader);
     }
@@ -90,7 +90,7 @@ impl BoxRenderer {
             .build(device, subpass)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target, camera: &dyn Camera) {
         let (view_matrix, projection_matrix) = camera.view_projection_matrices();
         let buffer = self.matrices_buffer.allocate(Matrices {

diff --git a/korangar/src/graphics/renderers/deferred/buffer/mod.rs b/korangar/src/graphics/renderers/deferred/buffer/mod.rs
@@ -3,7 +3,7 @@ fragment_shader!("src/graphics/renderers/deferred/buffer/fragment_shader.glsl");
 
 use std::sync::Arc;
 
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use vulkano::descriptor_set::WriteDescriptorSet;
 use vulkano::device::{Device, DeviceOwned};
 use vulkano::image::sampler::Sampler;
@@ -43,7 +43,7 @@ impl BufferRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(&mut self, device: Arc<Device>, subpass: Subpass, viewport: Viewport) {
         self.pipeline = Self::create_pipeline(device, subpass, viewport, &self.vertex_shader, &self.fragment_shader);
     }
@@ -60,7 +60,7 @@ impl BufferRenderer {
             .build(device, subpass)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target) {
         render_target
             .state

diff --git a/korangar/src/graphics/renderers/deferred/directional/mod.rs b/korangar/src/graphics/renderers/deferred/directional/mod.rs
@@ -4,7 +4,7 @@ fragment_shader!("src/graphics/renderers/deferred/directional/fragment_shader.gl
 use std::sync::Arc;
 
 use cgmath::{Matrix4, Vector3};
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use vulkano::descriptor_set::WriteDescriptorSet;
 use vulkano::device::{Device, DeviceOwned};
 use vulkano::image::sampler::Sampler;
@@ -48,7 +48,7 @@ impl DirectionalLightRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(&mut self, device: Arc<Device>, subpass: Subpass, viewport: Viewport) {
         self.pipeline = Self::create_pipeline(device, subpass, viewport, &self.vertex_shader, &self.fragment_shader);
     }
@@ -66,7 +66,7 @@ impl DirectionalLightRenderer {
             .build(device, subpass)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target) {
         render_target
             .state

diff --git a/korangar/src/graphics/renderers/deferred/effect/mod.rs b/korangar/src/graphics/renderers/deferred/effect/mod.rs
@@ -4,7 +4,7 @@ fragment_shader!("src/graphics/renderers/deferred/effect/fragment_shader.glsl");
 use std::sync::Arc;
 
 use cgmath::{Matrix2, Vector2};
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use vulkano::descriptor_set::WriteDescriptorSet;
 use vulkano::device::{Device, DeviceOwned};
 use vulkano::image::sampler::Sampler;
@@ -47,7 +47,7 @@ impl EffectRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(&mut self, device: Arc<Device>, subpass: Subpass, viewport: Viewport) {
         self.pipeline = Self::create_pipeline(device, subpass, viewport, &self.vertex_shader, &self.fragment_shader);
     }
@@ -65,7 +65,7 @@ impl EffectRenderer {
             .build(device, subpass)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target) {
         render_target
             .state

diff --git a/korangar/src/graphics/renderers/deferred/entity/mod.rs b/korangar/src/graphics/renderers/deferred/entity/mod.rs
@@ -4,7 +4,7 @@ fragment_shader!("src/graphics/renderers/deferred/entity/fragment_shader.glsl");
 use std::sync::Arc;
 
 use cgmath::{Vector2, Vector3};
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use vulkano::descriptor_set::WriteDescriptorSet;
 use vulkano::device::{Device, DeviceOwned};
 use vulkano::image::sampler::Sampler;
@@ -48,7 +48,7 @@ impl EntityRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(&mut self, device: Arc<Device>, subpass: Subpass, viewport: Viewport) {
         self.pipeline = Self::create_pipeline(device, subpass, viewport, &self.vertex_shader, &self.fragment_shader);
     }
@@ -67,7 +67,7 @@ impl EntityRenderer {
             .build(device, subpass)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target, camera: &dyn Camera) {
         let (view_matrix, projection_matrix) = camera.view_projection_matrices();
         let buffer = self.matrices_buffer.allocate(Matrices {

diff --git a/korangar/src/graphics/renderers/deferred/geometry/mod.rs b/korangar/src/graphics/renderers/deferred/geometry/mod.rs
@@ -4,7 +4,7 @@ fragment_shader!("src/graphics/renderers/deferred/geometry/fragment_shader.glsl"
 use std::sync::Arc;
 
 use cgmath::Matrix4;
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use vulkano::descriptor_set::WriteDescriptorSet;
 use vulkano::device::{Device, DeviceOwned};
 use vulkano::image::sampler::Sampler;
@@ -61,7 +61,7 @@ impl GeometryRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(
         &mut self,
         device: Arc<Device>,
@@ -116,7 +116,7 @@ impl GeometryRenderer {
             .build_with_specialization(device, subpass, specialization_constants)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target, camera: &dyn Camera, time: f32) {
         let (view_matrix, projection_matrix) = camera.view_projection_matrices();
         let buffer = self.matrices_buffer.allocate(Matrices {

diff --git a/korangar/src/graphics/renderers/deferred/indicator/mod.rs b/korangar/src/graphics/renderers/deferred/indicator/mod.rs
@@ -48,7 +48,7 @@ impl IndicatorRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(&mut self, device: Arc<Device>, subpass: Subpass, viewport: Viewport) {
         self.pipeline = Self::create_pipeline(device, subpass, viewport, &self.vertex_shader, &self.fragment_shader);
     }
@@ -67,7 +67,7 @@ impl IndicatorRenderer {
             .build(device, subpass)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target, camera: &dyn Camera) {
         let (view_matrix, projection_matrix) = camera.view_projection_matrices();
         let buffer = self.matrices_buffer.allocate(Matrices {
@@ -87,7 +87,7 @@ impl IndicatorRenderer {
             .unwrap();
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn render_ground_indicator(
         &self,
         render_target: &mut <DeferredRenderer as Renderer>::Target,

diff --git a/korangar/src/graphics/renderers/deferred/mod.rs b/korangar/src/graphics/renderers/deferred/mod.rs
@@ -20,8 +20,8 @@ use std::sync::Arc;
 #[cfg(feature = "debug")]
 use cgmath::SquareMatrix;
 use cgmath::{Matrix4, Vector2, Vector3};
+use korangar_debug::profile;
 use korangar_interface::application::FontSizeTrait;
-use korangar_procedural::profile;
 use ragnarok_networking::EntityId;
 use vulkano::device::{DeviceOwned, Queue};
 use vulkano::format::Format;

diff --git a/korangar/src/graphics/renderers/deferred/overlay/mod.rs b/korangar/src/graphics/renderers/deferred/overlay/mod.rs
@@ -3,7 +3,7 @@ fragment_shader!("src/graphics/renderers/deferred/overlay/fragment_shader.glsl")
 
 use std::sync::Arc;
 
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use vulkano::descriptor_set::WriteDescriptorSet;
 use vulkano::device::{Device, DeviceOwned};
 use vulkano::pipeline::graphics::viewport::Viewport;
@@ -37,7 +37,7 @@ impl OverlayRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(&mut self, device: Arc<Device>, subpass: Subpass, viewport: Viewport) {
         self.pipeline = Self::create_pipeline(device, subpass, viewport, &self.vertex_shader, &self.fragment_shader);
     }
@@ -55,7 +55,7 @@ impl OverlayRenderer {
             .build(device, subpass)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target) {
         render_target
             .state

diff --git a/korangar/src/graphics/renderers/deferred/point/mod.rs b/korangar/src/graphics/renderers/deferred/point/mod.rs
@@ -4,7 +4,7 @@ fragment_shader!("src/graphics/renderers/deferred/point/fragment_shader.glsl");
 use std::sync::Arc;
 
 use cgmath::Vector3;
-use korangar_procedural::profile;
+use korangar_debug::profile;
 use vulkano::descriptor_set::WriteDescriptorSet;
 use vulkano::device::{Device, DeviceOwned};
 use vulkano::padded::Padded;
@@ -43,7 +43,7 @@ impl PointLightRenderer {
         }
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     pub fn recreate_pipeline(&mut self, device: Arc<Device>, subpass: Subpass, viewport: Viewport) {
         self.pipeline = Self::create_pipeline(device, subpass, viewport, &self.vertex_shader, &self.fragment_shader);
     }
@@ -61,7 +61,7 @@ impl PointLightRenderer {
             .build(device, subpass)
     }
 
-    #[korangar_procedural::profile]
+    #[korangar_debug::profile]
     fn bind_pipeline(&self, render_target: &mut <DeferredRenderer as Renderer>::Target, camera: &dyn Camera) {
         let screen_to_world_matrix = camera.get_screen_to_world_matrix();
         let buffer = self.matrices_buffer.allocate(Matrices {