Demo rewrite #74

Patiga · 2023-03-17T13:12:07Z

Some relatively minor things like naming might still need to be changed
I haven't tested the demo writing yet, would be appreciated if someone else could do that.
I'm ofc open to changes :)

Patiga · 2023-03-19T20:10:52Z

I think the snapshot would be easier to work with, if it wasn't exposed as an Iterator or single HashMap, but instead as a struct with a HashMap for each snap object type.

struct Snapshot {
    player_input: HashMap<u16, PlayerInput>,
    projectile: HashMap<u16, Projectile>,
    laser: HashMap<u16, Laser>,
    ...
}

Each field would map each id to the object.
That struct could be generated using the gamenet python scripts, which I'm not familiar enough with.
(The fields could be suffixed with an s for a more intuitive plural form, but that wouldn't work all that well with all names)

Patiga · 2023-12-08T17:30:45Z

Rebased and with a tool to resave demos, in order to detect differences in parsing/saving.
Currently, it doesn't produce the same file, but visually the demo seemed correct. It would require further investigation, maybe Kaitai could help.

I think it is ready to merge for now. The gamenet and demo crate will be more actively used by me now, so maybe I'll need to develop this further soon.

Patiga · 2023-12-08T19:01:42Z

Fixed failed build

Patiga · 2023-12-10T19:49:04Z

I'm not sure what to do about the 2 failing checks. They appear to be about the Rust edition 2021(?).
Should I try to lower the Rust version @heinrich5991?

heinrich5991 · 2023-12-13T10:53:00Z

Why does it fail with nightly? 🤔

You can ignore the failure with old Rust for ow.

Patiga · 2023-12-13T14:10:33Z

A simple cargo update fixed the failed build. If preferred, I could probably also only run the command for proc_macro.

Patiga · 2023-12-29T11:08:12Z

After the latest change, which has nothing to do with any dependencies, rustc-serialize fails to build on ubuntu-latest, nightly???
I'll try another cargo update -p rustc-serialize, but I feel like I'm fixing symptoms of something I have no control over.

Patiga · 2023-12-29T11:19:08Z

Welp, that fixed it again

heinrich5991

Looks good to me. Is this ready to merge?

I left a couple of nits, but this can be merged without fixing them. In this case, I'd go over these myself and make a PR. :)

heinrich5991 · 2024-01-05T23:10:55Z

demo/src/format.rs

+        keyframe: bool,
+    },
+    Snapshot(&'a ArrayVec<[u8; MAX_SNAPSHOT_SIZE]>),
+    SnapshotDelta(&'a ArrayVec<[u8; MAX_SNAPSHOT_SIZE]>),


Maybe rather &'a [u8], I see no reason to make the type more specific.

heinrich5991 · 2024-01-05T23:11:18Z

snapshot/src/snap.rs

+        }
+
+        let mut builder = snap.recycle();
+        for size in &self.sizes {


Suggested change

for size in &self.sizes {

for &size in &self.sizes {

gets rid of the need to dereference below.

heinrich5991 · 2024-01-05T23:13:12Z

doc/snapshot.md

+Snapshots provide the full game state. In demos, they are used to provide
+additional entry points for the stream of snapshot deltas.
+
+- `data_size` is a positive signed 32-bit integer describing the amount of


Here and below: nonnegative or positive?
(0 is nonnegative but not positive.)

heinrich5991 · 2024-01-05T23:15:11Z

doc/demo.md

+The `chunk_data` of snapshots and snapshot deltas goes through variable-int
+compression once, and twice for messages.


Does "twice" mean decoded as ints twice, and the resulting bytes are then unpacked using TW variable int encoding a third time if the message has an int?

Or does it only go through int decoding once if the message doesn't contain any integers?

heinrich5991 · 2024-01-05T23:16:38Z

demo/src/ddnet.rs

+    Inner(#[from] reader::ReadError),
+    #[error("{0:?}")]
+    Snap(snapshot::snap::Error),
+    #[error("Uuid item has an incorrect size")]


Suggested change

#[error("Uuid item has an incorrect size")]

#[error("UUID item has an incorrect size")]

heinrich5991 · 2024-01-05T23:16:45Z

demo/src/ddnet.rs

+    Snap(snapshot::snap::Error),
+    #[error("Uuid item has an incorrect size")]
+    UuidItemLength,
+    #[error("Uuid type id that is not registered")]


Suggested change

#[error("Uuid type id that is not registered")]

#[error("UUID type ID that is not registered")]

heinrich5991 · 2024-01-05T23:22:43Z

I didn't know about the binrw crate. It looks pretty nice: https://docs.rs/binrw/0.13.3/binrw/.

Also add `thiserror` dependency

doc/demo Add variable-int compression

Abstracts away compression, snapshot parsing and applying of deltas

Usage: Find out if the Reader and Writer work as expected. Currently, it does produce a different file on a randomly selected demo. However, I didn't see any visual differences.

`cargo update -p proc-macro2@1.0.51` (two different versions exist in the dependency tree)

Grants access to all header data. Fixes pub attributes and exports. Adjust names of methods on `Reader`.

Patiga force-pushed the demo-rewrite branch from 46f2133 to de4712c Compare March 17, 2023 13:16

heinrich5991 force-pushed the master branch from c80cf0c to ae30d4b Compare May 23, 2023 22:36

heinrich5991 force-pushed the master branch 2 times, most recently from 10cb702 to aff9b03 Compare July 18, 2023 22:19

Patiga force-pushed the demo-rewrite branch from 8d708e8 to 257cbd3 Compare December 8, 2023 17:18

Patiga force-pushed the demo-rewrite branch from 257cbd3 to aac612c Compare December 8, 2023 19:01

Patiga force-pushed the demo-rewrite branch from 75700b4 to f82c9d0 Compare December 13, 2023 13:52

Patiga force-pushed the demo-rewrite branch from f82c9d0 to 43d4384 Compare December 14, 2023 12:43

Patiga force-pushed the demo-rewrite branch 3 times, most recently from 3d7d301 to 59359eb Compare December 30, 2023 11:42

heinrich5991 approved these changes Jan 5, 2024

View reviewed changes

Patiga added 9 commits January 6, 2024 01:06

demo: Replace CallbackData with io::Read

a36ac86

demo: Replace writer Callback with io::Write

d647724

demo: Bump Rust edition to 2018

1d441b4

demo: Rewrite to use binrw

2e67807

Also add `thiserror` dependency

snapshot: Add SnapReader

7f5358c

doc/snapshot: Add snapshot layout

649d6b9

doc/demo Add variable-int compression

demo: Introduce ddnet DemoReader

8c5cbf4

Abstracts away compression, snapshot parsing and applying of deltas

demo: Expose map data in ddnet DemoReader

9d09f14

tools: Add tool to read a demo and write it again

6a1cc11

Usage: Find out if the Reader and Writer work as expected. Currently, it does produce a different file on a randomly selected demo. However, I didn't see any visual differences.

Patiga and others added 3 commits January 6, 2024 01:06

Update proc-macro2

b775d0c

`cargo update -p proc-macro2@1.0.51` (two different versions exist in the dependency tree)

demo: Expose immutable inner Reader

1aa7f0c

Grants access to all header data. Fixes pub attributes and exports. Adjust names of methods on `Reader`.

demo: Exclude from MSRV

1b2be88

heinrich5991 force-pushed the demo-rewrite branch from 59359eb to 1b2be88 Compare January 6, 2024 00:08

heinrich5991 merged commit 1b2be88 into heinrich5991:master Jan 6, 2024
14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Demo rewrite #74

Demo rewrite #74

Patiga commented Mar 17, 2023

Patiga commented Mar 19, 2023

Patiga commented Dec 8, 2023

Patiga commented Dec 8, 2023

Patiga commented Dec 10, 2023

heinrich5991 commented Dec 13, 2023 •

edited

Loading

Patiga commented Dec 13, 2023

Patiga commented Dec 29, 2023

Patiga commented Dec 29, 2023

heinrich5991 left a comment

heinrich5991 Jan 5, 2024

heinrich5991 Jan 5, 2024

heinrich5991 Jan 5, 2024

heinrich5991 Jan 5, 2024

heinrich5991 Jan 5, 2024

heinrich5991 Jan 5, 2024

heinrich5991 commented Jan 5, 2024

		The `chunk_data` of snapshots and snapshot deltas goes through variable-int
		compression once, and twice for messages.

	#[error("Uuid item has an incorrect size")]
	#[error("UUID item has an incorrect size")]

	#[error("Uuid type id that is not registered")]
	#[error("UUID type ID that is not registered")]

Demo rewrite #74

Demo rewrite #74

Conversation

Patiga commented Mar 17, 2023

Patiga commented Mar 19, 2023

Patiga commented Dec 8, 2023

Patiga commented Dec 8, 2023

Patiga commented Dec 10, 2023

heinrich5991 commented Dec 13, 2023 • edited Loading

Patiga commented Dec 13, 2023

Patiga commented Dec 29, 2023

Patiga commented Dec 29, 2023

heinrich5991 left a comment

Choose a reason for hiding this comment

heinrich5991 Jan 5, 2024

Choose a reason for hiding this comment

heinrich5991 Jan 5, 2024

Choose a reason for hiding this comment

heinrich5991 Jan 5, 2024

Choose a reason for hiding this comment

heinrich5991 Jan 5, 2024

Choose a reason for hiding this comment

heinrich5991 Jan 5, 2024

Choose a reason for hiding this comment

heinrich5991 Jan 5, 2024

Choose a reason for hiding this comment

heinrich5991 commented Jan 5, 2024

heinrich5991 commented Dec 13, 2023 •

edited

Loading