more test

.cargo/config.toml

@@ -0,0 +1,2 @@
+[registries.strafesnet]
+index = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"

Cargo.lock

@@ -1632,9 +1632,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "strafesnet_common"
-version = "0.8.0"
+version = "0.8.1"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "171f2b754a8c59b335578824d5465d9637fb41ec4906c6a8c1fd39206891b09c"
+checksum = "cba84ffce9c31b70b5dcaab0b9e946fe34ca4d6613a4c83980745b47dfc86edf"
 dependencies = [
  "arrayvec",
  "bitflags 2.10.0",
@@ -1661,9 +1661,9 @@ dependencies = [
 
 [[package]]
 name = "strafesnet_roblox_bot_file"
-version = "0.8.1"
+version = "0.9.0"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "33d0fa524476d8b6cf23269b0c9cff6334b70585546b807cb8ec193858defecd"
+checksum = "3ee6a8c592794145fdbbb2fbdaedbbc5813373e2e2bbbb9bac6ab7944775cc0a"
 dependencies = [
  "binrw",
  "bitflags 2.10.0",
@@ -1678,7 +1678,6 @@ dependencies = [
  "strafesnet_common",
  "strafesnet_graphics",
  "strafesnet_roblox_bot_file",
- "strafesnet_snf",
  "wgpu",
 ]
 
@@ -1705,6 +1704,7 @@ dependencies = [
  "strafesnet_graphics",
  "strafesnet_roblox_bot_file",
  "strafesnet_roblox_bot_player",
+ "strafesnet_snf",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",

Cargo.toml

@@ -12,7 +12,7 @@ strip = true
 codegen-units = 1
 
 [workspace.dependencies]
-strafesnet_common = { version = "0.8.0", registry = "strafesnet" }
+strafesnet_common = { version = "0.8.1", registry = "strafesnet" }
 strafesnet_graphics = { version = "0.0.2", registry = "strafesnet" }
-strafesnet_roblox_bot_file = { version = "0.8.1", registry = "strafesnet" }
+strafesnet_roblox_bot_file = { version = "0.9.0", registry = "strafesnet" }
 strafesnet_snf = { version = "0.3.2", registry = "strafesnet" }

LICENSE-APACHE

@@ -0,0 +1,176 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS

LICENSE-MIT

@@ -0,0 +1,23 @@
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

README.md

@@ -1,3 +1,10 @@
+How to clone this repository:
+```
+git clone https://git.itzana.me/StrafesNET/roblox-bot-player
+cd roblox-bot-player
+git lfs pull
+```
+
 How to build the wasm module:
 ```
 cd wasm-module
@@ -13,5 +20,25 @@ python3 -m http.server
 How to run the native player:
 ```
 cd native-player
-cargo run --release
+cargo run --release -- ../web-demo/bhop_marble_5692093612.snfm ../web-demo/bhop_marble_7cf33a64-7120-4514-b9fa-4fe29d9523d.qbot
 ```
+You can drag and drop map files and bot files to load them.
+
+#### License
+
+This code depends on a proprietary module, [strafesnet_graphics](https://git.itzana.me/StrafesNET/strafe-project/src/branch/master/engine/graphics).  The resulting binary is
+not redistributable without the express permission of Rhys Lloyd.  The code in this repository
+is MIT & Apache 2.0 dual licensed, and is free to use.
+
+<sup>
+Licensed under either of <a href="LICENSE-APACHE">Apache License, Version
+2.0</a> or <a href="LICENSE-MIT">MIT license</a> at your option.
+</sup>
+
+<br>
+
+<sub>
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in this crate by you, as defined in the Apache-2.0 license, shall
+be dual licensed as above, without any additional terms or conditions.
+</sub>

lib/Cargo.toml

@@ -8,5 +8,4 @@ glam = "0.31.0"
 strafesnet_common.workspace = true
 strafesnet_graphics.workspace = true
 strafesnet_roblox_bot_file.workspace = true
-strafesnet_snf.workspace = true
 wgpu = "28.0.0"

lib/src/bot.rs

@@ -1,31 +1,47 @@
+use strafesnet_roblox_bot_file::v0;
+use strafesnet_common::physics::{Time as PhysicsTime};
+
 /// A loaded bot file.
 pub struct CompleteBot{
 	//Instructions
-	timelines:strafesnet_roblox_bot_file::v0::Block,
-	offset:f64,
-	duration:f64,
+	timelines:v0::Block,
+	time_base:PhysicsTime,
+	duration:PhysicsTime,
 }
 impl CompleteBot{
 	pub(crate) const CAMERA_OFFSET:glam::Vec3=glam::vec3(0.0,2.0,0.0);
 	pub fn new(
-		data:&[u8],
-	)->Result<Self,strafesnet_roblox_bot_file::v0::Error>{
-		let timelines=strafesnet_roblox_bot_file::v0::read_all_to_block(std::io::Cursor::new(data))?;
+		timelines:v0::Block,
+	)->Self{
 		let first=timelines.output_events.first().unwrap();
 		let last=timelines.output_events.last().unwrap();
-		Ok(Self{
-			offset:first.time,
-			duration:last.time-first.time,
+		Self{
+			time_base:crate::time::from_float(first.time).unwrap(),
+			duration:crate::time::from_float(last.time-first.time).unwrap(),
 			timelines,
-		})
+		}
 	}
-	pub const fn offset(&self)->f64{
-		self.offset
+	pub const fn time_base(&self)->PhysicsTime{
+		self.time_base
 	}
-	pub const fn duration(&self)->f64{
+	pub const fn duration(&self)->PhysicsTime{
 		self.duration
 	}
-	pub const fn timelines(&self)->&strafesnet_roblox_bot_file::v0::Block{
+	pub const fn timelines(&self)->&v0::Block{
 		&self.timelines
 	}
+	pub fn run_duration(&self,mode_id:v0::ModeID)->Option<PhysicsTime>{
+		let mut it=self.timelines.run_events.iter().rev();
+		let end=it.find_map(|event|match &event.event{
+			v0::RunEvent::Finish(run_start_event) if run_start_event.mode==mode_id=>Some(event.time),
+			_=>None,
+		})?;
+		let start=it.find_map(|event|match &event.event{
+			v0::RunEvent::Start(run_start_event) if run_start_event.mode==mode_id=>Some(event.time),
+			_=>None,
+		})?;
+		let start=crate::time::from_float(start).unwrap();
+		let end=crate::time::from_float(end).unwrap();
+		Some(end-start)
+	}
 }

lib/src/graphics.rs

@@ -18,9 +18,9 @@ impl Graphics{
 			config,
 		}
 	}
-	pub fn change_map(&mut self,map:&crate::map::CompleteMap){
+	pub fn change_map(&mut self,map:&strafesnet_common::map::CompleteMap){
 		self.graphics.clear();
-		self.graphics.generate_models(&self.device,&self.queue,map.map());
+		self.graphics.generate_models(&self.device,&self.queue,map);
 	}
 	pub fn resize(&mut self,surface:&wgpu::Surface<'_>,size:glam::UVec2){
 		self.config.width=size.x.max(1);

lib/src/head.rs

@@ -1,15 +1,11 @@
 use glam::Vec3Swizzles;
-use strafesnet_common::timer::{Timer,Scaled};
+use strafesnet_common::timer::{Scaled,Timer,TimerState};
 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,92 @@ 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,
-	offset:f64,
+	head:Head,
+	loop_offset:PhysicsTime,
 	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,
-			offset:0.0,
+			head:HEAD_NO_CRASH,
+			loop_offset:PhysicsTime::ZERO,
 			timer,
+			state:PlaybackState::new(),
 		}
 	}
-	pub fn advance_time(&mut self,bot:&crate::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+self.offset+bot.offset();
+	pub const fn state(&self)->&PlaybackState{
+		&self.state
+	}
+	pub fn time(&self,bot:&CompleteBot,time:SessionTime)->PhysicsTime{
+		bot.time_base()+self.timer.time(time)+self.loop_offset
+	}
+	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 set_paused(&mut self,time:SessionTime,paused:bool){
+		_=self.timer.set_paused(time,paused);
+	}
+	pub fn seek_to(&mut self,time:SessionTime,new_time:PhysicsTime){
+		self.timer.set_time(time,new_time);
+		self.loop_offset=PhysicsTime::ZERO;
+		// reset head
+		self.head=HEAD_NO_CRASH;
+	}
+	pub fn seek_backward(&mut self,time_offset:SessionTime){
+		let (mut state,paused)=self.timer.clone().into_state();
+		let offset=state.get_time(-time_offset).coerce();
+		state.set_offset(offset);
+		self.timer=Timer::from_state(state,paused);
+		// reset head
+		self.head=HEAD_NO_CRASH;
+	}
+	pub fn seek_forward(&mut self,time_offset:SessionTime){
+		let (mut state,paused)=self.timer.clone().into_state();
+		let offset=state.get_time(time_offset).coerce();
+		state.set_offset(offset);
+		self.timer=Timer::from_state(state,paused);
+	}
+	pub fn set_scale(&mut self,time:SessionTime,new_scale:strafesnet_common::integer::Ratio64){
+		self.timer.set_scale(time,new_scale);
+	}
+	pub fn advance_time(&mut self,bot:&CompleteBot,time:SessionTime){
+		let mut simulation_time=self.time(bot,time);
+		let mut time_float=simulation_time.get() as f64/PhysicsTime::ONE_SECOND.get() as f64;
 		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.offset-=bot.duration();
-					time_float-=bot.duration();
+					self.head=HEAD_NO_CRASH;
+					self.loop_offset-=bot.duration();
+					simulation_time-=bot.duration();
+					time_float=simulation_time.get() as f64/PhysicsTime::ONE_SECOND.get() as f64;
 				},
 			}
 		}
 	}
-	pub fn get_position_angles(&self,bot:&crate::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];
+	pub fn get_position_angles(&self,bot:&CompleteBot,time:SessionTime)->(glam::Vec3,glam::Vec2){
+		let time=self.time(bot,time);
+		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 +108,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+self.offset+bot.offset()-t0)/(t1-t0)) as f32;
+		let t=((time_float-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 +119,6 @@ impl PlaybackHead{
 		let angles1=vector3_to_glam(&event1.event.angles);
 		let angles=angles0.lerp(angles1,t);
 
-		(p+crate::bot::CompleteBot::CAMERA_OFFSET,angles.yx())
+		(p+CompleteBot::CAMERA_OFFSET,angles.yx())
 	}
 }

lib/src/lib.rs

@@ -1,6 +1,7 @@
 pub mod bot;
-pub mod map;
 pub mod head;
+pub mod time;
+pub mod state;
 // pub mod surface;
 pub mod graphics;
 

lib/src/map.rs

@@ -1,29 +0,0 @@
-#[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,210 @@
+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;
+
+pub 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);
+		}
+	}
+	pub fn time(&self,time:PhysicsTime)->run::Time{
+		self.run.time(time)
+	}
+	pub fn is_invalid(&self)->bool{
+		self.flag_reason.is_some()
+	}
+	pub fn is_in_progress(&self)->bool{
+		matches!(&self.run,run::RunState::Started{..})
+	}
+	pub fn is_finished(&self)->bool{
+		matches!(&self.run,run::RunState::Finished{..})
+	}
+	pub fn get_flag_reason_text(&self)->Option<&'static str>{
+		Some(match self.flag_reason{
+			Some(v0::FlagReason::Anticheat)=>"Passed through anticheat zone.",
+			Some(v0::FlagReason::StyleChange)=>"Changed style.",
+			Some(v0::FlagReason::Clock)=>"Incorrect clock.  (This can be caused by internet hiccups)",
+			Some(v0::FlagReason::Pause)=>"Pausing is not allowed in this style.",
+			Some(v0::FlagReason::Flying)=>"Flying is not allowed in this style.",
+			Some(v0::FlagReason::Gravity)=>"Gravity modification is not allowed in this style.",
+			Some(v0::FlagReason::Timescale)=>"Timescale is not allowed in this style.",
+			Some(v0::FlagReason::Timetravel)=>"Time travel is not allowed in this style.",
+			Some(v0::FlagReason::Teleport)=>"Illegal teleport.",
+			Some(v0::FlagReason::Practice)=>"Practice mode triggers invalidation.",
+			None=>return None,
+		})
+	}
+}
+
+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,
+		}
+	}
+	pub fn get_run(&self,mode:v0::ModeID)->Option<&Run>{
+		self.runs.get(&mode)
+	}
+	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),
+		}
+	}
+}

lib/src/time.rs

@@ -0,0 +1,32 @@
+use strafesnet_common::integer::Time;
+
+#[derive(Debug)]
+pub enum Error{
+	Underflow,
+	Overflow,
+	Nan,
+}
+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 fn from_float<T>(time:f64)->Result<Time<T>,Error>{
+	match time.classify(){
+		core::num::FpCategory::Nan=>Err(Error::Nan),
+		core::num::FpCategory::Zero=>Ok(Time::ZERO),
+		core::num::FpCategory::Infinite
+		|core::num::FpCategory::Subnormal
+		|core::num::FpCategory::Normal=>{
+			if time<Time::<T>::MIN.get() as f64{
+				return Err(Error::Underflow);
+			}
+			if (Time::<T>::MAX.get() as f64)<time{
+				return Err(Error::Overflow);
+			}
+			Ok(Time::raw((time*Time::<T>::ONE_SECOND.get() as f64) as i64))
+		}
+	}
+}

native-player/Cargo.toml

@@ -4,12 +4,12 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+glam = "0.31.0"
 pollster = "0.4.0"
-strafesnet_roblox_bot_player = { version = "0.1.0", path = "../lib" }
 wgpu = "28.0.0"
 winit = "0.30.12"
+strafesnet_roblox_bot_player = { version = "0.1.0", path = "../lib" }
 strafesnet_common.workspace = true
 strafesnet_graphics.workspace = true
 strafesnet_roblox_bot_file.workspace = true
 strafesnet_snf.workspace = true
-glam = "0.31.0"

native-player/src/file.rs

@@ -1,21 +1,11 @@
 use std::io::Read;
 
-#[cfg(any(feature="roblox",feature="source"))]
-use strafesnet_deferred_loader::deferred_loader::LoadFailureMode;
-
 #[expect(dead_code)]
 #[derive(Debug)]
 pub enum ReadError{
-	#[cfg(feature="roblox")]
-	Roblox(strafesnet_rbx_loader::ReadError),
-	#[cfg(feature="source")]
-	Source(strafesnet_bsp_loader::ReadError),
-	#[cfg(feature="snf")]
 	StrafesNET(strafesnet_snf::Error),
-	#[cfg(feature="snf")]
 	StrafesNETMap(strafesnet_snf::map::Error),
-	#[cfg(feature="snf")]
-	StrafesNETBot(strafesnet_snf::bot::Error),
+	RobloxBot(strafesnet_roblox_bot_file::v0::Error),
 	Io(std::io::Error),
 	UnknownFileFormat,
 }
@@ -27,14 +17,8 @@ impl std::fmt::Display for ReadError{
 impl std::error::Error for ReadError{}
 
 pub enum ReadFormat{
-	#[cfg(feature="roblox")]
-	Roblox(strafesnet_rbx_loader::Model),
-	#[cfg(feature="source")]
-	Source(strafesnet_bsp_loader::Bsp),
-	#[cfg(feature="snf")]
 	SNFM(strafesnet_common::map::CompleteMap),
-	#[cfg(feature="snf")]
-	SNFB(strafesnet_snf::bot::Segment),
+	QBOT(strafesnet_roblox_bot_file::v0::Block),
 }
 
 pub fn read<R:Read+std::io::Seek>(input:R)->Result<ReadFormat,ReadError>{
@@ -45,19 +29,12 @@ pub fn read<R:Read+std::io::Seek>(input:R)->Result<ReadFormat,ReadError>{
 	buf.read_to_end(&mut entire_file).map_err(ReadError::Io)?;
 	let cursor=std::io::Cursor::new(entire_file);
 	match peek.as_slice(){
-		#[cfg(feature="roblox")]
-		b"<rob"=>Ok(ReadFormat::Roblox(strafesnet_rbx_loader::read(cursor).map_err(ReadError::Roblox)?)),
-		#[cfg(feature="source")]
-		b"VBSP"=>Ok(ReadFormat::Source(strafesnet_bsp_loader::read(cursor).map_err(ReadError::Source)?)),
-		#[cfg(feature="snf")]
 		b"SNFM"=>Ok(ReadFormat::SNFM(
 			strafesnet_snf::read_map(cursor).map_err(ReadError::StrafesNET)?
 			.into_complete_map().map_err(ReadError::StrafesNETMap)?
 		)),
-		#[cfg(feature="snf")]
-		b"SNFB"=>Ok(ReadFormat::SNFB(
-			strafesnet_snf::read_bot(cursor).map_err(ReadError::StrafesNET)?
-			.read_all().map_err(ReadError::StrafesNETBot)?
+		b"qbot"=>Ok(ReadFormat::QBOT(
+			strafesnet_roblox_bot_file::v0::read_all_to_block(cursor).map_err(ReadError::RobloxBot)?
 		)),
 		_=>Err(ReadError::UnknownFileFormat),
 	}
@@ -68,10 +45,6 @@ pub fn read<R:Read+std::io::Seek>(input:R)->Result<ReadFormat,ReadError>{
 pub enum LoadError{
 	ReadError(ReadError),
 	File(std::io::Error),
-	#[cfg(feature="roblox")]
-	LoadRoblox(strafesnet_rbx_loader::LoadError),
-	#[cfg(feature="source")]
-	LoadSource(strafesnet_bsp_loader::LoadError),
 }
 impl std::fmt::Display for LoadError{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@@ -81,36 +54,15 @@ impl std::fmt::Display for LoadError{
 impl std::error::Error for LoadError{}
 
 pub enum LoadFormat{
-	#[cfg(any(feature="snf",feature="roblox",feature="source"))]
 	Map(strafesnet_common::map::CompleteMap),
-	#[cfg(feature="snf")]
-	Bot(strafesnet_snf::bot::Segment),
+	Bot(strafesnet_roblox_bot_file::v0::Block),
 }
 
 pub fn load<P:AsRef<std::path::Path>>(path:P)->Result<LoadFormat,LoadError>{
 	//blocking because it's simpler...
 	let file=std::fs::File::open(path).map_err(LoadError::File)?;
 	match read(file).map_err(LoadError::ReadError)?{
-		#[cfg(feature="snf")]
-		ReadFormat::SNFB(bot)=>Ok(LoadFormat::Bot(bot)),
-		#[cfg(feature="snf")]
+		ReadFormat::QBOT(bot)=>Ok(LoadFormat::Bot(bot)),
 		ReadFormat::SNFM(map)=>Ok(LoadFormat::Map(map)),
-		#[cfg(feature="roblox")]
-		ReadFormat::Roblox(model)=>{
-			let mut place=strafesnet_rbx_loader::Place::from(model);
-			let script_errors=place.run_scripts().unwrap();
-			for error in script_errors{
-				println!("Script error: {error}");
-			}
-			let (map,errors)=place.to_snf(LoadFailureMode::DefaultToNone).map_err(LoadError::LoadRoblox)?;
-			if errors.count()!=0{
-				print!("Errors encountered while loading the map:\n{}",errors);
-			}
-			Ok(LoadFormat::Map(map))
-		},
-		#[cfg(feature="source")]
-		ReadFormat::Source(bsp)=>Ok(LoadFormat::Map(
-			bsp.to_snf(LoadFailureMode::DefaultToNone,&[]).map_err(LoadError::LoadSource)?
-		)),
 	}
 }

native-player/src/player.rs

@@ -1,11 +1,11 @@
 use strafesnet_common::instruction::TimedInstruction;
 use strafesnet_common::session::Time as SessionTime;
+use strafesnet_common::physics::Time as PhysicsTime;
 use strafesnet_roblox_bot_player::{bot::CompleteBot,graphics::Graphics,head::PlaybackHead};
 
 pub enum SessionControlInstruction{
 	SetPaused(bool),
-}
-pub enum SessionPlaybackInstruction{
+	Restart,
 	SkipForward,
 	SkipBack,
 	DecreaseTimescale,
@@ -14,43 +14,77 @@ pub enum SessionPlaybackInstruction{
 
 pub enum Instruction{
 	SessionControl(SessionControlInstruction),
-	SessionPlayback(SessionPlaybackInstruction),
 	Render,
 	Resize(winit::dpi::PhysicalSize<u32>),
+	ChangeMap(strafesnet_common::map::CompleteMap),
+	LoadReplay(strafesnet_roblox_bot_file::v0::Block),
+}
+
+fn speed_ratio(speed:i8)->strafesnet_common::integer::Ratio64{
+	if speed.is_negative(){
+		strafesnet_common::integer::Ratio64::new(4i64.pow(-speed as u32),5u64.pow(-speed as u32)).unwrap()
+	}else{
+		strafesnet_common::integer::Ratio64::new(5i64.pow(speed as u32),4u64.pow(speed as u32)).unwrap()
+	}
 }
 
 pub struct PlayerWorker<'a>{
 	surface:wgpu::Surface<'a>,
 	graphics_thread:Graphics,
-	bot:CompleteBot,
+	bot:Option<CompleteBot>,
 	playback_head:PlaybackHead,
+	playback_speed:i8,
 }
 impl<'a> PlayerWorker<'a>{
 	pub fn new(
 		surface:wgpu::Surface<'a>,
-		bot:CompleteBot,
 		graphics_thread:Graphics,
 	)->Self{
 		let playback_head=PlaybackHead::new(SessionTime::ZERO);
 		Self{
 			surface,
 			graphics_thread,
-			bot,
+			bot:None,
 			playback_head,
+			playback_speed:0,
 		}
 	}
 	pub fn send(&mut self,ins:TimedInstruction<Instruction,SessionTime>){
 		match ins.instruction{
-			Instruction::SessionControl(session_control_instruction)=>{},
-			Instruction::SessionPlayback(session_playback_instruction)=>{},
-			Instruction::Render=>{
-				self.playback_head.advance_time(&self.bot,ins.time);
-				let (pos,angles)=self.playback_head.get_position_angles(&self.bot,ins.time);
+			Instruction::SessionControl(SessionControlInstruction::SetPaused(paused))=>{
+				self.playback_head.set_paused(ins.time,paused);
+			},
+			Instruction::SessionControl(SessionControlInstruction::Restart)=>{
+				self.playback_head.seek_to(ins.time,PhysicsTime::ZERO);
+			},
+			Instruction::SessionControl(SessionControlInstruction::SkipForward)=>{
+				self.playback_head.seek_forward(SessionTime::from_secs(2));
+			},
+			Instruction::SessionControl(SessionControlInstruction::SkipBack)=>{
+				self.playback_head.seek_backward(SessionTime::from_secs(2));
+			},
+			Instruction::SessionControl(SessionControlInstruction::DecreaseTimescale)=>{
+				self.playback_speed=self.playback_speed.saturating_sub(1).max(-27);
+				self.playback_head.set_scale(ins.time,speed_ratio(self.playback_speed));
+			},
+			Instruction::SessionControl(SessionControlInstruction::IncreaseTimescale)=>{
+				self.playback_speed=self.playback_speed.saturating_add(1).min(27);
+				self.playback_head.set_scale(ins.time,speed_ratio(self.playback_speed));
+			},
+			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);
 				self.graphics_thread.render(&self.surface,pos,angles);
 			},
 			Instruction::Resize(physical_size)=>{
 				self.graphics_thread.resize(&self.surface,glam::uvec2(physical_size.width,physical_size.height));
 			},
+			Instruction::ChangeMap(complete_map)=>{
+				self.graphics_thread.change_map(&complete_map);
+			},
+			Instruction::LoadReplay(bot)=>{
+				self.bot=Some(CompleteBot::new(bot));
+			},
 		}
 	}
 }

native-player/src/window.rs

@@ -1,8 +1,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),
@@ -11,53 +10,18 @@ pub enum Instruction{
 
 //holds thread handles to dispatch to
 pub struct WindowContext<'a>{
-	manual_mouse_lock:bool,
-	mouse_pos:glam::DVec2,
 	simulation_paused:bool,
-	screen_size:glam::UVec2,
 	window:&'a winit::window::Window,
 	physics_thread:PlayerWorker<'a>,
 }
 
 impl WindowContext<'_>{
-	fn get_middle_of_screen(&self)->winit::dpi::PhysicalPosition<u32>{
-		winit::dpi::PhysicalPosition::new(self.screen_size.x/2,self.screen_size.y/2)
-	}
-	fn free_mouse(&mut self){
-		self.manual_mouse_lock=false;
-		match self.window.set_cursor_position(self.get_middle_of_screen()){
-			Ok(())=>(),
-			Err(e)=>println!("Could not set cursor position: {:?}",e),
-		}
-		match self.window.set_cursor_grab(winit::window::CursorGrabMode::None){
-			Ok(())=>(),
-			Err(e)=>println!("Could not release cursor: {:?}",e),
-		}
-		self.window.set_cursor_visible(true);
-	}
-	fn lock_mouse(&mut self){
-		//if cursor is outside window don't lock but apparently there's no get pos function
-		//let pos=window.get_cursor_pos();
-		match self.window.set_cursor_grab(winit::window::CursorGrabMode::Locked){
-			Ok(())=>(),
-			Err(_)=>{
-				match self.window.set_cursor_grab(winit::window::CursorGrabMode::Confined){
-					Ok(())=>(),
-					Err(e)=>{
-						self.manual_mouse_lock=true;
-						println!("Could not confine cursor: {:?}",e)
-					},
-				}
-			}
-		}
-		self.window.set_cursor_visible(false);
-	}
 	fn window_event(&mut self,time:SessionTime,event:winit::event::WindowEvent){
 		match event{
 			winit::event::WindowEvent::DroppedFile(path)=>{
 				match crate::file::load(path.as_path()){
-					// Ok(LoadFormat::Map(map))=>self.physics_thread.send(TimedInstruction{time,instruction:PhysicsWorkerInstruction::ChangeMap(map)}),
-					// Ok(LoadFormat::Bot(bot))=>self.physics_thread.send(TimedInstruction{time,instruction:PhysicsWorkerInstruction::LoadReplay(bot)}),
+					Ok(LoadFormat::Map(map))=>self.physics_thread.send(TimedInstruction{time,instruction:PhysicsWorkerInstruction::ChangeMap(map)}),
+					Ok(LoadFormat::Bot(bot))=>self.physics_thread.send(TimedInstruction{time,instruction:PhysicsWorkerInstruction::LoadReplay(bot)}),
 					Err(e)=>println!("Failed to load file: {e}"),
 				}
 			},
@@ -78,8 +42,6 @@ impl WindowContext<'_>{
 				..
 			}=>{
 				match (logical_key,state){
-					(winit::keyboard::Key::Named(winit::keyboard::NamedKey::Tab),winit::event::ElementState::Pressed)=>self.free_mouse(),
-					(winit::keyboard::Key::Named(winit::keyboard::NamedKey::Tab),winit::event::ElementState::Released)=>self.lock_mouse(),
 					(winit::keyboard::Key::Named(winit::keyboard::NamedKey::F11),winit::event::ElementState::Pressed)=>{
 						if self.window.fullscreen().is_some(){
 							self.window.set_fullscreen(None);
@@ -87,70 +49,34 @@ impl WindowContext<'_>{
 							self.window.set_fullscreen(Some(winit::window::Fullscreen::Borderless(None)));
 						}
 					},
-					(winit::keyboard::Key::Named(winit::keyboard::NamedKey::Escape),winit::event::ElementState::Pressed)=>{
-						self.manual_mouse_lock=false;
-						match self.window.set_cursor_grab(winit::window::CursorGrabMode::None){
-							Ok(())=>(),
-							Err(e)=>println!("Could not release cursor: {:?}",e),
-						}
-						self.window.set_cursor_visible(true);
-					},
 					(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{
-							// TODO: bind system so playback pausing can use spacebar
-							winit::keyboard::Key::Named(winit::keyboard::NamedKey::Enter)=>if s{
+						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;
-								if paused{
-									self.free_mouse();
-								}else{
-									self.lock_mouse();
-								}
-								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::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),
 							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))
-								// }),
+								"R"|"r"=>session_ctrl!(Restart,s),
 								_=>None,
 							},
 							_=>None,
 						}{
 							self.physics_thread.send(TimedInstruction{
 								time,
-								instruction:session_instruction.into(),
+								instruction,
 							});
 						}
 					},
@@ -177,7 +103,7 @@ impl WindowContext<'_>{
 		}
 	}
 
-	fn device_event(&mut self,time:SessionTime,event:winit::event::DeviceEvent){
+	fn device_event(&mut self,_time:SessionTime,_event:winit::event::DeviceEvent){
 	}
 
 	pub fn send(&mut self,ins:TimedInstruction<Instruction,SessionTime>){
@@ -198,23 +124,12 @@ impl WindowContext<'_>{
 		surface:wgpu::Surface<'a>,
 		config:wgpu::SurfaceConfiguration,
 	)->WindowContext<'a>{
-		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 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);
+		let graphics=strafesnet_roblox_bot_player::graphics::Graphics::new(device,queue,config);
 		WindowContext{
-			manual_mouse_lock:false,
-			mouse_pos:glam::DVec2::ZERO,
 			simulation_paused:false,
-			//make sure to update this!!!!!
-			screen_size,
 			window,
 			physics_thread:crate::player::PlayerWorker::new(
 				surface,
-				bot,
 				graphics,
 			),
 		}

wasm-module/Cargo.toml

@@ -11,6 +11,7 @@ strafesnet_roblox_bot_player = { version = "0.1.0", path = "../lib" }
 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"] }

wasm-module/src/lib.rs

@@ -1,8 +1,11 @@
 use wasm_bindgen::prelude::wasm_bindgen;
 use wasm_bindgen::JsValue;
-use strafesnet_roblox_bot_player::{bot,map,head,graphics};
+use strafesnet_roblox_bot_file::v0;
+use strafesnet_roblox_bot_player::{bot,head,time,graphics};
 use strafesnet_graphics::setup;
-use strafesnet_common::session::Time as SessionTime;
+use strafesnet_common::physics::Time as PhysicsTime;
+
+mod ratio;
 
 // Hack to keep the code compiling,
 // SurfaceTarget::Canvas is not available in IDE for whatever reason.
@@ -42,8 +45,7 @@ pub async fn setup_graphics(canvas:web_sys::HtmlCanvasElement)->Graphics{
 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 time=time::from_float(time).unwrap();
 		let (pos,angles)=head.head.get_position_angles(&bot.bot,time);
 		self.graphics.render(&self.surface,pos,angles);
 	}
@@ -65,22 +67,36 @@ pub struct CompleteBot{
 impl CompleteBot{
 	#[wasm_bindgen(constructor)]
 	pub fn new(data:&[u8])->Result<Self,JsValue>{
+		let timelines=v0::read_all_to_block(std::io::Cursor::new(data)).map_err(|e|JsValue::from_str(&e.to_string()))?;
 		Ok(Self{
-			bot:bot::CompleteBot::new(data).map_err(|e|JsValue::from_str(&e.to_string()))?,
+			bot:bot::CompleteBot::new(timelines),
 		})
 	}
+	#[wasm_bindgen]
+	pub fn duration(&self)->f64{
+		self.bot.duration().get() as f64/PhysicsTime::ONE_SECOND.get() as f64
+	}
+	#[wasm_bindgen]
+	pub fn run_duration(&self,mode_id:u32)->Option<f64>{
+		let mode=v0::ModeID(mode_id);
+		Some(self.bot.run_duration(mode)?.get() as f64/PhysicsTime::ONE_SECOND.get() as f64)
+	}
 }
 
 #[wasm_bindgen]
 pub struct CompleteMap{
-	map:map::CompleteMap,
+	map:strafesnet_common::map::CompleteMap,
 }
 #[wasm_bindgen]
 impl CompleteMap{
 	#[wasm_bindgen(constructor)]
 	pub fn new(data:&[u8])->Result<Self,JsValue>{
+		let map=strafesnet_snf::read_map(std::io::Cursor::new(data))
+			.map_err(|e|JsValue::from_str(&e.to_string()))?
+			.into_complete_map()
+			.map_err(|e|JsValue::from_str(&e.to_string()))?;
 		Ok(Self{
-			map:map::CompleteMap::new(data).map_err(|e|JsValue::from_str(&e.to_string()))?,
+			map,
 		})
 	}
 }
@@ -93,16 +109,59 @@ pub struct PlaybackHead{
 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);
+		let time=time::from_float(time).unwrap();
 		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);
+		let time=time::from_float(time).unwrap();
 		self.head.advance_time(&bot.bot,time);
 	}
+	#[wasm_bindgen]
+	pub fn get_run_time(&self,bot:&CompleteBot,time:f64,mode_id:u32)->Option<f64>{
+		let time=time::from_float(time).unwrap();
+		let time=self.head.time(&bot.bot,time);
+		let mode=v0::ModeID(mode_id);
+		let run_time=self.head.state().get_run(mode)?.time(time);
+		Some(run_time.get() as f64/strafesnet_common::run::Time::ONE_SECOND.get() as f64)
+	}
+	#[wasm_bindgen]
+	pub fn is_run_in_progress(&self,mode_id:u32)->Option<bool>{
+		let mode=v0::ModeID(mode_id);
+		Some(self.head.state().get_run(mode)?.is_in_progress())
+	}
+	#[wasm_bindgen]
+	pub fn is_run_finished(&self,mode_id:u32)->Option<bool>{
+		let mode=v0::ModeID(mode_id);
+		Some(self.head.state().get_run(mode)?.is_finished())
+	}
+	#[wasm_bindgen]
+	pub fn set_paused(&mut self,time:f64,paused:bool){
+		let time=time::from_float(time).unwrap();
+		self.head.set_paused(time,paused);
+	}
+	#[wasm_bindgen]
+	pub fn set_scale(&mut self,time:f64,scale:f64){
+		let time=time::from_float(time).unwrap();
+		let scale=crate::ratio::ratio_from_float(scale).unwrap();
+		self.head.set_scale(time,scale);
+	}
+	#[wasm_bindgen]
+	pub fn seek_to(&mut self,time:f64,new_time:f64){
+		let time=time::from_float(time).unwrap();
+		let new_time=time::from_float(new_time).unwrap();
+		self.head.seek_to(time,new_time);
+	}
+	#[wasm_bindgen]
+	pub fn seek_forward(&mut self,time_offset:f64){
+		let time_offset=time::from_float(time_offset).unwrap();
+		self.head.seek_forward(time_offset);
+	}
+	#[wasm_bindgen]
+	pub fn seek_backward(&mut self,time_offset:f64){
+		let time_offset=time::from_float(time_offset).unwrap();
+		self.head.seek_backward(time_offset);
+	}
 }

wasm-module/src/ratio.rs

@@ -0,0 +1,130 @@
+use strafesnet_common::integer::Ratio64;
+
+#[derive(Debug)]
+pub enum RatioFromFloatError{
+	Nan,
+	Overflow,
+	Underflow,
+}
+
+fn f64_into_parts(f: f64) -> (u64, i16, i8) {
+	let bits: u64 = f.to_bits();
+	let sign: i8 = if bits >> 63 == 0 { 1 } else { -1 };
+	let mut exponent: i16 = ((bits >> 52) & 0x7ff) as i16;
+	let mantissa = if exponent == 0 {
+		(bits & 0xfffffffffffff) << 1
+	} else {
+		(bits & 0xfffffffffffff) | 0x10000000000000
+	};
+	// Exponent bias + mantissa shift
+	exponent -= 1023 + 52;
+	(mantissa, exponent, sign)
+}
+
+pub fn ratio_from_float(value:f64)->Result<Ratio64,RatioFromFloatError>{
+	// Handle special values first
+	match value.classify(){
+		core::num::FpCategory::Nan=>return Err(RatioFromFloatError::Nan),
+		core::num::FpCategory::Zero=>return Ok(Ratio64::ZERO),
+		core::num::FpCategory::Subnormal
+		|core::num::FpCategory::Normal
+		|core::num::FpCategory::Infinite=>{
+			if value<i64::MIN as f64{
+				return Err(RatioFromFloatError::Underflow);
+			}
+			if (i64::MAX as f64)<value{
+				return Err(RatioFromFloatError::Overflow);
+			}
+		}
+	}
+
+	// value = sign * mantissa * 2 ^ exponent
+	let (mantissa,exponent,sign)=f64_into_parts(value);
+
+	if 0<=exponent{
+		// we know value < i64::MIN, so it must just be an integer.
+		return Ok(Ratio64::new((sign as i64*mantissa as i64)<<exponent,1).unwrap());
+	}
+
+	if exponent< -62-52{
+		// very small number is not representable
+		return Ok(Ratio64::ZERO);
+	}
+
+	if -63<exponent{
+		// exactly representable
+		return Ok(Ratio64::new(sign as i64*mantissa as i64,1<<-exponent).unwrap());
+	}
+
+	// the denominator is necessarily bigger than the numerator at this point.
+
+	// create exact float num/den ratio
+	let mut in_num=mantissa as u128;
+	let mut in_den=1u128<<-exponent;
+
+	// a+b*c
+	fn ma(a:i64,b:i64,c:i64)->Option<i64>{
+		a.checked_add(b.checked_mul(c)?)
+	}
+
+	let mut p_prev=1i64;
+	let mut q_prev=0i64;
+	let mut p_cur=0i64;
+	let mut q_cur=1i64;
+
+	// compute continued fraction
+	loop{
+		let whole=in_den/in_num;
+
+		if whole==0{
+			// we have depleted the input fraction and created an exact representation
+			break;
+		}
+
+		if (i64::MAX as u128)<whole{
+			// cannot continue fraction
+			break;
+		}
+
+		let Some(p_next)=ma(p_prev,p_cur,whole as i64)else{
+			// overflow
+			break;
+		};
+		let Some(q_next)=ma(q_prev,q_cur,whole as i64)else{
+			// overflow
+			break;
+		};
+
+		p_prev=p_cur;
+		q_prev=q_cur;
+		p_cur=p_next;
+		q_cur=q_next;
+		(in_num,in_den)=(in_den-in_num*whole,in_num);
+	}
+
+	Ok(Ratio64::new(p_cur,q_cur as u64).unwrap())
+}
+
+#[cfg(test)]
+fn req(r0:Ratio64,r1:Ratio64){
+	println!("r0={r0:?} r1={r1:?}");
+	assert_eq!(r0.num(),r1.num(),"Nums not eq");
+	assert_eq!(r0.den(),r1.den(),"Dens not eq");
+}
+
+#[test]
+fn test(){
+	req(ratio_from_float(2.0).unwrap(),Ratio64::new(2,1).unwrap());
+	req(ratio_from_float(1.0).unwrap(),Ratio64::new(1,1).unwrap());
+	req(ratio_from_float(0.5).unwrap(),Ratio64::new(1,2).unwrap());
+	req(ratio_from_float(1.1).unwrap(),Ratio64::new(2476979795053773,2251799813685248).unwrap());
+	req(ratio_from_float(0.8).unwrap(),Ratio64::new(3602879701896397,4503599627370496).unwrap());
+	req(ratio_from_float(0.61).unwrap(),Ratio64::new(5494391545392005,9007199254740992).unwrap());
+	req(ratio_from_float(0.01).unwrap(),Ratio64::new(5764607523034235,576460752303423488).unwrap());
+	req(ratio_from_float(0.001).unwrap(),Ratio64::new(1152921504606847,1152921504606846976).unwrap());
+	req(ratio_from_float(0.00001).unwrap(),Ratio64::new(89605456633725,8960545663372499267).unwrap());
+	req(ratio_from_float(0.00000000001).unwrap(),Ratio64::new(35204848,3520484800000000213).unwrap());
+	req(ratio_from_float(0.000000000000000001).unwrap(),Ratio64::new(2,1999999999999999857).unwrap());
+	req(ratio_from_float(2222222222222.0).unwrap(),Ratio64::new(2222222222222,1).unwrap());
+	req(ratio_from_float(core::f64::consts::PI).unwrap(),Ratio64::new(884279719003555,281474976710656).unwrap());
+}

web-demo/index.html

@@ -23,11 +23,50 @@
 				width: 100%;
 				height: 100%;
 			}
+			.hud {
+				position: fixed;
+				bottom: 10px;
+				left: 10px;
+				display: flex;
+				flex-direction: column; /* stack vertically */
+				gap: 4px; /* space between timers */
+			}
+
+			.timer {
+				background: #000;
+				color: #fff;
+				padding: 4px 8px;
+				font-family: sans-serif;
+				font-size: 14px;
+				border-radius: 3px;
+			}
+
+			.controls {
+				position: fixed;
+				bottom: 10px;
+				left: 120px;
+				display: flex;
+				flex-direction: row; /* stack horizontally */
+				gap: 4px; /* space between timers */
+			}
 		</style>
 		<script defer src="player.js" type="module"></script>
 		<script defer type="module" src="iframe-helper.js"></script>
 	</head>
 	<body>
-		<canvas></canvas>
+		<canvas id="viewport"> </canvas>
+		<div class="hud">
+			<div id="hud_duration" class="timer">00:00:00</div>
+			<div id="hud_timer" class="timer">00:00:00</div>
+		</div>
+		<div class="controls">
+			<button id="control_reset">↪️</button>
+			<button id="control_pause">⏯</button>
+			<button id="control_backward">⬅️</button>
+			<button id="control_forward">➡️</button>
+			<button id="control_slower">⏪</button>
+			<input type="text" id="control_speed" value="1.00x"></>
+			<button id="control_faster">⏩</button>
+		</div>
 	</body>
 </html>

web-demo/player.js

@@ -5,12 +5,13 @@ import init, {
 	PlaybackHead,
 } from "./pkg/strafesnet_roblox_bot_player_wasm_module.js";
 
+// Loading
 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 canvas = document.getElementById("viewport");
 
 const graphics = await setup_graphics(canvas);
 const bot = new CompleteBot(new Uint8Array(await b.arrayBuffer()));
@@ -19,8 +20,73 @@ const playback = new PlaybackHead(0);
 
 graphics.change_map(map);
 
-const startTime = performance.now();
+// HUD
+const hud_timer = document.getElementById("hud_timer");
+const hud_duration = document.getElementById("hud_duration");
+const MODE_MAIN = 0;
 
+function timer_text(t) {
+	const h = Math.floor(t / 3600);
+	const m = Math.floor((t % 3600) / 60);
+	const s = Math.floor(t % 60);
+	const ms = Math.floor((t % 1) * 1000);
+	return `${String(h).padStart(2, "0")}:${String(m).padStart(2, "0")}:${String(s).padStart(2, "0")}.${String(ms).padStart(3, "0")}`;
+}
+
+hud_duration.textContent = timer_text(bot.run_duration(MODE_MAIN));
+
+// Stuff
+const startTime = document.timeline.currentTime;
+function elapsed() {
+	return (document.timeline.currentTime - startTime) / 1000;
+}
+
+const control_speed = document.getElementById("control_speed");
+
+var paused = false;
+var scale = 1;
+function set_scale(new_scale) {
+	scale = new_scale;
+	playback.set_scale(elapsed(), scale);
+	control_speed.value = `${scale.toPrecision(3)}x`;
+}
+
+// Controls
+document.getElementById("control_reset").addEventListener("click", (e) => {
+	playback.seek_to(elapsed(), 0.0);
+});
+document.getElementById("control_pause").addEventListener("click", (e) => {
+	paused = !paused;
+	playback.set_paused(elapsed(), paused);
+});
+document.getElementById("control_forward").addEventListener("click", (e) => {
+	playback.seek_forward(2.0);
+});
+document.getElementById("control_backward").addEventListener("click", (e) => {
+	playback.seek_backward(2.0);
+});
+document.getElementById("control_slower").addEventListener("click", (e) => {
+	set_scale((scale * 4) / 5);
+});
+const regex = new RegExp("^([^x]*)x?$");
+control_speed.addEventListener("change", (e) => {
+	const parsed = regex.exec(e.target.value);
+	if (!parsed) {
+		set_scale(1);
+		return;
+	}
+	const input = Number(parsed.at(1));
+	if (Number.isNaN(input)) {
+		set_scale(1);
+		return;
+	}
+	set_scale(input);
+});
+document.getElementById("control_faster").addEventListener("click", (e) => {
+	set_scale((scale * 5) / 4);
+});
+
+// Rendering
 function animate(now) {
 	const elapsedMs = now - startTime;
 	const elapsedSec = elapsedMs / 1000; // wasm expects seconds
@@ -28,6 +94,10 @@ function animate(now) {
 	// Advance the playback head to the current time
 	playback.advance_time(bot, elapsedSec);
 
+	// update the timer text
+	const time = playback.get_run_time(bot, elapsedSec, MODE_MAIN);
+	hud_timer.textContent = timer_text(time);
+
 	// Render the frame that the bot is at that time
 	graphics.render(bot, playback, elapsedSec);
 
@@ -37,6 +107,7 @@ function animate(now) {
 
 requestAnimationFrame(animate);
 
+// Resizing
 function resize() {
 	canvas.width = canvas.clientWidth;
 	canvas.height = canvas.clientHeight;