This commit is contained in:
griffi-gh 2023-12-01 20:51:41 +01:00
parent 5bac932108
commit ee1f3ced47
2 changed files with 4 additions and 6 deletions

View file

@ -1,12 +1,12 @@
use std::sync::Arc; use std::sync::Arc;
mod font; mod font;
mod ftm; mod texman;
use font::FontManager; use font::FontManager;
pub use font::FontHandle; pub use font::FontHandle;
use ftm::FontTextureManager; use texman::FontTextureManager;
pub use ftm::{FontTextureInfo, GlyphCacheEntry}; pub use texman::{FontTextureInfo, GlyphCacheEntry};
pub struct TextRenderer { pub struct TextRenderer {
fm: FontManager, fm: FontManager,

View file

@ -1,5 +1,5 @@
use std::sync::Arc; use std::sync::Arc;
use fontdue::{Font, Metrics}; use fontdue::Metrics;
use glam::{IVec2, UVec2, uvec2, ivec2}; use glam::{IVec2, UVec2, uvec2, ivec2};
use hashbrown::HashMap; use hashbrown::HashMap;
use rect_packer::DensePacker; use rect_packer::DensePacker;
@ -8,8 +8,6 @@ use crate::IfModified;
use super::font::{FontHandle, FontManager}; use super::font::{FontHandle, FontManager};
#[derive(PartialEq, Eq, Hash)] #[derive(PartialEq, Eq, Hash)]
struct GlyphCacheKey { struct GlyphCacheKey {
font_index: usize, font_index: usize,