Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TAS studio split and join sections of the script #110

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft

TAS studio split and join sections of the script #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dcd9adc
initial work for splitting on hide
Eddio0141 Nov 17, 2024
4630851
Revert "initial work for splitting on hide"
Eddio0141 Nov 19, 2024
e4fa0e2
way to track split markers in script
Eddio0141 Nov 19, 2024
d0f6579
Editor::rewrite does splits again
Eddio0141 Nov 24, 2024
1a5ee7f
split marker invalidations
Eddio0141 Nov 27, 2024
f6fdd11
update split marker ready-ness from accurate frames
Eddio0141 Nov 27, 2024
eb1121d
split markers assumed to be ready if save exists
Eddio0141 Nov 27, 2024
23dbd4f
fixed wrong filename
Eddio0141 Nov 27, 2024
8edb550
split hltas via SplitInfo
Eddio0141 Nov 28, 2024
654dfda
use split hltas for accurate frames
Eddio0141 Dec 3, 2024
23a9892
complete test and fixed split marker generation
Eddio0141 Dec 7, 2024
11d5cd1
changed split to require name
Eddio0141 Dec 7, 2024
1e6d257
test splitting hltas
Eddio0141 Dec 7, 2024
e0d3aca
split now represented by range
Eddio0141 Dec 11, 2024
301af0f
fixed broken split logic
Eddio0141 Dec 13, 2024
6dd13a5
fixed broken split logic
Eddio0141 Dec 24, 2024
7446438
shared / non-shared rng handling
Eddio0141 Dec 30, 2024
21e81d5
apply rng values
Eddio0141 Dec 30, 2024
25952fd
send rng values and apply to split
Eddio0141 Jan 4, 2025
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
3 changes: 2 additions & 1 deletion src/hooks/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use std::str::FromStr;

use bxt_macros::pattern;
use bxt_patterns::Patterns;
use serde::{Deserialize, Serialize};

use crate::ffi::com_model::{mleaf_s, model_s};
use crate::ffi::command::cmd_function_s;
Expand Down Expand Up @@ -1322,7 +1323,7 @@ impl SCREENINFO {
}
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Deserialize, Serialize)]
pub struct RngState {
pub idum: c_int,
pub iy: c_int,
Expand Down
6 changes: 6 additions & 0 deletions src/hooks/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#![allow(non_snake_case, non_upper_case_globals)]

use std::borrow::BorrowMut;
use std::os::raw::*;
use std::ptr::NonNull;

Expand Down Expand Up @@ -70,10 +71,15 @@ pub unsafe extern "C" fn my_CmdStart(
tas_recording::on_cmd_start(marker, *cmd, random_seed);
tas_optimizer::on_cmd_start(marker);

*RANDOM_SEED.borrow_mut(marker) = Some(random_seed);

CmdStart.get(marker)(player, cmd, random_seed);
})
}

// TODO: directly grab from server, see comment https://github.com/YaLTeR/bxt-rs/pull/110#discussion_r1899846171
pub static RANDOM_SEED: MainThreadRefCell<Option<c_uint>> = MainThreadRefCell::new(None);

pub unsafe extern "C" fn my_PM_Move(ppmove: *mut playermove_s, server: c_int) {
abort_on_panic(move || {
let marker = MainThreadMarker::new();
Expand Down
Loading