D3V-X3N0/roblox-bot-player
1
Fork 0
forked from StrafesNET/roblox-bot-player
Code Pull Requests Activity

clean up window and player

Browse Source
This commit is contained in:
Rhys Lloyd
2026-02-20 10:00:48 -08:00
parent cf59852468
commit 98f56d0608
2 changed files with 9 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
native-player/src/player.rs
View File

@@ -4,8 +4,6 @@ use strafesnet_roblox_bot_player::{bot::CompleteBot,graphics::Graphics,head::Pla
pub enum SessionControlInstruction{
SetPaused(bool),
}
pub enum SessionPlaybackInstruction{
SkipForward,
SkipBack,
DecreaseTimescale,
@@ -14,7 +12,6 @@ pub enum SessionPlaybackInstruction{
pub enum Instruction{
SessionControl(SessionControlInstruction),
SessionPlayback(SessionPlaybackInstruction),
Render,
Resize(winit::dpi::PhysicalSize<u32>),
ChangeMap(strafesnet_common::map::CompleteMap),
@@ -43,7 +40,6 @@ impl<'a> PlayerWorker<'a>{
pub fn send(&mut self,ins:TimedInstruction<Instruction,SessionTime>){
match ins.instruction{
Instruction::SessionControl(session_control_instruction)=>{},
Instruction::SessionPlayback(session_playback_instruction)=>{},
Instruction::Render=>if let Some(bot)=&self.bot{
self.playback_head.advance_time(bot,ins.time);
let (pos,angles)=self.playback_head.get_position_angles(bot,ins.time);

44
native-player/src/window.rs
View File

@@ -2,7 +2,7 @@ use strafesnet_common::instruction::TimedInstruction;
use strafesnet_common::session::Time as SessionTime;
use strafesnet_common::physics::{MiscInstruction,SetControlInstruction};
use crate::file::LoadFormat;
use crate::player::{PlayerWorker,Instruction as PhysicsWorkerInstruction,SessionControlInstruction,SessionPlaybackInstruction};
use crate::player::{PlayerWorker,Instruction as PhysicsWorkerInstruction,SessionControlInstruction};
pub enum Instruction{
WindowEvent(winit::event::WindowEvent),
@@ -54,53 +54,27 @@ impl WindowContext<'_>{
(keycode,state)=>{
let s=state.is_pressed();
// internal variants for this scope
enum SessionInstructionSubset{
Control(SessionControlInstruction),
Playback(SessionPlaybackInstruction),
}
macro_rules! session_ctrl{
($variant:ident,$state:expr)=>{
s.then_some(SessionInstructionSubset::Control(SessionControlInstruction::$variant))
s.then_some(PhysicsWorkerInstruction::SessionControl(SessionControlInstruction::$variant))
};
}
macro_rules! session_playback{
($variant:ident,$state:expr)=>{
s.then_some(SessionInstructionSubset::Playback(SessionPlaybackInstruction::$variant))
};
}
impl From<SessionInstructionSubset> for PhysicsWorkerInstruction{
fn from(value:SessionInstructionSubset)->Self{
match value{
SessionInstructionSubset::Control(session_control_instruction)=>PhysicsWorkerInstruction::SessionControl(session_control_instruction),
SessionInstructionSubset::Playback(session_playback_instruction)=>PhysicsWorkerInstruction::SessionPlayback(session_playback_instruction),
}
}
}
if let Some(session_instruction)=match keycode{
if let Some(instruction)=match keycode{
winit::keyboard::Key::Named(winit::keyboard::NamedKey::Space)=>if s{
let paused=!self.simulation_paused;
self.simulation_paused=paused;
Some(SessionInstructionSubset::Control(SessionControlInstruction::SetPaused(paused)))
Some(PhysicsWorkerInstruction::SessionControl(SessionControlInstruction::SetPaused(paused)))
}else{None},
winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowUp)=>session_playback!(IncreaseTimescale,s),
winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowDown)=>session_playback!(DecreaseTimescale,s),
winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowLeft)=>session_playback!(SkipBack,s),
winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowRight)=>session_playback!(SkipForward,s),
winit::keyboard::Key::Character(key)=>match key.as_str(){
// "R"|"r"=>s.then(||{
// //mouse needs to be reset since the position is absolute
// self.mouse_pos=glam::DVec2::ZERO;
// SessionInstructionSubset::Input(SessionInputInstruction::Mode(session::ImplicitModeInstruction::ResetAndRestart))
// }),
_=>None,
},
winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowUp)=>session_ctrl!(IncreaseTimescale,s),
winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowDown)=>session_ctrl!(DecreaseTimescale,s),
winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowLeft)=>session_ctrl!(SkipBack,s),
winit::keyboard::Key::Named(winit::keyboard::NamedKey::ArrowRight)=>session_ctrl!(SkipForward,s),
_=>None,
}{
self.physics_thread.send(TimedInstruction{
time,
instruction:session_instruction.into(),
instruction,
});
}
},