Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Allow hot reload without syncing all asset files to devFS #21436

Merged
jonahwilliams merged 13 commits into from
Oct 2, 2020
Merged

Allow hot reload without syncing all asset files to devFS #21436

Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d870dea
Allow hot reload without syncing all asset files to devFS
jonahwilliams Sep 26, 2020
847b53d
Update asset_manager.cc
Sep 26, 2020
62cea76
only preserve original asset manager
jonahwilliams Sep 27, 2020
ec3ba29
Update asset_manager.cc
Sep 27, 2020
9ebdec9
Update engine.cc
Sep 28, 2020
262912a
always re-create original asset dir
jonahwilliams Sep 30, 2020
0ebce10
Merge branch 'double_devfs' of github.com:jonahwilliams/engine into d…
jonahwilliams Sep 30, 2020
5a95412
remove missed merge
jonahwilliams Sep 30, 2020
cb3e7b1
fix order of asset resolvers
jonahwilliams Sep 30, 2020
32f85bd
add shell unit test for setting asset dir path
jonahwilliams Oct 1, 2020
f42dd5e
maybe this works
jonahwilliams Oct 2, 2020
f004337
make a private member
jonahwilliams Oct 2, 2020
ee6772a
format
jonahwilliams Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions shell/common/shell.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,6 +1404,9 @@ bool Shell::OnServiceProtocolRunInView(
configuration.AddAssetResolver(

@jonahwilliams jonahwilliams Sep 30, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all seems much simpler

std::make_unique<DirectoryAssetBundle>(fml::OpenDirectory(
asset_directory_path.c_str(), false, fml::FilePermission::kRead)));
configuration.AddAssetResolver(
std::make_unique<DirectoryAssetBundle>(fml::OpenDirectory(
settings_.assets_path.c_str(), false, fml::FilePermission::kRead)));

auto& allocator = response->GetAllocator();
response->SetObject();
Expand Down Expand Up @@ -1516,6 +1519,9 @@ bool Shell::OnServiceProtocolSetAssetBundlePath(

auto asset_manager = std::make_shared<AssetManager>();

asset_manager->PushFront(
std::make_unique<DirectoryAssetBundle>(fml::OpenDirectory(
settings_.assets_path.c_str(), false, fml::FilePermission::kRead)));
asset_manager->PushFront(std::make_unique<DirectoryAssetBundle>(
fml::OpenDirectory(params.at("assetDirectory").data(), false,
fml::FilePermission::kRead)));
Expand Down