シグニチャの変更など

mitoma · Jan 19, 2025 · 1c0861b · 1c0861b
1 parent 128f5fe
commit 1c0861b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/font_rasterizer/src/lib.rs b/font_rasterizer/src/lib.rs
@@ -18,4 +18,4 @@ pub mod svg;
 pub mod time;
 pub mod vector_instances;
 mod vector_vertex;
-mod vector_vertex_buffer;
+pub mod vector_vertex_buffer;
diff --git a/font_rasterizer/src/rasterizer_pipeline.rs b/font_rasterizer/src/rasterizer_pipeline.rs
@@ -389,7 +389,7 @@ impl RasterizerPipeline {
         queue: &wgpu::Queue,
         view_proj: ([[f32; 4]; 4], [[f32; 4]; 4]),
         glyph_buffers: Option<(&GlyphVertexBuffer, &[&GlyphInstances])>,
-        vector_buffers: Option<(&VectorVertexBuffer<&str>, &[&VectorInstances<&str>])>,
+        vector_buffers: Option<(&VectorVertexBuffer<String>, &[&VectorInstances<String>])>,
         screen_view: wgpu::TextureView,
     ) {
         self.overlap_bind_group.update(view_proj);
@@ -406,7 +406,7 @@ impl RasterizerPipeline {
         &self,
         encoder: &mut wgpu::CommandEncoder,
         glyph_buffers: Option<(&GlyphVertexBuffer, &[&GlyphInstances])>,
-        vector_buffers: Option<(&VectorVertexBuffer<&str>, &[&VectorInstances<&str>])>,
+        vector_buffers: Option<(&VectorVertexBuffer<String>, &[&VectorInstances<String>])>,
     ) {
         let overlap_bind_group = &self.overlap_bind_group.bind_group;
         let mut overlay_render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {

diff --git a/font_rasterizer/src/svg.rs b/font_rasterizer/src/svg.rs
@@ -58,6 +58,14 @@ impl SvgBuffers {
             .or_insert_with(|| VectorInstances::new(key.to_string(), device))
             .push(instance)
     }
+
+    pub fn vector_vertex_buffer(&self) -> &VectorVertexBuffer<String> {
+        &self.vertex_buffer
+    }
+
+    pub fn vector_instances(&self) -> Vec<&VectorInstances<String>> {
+        self.instances.values().collect()
+    }
 }
 
 #[allow(non_upper_case_globals)]