Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cached image loading

Browse Source
This commit is contained in:
galister
2025-12-27 22:06:28 +09:00
parent f4545241df
commit 8747487beb
8 changed files with 126 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wgui/src/parser/widget_image.rs
View File

@@ -2,10 +2,11 @@ use crate::{
assets::AssetPath,
layout::WidgetID,
parser::{
AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, print_invalid_attrib,
parse_children, parse_widget_universal, print_invalid_attrib,
style::{parse_color, parse_round, parse_style},
AttribPair, ParserContext, ParserFile,
},
renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
renderer_vk::text::custom_glyph::CustomGlyphData,
widget::image::{WidgetImage, WidgetImageParams},
};
@@ -33,7 +34,7 @@ pub fn parse_widget_image<'a>(
};
if !value.is_empty() {
glyph = match CustomGlyphContent::from_assets(&mut ctx.layout.state.globals, asset_path) {
glyph = match CustomGlyphData::from_assets(&mut ctx.layout.state.globals, asset_path) {
Ok(glyph) => Some(glyph),
Err(e) => {
log::warn!("failed to load {value}: {e}");
@@ -63,7 +64,7 @@ pub fn parse_widget_image<'a>(
}
if let Some(glyph) = glyph {
params.glyph_data = Some(CustomGlyphData::new(glyph));
params.glyph_data = Some(glyph);
} else {
log::warn!("No source for image node!");
}

8
wgui/src/parser/widget_sprite.rs
View File

@@ -1,8 +1,8 @@
use crate::{
assets::AssetPath,
layout::WidgetID,
parser::{AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, style::parse_style},
renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
parser::{parse_children, parse_widget_universal, style::parse_style, AttribPair, ParserContext, ParserFile},
renderer_vk::text::custom_glyph::CustomGlyphData,
widget::sprite::{WidgetSprite, WidgetSpriteParams},
};
@@ -32,7 +32,7 @@ pub fn parse_widget_sprite<'a>(
};
if !value.is_empty() {
glyph = match CustomGlyphContent::from_assets(&ctx.layout.state.globals, asset_path) {
glyph = match CustomGlyphData::from_assets(&ctx.layout.state.globals, asset_path) {
Ok(glyph) => Some(glyph),
Err(e) => {
log::warn!("failed to load {value}: {e}");
@@ -53,7 +53,7 @@ pub fn parse_widget_sprite<'a>(
}
if let Some(glyph) = glyph {
params.glyph_data = Some(CustomGlyphData::new(glyph));
params.glyph_data = Some(glyph);
} else {
log::warn!("No source for sprite node!");
}