{"header":{"message":"get fonts embedded and referencing assets","description":null,"timestamp":"2024-02-07T18:08:23.56110965Z","authors":[{}]},"hash":"SSJKQR6X6L2KUJI2YPLMBQU3PTR2RYAQQR6N35MDMOCOTV6ZDUEAC","authors":[{"login":"Jengamon","key":"47a75hR6eVaawZfVGBs2CqZUKZbcNz5Ago5CubrCkWvZ"}],"deps":{"hashes":[["SSJKQR6X6L2KUJI2YPLMBQU3PTR2RYAQQR6N35MDMOCOTV6ZDUEAC","get fonts embedded and referencing assets"],["AA",null],["EEO6C4YSWFW3JOZ3JH6K7X4TKAUTVJD53CQNYZHI2QY6REGEXUCAC","setup cosync and get webgl working again"],["GHIHJCWBCGFZI4AG66L7WG4WKJ467DXFBRBNLT4ZULSN7ZVBJI6AC","get world space & world text rendering working"],["O5P6HCPWGMGJBFJEMC3SYQJ5OEW2AQV4KEJCMRVTTS3K6M45Z3BAC","get a cheeky little web going"],["DKGUNP6LG3DJ35VMHU42K3VJO5JJ5UVYI4PLM72HO5ZNAQ4P366AC","maybe some text shenanigans"],["X5EMQBC4BFNJOOHS2QMF4UB4QH6JKSALK6RXLK6B7SP6MNYSAP6QC","remove yakui for now, and actually integrate egui (maybe)"],["KMU4E426CB2NDRJEK7B4GSL22P62CJPPZRK45X3JV5WP5NIBIGRQC","integrate physics system"],["PAOLWMH7TLJLNAWBJBWP7KB7YGDFUPASMTFU33KZ3QW5JXJMPXCAC","naga-oil cuz that HDR bloom had my name written on it"],["GROTV3H2V6BHU5CA7WSLVYDCWAR7GHUP5JV2QOGPLJ6N3553T4MAC","get text rendering somehow working"],["7CBRRVV3GLVLBHNPQNRHSA2ZCLHIMCHFEMWMZNOICY2OZLB7DGPAC","add some profiling, but mostly a secret"],["MT6IBX7SGLE26XIFZY53WYNHSJZMSDVDRJP3VYPXIQ4DKY75XVXAC","extract conversion logic & some clippy clip"],["RWAEE6C6YZEFU226ACROCZQYSPVW4QQLKDBY4S5BGTDGHQD5LJSAC","add .gitignore"],["L6RIUKGLJZLAOKFGUDTZKBPP4HUBPEZAKHJEQHO34WFF62AB2ZIQC","move from git to pijul"]],"deps":["EEO6C4YSWFW3JOZ3JH6K7X4TKAUTVJD53CQNYZHI2QY6REGEXUCAC"],"known":["L6RIUKGLJZLAOKFGUDTZKBPP4HUBPEZAKHJEQHO34WFF62AB2ZIQC","X5EMQBC4BFNJOOHS2QMF4UB4QH6JKSALK6RXLK6B7SP6MNYSAP6QC","KMU4E426CB2NDRJEK7B4GSL22P62CJPPZRK45X3JV5WP5NIBIGRQC","GROTV3H2V6BHU5CA7WSLVYDCWAR7GHUP5JV2QOGPLJ6N3553T4MAC","GHIHJCWBCGFZI4AG66L7WG4WKJ467DXFBRBNLT4ZULSN7ZVBJI6AC","MT6IBX7SGLE26XIFZY53WYNHSJZMSDVDRJP3VYPXIQ4DKY75XVXAC","PAOLWMH7TLJLNAWBJBWP7KB7YGDFUPASMTFU33KZ3QW5JXJMPXCAC","7CBRRVV3GLVLBHNPQNRHSA2ZCLHIMCHFEMWMZNOICY2OZLB7DGPAC","RWAEE6C6YZEFU226ACROCZQYSPVW4QQLKDBY4S5BGTDGHQD5LJSAC","DKGUNP6LG3DJ35VMHU42K3VJO5JJ5UVYI4PLM72HO5ZNAQ4P366AC","O5P6HCPWGMGJBFJEMC3SYQJ5OEW2AQV4KEJCMRVTTS3K6M45Z3BAC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":3,"ins":{"up_context":[{"change":3,"pos":54}],"down_context":[{"change":3,"pos":85}],"flag":"BLOCK","start":0,"end":20,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":54},"to":{"change":3,"start":54,"end":85},"introduced_by":3}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":7,"ins":{"up_context":[{"change":3,"pos":73}],"down_context":[{"change":3,"pos":178}],"flag":"BLOCK","start":21,"end":44,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":73},"to":{"change":3,"start":145,"end":178},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":145},"to":{"change":3,"start":145,"end":178},"introduced_by":3}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":" Asset, AssetCache,"}],"del_contents":[{"Del":" Asset, AssetCache, ReloadId,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":11,"ins":{"up_context":[{"change":3,"pos":196}],"down_context":[{"change":3,"pos":286}],"flag":"BLOCK","start":45,"end":155,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":196},"to":{"change":3,"start":196,"end":286},"introduced_by":3}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":" fontdb::Source, Attrs, Buffer, Color, FontSystem, Metrics, Shaping, SwashCache, TextArea,"},{"Add":" TextBounds,"}],"del_contents":[{"Del":" Attrs, Buffer, Color, FontSystem, Metrics, Shaping, SwashCache, TextArea, TextBounds,\n"}]}},{"Edit":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":21,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":438},"to":{"change":3,"start":438,"end":483},"introduced_by":3}],"inode":{"change":3,"pos":32}}},"contents":[{"Del":" loaded_fonts: HashMap,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":24,"ins":{"up_context":[{"change":3,"pos":486}],"down_context":[{"change":3,"pos":596}],"flag":"BLOCK","start":156,"end":1479,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":486},"to":{"change":3,"start":486,"end":596},"introduced_by":3}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":"impl TextSystem {"},{"Add":" pub fn new("},{"Add":" assets: &AssetCache,"},{"Add":" ) -> color_eyre::Result {"},{"Add":" let required_fonts = ["},{"Add":" \"fonts.poiret_one.PoiretOne-Regular\","},{"Add":" \"fonts.noto_color_emoji.NotoColorEmoji-Regular\","},{"Add":" ];"},{"Add":""},{"Add":" let fonts: Vec<_> = required_fonts"},{"Add":" .into_iter()"},{"Add":" .map(|id| {"},{"Add":" let font_data_handle = assets.load::(id)?;"},{"Add":" let font_data: Arc> = Arc::new(font_data_handle.read().0.clone());"},{"Add":" Ok((id, Source::Binary(font_data)))"},{"Add":" })"},{"Add":" .collect::, color_eyre::Report>>()?;"},{"Add":" // Until we can assume otherwise, hardcode this"},{"Add":" let locale = \"en-US\".to_string();"},{"Add":" let mut db = glyphon::fontdb::Database::new();"},{"Add":" #[cfg(not(target_arch = \"wasm32\"))]"},{"Add":" {"},{"Add":" db.load_system_fonts();"},{"Add":" }"},{"Add":" for (id, source) in fonts.into_iter() {"},{"Add":" let ids = db.load_font_source(source);"},{"Add":" log::warn!(\"laoded {id} into {ids}\");"},{"Add":" }"},{"Add":" // Set up default families"},{"Add":" // Default to emoji for sans serif"},{"Add":" db.set_sans_serif_family(\"Noto Color Emoji\");"},{"Add":" let fonts = FontSystem::new_with_locale_and_db(locale, db);"},{"Add":""},{"Add":" Ok(Self {"},{"Add":" fonts,"}],"del_contents":[{"Del":"impl Default for TextSystem {\n fn default() -> Self {\n Self {\n fonts: FontSystem::new(),\n"}]}},{"Edit":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":60,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":634},"to":{"change":3,"start":634,"end":676},"introduced_by":3}],"inode":{"change":3,"pos":32}}},"contents":[{"Del":" loaded_fonts: HashMap::new(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":70,"ins":{"up_context":[{"change":3,"pos":461}],"down_context":[{"change":3,"pos":686}],"flag":"BLOCK","start":1480,"end":1491,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":461},"to":{"change":3,"start":676,"end":686},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":676},"to":{"change":3,"start":676,"end":686},"introduced_by":3}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":" })"}],"del_contents":[{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":119,"ins":{"up_context":[{"change":3,"pos":979}],"down_context":[{"change":3,"pos":0}],"flag":"BLOCK","start":1492,"end":1528,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":979},"to":{"change":3,"start":979,"end":1022},"introduced_by":3}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":" /// Loading requested data here"}],"del_contents":[{"Del":" /// Loading requested asset fonts here\n"}]}},{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":123,"ins":{"up_context":[{"change":3,"pos":106}],"down_context":[{"change":3,"pos":138}],"flag":"BLOCK","start":1529,"end":1562,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":106},"to":{"change":3,"start":106,"end":138},"introduced_by":3}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":" _assets: &AssetCache,"}],"del_contents":[{"Del":" assets: &AssetCache,\n"}]}},{"Edit":{"inode":{"change":3,"pos":32},"path":"src/text.rs","line":125,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":146},"to":{"change":3,"start":1103,"end":1973},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2542},"to":{"change":3,"start":1103,"end":1973},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1103},"to":{"change":3,"start":1103,"end":1973},"introduced_by":3}],"inode":{"change":3,"pos":32}}},"contents":[{"Del":" let font_name = \"fonts.poiret_one.PoiretOne-Regular\";\n let font_data_handle = match assets.load::(font_name) {\n Ok(hnd) => hnd,\n Err(e) => {\n log::error!(\"failed to load font {font_name}: {e}\");\n return;\n }\n };\n let current_reload_id = self.loaded_fonts.get(font_name);\n if current_reload_id.is_none()\n || current_reload_id.is_some_and(|old_id| old_id < &font_data_handle.last_reload_id())\n {\n // Load the font into the system\n self.loaded_fonts\n .insert(font_name.to_string(), font_data_handle.last_reload_id());\n self.fonts\n .db_mut()\n .load_font_data(font_data_handle.read().0.clone());\n log::info!(\"successfully loaded font {font_name}!\");\n }\n"}]}},{"Edit":{"inode":{"change":3,"pos":9635},"path":"src/game.rs","line":97,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9925},"to":{"change":2,"start":2401,"end":2559},"introduced_by":2}],"inode":{"change":3,"pos":9635}}},"contents":[{"Del":" internal_state: GameState {\n world,\n assets,\n camera,\n render_options,\n },\n"}]}},{"Replacement":{"inode":{"change":3,"pos":9635},"path":"src/game.rs","line":110,"ins":{"up_context":[{"change":3,"pos":682}],"down_context":[{"change":3,"pos":246}],"flag":"BLOCK","start":1563,"end":1608,"inode":{"change":3,"pos":9635}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":682},"to":{"change":3,"start":7549,"end":7590},"introduced_by":3}],"inode":{"change":3,"pos":9635}},"ins_contents":[{"Add":" text: TextSystem::new(&assets)?,"}],"del_contents":[{"Del":" text: TextSystem::default(),\n"}]}},{"Edit":{"inode":{"change":3,"pos":9635},"path":"src/game.rs","line":113,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":278}],"down_context":[{"change":3,"pos":10074}],"flag":"BLOCK","start":1609,"end":1767,"inode":{"change":3,"pos":9635}}},"contents":[{"Add":" internal_state: GameState {"},{"Add":" world,"},{"Add":" assets,"},{"Add":" camera,"},{"Add":" render_options,"},{"Add":" },"}]}},{"Edit":{"inode":{"change":3,"pos":35},"path":".gitignore","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":62},"to":{"change":3,"start":62,"end":71},"introduced_by":3}],"inode":{"change":3,"pos":35}}},"contents":[{"Del":"assets/*\n"}]}}],"owner":"Jengamon","repo":"catwaiter","token":"uBRp6qt0SffFiDbWyLiMHS1fLlhjeLvx4OZZRXrtU4Y=","login":null}

…

Dependencies

Change contents