diff options
Diffstat (limited to 'src/assetbundle.rs')
| -rw-r--r-- | src/assetbundle.rs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/assetbundle.rs b/src/assetbundle.rs index db7ad97..8f6af15 100644 --- a/src/assetbundle.rs +++ b/src/assetbundle.rs @@ -24,10 +24,10 @@ impl<T: Read + Seek> AssetBundle<T> { .find_main_file() .ok_or(anyhow!("AssetBundle seems to lack main file"))?; debug!("detected {:?} as main file", main_ni.name); - let main = SerializedFile::read(fs.read(main_ni)?)?; + let main = SerializedFile::read(fs.read(main_ni)?, 0)?; let shared_assets = if let Some(n) = main.find_fs_shared_assets(&fs) { debug!("detect {:?} as shared assets", n.name); - Some(SerializedFile::read(fs.read(&n)?)?) + Some(SerializedFile::read(fs.read(&n)?, 1)?) } else { None }; @@ -50,9 +50,10 @@ impl<T: Read + Seek> AssetBundle<T> { .into_iter() .flatten(), ) - .map(|(fi, o)| PPtr { + .map(|(si, o)| PPtr { class: "".to_string(), - file_id: fi, + source_file: si, + file_id: 0, path_id: o.path_id, _class: PhantomData, }) @@ -69,9 +70,10 @@ impl<T: Read + Seek> AssetBundle<T> { .into_iter() .flatten(), ) - .map(|(fi, o)| PPtr { + .map(|(si, o)| PPtr { class: class_name.to_owned(), - file_id: fi, + source_file: si, + file_id: 0, path_id: o.path_id, _class: PhantomData, }) |