mirror of
https://github.com/lisk77/comet.git
synced 2025-12-12 09:08:49 +00:00
fix(texture_atlas): added texel offset to ensure correct interpolation on the GPU side
This commit is contained in:
parent
025d2b3a5f
commit
8831c46b4c
1 changed files with 356 additions and 236 deletions
|
|
@ -1,304 +1,424 @@
|
||||||
|
use crate::font::*;
|
||||||
|
use comet_log::*;
|
||||||
|
use image::{DynamicImage, GenericImage, GenericImageView};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::time::Instant;
|
|
||||||
use image::{DynamicImage, GenericImage, GenericImageView, ImageFormat};
|
|
||||||
use comet_log::*;
|
|
||||||
use wgpu::{Device, FilterMode, TextureFormat, TextureUsages};
|
|
||||||
use crate::font::GlyphData;
|
|
||||||
use crate::Texture;
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct TextureRegion {
|
pub struct TextureRegion {
|
||||||
u0: f32,
|
u0: f32,
|
||||||
v0: f32,
|
v0: f32,
|
||||||
u1: f32,
|
u1: f32,
|
||||||
v1: f32,
|
v1: f32,
|
||||||
advance: f32,
|
advance: f32,
|
||||||
offset_x: f32,
|
offset_x: f32,
|
||||||
offset_y: f32,
|
offset_y: f32,
|
||||||
dimensions: (u32, u32),
|
dimensions: (u32, u32),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TextureRegion {
|
impl TextureRegion {
|
||||||
pub fn new(u0: f32, v0: f32, u1: f32, v1: f32, dimensions: (u32, u32), advance: f32, offset_x: f32, offset_y: f32) -> Self {
|
pub fn new(
|
||||||
Self {
|
u0: f32,
|
||||||
u0,
|
v0: f32,
|
||||||
v0,
|
u1: f32,
|
||||||
u1,
|
v1: f32,
|
||||||
v1,
|
dimensions: (u32, u32),
|
||||||
advance,
|
advance: f32,
|
||||||
offset_x,
|
offset_x: f32,
|
||||||
offset_y,
|
offset_y: f32,
|
||||||
dimensions
|
) -> Self {
|
||||||
}
|
Self {
|
||||||
}
|
u0,
|
||||||
|
v0,
|
||||||
|
u1,
|
||||||
|
v1,
|
||||||
|
advance,
|
||||||
|
offset_x,
|
||||||
|
offset_y,
|
||||||
|
dimensions,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn u0(&self) -> f32 {
|
pub fn u0(&self) -> f32 {
|
||||||
self.u0
|
self.u0
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn u1(&self) -> f32 {
|
pub fn u1(&self) -> f32 {
|
||||||
self.u1
|
self.u1
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn v0(&self) -> f32 {
|
pub fn v0(&self) -> f32 {
|
||||||
self.v0
|
self.v0
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn v1(&self) -> f32 {
|
pub fn v1(&self) -> f32 {
|
||||||
self.v1
|
self.v1
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn dimensions(&self) -> (u32, u32) {
|
pub fn dimensions(&self) -> (u32, u32) {
|
||||||
self.dimensions
|
self.dimensions
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn advance(&self) -> f32 {
|
pub fn advance(&self) -> f32 {
|
||||||
self.advance
|
self.advance
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn offset_x(&self) -> f32 {
|
pub fn offset_x(&self) -> f32 {
|
||||||
self.offset_x
|
self.offset_x
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn offset_y(&self) -> f32 {
|
pub fn offset_y(&self) -> f32 {
|
||||||
self.offset_y
|
self.offset_y
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct TextureAtlas {
|
pub struct TextureAtlas {
|
||||||
atlas: DynamicImage,
|
atlas: DynamicImage,
|
||||||
textures: HashMap<String, TextureRegion>,
|
textures: HashMap<String, TextureRegion>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TextureAtlas {
|
impl TextureAtlas {
|
||||||
pub fn empty() -> Self {
|
pub fn empty() -> Self {
|
||||||
Self {
|
Self {
|
||||||
atlas: DynamicImage::new(1,1, image::ColorType::Rgb8),
|
atlas: DynamicImage::new(1, 1, image::ColorType::Rgb8),
|
||||||
textures: HashMap::new()
|
textures: HashMap::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn texture_paths(&self) -> Vec<String> {
|
pub fn texture_paths(&self) -> Vec<String> {
|
||||||
self.textures.keys().map(|k| k.to_string()).collect()
|
self.textures.keys().map(|k| k.to_string()).collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn calculate_atlas_width(textures: &Vec<DynamicImage>) -> u32 {
|
fn calculate_atlas_width(textures: &Vec<DynamicImage>) -> u32 {
|
||||||
let mut last_height: u32 = textures.get(0).unwrap().height();
|
let mut last_height: u32 = textures.get(0).unwrap().height();
|
||||||
let mut widths: Vec<u32> = Vec::new();
|
let mut widths: Vec<u32> = Vec::new();
|
||||||
let mut current_width: u32 = 0;
|
let mut current_width: u32 = 0;
|
||||||
|
|
||||||
for texture in textures {
|
for texture in textures {
|
||||||
if last_height != texture.height() {
|
if last_height != texture.height() {
|
||||||
widths.push(current_width);
|
widths.push(current_width);
|
||||||
current_width = 0;
|
current_width = 0;
|
||||||
last_height = texture.height();
|
last_height = texture.height();
|
||||||
}
|
}
|
||||||
current_width += texture.width();
|
current_width += texture.width();
|
||||||
}
|
}
|
||||||
|
|
||||||
widths.push(current_width);
|
widths.push(current_width);
|
||||||
|
|
||||||
*widths.iter().max().unwrap()
|
*widths.iter().max().unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn calculate_atlas_height(textures: &Vec<DynamicImage>) -> u32 {
|
fn calculate_atlas_height(textures: &Vec<DynamicImage>) -> u32 {
|
||||||
let last_height: u32 = textures.get(0).unwrap().height();
|
let last_height: u32 = textures.get(0).unwrap().height();
|
||||||
let mut height: u32 = 0;
|
let mut height: u32 = 0;
|
||||||
height += last_height;
|
height += last_height;
|
||||||
|
|
||||||
for texture in textures {
|
for texture in textures {
|
||||||
if last_height == texture.height() {
|
if last_height == texture.height() {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
height += texture.height();
|
height += texture.height();
|
||||||
}
|
}
|
||||||
|
|
||||||
height
|
height
|
||||||
}
|
}
|
||||||
|
|
||||||
fn insert_texture_at(base: &mut DynamicImage, texture: &DynamicImage, x_pos: u32, y_pos: u32) {
|
fn insert_texture_at(base: &mut DynamicImage, texture: &DynamicImage, x_pos: u32, y_pos: u32) {
|
||||||
for y in 0..texture.height() {
|
for y in 0..texture.height() {
|
||||||
for x in 0..texture.width() {
|
for x in 0..texture.width() {
|
||||||
let pixel = texture.get_pixel(x,y);
|
let pixel = texture.get_pixel(x, y);
|
||||||
base.put_pixel(x + x_pos, y + y_pos, pixel);
|
base.put_pixel(x + x_pos, y + y_pos, pixel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn from_texture_paths(
|
pub fn from_texture_paths(paths: Vec<String>) -> Self {
|
||||||
paths: Vec<String>,
|
let mut textures: Vec<DynamicImage> = Vec::new();
|
||||||
) -> Self {
|
let mut regions: HashMap<String, TextureRegion> = HashMap::new();
|
||||||
let mut textures: Vec<DynamicImage> = Vec::new();
|
|
||||||
let mut regions: HashMap<String, TextureRegion> = HashMap::new();
|
|
||||||
|
|
||||||
info!("Loading textures...");
|
info!("Loading textures...");
|
||||||
|
|
||||||
for path in &paths {
|
for path in &paths {
|
||||||
textures.push(image::open(&Path::new(path.as_str())).expect("Failed to load texture"));
|
textures.push(image::open(&Path::new(path.as_str())).expect("Failed to load texture"));
|
||||||
}
|
}
|
||||||
|
|
||||||
info!("Textures loaded!");
|
info!("Textures loaded!");
|
||||||
info!("Sorting textures by height...");
|
info!("Sorting textures by height...");
|
||||||
|
|
||||||
let mut texture_path_pairs: Vec<(&DynamicImage, &String)> = textures.iter().zip(paths.iter()).collect();
|
let mut texture_path_pairs: Vec<(&DynamicImage, &String)> =
|
||||||
texture_path_pairs.sort_by(|a, b| b.0.height().cmp(&a.0.height()));
|
textures.iter().zip(paths.iter()).collect();
|
||||||
let (sorted_textures, sorted_paths): (Vec<&DynamicImage>, Vec<&String>) = texture_path_pairs.into_iter().unzip();
|
texture_path_pairs.sort_by(|a, b| b.0.height().cmp(&a.0.height()));
|
||||||
let sorted_textures: Vec<DynamicImage> = sorted_textures.into_iter().map(|t| t.clone()).collect();
|
let (sorted_textures, sorted_paths): (Vec<&DynamicImage>, Vec<&String>) =
|
||||||
let sorted_paths: Vec<String> = sorted_paths.into_iter().map(|s| s.to_string()).collect();
|
texture_path_pairs.into_iter().unzip();
|
||||||
|
let sorted_textures: Vec<DynamicImage> =
|
||||||
|
sorted_textures.into_iter().map(|t| t.clone()).collect();
|
||||||
|
let sorted_paths: Vec<String> = sorted_paths.into_iter().map(|s| s.to_string()).collect();
|
||||||
|
|
||||||
let (height, width) = (Self::calculate_atlas_height(&sorted_textures), Self::calculate_atlas_width(&sorted_textures));
|
let (height, width) = (
|
||||||
let mut base = DynamicImage::new_rgba8(width,height);
|
Self::calculate_atlas_height(&sorted_textures),
|
||||||
|
Self::calculate_atlas_width(&sorted_textures),
|
||||||
|
);
|
||||||
|
let mut base = DynamicImage::new_rgba8(width, height);
|
||||||
|
|
||||||
let mut previous = sorted_textures.get(0).unwrap().height();
|
let mut previous = sorted_textures.get(0).unwrap().height();
|
||||||
let mut x_offset: u32 = 0;
|
let mut x_offset: u32 = 0;
|
||||||
let mut y_offset: u32 = 0;
|
let mut y_offset: u32 = 0;
|
||||||
|
|
||||||
info!("Creating texture atlas...");
|
info!("Creating texture atlas...");
|
||||||
|
|
||||||
for (texture, path) in sorted_textures.iter().zip(sorted_paths.iter()) {
|
for (texture, path) in sorted_textures.iter().zip(sorted_paths.iter()) {
|
||||||
if texture.height() != previous {
|
if texture.height() != previous {
|
||||||
y_offset += previous;
|
y_offset += previous;
|
||||||
x_offset = 0;
|
x_offset = 0;
|
||||||
previous = texture.height();
|
previous = texture.height();
|
||||||
}
|
}
|
||||||
|
|
||||||
Self::insert_texture_at(&mut base, &texture, x_offset, y_offset);
|
Self::insert_texture_at(&mut base, &texture, x_offset, y_offset);
|
||||||
regions.insert(path.to_string(), TextureRegion::new(
|
let texel_w = 0.5 / width as f32;
|
||||||
x_offset as f32 / width as f32,
|
let texel_h = 0.5 / height as f32;
|
||||||
y_offset as f32 / height as f32,
|
|
||||||
(x_offset + texture.width()) as f32 / width as f32,
|
|
||||||
(y_offset + texture.height()) as f32 / height as f32,
|
|
||||||
texture.dimensions(),
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0
|
|
||||||
));
|
|
||||||
x_offset += texture.width();
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("Texture atlas created!");
|
let u0 = (x_offset as f32 + texel_w) / width as f32;
|
||||||
|
let v0 = (y_offset as f32 + texel_h) / height as f32;
|
||||||
|
let u1 = ((x_offset + texture.width()) as f32 - texel_w) / width as f32;
|
||||||
|
let v1 = ((y_offset + texture.height()) as f32 - texel_h) / height as f32;
|
||||||
|
|
||||||
TextureAtlas {
|
regions.insert(
|
||||||
atlas: base,
|
path.to_string(),
|
||||||
textures: regions
|
TextureRegion::new(u0, v0, u1, v1, texture.dimensions(), 0.0, 0.0, 0.0),
|
||||||
}
|
);
|
||||||
}
|
x_offset += texture.width();
|
||||||
|
}
|
||||||
|
|
||||||
pub fn from_textures(
|
info!("Texture atlas created!");
|
||||||
names: Vec<String>,
|
|
||||||
textures: Vec<DynamicImage>,
|
|
||||||
) -> Self {
|
|
||||||
let mut regions: HashMap<String, TextureRegion> = HashMap::new();
|
|
||||||
|
|
||||||
info!("Sorting textures by height...");
|
TextureAtlas {
|
||||||
|
atlas: base,
|
||||||
|
textures: regions,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let mut texture_path_pairs: Vec<(&DynamicImage, &String)> = textures.iter().zip(names.iter()).collect();
|
pub fn from_textures(names: Vec<String>, textures: Vec<DynamicImage>) -> Self {
|
||||||
texture_path_pairs.sort_by(|a, b| b.0.height().cmp(&a.0.height()));
|
let mut regions: HashMap<String, TextureRegion> = HashMap::new();
|
||||||
let (sorted_textures, sorted_paths): (Vec<&DynamicImage>, Vec<&String>) = texture_path_pairs.into_iter().unzip();
|
|
||||||
let sorted_textures: Vec<DynamicImage> = sorted_textures.into_iter().map(|t| t.clone()).collect();
|
|
||||||
let sorted_paths: Vec<String> = sorted_paths.into_iter().map(|s| s.to_string()).collect();
|
|
||||||
|
|
||||||
let (height, width) = (Self::calculate_atlas_height(&sorted_textures), Self::calculate_atlas_width(&sorted_textures));
|
info!("Sorting textures by height...");
|
||||||
let mut base = DynamicImage::new_rgba8(width,height);
|
|
||||||
|
|
||||||
let mut previous = sorted_textures.get(0).unwrap().height();
|
let mut texture_path_pairs: Vec<(&DynamicImage, &String)> =
|
||||||
let mut x_offset: u32 = 0;
|
textures.iter().zip(names.iter()).collect();
|
||||||
let mut y_offset: u32 = 0;
|
texture_path_pairs.sort_by(|a, b| b.0.height().cmp(&a.0.height()));
|
||||||
|
let (sorted_textures, sorted_paths): (Vec<&DynamicImage>, Vec<&String>) =
|
||||||
|
texture_path_pairs.into_iter().unzip();
|
||||||
|
let sorted_textures: Vec<DynamicImage> =
|
||||||
|
sorted_textures.into_iter().map(|t| t.clone()).collect();
|
||||||
|
let sorted_paths: Vec<String> = sorted_paths.into_iter().map(|s| s.to_string()).collect();
|
||||||
|
|
||||||
info!("Creating texture atlas...");
|
let (height, width) = (
|
||||||
|
Self::calculate_atlas_height(&sorted_textures),
|
||||||
|
Self::calculate_atlas_width(&sorted_textures),
|
||||||
|
);
|
||||||
|
let mut base = DynamicImage::new_rgba8(width, height);
|
||||||
|
|
||||||
for (texture, name) in sorted_textures.iter().zip(sorted_paths.iter()) {
|
let mut previous = sorted_textures.get(0).unwrap().height();
|
||||||
if texture.height() != previous {
|
let mut x_offset: u32 = 0;
|
||||||
y_offset += previous;
|
let mut y_offset: u32 = 0;
|
||||||
x_offset = 0;
|
|
||||||
previous = texture.height();
|
|
||||||
}
|
|
||||||
|
|
||||||
Self::insert_texture_at(&mut base, &texture, x_offset, y_offset);
|
info!("Creating texture atlas...");
|
||||||
regions.insert(name.to_string(), TextureRegion::new(
|
|
||||||
x_offset as f32 / width as f32,
|
|
||||||
y_offset as f32 / height as f32,
|
|
||||||
(x_offset + texture.width()) as f32 / width as f32,
|
|
||||||
(y_offset + texture.height()) as f32 / height as f32,
|
|
||||||
texture.dimensions(),
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0
|
|
||||||
));
|
|
||||||
x_offset += texture.width();
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("Texture atlas created!");
|
for (texture, name) in sorted_textures.iter().zip(sorted_paths.iter()) {
|
||||||
|
if texture.height() != previous {
|
||||||
|
y_offset += previous;
|
||||||
|
x_offset = 0;
|
||||||
|
previous = texture.height();
|
||||||
|
}
|
||||||
|
|
||||||
TextureAtlas {
|
Self::insert_texture_at(&mut base, &texture, x_offset, y_offset);
|
||||||
atlas: base,
|
regions.insert(
|
||||||
textures: regions
|
name.to_string(),
|
||||||
}
|
TextureRegion::new(
|
||||||
}
|
x_offset as f32 / width as f32,
|
||||||
|
y_offset as f32 / height as f32,
|
||||||
|
(x_offset + texture.width()) as f32 / width as f32,
|
||||||
|
(y_offset + texture.height()) as f32 / height as f32,
|
||||||
|
texture.dimensions(),
|
||||||
|
0.0,
|
||||||
|
0.0,
|
||||||
|
0.0,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
x_offset += texture.width();
|
||||||
|
}
|
||||||
|
|
||||||
pub fn from_glyphs(mut glyphs: Vec<GlyphData>) -> Self {
|
info!("Texture atlas created!");
|
||||||
glyphs.sort_by(|a, b| b.render.height().cmp(&a.render.height()));
|
|
||||||
|
|
||||||
let height = Self::calculate_atlas_height(
|
TextureAtlas {
|
||||||
&glyphs.iter().map(|g| g.render.clone()).collect::<Vec<_>>()
|
atlas: base,
|
||||||
);
|
textures: regions,
|
||||||
let width = Self::calculate_atlas_width(
|
}
|
||||||
&glyphs.iter().map(|g| g.render.clone()).collect::<Vec<_>>()
|
}
|
||||||
);
|
|
||||||
|
|
||||||
let padding = (glyphs.len() * 3) as u32;
|
pub fn from_glyphs(mut glyphs: Vec<GlyphData>) -> Self {
|
||||||
|
glyphs.sort_by(|a, b| b.render.height().cmp(&a.render.height()));
|
||||||
|
|
||||||
let mut base = DynamicImage::new_rgba8(width + padding, height);
|
let height = Self::calculate_atlas_height(
|
||||||
let mut regions = HashMap::new();
|
&glyphs.iter().map(|g| g.render.clone()).collect::<Vec<_>>(),
|
||||||
let mut current_row_height = glyphs[0].render.height();
|
);
|
||||||
let mut x_offset: u32 = 0;
|
let width = Self::calculate_atlas_width(
|
||||||
let mut y_offset: u32 = 0;
|
&glyphs.iter().map(|g| g.render.clone()).collect::<Vec<_>>(),
|
||||||
|
);
|
||||||
|
|
||||||
|
let padding = (glyphs.len() * 3) as u32;
|
||||||
|
|
||||||
for g in glyphs.iter() {
|
let mut base = DynamicImage::new_rgba8(width + padding, height);
|
||||||
let glyph_w = g.render.width();
|
let mut regions = HashMap::new();
|
||||||
let glyph_h = g.render.height();
|
let mut current_row_height = glyphs[0].render.height();
|
||||||
|
let mut x_offset: u32 = 0;
|
||||||
|
let mut y_offset: u32 = 0;
|
||||||
|
|
||||||
if glyph_h != current_row_height {
|
for g in glyphs.iter() {
|
||||||
y_offset += current_row_height + 3;
|
let glyph_w = g.render.width();
|
||||||
x_offset = 0;
|
let glyph_h = g.render.height();
|
||||||
current_row_height = glyph_h;
|
|
||||||
}
|
|
||||||
|
|
||||||
Self::insert_texture_at(&mut base, &g.render, x_offset, y_offset);
|
if glyph_h != current_row_height {
|
||||||
|
y_offset += current_row_height + 3;
|
||||||
|
x_offset = 0;
|
||||||
|
current_row_height = glyph_h;
|
||||||
|
}
|
||||||
|
|
||||||
let u0 = x_offset as f32 / (width + padding) as f32;
|
Self::insert_texture_at(&mut base, &g.render, x_offset, y_offset);
|
||||||
let v0 = y_offset as f32 / height as f32;
|
|
||||||
let u1 = (x_offset + glyph_w) as f32 / (width + padding) as f32;
|
|
||||||
let v1 = (y_offset + glyph_h) as f32 / height as f32;
|
|
||||||
|
|
||||||
let region = TextureRegion::new(
|
let u0 = x_offset as f32 / (width + padding) as f32;
|
||||||
u0, v0, u1, v1,
|
let v0 = y_offset as f32 / height as f32;
|
||||||
(glyph_w, glyph_h),
|
let u1 = (x_offset + glyph_w) as f32 / (width + padding) as f32;
|
||||||
g.advance,
|
let v1 = (y_offset + glyph_h) as f32 / height as f32;
|
||||||
g.offset_x,
|
|
||||||
g.offset_y,
|
|
||||||
);
|
|
||||||
|
|
||||||
regions.insert(g.name.clone(), region);
|
let region = TextureRegion::new(
|
||||||
|
u0,
|
||||||
|
v0,
|
||||||
|
u1,
|
||||||
|
v1,
|
||||||
|
(glyph_w, glyph_h),
|
||||||
|
g.advance,
|
||||||
|
g.offset_x,
|
||||||
|
g.offset_y,
|
||||||
|
);
|
||||||
|
|
||||||
x_offset += glyph_w + 3;
|
regions.insert(g.name.clone(), region);
|
||||||
}
|
|
||||||
|
|
||||||
TextureAtlas {
|
x_offset += glyph_w + 3;
|
||||||
atlas: base,
|
}
|
||||||
textures: regions,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn atlas(&self) -> &DynamicImage {
|
TextureAtlas {
|
||||||
&self.atlas
|
atlas: base,
|
||||||
}
|
textures: regions,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn textures(&self) -> &HashMap<String, TextureRegion> {
|
pub fn from_fonts(fonts: &Vec<Font>) -> Self {
|
||||||
&self.textures
|
if fonts.is_empty() {
|
||||||
}
|
return Self::empty();
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut all_glyphs: Vec<(String, DynamicImage, TextureRegion)> = Vec::new();
|
||||||
|
|
||||||
|
let mut font_indices: Vec<usize> = (0..fonts.len()).collect();
|
||||||
|
font_indices.sort_by(|&a, &b| fonts[a].name().cmp(&fonts[b].name()));
|
||||||
|
|
||||||
|
for fi in font_indices {
|
||||||
|
let font = &fonts[fi];
|
||||||
|
let font_name = font.name();
|
||||||
|
|
||||||
|
let mut glyph_names: Vec<String> = font.glyphs().textures().keys().cloned().collect();
|
||||||
|
glyph_names.sort();
|
||||||
|
|
||||||
|
for glyph_name in glyph_names {
|
||||||
|
let region = font.glyphs().textures().get(&glyph_name).unwrap();
|
||||||
|
|
||||||
|
let (u0, v0, u1, v1) = (region.u0(), region.v0(), region.u1(), region.v1());
|
||||||
|
let (width, height) = region.dimensions();
|
||||||
|
|
||||||
|
let src_x = (u0 * font.glyphs().atlas().width() as f32) as u32;
|
||||||
|
let src_y = (v0 * font.glyphs().atlas().height() as f32) as u32;
|
||||||
|
|
||||||
|
let glyph_img = DynamicImage::ImageRgba8(
|
||||||
|
font.glyphs()
|
||||||
|
.atlas()
|
||||||
|
.view(src_x, src_y, width, height)
|
||||||
|
.to_image(),
|
||||||
|
);
|
||||||
|
|
||||||
|
let key = format!("{}::{}", font_name, glyph_name);
|
||||||
|
|
||||||
|
all_glyphs.push((key, glyph_img, region.clone()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
all_glyphs.sort_by(|a, b| {
|
||||||
|
let ha = a.1.height();
|
||||||
|
let hb = b.1.height();
|
||||||
|
match hb.cmp(&ha) {
|
||||||
|
std::cmp::Ordering::Equal => a.0.cmp(&b.0),
|
||||||
|
other => other,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let textures: Vec<DynamicImage> =
|
||||||
|
all_glyphs.iter().map(|(_, img, _)| img.clone()).collect();
|
||||||
|
let atlas_height = Self::calculate_atlas_height(&textures);
|
||||||
|
let atlas_width = Self::calculate_atlas_width(&textures);
|
||||||
|
|
||||||
|
let padding = (all_glyphs.len() * 3) as u32;
|
||||||
|
let mut base = DynamicImage::new_rgba8(atlas_width + padding, atlas_height);
|
||||||
|
let mut regions = HashMap::new();
|
||||||
|
|
||||||
|
let mut current_row_height = textures[0].height();
|
||||||
|
let mut x_offset: u32 = 0;
|
||||||
|
let mut y_offset: u32 = 0;
|
||||||
|
|
||||||
|
for (key, img, original_region) in all_glyphs {
|
||||||
|
let w = img.width();
|
||||||
|
let h = img.height();
|
||||||
|
|
||||||
|
if h != current_row_height {
|
||||||
|
y_offset += current_row_height + 3;
|
||||||
|
x_offset = 0;
|
||||||
|
current_row_height = h;
|
||||||
|
}
|
||||||
|
|
||||||
|
Self::insert_texture_at(&mut base, &img, x_offset, y_offset);
|
||||||
|
|
||||||
|
let u0 = x_offset as f32 / (atlas_width + padding) as f32;
|
||||||
|
let v0 = y_offset as f32 / atlas_height as f32;
|
||||||
|
let u1 = (x_offset + w) as f32 / (atlas_width + padding) as f32;
|
||||||
|
let v1 = (y_offset + h) as f32 / atlas_height as f32;
|
||||||
|
|
||||||
|
let region = TextureRegion::new(
|
||||||
|
u0,
|
||||||
|
v0,
|
||||||
|
u1,
|
||||||
|
v1,
|
||||||
|
(w, h),
|
||||||
|
original_region.advance(),
|
||||||
|
original_region.offset_x(),
|
||||||
|
original_region.offset_y(),
|
||||||
|
);
|
||||||
|
|
||||||
|
regions.insert(key, region);
|
||||||
|
|
||||||
|
x_offset += w + 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
TextureAtlas {
|
||||||
|
atlas: base,
|
||||||
|
textures: regions,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn atlas(&self) -> &DynamicImage {
|
||||||
|
&self.atlas
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn textures(&self) -> &HashMap<String, TextureRegion> {
|
||||||
|
&self.textures
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue