asuro/rust-engine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vulkano reeeeeeeeeeee

Browse Source
This commit is contained in:
Asuro
2021-10-24 18:57:46 +02:00
parent 23e19bf9d0
commit 2834623ba7
12 changed files with 193 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/text.rs
View File

@@ -1,5 +1,5 @@
use glyph_brush::{BrushAction, BrushError, GlyphBrush, GlyphBrushBuilder, GlyphVertex, Rectangle, Section, Text, ab_glyph::FontArc};
use vulkano::{format::Format, image::Dimensions, sampler::{Filter, SamplerAddressMode}};
use vulkano::{format::Format, image::ImageDimensions, sampler::{Filter, SamplerAddressMode}};
use crate::vulkan::{MeshHandle, TextVertex, TextureHandle, VulkanRenderer, gameobject::{GameObject, GameObjectHandle}, mesh::{CPUMesh, CPUVertexList}};
@@ -20,7 +20,7 @@ pub fn update_text(game_object_handle: GameObjectHandle, new_text: &str, new_siz
},
Ok(BrushAction::ReDraw) => {},
Err(BrushError::TextureTooSmall { suggested }) => {
let size = Dimensions::Dim2d { width: suggested.0, height: suggested.1 };
let size = ImageDimensions::Dim2d { width: suggested.0, height: suggested.1, array_layers: 1 };
debug_assert!(go.textures.len() == 1);
renderer.resize_texture(go, go.textures[0], size);
brush.resize_texture(suggested.0, suggested.1);
@@ -70,7 +70,7 @@ pub fn update_text_texture(old_texture: Option<TextureHandle>, renderer: &mut Vu
renderer.update_texture(tex_handle, text_data, [rect.width(), rect.height(), 1], [rect.min[0], rect.min[1], 0], renderer.device.clone());
None
} else {
let tex = renderer.upload_texture(text_data, size, size, Format::R8Unorm, Filter::Nearest, SamplerAddressMode::ClampToEdge, renderer.device.clone());
let tex = renderer.upload_texture(text_data, size, size, Format::R8_UNORM, Filter::Nearest, SamplerAddressMode::ClampToEdge, renderer.device.clone());
renderer.game_data.textures.push(tex.clone());
Some(renderer.game_data.textures.len() - 1)
}