new deku #747
Merged
new deku #747
+361
−337
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wgreenberg
requested changes
Jan 23, 2025
rust/src/wow/db.rs
Outdated
| { | ||
| let v_bytes = v.to_le_bytes(); | ||
| let (_, result) = T::read(BitSlice::from_slice(&v_bytes), ())?; | ||
| reader.seek(std::io::SeekFrom::Start(old)).unwrap(); |
There was a problem hiding this comment.
not entirely sure, but can you use reader.seek_last_read() here?
There was a problem hiding this comment.
don't think so, we're seeking and then skipping
rust/src/wow/db.rs
Outdated
|
|
||
| fn read_field_to_u32<R: deku::no_std_io::Read + deku::no_std_io::Seek>(reader: &mut Reader<R>, field_offset_bits: usize, field_size_bits: usize) -> Result<u32, DekuError> { | ||
| // Assumes the reader points to the start of the record | ||
| let old = reader.seek(std::io::SeekFrom::Current(0i64)).unwrap(); |
There was a problem hiding this comment.
looks like they implemented From<Error> for DekuError, so i think you should be able to just do:
Suggested change
| let old = reader.seek(std::io::SeekFrom::Current(0i64)).unwrap(); | |
| let old = reader.seek(std::io::SeekFrom::Current(0))?; |
There was a problem hiding this comment.
Do I need to import a trait or something?
error[E0277]: `?` couldn't convert the error to `deku::DekuError`
--> src\wow\db.rs:215:61
|
215 | let old = reader.seek(std::io::SeekFrom::Current(0))?;
| ^ the trait `From<std::io::Error>` is not implemented for `deku::DekuError`, which is required by `std::result::Result<String, deku::DekuError>: FromResidual<std::result::Result<Infallible, std::io::Error>>`
|
= note: the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait
= help: the following other types implement trait `From<T>`:
<deku::DekuError as From<Infallible>>
<deku::DekuError as From<TryFromSliceError>>
<deku::DekuError as From<std::num::TryFromIntError>>
= note: required for `std::result::Result<String, deku::DekuError>` to implement `FromResidual<std::result::Result<Infallible, std::io::Error>>`
There was a problem hiding this comment.
oh i'm dumb, they implemented From<DekuError> for Error lol. looks like one thing you could do is
let old = reader.seek(std::io::SeekFrom::Current(0))
.map_err(|err| DekuError::Io(error.kind()))?;
| light_param_ids: [u16; 8], | ||
| pub unk: u16, |
There was a problem hiding this comment.
interesting, does this not throw things off?
There was a problem hiding this comment.
we're always advancing according to header.record_size and seeking within the record ourselves now
magcius
force-pushed
the
new-deku
branch
2 times, most recently
from
b9e415b to
63270d9
Compare
This was the cause of all of our WoW rendering failures with new-deku. Unfortunate we can't (yet?) use Deku for this part, but honestly I think the shift + mask is better than a loop anyway.
The deku::byte_offset trick we do for alignment requires reader.bits_read to be correct, as that's the number we pad by. In our PackedVec implementations, we read a u8, and then later skip over it, which double-counts from the perspective of reader.bits_read. Fix this by adjusting after we read it.
|
I think this should be ready for review. I fixed both WoW and Unity loading. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.