Skip to content

Commit 3297be6

Browse files
committed
pass resource manager by value
1 parent 1bc3786 commit 3297be6

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

editor/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1846,7 +1846,7 @@ impl Editor {
18461846
match block_on(UserInterface::load_from_file_ex(
18471847
&scene_path,
18481848
self.widget_constructors.clone(),
1849-
&self.engine.resource_manager,
1849+
self.engine.resource_manager.clone(),
18501850
&FsResourceIo,
18511851
)) {
18521852
Ok(ui) => {

fyrox-ui/src/lib.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2883,7 +2883,7 @@ impl UserInterface {
28832883
#[allow(clippy::arc_with_non_send_sync)]
28842884
pub async fn load_from_file<P: AsRef<Path>>(
28852885
path: P,
2886-
resource_manager: &ResourceManager,
2886+
resource_manager: ResourceManager,
28872887
) -> Result<Self, VisitError> {
28882888
Self::load_from_file_ex(
28892889
path,
@@ -2898,16 +2898,14 @@ impl UserInterface {
28982898
pub async fn load_from_file_ex<P: AsRef<Path>>(
28992899
path: P,
29002900
constructors: Arc<WidgetConstructorContainer>,
2901-
resource_manager: &ResourceManager,
2901+
resource_manager: ResourceManager,
29022902
io: &dyn ResourceIo,
29032903
) -> Result<Self, VisitError> {
29042904
let mut visitor = Visitor::load_from_memory(&io.load_file(path.as_ref()).await?)?;
29052905
let (sender, receiver) = mpsc::channel();
29062906
visitor.blackboard.register(constructors);
29072907
visitor.blackboard.register(Arc::new(sender.clone()));
2908-
visitor
2909-
.blackboard
2910-
.register(Arc::new(resource_manager.clone()));
2908+
visitor.blackboard.register(Arc::new(resource_manager));
29112909
let mut ui = UserInterface::new_with_channel(sender, receiver, Vector2::new(100.0, 100.0));
29122910
ui.visit("Ui", &mut visitor)?;
29132911
for widget in ui.nodes.iter_mut() {

fyrox-ui/src/loader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl ResourceLoader for UserInterfaceLoader {
3434
let ui = UserInterface::load_from_file_ex(
3535
&path,
3636
Arc::new(WidgetConstructorContainer::new()),
37-
&resource_manager,
37+
resource_manager,
3838
io,
3939
)
4040
.await

0 commit comments

Comments
 (0)