diff --git a/rpfm_ui/build.rs b/rpfm_ui/build.rs index 743abd74d..ae92ad3ad 100644 --- a/rpfm_ui/build.rs +++ b/rpfm_ui/build.rs @@ -35,8 +35,7 @@ fn main() { // Model renderer, only on windows. #[cfg(feature = "support_model_renderer")] { - //let assets_path = "./../assets/"; // Disabled until SetAssetFolder works. - let assets_path = &target_path; + let assets_path = "./../assets/"; DirBuilder::new().recursive(true).create(assets_path).unwrap(); // TODO: unhardcode this path once the folder is moved to a 3rdparty subrepo. @@ -86,7 +85,7 @@ fn main() { copy(renderer_path.to_owned() + "Rldx/Rldx/RenderResources/Textures/CubeMaps/SkyCubemapIBLDiffuse.dds", assets_path.to_owned() + "SkyCubemapIBLDiffuse.dds").unwrap(); copy(renderer_path.to_owned() + "Rldx/Rldx/RenderResources/Textures/CubeMaps/SkyCubemapIBLSpecular.dds", assets_path.to_owned() + "SkyCubemapIBLSpecular.dds").unwrap(); - copy(renderer_path.to_owned() + "QtRenderingWidget/myfile.spritefont", target_path.to_owned() + "myfile.spritefont").unwrap(); + copy(renderer_path.to_owned() + "QtRenderingWidget/myfile.spritefont", assets_path.to_owned() + "myfile.spritefont").unwrap(); } Err(error) => { stdout().write_all(error.to_string().as_bytes()).unwrap(); diff --git a/rpfm_ui/src/ffi/mod.rs b/rpfm_ui/src/ffi/mod.rs index 5e519143f..339bbb29d 100644 --- a/rpfm_ui/src/ffi/mod.rs +++ b/rpfm_ui/src/ffi/mod.rs @@ -561,6 +561,14 @@ pub unsafe fn set_asset_folder(folder: &str) { SetAssetFolder(folder.as_mut_raw_ptr()) } +#[cfg(feature = "support_model_renderer")] +extern "C" { fn SetLogFolder(folder: *mut QString); } +#[cfg(feature = "support_model_renderer")] +pub unsafe fn set_log_folder(folder: &str) { + let folder = QString::from_std_str(folder); + SetLogFolder(folder.as_mut_raw_ptr()) +} + #[cfg(feature = "support_model_renderer")] extern "C" { fn PauseRendering(pQRendeeWiget: *mut QWidget); } #[cfg(feature = "support_model_renderer")] diff --git a/rpfm_ui/src/settings_ui/backend.rs b/rpfm_ui/src/settings_ui/backend.rs index 231077c3e..81a208a9b 100644 --- a/rpfm_ui/src/settings_ui/backend.rs +++ b/rpfm_ui/src/settings_ui/backend.rs @@ -183,7 +183,8 @@ pub unsafe fn init_settings(main_window: &QPtr) { #[must_use = "Many things depend on this folder existing. So better check this worked."] pub fn init_config_path() -> Result<()> { - DirBuilder::new().recursive(true).create(config_path()?)?; + let config_path = config_path()?; + DirBuilder::new().recursive(true).create(&config_path)?; DirBuilder::new().recursive(true).create(backup_autosave_path()?)?; DirBuilder::new().recursive(true).create(error_path()?)?; DirBuilder::new().recursive(true).create(schemas_path()?)?; @@ -209,7 +210,10 @@ pub fn init_config_path() -> Result<()> { DirBuilder::new().recursive(true).create(&assets_path)?; } - //unsafe {crate::ffi::set_asset_folder(&assets_path); } + unsafe {crate::ffi::set_asset_folder(&assets_path); } + + let log_path = config_path.to_string_lossy(); + unsafe {crate::ffi::set_log_folder(&log_path); } } Ok(())