fix flag

Cargo.lock

@@ -483,8 +483,6 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 [[package]]
 name = "fixed_wide"
 version = "0.2.2"
-source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "1397e01522f708e80dcf6c17db69139abb57c43212226b60b50fc09d91c607b5"
 dependencies = [
  "arrayvec",
  "bnum",
@@ -819,8 +817,6 @@ dependencies = [
 [[package]]
 name = "linear_ops"
 version = "0.1.1"
-source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "d6ea2e52a83eab4afe56536e6d27f8e815bd994111ccdc3e2c0aafce77014286"
 dependencies = [
  "fixed_wide",
  "paste",
@@ -1410,8 +1406,6 @@ checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
 [[package]]
 name = "ratio_ops"
 version = "0.1.1"
-source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "93f2dc5bfc9d878028a699e77c6f88ac59d23404218af9fcfbfc190610f49c80"
 
 [[package]]
 name = "raw-window-handle"
@@ -1633,8 +1627,6 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 [[package]]
 name = "strafesnet_common"
 version = "0.8.0"
-source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "171f2b754a8c59b335578824d5465d9637fb41ec4906c6a8c1fd39206891b09c"
 dependencies = [
  "arrayvec",
  "bitflags 2.10.0",
@@ -1647,9 +1639,7 @@ dependencies = [
 
 [[package]]
 name = "strafesnet_graphics"
-version = "0.0.1"
-source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "2514be1d07402210ba2f5f75f008f6daaed134cc7ea6340dabf96418d5e23ba0"
+version = "0.0.2"
 dependencies = [
  "bytemuck",
  "ddsfile",
@@ -1662,8 +1652,6 @@ dependencies = [
 [[package]]
 name = "strafesnet_roblox_bot_file"
 version = "0.8.1"
-source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "33d0fa524476d8b6cf23269b0c9cff6334b70585546b807cb8ec193858defecd"
 dependencies = [
  "binrw",
  "bitflags 2.10.0",
@@ -1705,15 +1693,15 @@ dependencies = [
  "strafesnet_graphics",
  "strafesnet_roblox_bot_file",
  "strafesnet_roblox_bot_player",
- "strafesnet_snf",
  "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu",
 ]
 
 [[package]]
 name = "strafesnet_snf"
 version = "0.3.2"
-source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "aab96a189e3f5c4e5eca1feae704c0d6ceaa0de37a41e29ef3a89816e354292f"
 dependencies = [
  "binrw",
  "id",

Cargo.toml

@@ -6,8 +6,13 @@ members = [
 ]
 resolver = "3"
 
+[profile.release]
+# lto = true
+strip = true
+codegen-units = 1
+
 [workspace.dependencies]
-strafesnet_common = { version = "0.8.0", registry = "strafesnet" }
-strafesnet_graphics = { version = "0.0.1", registry = "strafesnet" }
-strafesnet_roblox_bot_file = { version = "0.8.1", registry = "strafesnet" }
-strafesnet_snf = { version = "0.3.2", registry = "strafesnet" }
+strafesnet_common = { version = "0.8.0", registry = "strafesnet", path = "../strafe-project/lib/common" }
+strafesnet_graphics = { version = "0.0.2", registry = "strafesnet", path = "../strafe-project/engine/graphics" }
+strafesnet_roblox_bot_file = { version = "0.8.1", registry = "strafesnet", path = "../roblox_bot_file" }
+strafesnet_snf = { version = "0.3.2", registry = "strafesnet", path = "../strafe-project/lib/snf" }

README.md

@@ -0,0 +1,17 @@
+How to build the wasm module:
+```
+cd wasm-module
+wasm-pack build --target web --out-dir ../web-demo/pkg
+```
+
+How to serve the web demo (requires wasm module):
+```
+cd web-demo
+python3 -m http.server
+```
+
+How to run the native player:
+```
+cd native-player
+cargo run --release
+```

lib/src/bot.rs

@@ -1,11 +1,11 @@
 /// A loaded bot file.
-pub struct Bot{
+pub struct CompleteBot{
 	//Instructions
 	timelines:strafesnet_roblox_bot_file::v0::Block,
 	offset:f64,
 	duration:f64,
 }
-impl Bot{
+impl CompleteBot{
 	pub(crate) const CAMERA_OFFSET:glam::Vec3=glam::vec3(0.0,2.0,0.0);
 	pub fn new(
 		data:&[u8],

lib/src/graphics.rs

@@ -1,75 +1,51 @@
 use strafesnet_graphics::graphics::GraphicsState;
 
-#[derive(Debug)]
-pub enum Error{
-	File(strafesnet_snf::Error),
-	Map(strafesnet_snf::map::Error),
-}
-
-pub enum Instruction{
-	Render{pos:glam::Vec3,angles:glam::Vec2},
-	Resize(glam::UVec2),
-	ChangeMap(strafesnet_common::map::CompleteMap),
-}
-
 /// The graphics state, essentially a handle to all the information on the GPU.
-pub struct Graphics<'a>{
+pub struct Graphics{
 	graphics:GraphicsState,
 	config:wgpu::SurfaceConfiguration,
-	surface:wgpu::Surface<'a>,
 	device:wgpu::Device,
 	queue:wgpu::Queue,
 }
-impl<'a> Graphics<'a>{
-	pub fn new(mut graphics:GraphicsState,data:&[u8],device:wgpu::Device,queue:wgpu::Queue,surface:wgpu::Surface<'a>,config:wgpu::SurfaceConfiguration,)->Result<Self,Error>{
-		let map=strafesnet_snf::read_map(std::io::Cursor::new(data))
-			.map_err(Error::File)?
-			.into_complete_map()
-			.map_err(Error::Map)?;
-		graphics.generate_models(&device,&queue,&map);
-		Ok(Self{
+impl Graphics{
+	pub fn new(device:wgpu::Device,queue:wgpu::Queue,config:wgpu::SurfaceConfiguration)->Self{
+		let mut graphics=strafesnet_graphics::graphics::GraphicsState::new(&device,&queue,&config);
+		graphics.resize(&device,&config,glam::Vec2::ONE);
+		Self{
 			graphics,
 			device,
 			queue,
-			surface,
 			config,
-		})
-	}
-	pub fn send(&mut self,ins:Instruction){
-		match ins{
-			Instruction::ChangeMap(map)=>{
-				self.graphics.clear();
-				self.graphics.generate_models(&self.device,&self.queue,&map);
-			},
-			Instruction::Resize(size)=>{
-				println!("Resizing to {:?}",size);
-				let t0=std::time::Instant::now();
-				self.config.width=size.x.max(1);
-				self.config.height=size.y.max(1);
-				self.surface.configure(&self.device,&self.config);
-				self.graphics.resize(&self.device,&self.config,glam::Vec2::ONE);
-				println!("Resize took {:?}",t0.elapsed());
-			}
-			Instruction::Render{pos,angles}=>{
-				//this has to go deeper somehow
-				let frame=match self.surface.get_current_texture(){
-					Ok(frame)=>frame,
-					Err(_)=>{
-						self.surface.configure(&self.device,&self.config);
-						self.surface
-							.get_current_texture()
-							.expect("Failed to acquire next surface texture!")
-					}
-				};
-				let view=frame.texture.create_view(&wgpu::TextureViewDescriptor{
-					format:Some(self.config.view_formats[0]),
-					..wgpu::TextureViewDescriptor::default()
-				});
-
-				self.graphics.render(&view,&self.device,&self.queue,strafesnet_graphics::graphics::view_inv(pos,angles));
-
-				frame.present();
-			}
 		}
 	}
+	pub fn change_map(&mut self,map:&crate::map::CompleteMap){
+		self.graphics.clear();
+		self.graphics.generate_models(&self.device,&self.queue,map.map());
+	}
+	pub fn resize(&mut self,surface:&wgpu::Surface<'_>,size:glam::UVec2){
+		self.config.width=size.x.max(1);
+		self.config.height=size.y.max(1);
+		surface.configure(&self.device,&self.config);
+		self.graphics.resize(&self.device,&self.config,glam::Vec2::ONE);
+	}
+	pub fn render(&mut self,surface:&wgpu::Surface<'_>,pos:glam::Vec3,angles:glam::Vec2){
+		//this has to go deeper somehow
+		let frame=match surface.get_current_texture(){
+			Ok(frame)=>frame,
+			Err(_)=>{
+				surface.configure(&self.device,&self.config);
+				surface
+					.get_current_texture()
+					.expect("Failed to acquire next surface texture!")
+			}
+		};
+		let view=frame.texture.create_view(&wgpu::TextureViewDescriptor{
+			format:Some(self.config.view_formats[0]),
+			..wgpu::TextureViewDescriptor::default()
+		});
+
+		self.graphics.render(&view,&self.device,&self.queue,strafesnet_graphics::graphics::view_inv(pos,angles));
+
+		frame.present();
+	}
 }

lib/src/head.rs

@@ -2,14 +2,10 @@ use glam::Vec3Swizzles;
 use strafesnet_common::timer::{Timer,Scaled};
 use strafesnet_common::session::{Time as SessionTime,TimeInner as SessionTimeInner};
 use strafesnet_common::physics::{Time as PhysicsTime,TimeInner as PhysicsTimeInner};
+use strafesnet_roblox_bot_file::v0::{EventType,Head,Timed};
 
-pub enum PlaybackInstructionInternal{
-	Sound
-}
-pub enum PlaybackInstructionExternal{
-	SetPaused(bool),
-	Idle,
-}
+use crate::bot::CompleteBot;
+use crate::state::PlaybackState;
 
 fn vector3_to_glam(v:&strafesnet_roblox_bot_file::v0::Vector3)->glam::Vec3{
 	glam::vec3(v.x,v.y,v.z)
@@ -17,45 +13,59 @@ fn vector3_to_glam(v:&strafesnet_roblox_bot_file::v0::Vector3)->glam::Vec3{
 
 /// A playback context.  Advance time and then generate a camera position to pass to the renderer.
 pub struct PlaybackHead{
-	//"Simulation"
-	event_id:usize,
+	head:Head,
 	offset:f64,
 	timer:Timer<Scaled<SessionTimeInner,PhysicsTimeInner>>,
+	state:PlaybackState,
 }
+const HEAD_NO_CRASH:Head={
+	let mut head=Head::new();
+	// push one output event so that output-1 doesn't underflow
+	head.push(EventType::Output);
+	head
+};
 impl PlaybackHead{
 	pub fn new(time:SessionTime)->Self{
 		let timer=Timer::unpaused(time,PhysicsTime::ZERO);
 		Self{
-			event_id:0,
+			head:HEAD_NO_CRASH,
 			offset:0.0,
 			timer,
+			state:PlaybackState::new(),
 		}
 	}
-	pub fn advance_time(&mut self,bot:&crate::bot::Bot,time:SessionTime){
+	pub fn next_event(&self,bot:&CompleteBot)->Option<Timed<EventType>>{
+		self.head.next_event(bot.timelines())
+	}
+	pub fn process_event(&mut self,bot:&CompleteBot,event_type:EventType){
+		self.state.process_event(bot,event_type,self.head.get_event_index(event_type));
+		self.head.push(event_type);
+	}
+	pub fn advance_time(&mut self,bot:&CompleteBot,time:SessionTime){
 		let simulation_time=self.timer.time(time);
-		let mut time_float=simulation_time.get() as f64/PhysicsTime::ONE_SECOND.get() as f64+bot.offset()+self.offset;
+		let mut time_float=simulation_time.get() as f64/PhysicsTime::ONE_SECOND.get() as f64+self.offset+bot.offset();
 		loop{
-			match bot.timelines().output_events.get(self.event_id+1){
+			match self.next_event(bot){
 				Some(next_event)=>{
 					if next_event.time<time_float{
-						self.event_id+=1;
+						self.process_event(bot,next_event.event);
 					}else{
 						break;
 					}
 				},
 				None=>{
 					//reset playback
-					self.event_id=0;
+					self.head=HEAD_NO_CRASH;
 					self.offset-=bot.duration();
 					time_float-=bot.duration();
 				},
 			}
 		}
 	}
-	pub fn get_position_angles(&self,bot:&crate::bot::Bot,time:SessionTime)->(glam::Vec3,glam::Vec2){
+	pub fn get_position_angles(&self,bot:&CompleteBot,time:SessionTime)->(glam::Vec3,glam::Vec2){
 		let time=self.timer.time(time);
-		let event0=&bot.timelines().output_events[self.event_id];
-		let event1=&bot.timelines().output_events[self.event_id+1];
+		let event0=&bot.timelines().output_events[self.head.get_event_index(EventType::Output)-1];
+		let event1=&bot.timelines().output_events[self.head.get_event_index(EventType::Output)];
 		let p0=vector3_to_glam(&event0.event.position);
 		let p1=vector3_to_glam(&event1.event.position);
 		// let v0=vector3_to_glam(&event0.event.velocity);
@@ -65,7 +75,7 @@ impl PlaybackHead{
 		let t0=event0.time;
 		let t1=event1.time;
 		let time_float=time.get() as f64/PhysicsTime::ONE_SECOND.get() as f64;
-		let t=((time_float+bot.offset()+self.offset-t0)/(t1-t0)) as f32;
+		let t=((time_float+self.offset+bot.offset()-t0)/(t1-t0)) as f32;
 		let p=p0.lerp(p1,t);
 		// let v=v0.lerp(v1,t);
 		// let a=a0.lerp(a1,t);
@@ -76,6 +86,6 @@ impl PlaybackHead{
 		let angles1=vector3_to_glam(&event1.event.angles);
 		let angles=angles0.lerp(angles1,t);
 
-		(p+crate::bot::Bot::CAMERA_OFFSET,angles.yx())
+		(p+CompleteBot::CAMERA_OFFSET,angles.yx())
 	}
 }

lib/src/lib.rs

@@ -1,7 +1,9 @@
 pub mod bot;
-pub mod graphics;
+pub mod map;
 pub mod head;
-pub mod surface;
+pub mod state;
+// pub mod surface;
+pub mod graphics;
 
 // Create Surface
 // Create Graphics from map file and with surface as sample

lib/src/map.rs

@@ -0,0 +1,29 @@
+#[derive(Debug)]
+pub enum Error{
+	File(strafesnet_snf::Error),
+	Map(strafesnet_snf::map::Error),
+}
+impl std::fmt::Display for Error{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for Error{}
+
+pub struct CompleteMap{
+	complete_map:strafesnet_common::map::CompleteMap,
+}
+impl CompleteMap{
+	pub fn new(
+		data:&[u8],
+	)->Result<Self,Error>{
+		let complete_map=strafesnet_snf::read_map(std::io::Cursor::new(data))
+			.map_err(Error::File)?
+			.into_complete_map()
+			.map_err(Error::Map)?;
+		Ok(Self{complete_map})
+	}
+	pub const fn map(&self)->&strafesnet_common::map::CompleteMap{
+		&self.complete_map
+	}
+}

lib/src/state.rs

@@ -0,0 +1,186 @@
+use std::collections::HashMap;
+
+use strafesnet_common::run;
+use strafesnet_common::physics::Time as PhysicsTime;
+use strafesnet_roblox_bot_file::v0;
+
+use crate::bot::CompleteBot;
+
+struct Run{
+	run:run::RunState,
+	flag_reason:Option<v0::FlagReason>,
+}
+impl Run{
+	fn new()->Self{
+		Self{
+			run:run::RunState::Created,
+			flag_reason:None,
+		}
+	}
+	fn flag(&mut self,flag_reason:v0::FlagReason){
+		if self.flag_reason.is_none(){
+			self.flag_reason=Some(flag_reason);
+		}
+	}
+	fn is_invalid(&self)->bool{
+		self.flag_reason.is_some()
+	}
+	fn is_in_progress(&self)->bool{
+		matches!(&self.run,run::RunState::Started{..})
+	}
+}
+
+pub struct PlaybackState{
+	// EventType::Input
+	game_controls:v0::GameControls,
+	mouse_pos:v0::Vector2,
+	// EventType::Output
+	jump_count:u32,
+	// EventType::Sound
+	// EventType::World
+	// EventType::Gravity
+	gravity:v0::Vector3,
+	// EventType::Run
+	runs:HashMap<v0::ModeID,Run>,
+	style:v0::Style,
+	// EventType::Camera
+	// TODO: camera punch
+	// EventType::Setting
+	absolute_sensitivity_enabled:bool,
+	fov_y:f64,
+	sens_x:f64,
+	vertical_sensitivity_multipler:f64,
+	turn_speed:f64,
+}
+impl PlaybackState{
+	pub fn new()->Self{
+		Self{
+			game_controls:v0::GameControls::empty(),
+			mouse_pos:v0::Vector2{x:0.0,y:0.0},
+			jump_count:0,
+			gravity:v0::Vector3{x:0.0,y:0.0,z:0.0},
+			runs:HashMap::new(),
+			style:v0::Style::Autohop,
+			absolute_sensitivity_enabled:false,
+			fov_y:1.0,
+			sens_x:1.0,
+			vertical_sensitivity_multipler:1.0,
+			turn_speed:1.0,
+		}
+	}
+	fn push_output(&mut self,event:&v0::OutputEvent){
+		if event.tick_info.contains(v0::TickInfo::Jump){
+			self.jump_count+=1;
+		}
+	}
+	fn push_input(&mut self,event:&v0::InputEvent){
+		self.game_controls=event.game_controls;
+		self.mouse_pos=event.mouse_pos;
+	}
+	fn push_gravity(&mut self,event:&v0::GravityEvent){
+		self.gravity=event.gravity;
+	}
+	fn push_run(&mut self,event:&v0::Timed<v0::RunEvent>){
+		match &event.event{
+			v0::RunEvent::Prepare(run_event_prepare)=>{
+				self.runs.insert(run_event_prepare.mode,Run::new());
+				self.style=run_event_prepare.style;
+			},
+			v0::RunEvent::Start(run_event_zone)=>{
+				let time=PhysicsTime::raw((event.time*PhysicsTime::ONE_SECOND.get() as f64) as i64);
+				if let Some(run)=self.runs.get_mut(&run_event_zone.mode){
+					_=run.run.start(time);
+				}
+			},
+			v0::RunEvent::Finish(run_event_zone)=>{
+				let time=PhysicsTime::raw((event.time*PhysicsTime::ONE_SECOND.get() as f64) as i64);
+				if let Some(run)=self.runs.get_mut(&run_event_zone.mode){
+					_=run.run.finish(time);
+				}
+			},
+			v0::RunEvent::Clear(run_event_clear)=>{
+				match run_event_clear.mode{
+					v0::ModeSpec::Exactly(mode_id)=>{
+						self.runs.remove(&mode_id);
+					},
+					v0::ModeSpec::All=>{
+						self.runs.clear();
+					},
+					v0::ModeSpec::Invalid=>{
+						self.runs.retain(|_,run|!run.is_invalid());
+					},
+					v0::ModeSpec::InProgress=>{
+						self.runs.retain(|_,run|!run.is_in_progress());
+					},
+				}
+			},
+			v0::RunEvent::Flag(run_event_flag)=>{
+				match run_event_flag.mode{
+					v0::ModeSpec::Exactly(mode_id)=>{
+						if let Some(run)=self.runs.get_mut(&mode_id){
+							run.flag(run_event_flag.flag_reason);
+						}
+					},
+					v0::ModeSpec::All=>{
+						for run in self.runs.values_mut(){
+							run.flag(run_event_flag.flag_reason);
+						}
+					},
+					v0::ModeSpec::Invalid=>{
+						for run in self.runs.values_mut(){
+							if run.is_invalid(){
+								run.flag(run_event_flag.flag_reason);
+							}
+						}
+					},
+					v0::ModeSpec::InProgress=>{
+						for run in self.runs.values_mut(){
+							if run.is_in_progress(){
+								run.flag(run_event_flag.flag_reason);
+							}
+						}
+					},
+				}
+			},
+			// these should never appear in a uploaded bot file,
+			// they are just part of the network protocol for spectating
+			// someone in practice mode.
+			//
+			// Yes, this is a design mistake.
+			// I didn't understand Session vs Simulation when I rewrote bhop in 2022
+			v0::RunEvent::LoadState(_run_event_practice)=>{},
+			v0::RunEvent::SaveState(_run_event_practice)=>{},
+		}
+	}
+	fn push_setting(&mut self,event:&v0::SettingEvent){
+		match event{
+			v0::SettingEvent::FieldOfView(setting_event_field_of_view)=>{
+				self.fov_y=setting_event_field_of_view.fov;
+			},
+			v0::SettingEvent::Sensitivity(setting_event_sensitivity)=>{
+				self.sens_x=setting_event_sensitivity.sensitivity;
+			},
+			v0::SettingEvent::VerticalSensitivityMultiplier(setting_event_vertical_sensitivity_multiplier)=>{
+				self.vertical_sensitivity_multipler=setting_event_vertical_sensitivity_multiplier.multiplier;
+			},
+			v0::SettingEvent::AbsoluteSensitivity(setting_event_absolute_sensitivity)=>{
+				self.absolute_sensitivity_enabled=setting_event_absolute_sensitivity.enabled;
+			},
+			v0::SettingEvent::TurnSpeed(setting_event_turn_speed)=>{
+				self.turn_speed=setting_event_turn_speed.turn_speed;
+			},
+		}
+	}
+	pub(crate) fn process_event(&mut self,bot:&CompleteBot,event_type:v0::EventType,event_index:usize){
+		match event_type{
+			v0::EventType::Input=>self.push_input(&bot.timelines().input_events[event_index].event),
+			v0::EventType::Output=>self.push_output(&bot.timelines().output_events[event_index].event),
+			v0::EventType::Sound=>{},
+			v0::EventType::World=>{},
+			v0::EventType::Gravity=>self.push_gravity(&bot.timelines().gravity_events[event_index].event),
+			v0::EventType::Run=>self.push_run(&bot.timelines().run_events[event_index]),
+			v0::EventType::Camera=>{},
+			v0::EventType::Setting=>self.push_setting(&bot.timelines().setting_events[event_index].event),
+		}
+	}
+}

native-player/src/main.rs

@@ -8,5 +8,5 @@ mod window;
 const TITLE:&'static str=concat!("Roblox Bot Player v",env!("CARGO_PKG_VERSION"));
 
 fn main(){
-	setup::setup_and_start(TITLE);
+	pollster::block_on(setup::setup_and_start(TITLE));
 }

native-player/src/player.rs

@@ -1,6 +1,6 @@
 use strafesnet_common::instruction::TimedInstruction;
 use strafesnet_common::session::Time as SessionTime;
-use strafesnet_roblox_bot_player::{bot::Bot,graphics::Graphics,head::PlaybackHead};
+use strafesnet_roblox_bot_player::{bot::CompleteBot,graphics::Graphics,head::PlaybackHead};
 
 pub enum SessionControlInstruction{
 	SetPaused(bool),
@@ -20,19 +20,22 @@ pub enum Instruction{
 }
 
 pub struct PlayerWorker<'a>{
-	graphics_thread:Graphics<'a>,
-	bot:Bot,
+	surface:wgpu::Surface<'a>,
+	graphics_thread:Graphics,
+	bot:CompleteBot,
 	playback_head:PlaybackHead,
 }
 impl<'a> PlayerWorker<'a>{
 	pub fn new(
-		bot:Bot,
-		graphics_thread:Graphics<'a>,
+		surface:wgpu::Surface<'a>,
+		bot:CompleteBot,
+		graphics_thread:Graphics,
 	)->Self{
 		let playback_head=PlaybackHead::new(SessionTime::ZERO);
 		Self{
-			bot,
+			surface,
 			graphics_thread,
+			bot,
 			playback_head,
 		}
 	}
@@ -43,10 +46,10 @@ impl<'a> PlayerWorker<'a>{
 			Instruction::Render=>{
 				self.playback_head.advance_time(&self.bot,ins.time);
 				let (pos,angles)=self.playback_head.get_position_angles(&self.bot,ins.time);
-				self.graphics_thread.send(strafesnet_roblox_bot_player::graphics::Instruction::Render{pos,angles});
+				self.graphics_thread.render(&self.surface,pos,angles);
 			},
 			Instruction::Resize(physical_size)=>{
-				self.graphics_thread.send(strafesnet_roblox_bot_player::graphics::Instruction::Resize(glam::uvec2(physical_size.width,physical_size.height)));
+				self.graphics_thread.resize(&self.surface,glam::uvec2(physical_size.width,physical_size.height));
 			},
 		}
 	}

native-player/src/setup.rs

@@ -1,186 +1,38 @@
-fn optional_features()->wgpu::Features{
-	wgpu::Features::TEXTURE_COMPRESSION_ASTC
-	|wgpu::Features::TEXTURE_COMPRESSION_ETC2
-}
-fn required_features()->wgpu::Features{
-	wgpu::Features::TEXTURE_COMPRESSION_BC
-}
-fn required_downlevel_capabilities()->wgpu::DownlevelCapabilities{
-	wgpu::DownlevelCapabilities{
-		flags:wgpu::DownlevelFlags::empty(),
-		shader_model:wgpu::ShaderModel::Sm5,
-		..wgpu::DownlevelCapabilities::default()
-	}
-}
+use strafesnet_graphics::setup;
 
-struct SetupContextPartial1{
-	backends:wgpu::Backends,
-	instance:wgpu::Instance,
-}
 fn create_window(title:&str,event_loop:&winit::event_loop::EventLoop<()>)->Result<winit::window::Window,winit::error::OsError>{
 	let mut attr=winit::window::WindowAttributes::default();
 	attr=attr.with_title(title);
 	event_loop.create_window(attr)
 }
-fn create_instance()->SetupContextPartial1{
-	let backends=wgpu::Backends::from_env().unwrap_or_default();
-	SetupContextPartial1{
-		backends,
-		instance:Default::default(),
-	}
-}
-impl SetupContextPartial1{
-	fn create_surface<'a>(self,window:&'a winit::window::Window)->Result<SetupContextPartial2<'a>,wgpu::CreateSurfaceError>{
-		Ok(SetupContextPartial2{
-			backends:self.backends,
-			surface:self.instance.create_surface(window)?,
-			instance:self.instance,
-		})
-	}
-}
-struct SetupContextPartial2<'a>{
-	backends:wgpu::Backends,
-	instance:wgpu::Instance,
-	surface:wgpu::Surface<'a>,
-}
-impl<'a> SetupContextPartial2<'a>{
-	fn pick_adapter(self)->SetupContextPartial3<'a>{
-		//TODO: prefer adapter that implements optional features
-		//let optional_features=optional_features();
-		let required_features=required_features();
 
-		//no helper function smh gotta write it myself
-		let adapters=pollster::block_on(self.instance.enumerate_adapters(self.backends));
-
-		let chosen_adapter=adapters.into_iter()
-			// reverse because we want to select adapters that appear first in ties,
-			// and max_by_key selects the last equal element in the iterator.
-			.rev()
-			.filter(|adapter|
-				adapter.is_surface_supported(&self.surface)
-				&&adapter.features().contains(required_features)
-			)
-			.max_by_key(|adapter|match adapter.get_info().device_type{
-				wgpu::DeviceType::IntegratedGpu=>3,
-				wgpu::DeviceType::DiscreteGpu=>4,
-				wgpu::DeviceType::VirtualGpu=>2,
-				wgpu::DeviceType::Other|wgpu::DeviceType::Cpu=>1,
-			});
-
-		let adapter=chosen_adapter.expect("No suitable GPU adapters found on the system!");
-
-		let adapter_info=adapter.get_info();
-		println!("Using {} ({:?})", adapter_info.name, adapter_info.backend);
-
-		let required_downlevel_capabilities=required_downlevel_capabilities();
-		let downlevel_capabilities=adapter.get_downlevel_capabilities();
-		assert!(
-			downlevel_capabilities.shader_model >= required_downlevel_capabilities.shader_model,
-			"Adapter does not support the minimum shader model required to run this example: {:?}",
-			required_downlevel_capabilities.shader_model
-		);
-		assert!(
-			downlevel_capabilities
-				.flags
-				.contains(required_downlevel_capabilities.flags),
-			"Adapter does not support the downlevel capabilities required to run this example: {:?}",
-			required_downlevel_capabilities.flags - downlevel_capabilities.flags
-		);
-		SetupContextPartial3{
-			surface:self.surface,
-			adapter,
-		}
-	}
-}
-struct SetupContextPartial3<'a>{
-	surface:wgpu::Surface<'a>,
-	adapter:wgpu::Adapter,
-}
-impl<'a> SetupContextPartial3<'a>{
-	fn request_device(self)->SetupContextPartial4<'a>{
-		let optional_features=optional_features();
-		let required_features=required_features();
-
-		// Make sure we use the texture resolution limits from the adapter, so we can support images the size of the surface.
-		let needed_limits=strafesnet_graphics::graphics::required_limits().using_resolution(self.adapter.limits());
-
-		let (device, queue)=pollster::block_on(self.adapter
-			.request_device(
-				&wgpu::DeviceDescriptor{
-					label:None,
-					required_features:(optional_features&self.adapter.features())|required_features,
-					required_limits:needed_limits,
-					memory_hints:wgpu::MemoryHints::Performance,
-					trace:wgpu::Trace::Off,
-					experimental_features:wgpu::ExperimentalFeatures::disabled(),
-				},
-			))
-			.expect("Unable to find a suitable GPU adapter!");
-
-		SetupContextPartial4{
-			surface:self.surface,
-			adapter:self.adapter,
-			device,
-			queue,
-		}
-	}
-}
-struct SetupContextPartial4<'a>{
-	surface:wgpu::Surface<'a>,
-	adapter:wgpu::Adapter,
-	device:wgpu::Device,
-	queue:wgpu::Queue,
-}
-impl<'a> SetupContextPartial4<'a>{
-	fn configure_surface(self,size:&'a winit::dpi::PhysicalSize<u32>)->SetupContext<'a>{
-		let mut config=self.surface
-			.get_default_config(&self.adapter, size.width, size.height)
-			.expect("Surface isn't supported by the adapter.");
-		let surface_view_format=config.format.add_srgb_suffix();
-		config.view_formats.push(surface_view_format);
-		config.present_mode=wgpu::PresentMode::AutoNoVsync;
-		self.surface.configure(&self.device, &config);
-
-		SetupContext{
-			surface:self.surface,
-			device:self.device,
-			queue:self.queue,
-			config,
-		}
-	}
-}
-pub struct SetupContext<'a>{
-	pub surface:wgpu::Surface<'a>,
-	pub device:wgpu::Device,
-	pub queue:wgpu::Queue,
-	pub config:wgpu::SurfaceConfiguration,
-}
-
-pub fn setup_and_start(title:&str){
+pub async fn setup_and_start(title:&str){
 	let event_loop=winit::event_loop::EventLoop::new().unwrap();
 
-	println!("Initializing the surface...");
-
-	let partial_1=create_instance();
-
 	let window=create_window(title,&event_loop).unwrap();
 
-	let partial_2=partial_1.create_surface(&window).unwrap();
+	println!("Initializing the surface...");
 
-	let partial_3=partial_2.pick_adapter();
+	let instance=setup::step1::create_instance();
 
-	let partial_4=partial_3.request_device();
+	let surface=setup::step2::create_surface(&instance,&window).unwrap();
+
+	let adapter=setup::step3::pick_adapter(&instance,&surface).await.expect("No suitable GPU adapters found on the system!");
+
+	let (device,queue)=setup::step4::request_device(&adapter).await;
 
 	let size=window.inner_size();
-
-	let setup_context=partial_4.configure_surface(&size);
+	let config=setup::step5::configure_surface(&adapter,&device,&surface,(size.width,size.height));
 
 	//dedicated thread to ping request redraw back and resize the window doesn't seem logical
 
 	//the thread that spawns the physics thread
 	let mut window_thread=crate::window::WindowContext::new(
 		&window,
-		setup_context,
+		device,
+		queue,
+		surface,
+		config,
 	);
 
 	for arg in std::env::args().skip(1){

native-player/src/window.rs

@@ -193,19 +193,18 @@ impl WindowContext<'_>{
 
 	pub fn new<'a>(
 		window:&'a winit::window::Window,
-		setup_context:crate::setup::SetupContext<'a>,
+		device:wgpu::Device,
+		queue:wgpu::Queue,
+		surface:wgpu::Surface<'a>,
+		config:wgpu::SurfaceConfiguration,
 	)->WindowContext<'a>{
-		// WindowContextSetup::new
-
-		let mut graphics=strafesnet_graphics::graphics::GraphicsState::new(&setup_context.device,&setup_context.queue,&setup_context.config);
-
-		//WindowContextSetup::into_context
-		let screen_size=glam::uvec2(setup_context.config.width,setup_context.config.height);
-		graphics.resize(&setup_context.device,&setup_context.config,glam::Vec2::ONE);
+		let screen_size=glam::uvec2(config.width,config.height);
 		let bot=include_bytes!("../../web-demo/bhop_marble_7cf33a64-7120-4514-b9fa-4fe29d9523d.qbot");
 		let map=include_bytes!("../../web-demo/bhop_marble_5692093612.snfm");
-		let graphics=strafesnet_roblox_bot_player::graphics::Graphics::new(graphics,map,setup_context.device,setup_context.queue,setup_context.surface,setup_context.config).unwrap();
-		let bot=strafesnet_roblox_bot_player::bot::Bot::new(bot).unwrap();
+		let bot=strafesnet_roblox_bot_player::bot::CompleteBot::new(bot).unwrap();
+		let map=strafesnet_roblox_bot_player::map::CompleteMap::new(map).unwrap();
+		let mut graphics=strafesnet_roblox_bot_player::graphics::Graphics::new(device,queue,config);
+		graphics.change_map(&map);
 		WindowContext{
 			manual_mouse_lock:false,
 			mouse_pos:glam::DVec2::ZERO,
@@ -214,6 +213,7 @@ impl WindowContext<'_>{
 			screen_size,
 			window,
 			physics_thread:crate::player::PlayerWorker::new(
+				surface,
 				bot,
 				graphics,
 			),

wasm-module/Cargo.toml

@@ -3,10 +3,18 @@ name = "strafesnet_roblox_bot_player_wasm_module"
 version = "0.1.0"
 edition = "2024"
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 strafesnet_roblox_bot_player = { version = "0.1.0", path = "../lib" }
-wasm-bindgen = "0.2.108"
 strafesnet_common.workspace = true
 strafesnet_graphics.workspace = true
 strafesnet_roblox_bot_file.workspace = true
-strafesnet_snf.workspace = true
+wasm-bindgen = "0.2.108"
+wasm-bindgen-futures = "0.4.58"
+web-sys = { version = "0.3.85", features = ["HtmlCanvasElement"] }
+wgpu = "28.0.0"
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = ["-Oz", "--enable-bulk-memory","--enable-nontrapping-float-to-int"]

wasm-module/src/lib.rs

@@ -0,0 +1,108 @@
+use wasm_bindgen::prelude::wasm_bindgen;
+use wasm_bindgen::JsValue;
+use strafesnet_roblox_bot_player::{bot,map,head,graphics};
+use strafesnet_graphics::setup;
+use strafesnet_common::session::Time as SessionTime;
+
+// Hack to keep the code compiling,
+// SurfaceTarget::Canvas is not available in IDE for whatever reason.
+struct ToSurfaceTarget(web_sys::HtmlCanvasElement);
+impl From<ToSurfaceTarget> for wgpu::SurfaceTarget<'static>{
+	fn from(ToSurfaceTarget(canvas):ToSurfaceTarget)->Self{
+		#[cfg(target_arch = "wasm32")]
+		let target=wgpu::SurfaceTarget::Canvas(canvas);
+		#[expect(unused)]
+		#[cfg(not(target_arch = "wasm32"))]
+		let target=panic!("{canvas:?}");
+		#[allow(unused)]
+		target
+	}
+}
+
+#[wasm_bindgen]
+pub struct Graphics{
+	graphics:graphics::Graphics,
+	surface:wgpu::Surface<'static>,
+}
+#[wasm_bindgen]
+pub async fn setup_graphics(canvas:web_sys::HtmlCanvasElement)->Graphics{
+	let size=(canvas.width(),canvas.height());
+
+	let instance=setup::step1::create_instance();
+	let surface=setup::step2::create_surface(&instance,ToSurfaceTarget(canvas)).unwrap();
+	let adapter=setup::step3::pick_adapter(&instance,&surface).await.expect("No suitable GPU adapters found on the system!");
+	let (device,queue)=setup::step4::request_device(&adapter).await;
+	let config=setup::step5::configure_surface(&adapter,&device,&surface,size);
+	Graphics{
+		graphics:graphics::Graphics::new(device,queue,config),
+		surface:surface,
+	}
+}
+#[wasm_bindgen]
+impl Graphics{
+	#[wasm_bindgen]
+	pub fn render(&mut self,bot:&CompleteBot,head:&PlaybackHead,time:f64){
+		// TODO: check f64 range
+		let time=SessionTime::raw((time*SessionTime::ONE_SECOND.get() as f64) as i64);
+		let (pos,angles)=head.head.get_position_angles(&bot.bot,time);
+		self.graphics.render(&self.surface,pos,angles);
+	}
+	#[wasm_bindgen]
+	pub fn resize(&mut self,width:u32,height:u32){
+		self.graphics.resize(&self.surface,[width,height].into());
+	}
+	#[wasm_bindgen]
+	pub fn change_map(&mut self,map:&CompleteMap){
+		self.graphics.change_map(&map.map);
+	}
+}
+
+#[wasm_bindgen]
+pub struct CompleteBot{
+	bot:bot::CompleteBot,
+}
+#[wasm_bindgen]
+impl CompleteBot{
+	#[wasm_bindgen(constructor)]
+	pub fn new(data:&[u8])->Result<Self,JsValue>{
+		Ok(Self{
+			bot:bot::CompleteBot::new(data).map_err(|e|JsValue::from_str(&e.to_string()))?,
+		})
+	}
+}
+
+#[wasm_bindgen]
+pub struct CompleteMap{
+	map:map::CompleteMap,
+}
+#[wasm_bindgen]
+impl CompleteMap{
+	#[wasm_bindgen(constructor)]
+	pub fn new(data:&[u8])->Result<Self,JsValue>{
+		Ok(Self{
+			map:map::CompleteMap::new(data).map_err(|e|JsValue::from_str(&e.to_string()))?,
+		})
+	}
+}
+
+#[wasm_bindgen]
+pub struct PlaybackHead{
+	head:head::PlaybackHead,
+}
+#[wasm_bindgen]
+impl PlaybackHead{
+	#[wasm_bindgen(constructor)]
+	pub fn new(time:f64)->Result<Self,JsValue>{
+		// TODO: check f64 range
+		let time=SessionTime::raw((time*SessionTime::ONE_SECOND.get() as f64) as i64);
+		Ok(Self{
+			head:head::PlaybackHead::new(time),
+		})
+	}
+	#[wasm_bindgen]
+	pub fn advance_time(&mut self,bot:&CompleteBot,time:f64){
+		// TODO: check f64 range
+		let time=SessionTime::raw((time*SessionTime::ONE_SECOND.get() as f64) as i64);
+		self.head.advance_time(&bot.bot,time);
+	}
+}

web-demo/iframe-helper.js

@@ -0,0 +1,13 @@
+if (window.frameElement) {
+	const body = document.body;
+	const observer = new ResizeObserver(() => {
+		window.parent.postMessage({
+			cmd: "resize",
+			data: {
+				width: body.scrollWidth,
+				height: body.scrollHeight,
+			},
+		});
+	});
+	observer.observe(body);
+}

web-demo/index.html

@@ -4,44 +4,30 @@
 		<meta charset="utf-8" />
 		<meta
 			name="viewport"
-			content="width=device-width, height=device-height, initial-scale=1"
+			content="width=device-width, initial-scale=1, shrink-to-fit=no"
 		/>
-		<title>Strafe Client</title>
-
-		<base data-trunk-public-url />
-		<style type="text/css">
-			:focus {
-				outline: none;
+		<title>StrafesNET Roblox Bot Player Demo</title>
+		<style>
+			:root {
+				color-scheme: light dark;
 			}
-
+			html,
 			body {
 				margin: 0px;
-				background: #fff;
 				width: 100%;
 				height: 100%;
+				overflow: hidden;
 			}
-
-			#content {
-				/* This allows the flexbox to grow to max size, this is needed for WebGPU */
-				flex: 1 1 100%;
-				/* This forces CSS to ignore the width/height of the canvas, this is needed for WebGL */
-				contain: size;
-			}
-
-			.main-canvas {
+			canvas {
 				margin: 0;
 				width: 100%;
 				height: 100%;
 			}
 		</style>
+		<script defer src="player.js" type="module"></script>
+		<script defer type="module" src="iframe-helper.js"></script>
 	</head>
 	<body>
-		<canvas class="main-canvas" id="canvas"></canvas>
-		<link
-			data-trunk
-			rel="rust"
-			href="../strafe-client/Cargo.toml"
-			data-wasm-opt-params="--enable-bulk-memory --enable-nontrapping-float-to-int"
-		/>
+		<canvas></canvas>
 	</body>
 </html>

web-demo/player.js

@@ -0,0 +1,46 @@
+import init, {
+	setup_graphics,
+	CompleteBot,
+	CompleteMap,
+	PlaybackHead,
+} from "./pkg/strafesnet_roblox_bot_player_wasm_module.js";
+
+await init(); // load the wasm module
+
+const b = await fetch("bhop_marble_7cf33a64-7120-4514-b9fa-4fe29d9523d.qbot");
+const m = await fetch("bhop_marble_5692093612.snfm");
+
+const canvas = document.querySelector("canvas");
+
+const graphics = await setup_graphics(canvas);
+const bot = new CompleteBot(new Uint8Array(await b.arrayBuffer()));
+const map = new CompleteMap(new Uint8Array(await m.arrayBuffer()));
+const playback = new PlaybackHead(0);
+
+graphics.change_map(map);
+
+const startTime = performance.now();
+
+function animate(now) {
+	const elapsedMs = now - startTime;
+	const elapsedSec = elapsedMs / 1000; // wasm expects seconds
+
+	// Advance the playback head to the current time
+	playback.advance_time(bot, elapsedSec);
+
+	// Render the frame that the bot is at that time
+	graphics.render(bot, playback, elapsedSec);
+
+	// Keep the loop going
+	requestAnimationFrame(animate);
+}
+
+requestAnimationFrame(animate);
+
+function resize() {
+	canvas.width = canvas.clientWidth;
+	canvas.height = canvas.clientHeight;
+	graphics.resize(canvas.width, canvas.height);
+}
+window.addEventListener("resize", resize);
+resize();