名前を整理

mitoma · Jan 11, 2025 · 6e0dadf · 6e0dadf
1 parent 03c38b3
commit 6e0dadf
Show file tree

Hide file tree

Showing 33 changed files with 51 additions and 45 deletions.
diff --git a/font_rasterizer/src/context.rs b/font_rasterizer/src/context.rs
@@ -5,7 +5,8 @@ use stroke_parser::Action;
 use winit::dpi::PhysicalSize;
 
 use crate::{
-    char_width_calcurator::CharWidthCalculator, color_theme::ColorTheme, font_buffer::Direction,
+    char_width_calcurator::CharWidthCalculator, color_theme::ColorTheme,
+    glyph_vertex_buffer::Direction,
 };
 
 pub struct StateContext {

diff --git a/font_rasterizer/src/instances.rs → font_rasterizer/src/glyph_instances.rs b/font_rasterizer/src/instances.rs → font_rasterizer/src/glyph_instances.rs
@@ -1,5 +1,5 @@
 use crate::{
-    font_buffer::Direction,
+    glyph_vertex_buffer::Direction,
     vector_instances::{InstanceAttributes, InstanceKey, VectorInstances},
 };
 

diff --git a/font_rasterizer/src/font_buffer.rs → font_rasterizer/src/glyph_vertex_buffer.rs b/font_rasterizer/src/font_buffer.rs → font_rasterizer/src/glyph_vertex_buffer.rs
@@ -70,7 +70,7 @@ impl GlyphVertexBuffer {
         self.registerd_chars.clone()
     }
 
-    pub fn append_glyph(
+    pub fn append_chars(
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,

diff --git a/font_rasterizer/src/lib.rs b/font_rasterizer/src/lib.rs
@@ -4,9 +4,9 @@ pub mod color_theme;
 pub mod context;
 mod debug_mode;
 pub mod errors;
-pub mod font_buffer;
 pub mod font_converter;
-pub mod instances;
+pub mod glyph_instances;
+pub mod glyph_vertex_buffer;
 pub mod motion;
 mod outline_bind_group;
 mod overlap_bind_group;

diff --git a/font_rasterizer/src/rasterizer_pipeline.rs b/font_rasterizer/src/rasterizer_pipeline.rs
@@ -5,8 +5,8 @@ use wgpu::include_wgsl;
 
 use crate::{
     background_bind_group::BackgroundImageBindGroup,
-    font_buffer::GlyphVertexBuffer,
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
+    glyph_vertex_buffer::GlyphVertexBuffer,
     outline_bind_group::OutlineBindGroup,
     overlap_bind_group::OverlapBindGroup,
     screen_bind_group::ScreenBindGroup,

diff --git a/font_rasterizer_example/src/lib.rs b/font_rasterizer_example/src/lib.rs
@@ -8,7 +8,7 @@ use cgmath::Rotation3;
 use font_rasterizer::{
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
     motion::{EasingFuncType, MotionDetail, MotionFlags, MotionTarget, MotionType},
     rasterizer_pipeline::Quarity,
     time::now_millis,

diff --git a/kashikishi/src/main.rs b/kashikishi/src/main.rs
@@ -24,8 +24,8 @@ use world::{CategorizedMemosWorld, HelpWorld, ModalWorld, NullWorld, StartWorld}
 use font_rasterizer::{
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    font_buffer::Direction,
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
+    glyph_vertex_buffer::Direction,
     rasterizer_pipeline::Quarity,
     time::set_clock_mode,
 };

diff --git a/kashikishi/src/world/categorized_memos_world.rs b/kashikishi/src/world/categorized_memos_world.rs
@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use font_rasterizer::{
     context::{StateContext, WindowSize},
-    font_buffer::Direction,
+    glyph_vertex_buffer::Direction,
 };
 use stroke_parser::{Action, ActionArgument};
 use text_buffer::action::EditorOperation;

diff --git a/kashikishi/src/world/help_world.rs b/kashikishi/src/world/help_world.rs
@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use font_rasterizer::{
     context::{StateContext, WindowSize},
-    font_buffer::Direction,
+    glyph_vertex_buffer::Direction,
 };
 use ui_support::{
     camera::CameraAdjustment,

diff --git a/kashikishi/src/world/null_world.rs b/kashikishi/src/world/null_world.rs
@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use font_rasterizer::{
     context::{StateContext, WindowSize},
-    font_buffer::Direction,
+    glyph_vertex_buffer::Direction,
 };
 use ui_support::{
     camera::CameraAdjustment,

diff --git a/kashikishi/src/world/start_world.rs b/kashikishi/src/world/start_world.rs
@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use font_rasterizer::{context::StateContext, font_buffer::Direction};
+use font_rasterizer::{context::StateContext, glyph_vertex_buffer::Direction};
 use ui_support::{
     camera::CameraAdjustment,
     layout_engine::{DefaultWorld, Model, World},

diff --git a/rokid_3dof/examples/rokid_test.rs b/rokid_3dof/examples/rokid_test.rs
@@ -8,7 +8,7 @@ use cgmath::Rotation3;
 use font_rasterizer::{
     color_theme::ColorTheme::{self, SolarizedDark},
     context::{StateContext, WindowSize},
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
     motion::{EasingFuncType, MotionDetail, MotionFlags, MotionTarget, MotionType},
     rasterizer_pipeline::Quarity,
     time::now_millis,

diff --git a/sample_codes/showcase/src/lib.rs b/sample_codes/showcase/src/lib.rs
@@ -9,7 +9,7 @@ use wasm_bindgen::prelude::*;
 use font_rasterizer::{
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
     rasterizer_pipeline::Quarity,
 };
 use ui_support::{

diff --git a/ui_support/examples/save_apng.rs b/ui_support/examples/save_apng.rs
@@ -6,7 +6,7 @@ use cgmath::Rotation3;
 use font_rasterizer::{
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
     motion::{EasingFuncType, MotionDetail, MotionFlags, MotionTarget, MotionType},
     rasterizer_pipeline::Quarity,
     time::now_millis,

diff --git a/ui_support/examples/save_apng2.rs b/ui_support/examples/save_apng2.rs
@@ -5,7 +5,7 @@ use instant::Duration;
 use font_rasterizer::{
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
     rasterizer_pipeline::Quarity,
 };
 use log::info;

diff --git a/ui_support/examples/save_gif.rs b/ui_support/examples/save_gif.rs
@@ -7,7 +7,7 @@ use instant::Duration;
 use font_rasterizer::{
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
     rasterizer_pipeline::Quarity,
 };
 use log::info;

diff --git a/ui_support/examples/setup_glyphs.rs b/ui_support/examples/setup_glyphs.rs
@@ -2,7 +2,7 @@ use font_collector::{FontCollector, FontRepository};
 use font_rasterizer::{
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
     rasterizer_pipeline::Quarity,
 };
 use instant::Instant;

diff --git a/ui_support/examples/support_test.rs b/ui_support/examples/support_test.rs
@@ -11,7 +11,7 @@ use cgmath::Rotation3;
 use font_rasterizer::{
     color_theme::ColorTheme::{self, SolarizedDark},
     context::{StateContext, WindowSize},
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
     motion::{EasingFuncType, MotionDetail, MotionFlags, MotionTarget, MotionType},
     rasterizer_pipeline::Quarity,
     time::now_millis,

diff --git a/ui_support/src/action/system.rs b/ui_support/src/action/system.rs
@@ -9,7 +9,7 @@ use stroke_parser::{Action, ActionArgument, CommandName, CommandNamespace};
 use font_rasterizer::{
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    font_buffer::Direction,
+    glyph_vertex_buffer::Direction,
 };
 
 use crate::{

diff --git a/ui_support/src/action/world.rs b/ui_support/src/action/world.rs
@@ -1,7 +1,7 @@
 use stroke_parser::{ActionArgument, CommandName, CommandNamespace};
 use text_buffer::action::EditorOperation;
 
-use font_rasterizer::{context::StateContext, font_buffer::Direction};
+use font_rasterizer::{context::StateContext, glyph_vertex_buffer::Direction};
 
 use crate::{
     camera::{CameraAdjustment, CameraOperation},

diff --git a/ui_support/src/layout_engine.rs b/ui_support/src/layout_engine.rs
@@ -10,8 +10,8 @@ use text_buffer::{action::EditorOperation, editor::CharWidthResolver};
 
 use font_rasterizer::{
     context::{StateContext, WindowSize},
-    font_buffer::Direction,
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
+    glyph_vertex_buffer::Direction,
 };
 
 use crate::camera::{Camera, CameraAdjustment, CameraController, CameraOperation};

diff --git a/ui_support/src/lib.rs b/ui_support/src/lib.rs
@@ -18,8 +18,8 @@ use camera::Camera;
 use font_rasterizer::{
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    font_buffer::Direction,
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
+    glyph_vertex_buffer::Direction,
     rasterizer_pipeline::Quarity,
     time::{increment_fixed_clock, set_clock_mode, ClockMode},
 };

diff --git a/ui_support/src/render_state.rs b/ui_support/src/render_state.rs
@@ -5,7 +5,7 @@ use font_rasterizer::{
     char_width_calcurator::CharWidthCalculator,
     color_theme::ColorTheme,
     context::{StateContext, WindowSize},
-    font_buffer::{Direction, GlyphVertexBuffer},
+    glyph_vertex_buffer::{Direction, GlyphVertexBuffer},
     rasterizer_pipeline::{Quarity, RasterizerPipeline},
 };
 use image::{DynamicImage, ImageBuffer, Rgba};
@@ -450,7 +450,7 @@ impl RenderState {
             .try_recv()
             .into_iter()
             .for_each(|s| {
-                let _ = self.glyph_vertex_buffer.append_glyph(
+                let _ = self.glyph_vertex_buffer.append_chars(
                     &self.context.device,
                     &self.context.queue,
                     s.chars().collect(),
@@ -521,7 +521,7 @@ impl RenderState {
         let registerd_chars = self.glyph_vertex_buffer.registerd_chars();
         self.glyph_vertex_buffer =
             GlyphVertexBuffer::new(font_binaries, char_width_calcurator.clone());
-        let _ = self.glyph_vertex_buffer.append_glyph(
+        let _ = self.glyph_vertex_buffer.append_chars(
             &self.context.device,
             &self.context.queue,
             registerd_chars,

diff --git a/ui_support/src/text_instances.rs b/ui_support/src/text_instances.rs
@@ -7,8 +7,8 @@ use text_buffer::{
 use wgpu::{Device, Queue};
 
 use font_rasterizer::{
-    font_buffer::Direction,
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
+    glyph_vertex_buffer::Direction,
     vector_instances::{InstanceAttributes, InstanceKey},
 };
 

diff --git a/ui_support/src/ui/card.rs b/ui_support/src/ui/card.rs
@@ -1,7 +1,7 @@
 use cgmath::Point2;
 use text_buffer::action::EditorOperation;
 
-use font_rasterizer::{context::StateContext, instances::GlyphInstances};
+use font_rasterizer::{context::StateContext, glyph_instances::GlyphInstances};
 
 use crate::{
     layout_engine::Model,

diff --git a/ui_support/src/ui/ime_input.rs b/ui_support/src/ui/ime_input.rs
@@ -3,7 +3,9 @@ use log::info;
 use stroke_parser::Action;
 use text_buffer::action::EditorOperation;
 
-use font_rasterizer::{color_theme::ThemedColor, context::StateContext, instances::GlyphInstances};
+use font_rasterizer::{
+    color_theme::ThemedColor, context::StateContext, glyph_instances::GlyphInstances,
+};
 
 use crate::{
     layout_engine::Model,

diff --git a/ui_support/src/ui/mod.rs b/ui_support/src/ui/mod.rs
@@ -24,8 +24,8 @@ use text_buffer::caret::CaretType;
 
 use font_rasterizer::{
     char_width_calcurator::CharWidthCalculator, color_theme::ColorTheme, context::StateContext,
-    font_buffer::Direction, instances::GlyphInstances, motion::MotionFlags, time::now_millis,
-    vector_instances::InstanceAttributes,
+    glyph_instances::GlyphInstances, glyph_vertex_buffer::Direction, motion::MotionFlags,
+    time::now_millis, vector_instances::InstanceAttributes,
 };
 
 use crate::layout_engine::{Model, ModelBorder, ModelMode, ModelOperation, ModelOperationResult};

diff --git a/ui_support/src/ui/selectbox.rs b/ui_support/src/ui/selectbox.rs
@@ -6,8 +6,8 @@ use stroke_parser::Action;
 use text_buffer::action::EditorOperation;
 
 use font_rasterizer::{
-    char_width_calcurator::CharWidthCalculator, context::StateContext, font_buffer::Direction,
-    instances::GlyphInstances,
+    char_width_calcurator::CharWidthCalculator, context::StateContext,
+    glyph_instances::GlyphInstances, glyph_vertex_buffer::Direction,
 };
 
 use crate::{

diff --git a/ui_support/src/ui/single_line.rs b/ui_support/src/ui/single_line.rs
@@ -4,8 +4,9 @@ use cgmath::Rotation3;
 use instant::Duration;
 
 use font_rasterizer::{
-    char_width_calcurator::CharWidthCalculator, context::StateContext, instances::GlyphInstances,
-    motion::MotionFlags, time::now_millis, vector_instances::InstanceAttributes,
+    char_width_calcurator::CharWidthCalculator, context::StateContext,
+    glyph_instances::GlyphInstances, motion::MotionFlags, time::now_millis,
+    vector_instances::InstanceAttributes,
 };
 
 use super::get_color;

diff --git a/ui_support/src/ui/text_input.rs b/ui_support/src/ui/text_input.rs
@@ -3,7 +3,9 @@ use std::sync::mpsc::Sender;
 use stroke_parser::{Action, ActionArgument};
 use text_buffer::action::EditorOperation;
 
-use font_rasterizer::{context::StateContext, font_buffer::Direction, instances::GlyphInstances};
+use font_rasterizer::{
+    context::StateContext, glyph_instances::GlyphInstances, glyph_vertex_buffer::Direction,
+};
 
 use crate::{
     layout_engine::{Model, ModelBorder, ModelMode},

diff --git a/ui_support/src/ui/textedit.rs b/ui_support/src/ui/textedit.rs
@@ -19,8 +19,8 @@ use font_rasterizer::{
     char_width_calcurator::{CharWidth, CharWidthCalculator},
     color_theme::{ColorTheme, ThemedColor},
     context::StateContext,
-    font_buffer::Direction,
-    instances::GlyphInstances,
+    glyph_instances::GlyphInstances,
+    glyph_vertex_buffer::Direction,
 };
 
 use crate::{

diff --git a/ui_support/src/ui/view_element_state.rs b/ui_support/src/ui/view_element_state.rs
@@ -12,7 +12,7 @@ use wgpu::Device;
 use font_rasterizer::{
     char_width_calcurator::{CharWidth, CharWidthCalculator},
     color_theme::{ColorTheme, ThemedColor},
-    font_buffer::Direction,
+    glyph_vertex_buffer::Direction,
     motion::MotionFlags,
     time::now_millis,
     vector_instances::InstanceAttributes,

diff --git a/ui_support/src/ui_context.rs b/ui_support/src/ui_context.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use cgmath::Point2;
 use font_rasterizer::{
     color_theme::ColorTheme,
-    font_buffer::Direction,
+    glyph_vertex_buffer::Direction,
     motion::{CameraDetail, EasingFuncType, MotionDetail, MotionFlags, MotionTarget, MotionType},
 };
 use text_buffer::editor::LineBoundaryProhibitedChars;