diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD index 890cef1..ec8a33d 100644 --- a/pkgbuild/PKGBUILD +++ b/pkgbuild/PKGBUILD @@ -26,4 +26,7 @@ package() { # copy layer discovery info file install -Dm644 ${_pkgbase}/rFactorOverlay.json "${pkgdir}"/usr/share/vulkan/implicit_layer.d/rFactorOverlay.json + + # copy font png + install -Dm644 ${_pkgbase}/font.png "${pkgdir}"/usr/share/vulkan_rf2_layer/font.png } diff --git a/src/overlay/mod.rs b/src/overlay/mod.rs index 385cc6c..2533405 100644 --- a/src/overlay/mod.rs +++ b/src/overlay/mod.rs @@ -46,9 +46,7 @@ impl UiSelectorConfig { #[derive(Deserialize, Serialize)] pub struct OverlayConfig { pub ui_config: UiSelectorConfig, - pub radar_config: RadarConfig, - pub font_path: String, } impl OverlayConfig { @@ -56,7 +54,6 @@ impl OverlayConfig { Self { ui_config: UiSelectorConfig::new(), radar_config: RadarConfig::new(), - font_path: String::new(), } } } @@ -93,8 +90,6 @@ impl Overlay { pub fn set_config(&mut self, config: OverlayConfig) { self.config = config; - - self.config.font_path = "/opt/sata_ssd/Workspace/vk_layer_rs/font.png".to_string(); } pub fn set_instance(&mut self, instance: Arc) { @@ -144,9 +139,10 @@ impl Overlay { // only font is used let mut create_info = GuiHandlerCreateInfo::default(); - // create_info.font_path = AssetPath::from(self.config.font_path.clone()); - create_info.font_path = AssetPath::from("/opt/sata_ssd/Workspace/vk_layer_rs/font.png"); + + create_info.font_path = AssetPath::from("/usr/share/vulkan_rf2_layer/font.png"); create_info.font_path.assume_prefix_free(); + // required to not crash create_info.resource_directory = AssetPath::from(""); create_info.resource_directory.assume_prefix_free();