Compare commits
10 Commits
master
...
file-forma
Author | SHA1 | Date | |
---|---|---|---|
a6dd7f3111 | |||
a6c51654e5 | |||
abbab00eea | |||
99db653c14 | |||
e9ba0c694c | |||
261854cfa5 | |||
e3eb040675 | |||
fdb8f93b0b | |||
a2ce319cb2 | |||
a79157da88 |
@ -11,6 +11,7 @@ mod model_graphics;
|
|||||||
mod zeroes;
|
mod zeroes;
|
||||||
mod worker;
|
mod worker;
|
||||||
mod physics;
|
mod physics;
|
||||||
|
mod sniffer;
|
||||||
mod settings;
|
mod settings;
|
||||||
mod framework;
|
mod framework;
|
||||||
mod primitives;
|
mod primitives;
|
||||||
|
@ -19,8 +19,6 @@ pub enum PhysicsInstruction {
|
|||||||
}
|
}
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum PhysicsInputInstruction{
|
pub enum PhysicsInputInstruction{
|
||||||
ReplaceMouse(MouseState,MouseState),
|
|
||||||
SetNextMouse(MouseState),
|
|
||||||
SetMoveRight(bool),
|
SetMoveRight(bool),
|
||||||
SetMoveUp(bool),
|
SetMoveUp(bool),
|
||||||
SetMoveBack(bool),
|
SetMoveBack(bool),
|
||||||
@ -29,26 +27,51 @@ pub enum PhysicsInputInstruction {
|
|||||||
SetMoveForward(bool),
|
SetMoveForward(bool),
|
||||||
SetJump(bool),
|
SetJump(bool),
|
||||||
SetZoom(bool),
|
SetZoom(bool),
|
||||||
|
ReplaceMouse(MouseState,MouseState),
|
||||||
|
SetNextMouse(MouseState),
|
||||||
Reset,
|
Reset,
|
||||||
Idle,
|
Idle,
|
||||||
}
|
}
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
#[repr(u32)]
|
||||||
pub enum InputInstruction {
|
pub enum InputInstruction {
|
||||||
MoveMouse(glam::IVec2),
|
MoveRight(bool)=0,
|
||||||
MoveRight(bool),
|
MoveUp(bool)=1,
|
||||||
MoveUp(bool),
|
MoveBack(bool)=2,
|
||||||
MoveBack(bool),
|
MoveLeft(bool)=3,
|
||||||
MoveLeft(bool),
|
MoveDown(bool)=4,
|
||||||
MoveDown(bool),
|
MoveForward(bool)=5,
|
||||||
MoveForward(bool),
|
Jump(bool)=6,
|
||||||
Jump(bool),
|
Zoom(bool)=7,
|
||||||
Zoom(bool),
|
MoveMouse(glam::IVec2)=64,
|
||||||
Reset,
|
Reset=100,
|
||||||
Idle,
|
Idle=127,
|
||||||
//Idle: there were no input events, but the simulation is safe to advance to this timestep
|
//Idle: there were no input events, but the simulation is safe to advance to this timestep
|
||||||
//for interpolation / networking / playback reasons, most playback heads will always want
|
//for interpolation / networking / playback reasons, most playback heads will always want
|
||||||
//to be 1 instruction ahead to generate the next state for interpolation.
|
//to be 1 instruction ahead to generate the next state for interpolation.
|
||||||
}
|
}
|
||||||
|
impl InputInstruction{
|
||||||
|
pub fn id(&self)->u32{
|
||||||
|
let parity=match self{
|
||||||
|
crate::physics::InputInstruction::MoveRight(s)
|
||||||
|
|crate::physics::InputInstruction::MoveUp(s)
|
||||||
|
|crate::physics::InputInstruction::MoveBack(s)
|
||||||
|
|crate::physics::InputInstruction::MoveLeft(s)
|
||||||
|
|crate::physics::InputInstruction::MoveDown(s)
|
||||||
|
|crate::physics::InputInstruction::MoveForward(s)
|
||||||
|
|crate::physics::InputInstruction::Jump(s)
|
||||||
|
|crate::physics::InputInstruction::Zoom(s)=>(*s as u32)<<31,
|
||||||
|
crate::physics::InputInstruction::MoveMouse(_)
|
||||||
|
|crate::physics::InputInstruction::Reset
|
||||||
|
|crate::physics::InputInstruction::Idle=>0u32,
|
||||||
|
};
|
||||||
|
self.discriminant()|parity
|
||||||
|
}
|
||||||
|
pub fn discriminant(&self)->u32{
|
||||||
|
//from documentation for std::mem::discriminant(&self)
|
||||||
|
unsafe{*<*const _>::from(self).cast::<u32>()}
|
||||||
|
}
|
||||||
|
}
|
||||||
#[derive(Clone,Hash)]
|
#[derive(Clone,Hash)]
|
||||||
pub struct Body {
|
pub struct Body {
|
||||||
position: Planar64Vec3,//I64 where 2^32 = 1 u
|
position: Planar64Vec3,//I64 where 2^32 = 1 u
|
||||||
|
134
src/sniffer.rs
Normal file
134
src/sniffer.rs
Normal file
@ -0,0 +1,134 @@
|
|||||||
|
//file format "sniff"
|
||||||
|
|
||||||
|
/* spec
|
||||||
|
|
||||||
|
//begin global header
|
||||||
|
|
||||||
|
//global metadata (32 bytes)
|
||||||
|
b"SNFB"
|
||||||
|
u32 format_version
|
||||||
|
u64 priming_bytes
|
||||||
|
//how many bytes of the file must be read to guarantee all of the expected
|
||||||
|
//format-specific metadata is available to facilitate streaming the remaining contents
|
||||||
|
//used by the database to guarantee that it serves at least the bare minimum
|
||||||
|
u128 resource_uuid
|
||||||
|
//identifies the file from anywhere for any other file
|
||||||
|
|
||||||
|
//global block layout (variable size)
|
||||||
|
u64 num_blocks
|
||||||
|
for block_id in 0..num_blocks{
|
||||||
|
u64 first_byte
|
||||||
|
}
|
||||||
|
|
||||||
|
//end global header
|
||||||
|
|
||||||
|
//begin blocks
|
||||||
|
|
||||||
|
//each block is compressed with zstd or gz or something
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* block types
|
||||||
|
BLOCK_MAP_HEADER:
|
||||||
|
StyleInfoOverrides style_info_overrides
|
||||||
|
//bvh goes here
|
||||||
|
u64 num_nodes
|
||||||
|
//node 0 parent node is implied to be None
|
||||||
|
for node_id in 1..num_nodes{
|
||||||
|
u64 parent_node
|
||||||
|
}
|
||||||
|
//block 0 is the current block, not part of the map data
|
||||||
|
u64 num_spacial_blocks
|
||||||
|
for block_id in 1..num_spacial_blocks{
|
||||||
|
u64 node_id
|
||||||
|
u64 block_id
|
||||||
|
Aabb block_extents
|
||||||
|
}
|
||||||
|
//ideally spacial blocks are sorted from distance to start zone
|
||||||
|
//texture blocks are inserted before the first spacial block they are used in
|
||||||
|
|
||||||
|
BLOCK_MAP_RESOURCE:
|
||||||
|
//an individual one of the following:
|
||||||
|
- model (IndexedModel)
|
||||||
|
- shader (compiled SPIR-V)
|
||||||
|
- image (JpegXL)
|
||||||
|
- sound (Opus)
|
||||||
|
- video (AV1)
|
||||||
|
- animation (Trey thing)
|
||||||
|
|
||||||
|
BLOCK_MAP_OBJECT:
|
||||||
|
//an individual one of the following:
|
||||||
|
- model instance
|
||||||
|
- located resource
|
||||||
|
//for a list of resources, parse the object.
|
||||||
|
|
||||||
|
BLOCK_BOT_HEADER:
|
||||||
|
u128 map_resource_uuid //which map is this bot running
|
||||||
|
u128 time_resource_uuid //resource database time
|
||||||
|
//don't include style info in bot header because it's in the physics state
|
||||||
|
//blocks are laid out in chronological order, but indices may jump around.
|
||||||
|
u64 num_segments
|
||||||
|
for _ in 0..num_segments{
|
||||||
|
i64 time //physics_state timestamp
|
||||||
|
u64 block_id
|
||||||
|
}
|
||||||
|
|
||||||
|
BLOCK_BOT_SEGMENT:
|
||||||
|
//format version indicates what version of these structures to use
|
||||||
|
PhysicsState physics_state
|
||||||
|
//to read, greedily decode instructions until eof
|
||||||
|
loop{
|
||||||
|
//delta encode as much as possible (time,mousepos)
|
||||||
|
//strafe ticks are implied
|
||||||
|
//physics can be implied in an input-only bot file
|
||||||
|
TimedInstruction<PhysicsInstruction> instruction
|
||||||
|
}
|
||||||
|
|
||||||
|
BLOCK_DEMO_HEADER:
|
||||||
|
//timeline of loading maps, player equipment, bots
|
||||||
|
*/
|
||||||
|
struct InputInstructionCodecState{
|
||||||
|
mouse_pos:glam::IVec2,
|
||||||
|
time:crate::integer::Time,
|
||||||
|
}
|
||||||
|
//8B - 12B
|
||||||
|
impl InputInstructionCodecState{
|
||||||
|
pub fn encode(&mut self,ins:&crate::instruction::TimedInstruction<crate::physics::InputInstruction>)->([u8;12],usize){
|
||||||
|
let dt=ins.time-self.time;
|
||||||
|
self.time=ins.time;
|
||||||
|
let mut data=[0u8;12];
|
||||||
|
[data[0],data[1],data[2],data[3]]=(dt.nanos() as u32).to_le_bytes();//4B
|
||||||
|
//instruction id packed with game control parity bit. This could be 1 byte but it ruins the alignment
|
||||||
|
[data[4],data[5],data[6],data[7]]=ins.instruction.id().to_le_bytes();//4B
|
||||||
|
match &ins.instruction{
|
||||||
|
&crate::physics::InputInstruction::MoveMouse(m)=>{//4B
|
||||||
|
let dm=m-self.mouse_pos;
|
||||||
|
[data[8],data[9]]=(dm.x as i16).to_le_bytes();
|
||||||
|
[data[10],data[11]]=(dm.y as i16).to_le_bytes();
|
||||||
|
self.mouse_pos=m;
|
||||||
|
(data,12)
|
||||||
|
},
|
||||||
|
//0B
|
||||||
|
crate::physics::InputInstruction::MoveRight(_)
|
||||||
|
|crate::physics::InputInstruction::MoveUp(_)
|
||||||
|
|crate::physics::InputInstruction::MoveBack(_)
|
||||||
|
|crate::physics::InputInstruction::MoveLeft(_)
|
||||||
|
|crate::physics::InputInstruction::MoveDown(_)
|
||||||
|
|crate::physics::InputInstruction::MoveForward(_)
|
||||||
|
|crate::physics::InputInstruction::Jump(_)
|
||||||
|
|crate::physics::InputInstruction::Zoom(_)
|
||||||
|
|crate::physics::InputInstruction::Reset
|
||||||
|
|crate::physics::InputInstruction::Idle=>(data,8),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//everything must be 4 byte aligned, it's all going to be compressed so don't think too had about saving less than 4 bytes
|
||||||
|
//TODO: Omit (mouse only?) instructions that don't surround an actual physics instruction
|
||||||
|
fn write_input_instruction<W:std::io::Write>(state:&mut InputInstructionCodecState,w:&mut W,ins:&crate::instruction::TimedInstruction<crate::physics::InputInstruction>)->Result<usize,std::io::Error>{
|
||||||
|
//TODO: insert idle instruction if gap is over u32 nanoseconds
|
||||||
|
//TODO: don't write idle instructions
|
||||||
|
//OR: end the data block! the full state at the start of the next block will contain an absolute timestamp
|
||||||
|
let (data,size)=state.encode(ins);
|
||||||
|
w.write(&data[0..size])//8B-12B
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user