implement attributes + stages

Cargo.lock

@@ -92,15 +92,6 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
-[[package]]
-name = "arrayvec"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-dependencies = [
- "nodrop",
-]
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -206,7 +197,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec",
  "cc",
  "cfg-if",
  "constant_time_eq",
@@ -247,33 +238,12 @@ dependencies = [
  "objc2-encode",
 ]
 
-[[package]]
-name = "bsp"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d6d699bcff31f0c8a5951d29b9a7edfe3270218c20f6c3509f90ae7e1c46e7"
-dependencies = [
- "arrayvec 0.4.12",
- "bitflags 1.3.2",
- "bv",
- "byteorder 0.5.3",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
-[[package]]
-name = "bv"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8834bb1d8ee5dc048ee3124f2c7c1afcc6bc9aed03f11e9dfd8c69470a5db340"
-dependencies = [
- "feature-probe",
-]
-
 [[package]]
 name = "bytemuck"
 version = "1.13.1"
@@ -294,12 +264,6 @@ dependencies = [
  "syn 2.0.29",
 ]
 
-[[package]]
-name = "byteorder"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -459,7 +423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "594ecd967c2f40db5dde8da4c356975fc1fe030e951c7c3962f6dc2e80042e87"
 dependencies = [
  "bitflags 1.3.2",
- "byteorder 1.4.3",
+ "byteorder",
  "enum_primitive",
 ]
 
@@ -568,12 +532,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "feature-probe"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da"
-
 [[package]]
 name = "flate2"
 version = "1.0.27"
@@ -876,6 +834,29 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "lazy-regex"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e723bd417b2df60a0f6a2b6825f297ea04b245d4ba52b5a22cb679bdf58b05fa"
+dependencies = [
+ "lazy-regex-proc_macros",
+ "once_cell",
+ "regex",
+]
+
+[[package]]
+name = "lazy-regex-proc_macros"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f0a1d9139f0ee2e862e08a9c5d0ba0470f2aa21cd1e1aa1b1562f83116c725f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.29",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -1100,12 +1081,6 @@ dependencies = [
  "memoffset",
 ]
 
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -1554,7 +1529,7 @@ version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
 dependencies = [
- "byteorder 1.4.3",
+ "byteorder",
  "num-traits 0.2.16",
  "paste",
 ]
@@ -1565,7 +1540,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
 dependencies = [
- "byteorder 1.4.3",
+ "byteorder",
  "rmp",
  "serde",
 ]
@@ -1710,11 +1685,11 @@ name = "strafe-client"
 version = "0.7.0"
 dependencies = [
  "async-executor",
- "bsp",
  "bytemuck",
  "ddsfile",
  "env_logger",
  "glam",
+ "lazy-regex",
  "log",
  "obj",
  "pollster",
@@ -1722,7 +1697,6 @@ dependencies = [
  "rbx_dom_weak",
  "rbx_reflection_database",
  "rbx_xml",
- "regex",
  "wgpu",
  "winit",
 ]
@@ -1797,7 +1771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec",
  "bytemuck",
  "cfg-if",
  "png",
@@ -2041,7 +2015,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7472f3b69449a8ae073f6ec41d05b6f846902d92a6c45313c50cb25857b736ce"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "cfg-if",
  "js-sys",
  "log",
@@ -2065,7 +2039,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecf7454d9386f602f7399225c92dd2fbdcde52c519bc8fb0bd6fbeb388075dc2"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "bit-vec",
  "bitflags 2.4.0",
  "codespan-reporting",
@@ -2089,7 +2063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6654a13885a17f475e8324efb46dc6986d7aaaa98353330f8de2077b153d0101"
 dependencies = [
  "android_system_properties",
- "arrayvec 0.7.4",
+ "arrayvec",
  "ash",
  "bit-set",
  "bitflags 2.4.0",

Cargo.toml

@@ -7,11 +7,11 @@ edition = "2021"
 
 [dependencies]
 async-executor = "1.5.1"
-bsp = "0.1.2"
 bytemuck = { version = "1.13.1", features = ["derive"] }
 ddsfile = "0.5.1"
 env_logger = "0.10.0"
 glam = "0.24.1"
+lazy-regex = "3.0.2"
 log = "0.4.20"
 obj = "0.10.2"
 pollster = "0.3.0"
@@ -19,7 +19,6 @@ rbx_binary = "0.7.1"
 rbx_dom_weak = "2.5.0"
 rbx_reflection_database = "0.2.7"
 rbx_xml = "0.13.1"
-regex = "1.9.5"
 wgpu = "0.17.0"
 winit = "0.28.6"
 

src/body.rs

@@ -97,6 +97,8 @@ enum MouseInterpolation {
 	First,//just checks the last value
 	Lerp,//lerps between
 }
+
+//hey dumbass just use a delta
 pub struct MouseInterpolationState {
 	interpolation: MouseInterpolation,
 	time0: TIME,
@@ -255,28 +257,70 @@ fn get_control_dir(controls: u32) -> glam::Vec3{
 	return control_dir
 }
 
-pub struct PhysicsState {
-	pub body: Body,
-	pub hitbox_halfsize: glam::Vec3,
-	pub contacts: std::collections::HashSet::<RelativeCollision>,
+pub struct GameMechanicsState{
+	pub spawn_id:u32,
+	//jump_counts:HashMap<u32,u32>,
+}
+impl std::default::Default for GameMechanicsState{
+	fn default() -> Self {
+		Self{
+			spawn_id:0,
+		}
+	}
+}
+
+pub struct WorldState{}
+
+pub struct StyleModifiers{
+	pub constrols_mask:u32,//constrols which are unable to be activated
+	pub constrols_held:u32,//constrols which must be active to be able to strafe
+	pub mv:f32,
+	pub walkspeed:f32,
+	pub friction:f32,
+	pub walk_accel:f32,
+	pub gravity:glam::Vec3,
+	pub strafe_tick_num:TIME,
+	pub strafe_tick_den:TIME,
+	pub hitbox_halfsize:glam::Vec3,
+}
+impl std::default::Default for StyleModifiers{
+	fn default() -> Self {
+		Self{
+			constrols_mask: !0&!(CONTROL_MOVEUP|CONTROL_MOVEDOWN),
+			constrols_held: 0,
+			strafe_tick_num: 100,//100t
+			strafe_tick_den: 1_000_000_000,
+			gravity: glam::vec3(0.0,-100.0,0.0),
+			friction: 1.2,
+			walk_accel: 90.0,
+			mv: 2.7,
+			walkspeed: 18.0,
+			hitbox_halfsize: glam::vec3(1.0,2.5,1.0),
+		}
+	}
+}
+
+pub struct PhysicsState{
+	pub time:TIME,
+	pub body:Body,
+	pub world:WorldState,//currently there is only one state the world can be in
+	pub game:GameMechanicsState,
+	pub style:StyleModifiers,
+	pub contacts:std::collections::HashSet::<RelativeCollision>,
 	//pub intersections: Vec<ModelId>,
-	pub models: Vec<ModelPhysics>,
 	//camera must exist in state because wormholes modify the camera, also camera punch
-	pub camera: Camera,
-	pub mouse_interpolation: MouseInterpolationState,
-	pub controls: u32,
-	pub time: TIME,
-	pub strafe_tick_num: TIME,
-	pub strafe_tick_den: TIME,
-	pub tick: u32,
-	pub mv: f32,
-	pub walk: WalkState,
-	pub walkspeed: f32,
-	pub friction: f32,
-	pub walk_accel:  f32,
-	pub gravity: glam::Vec3,
-	pub grounded: bool,
-	pub spawn_point: glam::Vec3,
+	pub camera:Camera,
+	pub mouse_interpolation:MouseInterpolationState,
+	pub controls:u32,
+	pub walk:WalkState,
+	pub grounded:bool,
+	//all models
+	pub models:Vec<ModelPhysics>,
+	
+	pub stages:Vec<crate::model::StageDescription>,
+	//the spawn point is where you spawn when you load into the map.
+	//This is not the same as Reset which teleports you to Spawn0
+	pub spawn_point:glam::Vec3,
 }
 
 #[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
@@ -388,20 +432,40 @@ impl Aabb {
 type TreyMeshFace = AabbFace;
 type TreyMesh = Aabb;
 
+enum PhysicsCollisionAttributes{
+	Contact{//track whether you are contacting the object
+		contacting:crate::model::ContactingAttributes,
+		general:crate::model::GameMechanicAttributes,
+	},
+	Intersect{//track whether you are intersecting the object
+		intersecting:crate::model::IntersectingAttributes,
+		general:crate::model::GameMechanicAttributes,
+	},
+}
+
 pub struct ModelPhysics {
 	//A model is a thing that has a hitbox. can be represented by a list of TreyMesh-es
 	//in this iteration, all it needs is extents.
 	mesh: TreyMesh,
+	attributes:PhysicsCollisionAttributes,
 }
 
 impl ModelPhysics {
-	pub fn from_model(model:&crate::model::IndexedModel,model_transform:glam::Affine3A) -> Self {
+	fn from_model_transform_attributes(model:&crate::model::IndexedModel,transform:&glam::Affine3A,attributes:PhysicsCollisionAttributes)->Self{
 		let mut aabb=Aabb::new();
 		for indexed_vertex in &model.unique_vertices {
-			aabb.grow(model_transform.transform_point3(glam::Vec3::from_array(model.unique_pos[indexed_vertex.pos as usize])));
+			aabb.grow(transform.transform_point3(glam::Vec3::from_array(model.unique_pos[indexed_vertex.pos as usize])));
 		}
 		Self{
 			mesh:aabb,
+			attributes,
+		}
+	}
+	pub fn from_model(model:&crate::model::IndexedModel,instance:&crate::model::ModelInstance) -> Option<Self> {
+		match &instance.attributes{
+			crate::model::CollisionAttributes::Decoration=>None,
+			crate::model::CollisionAttributes::Contact{contacting,general}=>Some(ModelPhysics::from_model_transform_attributes(model,&instance.transform,PhysicsCollisionAttributes::Contact{contacting:contacting.clone(),general:general.clone()})),
+			crate::model::CollisionAttributes::Intersect{intersecting,general}=>None,//Some(ModelPhysics::from_model_transform_attributes(model,&instance.transform,PhysicsCollisionAttributes::Intersecting{intersecting,general})),
 		}
 	}
 	pub fn unit_vertices(&self) -> [glam::Vec3;8] {
@@ -520,7 +584,7 @@ impl PhysicsState {
 	}
 	fn next_strafe_instruction(&self) -> Option<TimedInstruction<PhysicsInstruction>> {
 		return Some(TimedInstruction{
-			time:(self.time*self.strafe_tick_num/self.strafe_tick_den+1)*self.strafe_tick_den/self.strafe_tick_num,
+			time:(self.time*self.style.strafe_tick_num/self.style.strafe_tick_den+1)*self.style.strafe_tick_den/self.style.strafe_tick_num,
 			//only poll the physics if there is a before and after mouse event
 			instruction:PhysicsInstruction::StrafeTick
 		});
@@ -570,7 +634,7 @@ impl PhysicsState {
 				self.body.acceleration=a;
 				self.walk.state=WalkEnum::Reached;
 			}else{
-				let accel=self.walk_accel.min(self.gravity.length()*self.friction);
+				let accel=self.style.walk_accel.min(self.style.gravity.length()*self.style.friction);
 				let time_delta=target_diff.length()/accel;
 				let mut a=target_diff/time_delta;
 				self.contact_constrain_acceleration(&mut a);
@@ -599,7 +663,7 @@ impl PhysicsState {
 	fn mesh(&self) -> TreyMesh {
 		let mut aabb=Aabb::new();
 		for vertex in Aabb::unit_vertices(){
-			aabb.grow(self.body.position+self.hitbox_halfsize*vertex);
+			aabb.grow(self.body.position+self.style.hitbox_halfsize*vertex);
 		}
 		aabb
 	}
@@ -943,7 +1007,7 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 			},
 			PhysicsInstruction::CollisionEnd(c) => {
 			    self.contacts.remove(&c);//remove contact before calling contact_constrain_acceleration
-				let mut a=self.gravity;
+				let mut a=self.style.gravity;
 				self.contact_constrain_acceleration(&mut a);
 				self.body.acceleration=a;
 				//check ground
@@ -959,8 +1023,8 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 				let camera_mat=self.camera.simulate_move_rotation_y(self.mouse_interpolation.interpolated_position(self.time).x-self.mouse_interpolation.mouse0.x);
 				let control_dir=camera_mat*get_control_dir(self.controls);
 				let d=self.body.velocity.dot(control_dir);
-				if d<self.mv {
-					let mut v=self.body.velocity+(self.mv-d)*control_dir;
+				if d<self.style.mv {
+					let mut v=self.body.velocity+(self.style.mv-d)*control_dir;
 					self.contact_constrain_velocity(&mut v);
 					self.body.velocity=v;
 				}
@@ -1006,7 +1070,7 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 						self.body.velocity=glam::Vec3::ZERO;
 						//manual clear //for c in self.contacts{process_instruction(CollisionEnd(c))}
 						self.contacts.clear();
-						self.body.acceleration=self.gravity;
+						self.body.acceleration=self.style.gravity;
 						self.walk.state=WalkEnum::Reached;
 						self.grounded=false;
 						refresh_walk_target=false;
@@ -1018,7 +1082,7 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 					if refresh_walk_target_velocity{
 						let camera_mat=self.camera.simulate_move_rotation_y(self.mouse_interpolation.interpolated_position(self.time).x-self.mouse_interpolation.mouse0.x);
 						let control_dir=camera_mat*get_control_dir(self.controls);
-						self.walk.target_velocity=self.walkspeed*control_dir;
+						self.walk.target_velocity=self.style.walkspeed*control_dir;
 					}
 					self.refresh_walk_target();
 				}

src/load_bsp.rs

@@ -1,16 +0,0 @@
-pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:R) -> crate::model::IndexedModelInstances{
-	let mut spawn_point=glam::Vec3::ZERO;
-
-	let mut indexed_models=Vec::new();
-
-	match bsp::Bsp::read(input){
-		Ok(guac)=>println!("we got the guac {:?}", guac),
-		Err(e)=>println!("rotten {:?}",e),
-	}
-
-	crate::model::IndexedModelInstances{
-		textures:Vec::new(),
-		models:indexed_models,
-		spawn_point,
-	}
-}

src/load_roblox.rs

@@ -30,13 +30,71 @@ fn get_texture_refs(dom:&rbx_dom_weak::WeakDom) -> Vec<rbx_dom_weak::types::Ref>
 	//next class
 	objects
 }
+fn get_attributes(name:&str,can_collide:bool,velocity:glam::Vec3)->crate::model::CollisionAttributes{
+	let mut general=crate::model::GameMechanicAttributes::default();
+	let mut intersecting=crate::model::IntersectingAttributes::default();
+	let mut contacting=crate::model::ContactingAttributes::default();
+	match name{
+		// "Water"=>intersecting.water=Some(crate::model::IntersectingWater::default()),
+		// "Accelerator"=>(),
+		// "MapFinish"=>(),
+		// "MapAnticheat"=>(),
+		"Platform"=>general.stage_element=Some(crate::model::GameMechanicStageElement{
+			mode_id:0,
+			stage_id:0,
+			force:false,
+			behaviour:crate::model::StageElementBehaviour::Platform,
+		}),
+		other=>{
+			let regman=lazy_regex::regex!(r"^(Force)?(SpawnAt|Trigger|Teleport|Platform)(\d+)$");
+			if let Some(captures) = regman.captures(other) {
+				general.stage_element=Some(crate::model::GameMechanicStageElement{
+					mode_id:0,
+					stage_id:captures[3].parse::<u32>().unwrap(),
+					force:match captures.get(1){
+						Some(m)=>m.as_str()=="Force",
+						None=>false,
+					},
+					behaviour:match &captures[2]{
+						"SpawnAt"=>crate::model::StageElementBehaviour::SpawnAt,
+						"Trigger"=>crate::model::StageElementBehaviour::Trigger,
+						"Teleport"=>crate::model::StageElementBehaviour::Teleport,
+						"Platform"=>crate::model::StageElementBehaviour::Platform,
+						_=>panic!("regex[2] messed up bad"),
+					}
+				})
+				
+			}
+		}
+	}
+	//need some way to skip this
+	if velocity!=glam::Vec3::ZERO{
+		general.booster=Some(crate::model::GameMechanicBooster{velocity});
+	}
+	match can_collide{
+		true=>{
+			match name{
+				//"Bounce"=>(),
+				"Surf"=>contacting.surf=Some(crate::model::ContactingSurf{}),
+				"Ladder"=>contacting.ladder=Some(crate::model::ContactingLadder{sticky:true}),
+				other=>{
+					//REGEX!!!!
+					//Jump#
+					//WormholeIn#
+				}
+			}
+			return crate::model::CollisionAttributes::Contact{contacting,general};
+		},
+		false=>return crate::model::CollisionAttributes::Decoration,
+	}
+}
 
 struct RobloxAssetId(u64);
 struct RobloxAssetIdParseErr;
 impl std::str::FromStr for RobloxAssetId {
 	type Err=RobloxAssetIdParseErr;
 	fn from_str(s: &str) -> Result<Self, Self::Err>{
-		let regman=regex::Regex::new(r"(\d+)$").unwrap();
+		let regman=lazy_regex::regex!(r"(\d+)$");
 		if let Some(captures) = regman.captures(s) {
 			if captures.len()==2{//captures[0] is all captures concatenated, and then each individual capture
 				if let Ok(id) = captures[0].parse::<u64>() {
@@ -113,6 +171,8 @@ pub fn generate_indexed_models(dom:rbx_dom_weak::WeakDom) -> crate::model::Index
 	//IndexedModelInstances includes textures
 	let mut spawn_point=glam::Vec3::ZERO;
 
+	let mut stages=Vec::new();
+
 	let mut indexed_models=Vec::new();
 	let mut model_id_from_description=std::collections::HashMap::<RobloxBasePartDescription,usize>::new();
 
@@ -127,13 +187,17 @@ pub fn generate_indexed_models(dom:rbx_dom_weak::WeakDom) -> crate::model::Index
 			if let (
 					Some(rbx_dom_weak::types::Variant::CFrame(cf)),
 					Some(rbx_dom_weak::types::Variant::Vector3(size)),
+					Some(rbx_dom_weak::types::Variant::Vector3(velocity)),
 					Some(rbx_dom_weak::types::Variant::Float32(transparency)),
 					Some(rbx_dom_weak::types::Variant::Color3uint8(color3)),
+					Some(rbx_dom_weak::types::Variant::Bool(can_collide)),
 				) = (
 					object.properties.get("CFrame"),
 					object.properties.get("Size"),
+					object.properties.get("Velocity"),
 					object.properties.get("Transparency"),
 					object.properties.get("Color"),
+					object.properties.get("CanCollide"),
 				)
 			{
 				let model_transform=glam::Affine3A::from_translation(
@@ -150,12 +214,9 @@ pub fn generate_indexed_models(dom:rbx_dom_weak::WeakDom) -> crate::model::Index
 					glam::Vec3::new(size.x,size.y,size.z)/2.0
 				);
 				if object.name=="MapStart"{
-					spawn_point=model_transform.transform_point3(glam::Vec3::Y)+glam::vec3(0.0,2.5,0.0);
+					spawn_point=model_transform.transform_point3(-glam::Vec3::Y)+glam::vec3(0.0,2.5+0.1,0.0);
 					println!("Found MapStart{:?}",spawn_point);
 				}
-				if *transparency==1.0 {
-					continue;
-				}
 
 				//TODO: also detect "CylinderMesh" etc here
 				let shape=match &object.class[..]{
@@ -336,6 +397,7 @@ pub fn generate_indexed_models(dom:rbx_dom_weak::WeakDom) -> crate::model::Index
 				indexed_models[model_id].instances.push(crate::model::ModelInstance {
 					transform:model_transform,
 					color:glam::vec4(color3.r as f32/255f32, color3.g as f32/255f32, color3.b as f32/255f32, 1.0-*transparency),
+					attributes:get_attributes(&object.name,*can_collide,glam::vec3(velocity.x,velocity.y,velocity.z)),
 				});
 			}
 		}
@@ -344,5 +406,6 @@ pub fn generate_indexed_models(dom:rbx_dom_weak::WeakDom) -> crate::model::Index
 		textures:asset_id_from_texture_id.iter().map(|t|t.to_string()).collect(),
 		models:indexed_models,
 		spawn_point,
+		stages,
 	}
 }

src/main.rs

@@ -10,7 +10,6 @@ mod zeroes;
 mod framework;
 mod primitives;
 mod instruction;
-mod load_bsp;
 mod load_roblox;
 
 struct Entity {
@@ -89,12 +88,14 @@ impl GraphicsData {
 		for model in &indexed_models.models{
 			//make aabb and run vertices to get realistic bounds
 			for model_instance in &model.instances{
-				self.physics.models.push(body::ModelPhysics::from_model(&model,model_instance.transform));
+				if let Some(model_physics)=body::ModelPhysics::from_model(model,model_instance){
+					self.physics.models.push(model_physics);
+				}
 			}
 		}
 		println!("Physics Objects: {}",self.physics.models.len());
 	}
-	fn generate_model_graphics(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,mut indexed_models:model::IndexedModelInstances){
+	fn generate_model_graphics(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,indexed_models:model::IndexedModelInstances){
 		//generate texture view per texture
 
 		//idk how to do this gooder lol
@@ -165,17 +166,21 @@ impl GraphicsData {
 		let mut unique_texture_models=Vec::with_capacity(indexed_models_len);
 		for mut model in indexed_models.models.into_iter(){
 			//convert ModelInstance into ModelGraphicsInstance
-			let instances:Vec<ModelGraphicsInstance>=model.instances.iter().map(|instance|{
-				ModelGraphicsInstance{
-					transform: glam::Mat4::from(instance.transform),
-					normal_transform: glam::Mat4::from(instance.transform.inverse()).transpose(),
-					color: instance.color,
+			let instances:Vec<ModelGraphicsInstance>=model.instances.into_iter().filter_map(|instance|{
+				if instance.color.w==0.0{
+					None
+				}else{
+					Some(ModelGraphicsInstance{
+						transform: glam::Mat4::from(instance.transform),
+						normal_transform: glam::Mat4::from(instance.transform.inverse()).transpose(),
+						color: instance.color,
+					})
 				}
 			}).collect();
 			//check each group, if it's using a new texture then make a new clone of the model
 			let id=unique_texture_models.len();
 			let mut unique_textures=Vec::new();
-			for group in model.groups.drain(..){
+			for group in model.groups.into_iter(){
 				//ignore zero coppy optimization for now
 				let texture_index=if let Some(texture_index)=unique_textures.iter().position(|&texture|texture==group.texture){
 					texture_index
@@ -239,7 +244,7 @@ impl GraphicsData {
 				texture:model.texture,
 			});
 		}
-		//drain the modeldata vec so entities can be /moved/ to models.entities
+		//.into_iter() the modeldata vec so entities can be /moved/ to models.entities
 		let mut model_count=0;
 		let mut instance_count=0;
 		let uniform_buffer_binding_size=<GraphicsData as framework::Example>::required_limits().max_uniform_buffer_binding_size as usize;
@@ -372,33 +377,46 @@ impl framework::Example for GraphicsData {
 		indexed_models[0].instances.push(ModelInstance{
 			transform:glam::Affine3A::from_translation(glam::vec3(10.,0.,-10.)),
 			color:glam::Vec4::ONE,
+			attributes:model::CollisionAttributes::contact(),
 		});
 		//quad monkeys
 		indexed_models[1].instances.push(ModelInstance{
 			transform:glam::Affine3A::from_translation(glam::vec3(10.,5.,10.)),
 			color:glam::Vec4::ONE,
+			attributes:model::CollisionAttributes::contact(),
 		});
 		indexed_models[1].instances.push(ModelInstance{
 			transform:glam::Affine3A::from_translation(glam::vec3(20.,5.,10.)),
 			color:glam::vec4(1.0,0.0,0.0,1.0),
+			attributes:model::CollisionAttributes::contact(),
 		});
 		indexed_models[1].instances.push(ModelInstance{
 			transform:glam::Affine3A::from_translation(glam::vec3(10.,5.,20.)),
 			color:glam::vec4(0.0,1.0,0.0,1.0),
+			attributes:model::CollisionAttributes::contact(),
 		});
 		indexed_models[1].instances.push(ModelInstance{
 			transform:glam::Affine3A::from_translation(glam::vec3(20.,5.,20.)),
 			color:glam::vec4(0.0,0.0,1.0,1.0),
+			attributes:model::CollisionAttributes::contact(),
+		});
+		//decorative monkey
+		indexed_models[1].instances.push(ModelInstance{
+			transform:glam::Affine3A::from_translation(glam::vec3(15.,10.,15.)),
+			color:glam::vec4(0.5,0.5,0.5,0.5),
+			attributes:model::CollisionAttributes::Decoration,
 		});
 		//teapot
 		indexed_models[2].instances.push(ModelInstance{
 			transform:glam::Affine3A::from_scale_rotation_translation(glam::vec3(0.5, 1.0, 0.2),glam::quat(-0.22248298016985793,-0.839457167990537,-0.05603504040830783,-0.49261857546227916),glam::vec3(-10.,7.,10.)),
 			color:glam::Vec4::ONE,
+			attributes:model::CollisionAttributes::contact(),
 		});
 		//ground
 		indexed_models[3].instances.push(ModelInstance{
 			transform:glam::Affine3A::from_translation(glam::vec3(0.,0.,0.))*glam::Affine3A::from_scale(glam::vec3(160.0, 1.0, 160.0)),
 			color:glam::Vec4::ONE,
+			attributes:model::CollisionAttributes::contact(),
 		});
 
 		let camera_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -500,22 +518,17 @@ impl framework::Example for GraphicsData {
 			spawn_point:glam::vec3(0.0,50.0,0.0),
 			body: body::Body::with_pva(glam::vec3(0.0,50.0,0.0),glam::vec3(0.0,0.0,0.0),glam::vec3(0.0,-100.0,0.0)),
 			time: 0,
-			tick: 0,
-			strafe_tick_num: 100,//100t
-			strafe_tick_den: 1_000_000_000,
-			gravity: glam::vec3(0.0,-100.0,0.0),
-			friction: 1.2,
-			walk_accel: 90.0,
-			mv: 2.7,
+			style:body::StyleModifiers::default(),
 			grounded: false,
-			walkspeed: 18.0,
 			contacts: std::collections::HashSet::new(),
 			models: Vec::new(),
 			walk: body::WalkState::new(),
-			hitbox_halfsize: glam::vec3(1.0,2.5,1.0),
 			camera: body::Camera::from_offset(glam::vec3(0.0,4.5-2.5,0.0),(config.width as f32)/(config.height as f32)),
 			mouse_interpolation: body::MouseInterpolationState::new(),
 			controls: 0,
+			world:body::WorldState{},
+			game:body::GameMechanicsState::default(),
+			stages:Vec::new(),
 		};
 
 		//load textures
@@ -771,6 +784,7 @@ impl framework::Example for GraphicsData {
 			textures:Vec::new(),
 			models:indexed_models,
 			spawn_point:glam::Vec3::Y*50.0,
+			stages:Vec::new(),
 		};
 		graphics.generate_model_physics(&indexed_model_instances);
 		graphics.generate_model_graphics(&device,&queue,indexed_model_instances);
@@ -812,21 +826,7 @@ impl framework::Example for GraphicsData {
 								},
 							}
 						},
-						b"VBSP"=>{
-							let mut entire_file=Vec::new();
-							match std::io::Read::read_to_end(&mut input, &mut entire_file){
-								Ok(_)=>{
-									//haha yes this is a quake file what do you mean
-									entire_file[0]=b'I';
-									entire_file[4..8].copy_from_slice(&0x2ei32.to_le_bytes());
-									Some(load_bsp::generate_indexed_models(&mut std::io::Cursor::new(entire_file)))
-								},
-								Err(e)=>{
-									println!("Error loading \"valve\" file:{:?}",e);
-									None
-								},
-							}
-						},
+						//b"VBSP"=>Some(load_bsp::generate_indexed_models(input)),
 						//b"SNFM"=>Some(sniffer::generate_indexed_models(input)),
 						//b"SNFB"=>Some(sniffer::load_bot(input)),
 						other=>{

src/model.rs

@@ -56,15 +56,131 @@ pub struct ModelGraphicsInstance{
 	pub color:glam::Vec4,
 }
 pub struct ModelInstance{
+	//pub id:u64,//this does not actually help with map fixes resimulating bots, they must always be resimulated
 	pub transform:glam::Affine3A,
-	pub color:glam::Vec4,
+	pub color:glam::Vec4,//transparency is in here
+	pub attributes:CollisionAttributes,
 }
 pub struct IndexedModelInstances{
 	pub textures:Vec<String>,//RenderPattern
 	pub models:Vec<IndexedModel>,
-	//object_index for spawns, triggers etc?
+	//may make this into an object later.
+	pub stages:Vec<StageDescription>,
 	pub spawn_point:glam::Vec3,
 }
+//stage description referencing flattened ids is spooky, but the map loading is meant to be deterministic.
+pub struct StageDescription{
+	pub start:u32,//start=model_id
+	pub spawns:Vec<u32>,//spawns[spawn_id]=model_id
+	pub ordered_checkpoints:Vec<u32>,//ordered_checkpoints[checkpoint_id]=model_id
+	pub unordered_checkpoints:Vec<u32>,//unordered_checkpoints[checkpoint_id]=model_id
+}
+
+//you have this effect while in contact
+#[derive(Clone)]
+pub struct ContactingSurf{}
+#[derive(Clone)]
+pub struct ContactingLadder{
+	pub sticky:bool
+}
+//you have this effect while intersecting
+#[derive(Clone)]
+pub struct IntersectingWater{
+	pub viscosity:i64,
+	pub density:i64,
+	pub current:glam::Vec3,
+}
+#[derive(Clone)]
+pub struct IntersectingAccelerator{
+	pub acceleration:glam::Vec3
+}
+//All models can be given these attributes
+#[derive(Clone)]
+pub struct GameMechanicJumpLimit{
+	pub count:u32,
+}
+#[derive(Clone)]
+pub struct GameMechanicBooster{
+	pub velocity:glam::Vec3,
+}
+#[derive(Clone)]
+pub enum ZoneBehaviour{
+	//Start is indexed
+	//Checkpoints are indexed
+	Finish,
+	Anitcheat,
+}
+#[derive(Clone)]
+pub struct GameMechanicZone{
+	pub mode_id:u32,
+	pub behaviour:ZoneBehaviour,
+}
+// enum TrapCondition{
+// 	FasterThan(i64),
+// 	SlowerThan(i64),
+// 	InRange(i64,i64),
+// 	OutsideRange(i64,i64),
+// }
+#[derive(Clone)]
+pub enum StageElementBehaviour{
+ 	//Spawn,//The behaviour of stepping on a spawn setting the spawnid
+ 	SpawnAt,
+ 	Trigger,
+ 	Teleport,
+ 	Platform,
+ 	//Speedtrap(TrapCondition),//Acts as a trigger with a speed condition
+}
+#[derive(Clone)]
+pub struct GameMechanicStageElement{
+	pub mode_id:u32,
+	pub stage_id:u32,//which spawn to send to
+	pub force:bool,//allow setting to lower spawn id i.e. 7->3
+	pub behaviour:StageElementBehaviour
+}
+#[derive(Clone)]
+pub struct GameMechanicWormhole{//(position,angles)*=origin.transform.inverse()*destination.transform
+	pub model_id:u32,
+}
+#[derive(Default,Clone)]
+pub struct GameMechanicAttributes{
+	pub jump_limit:Option<GameMechanicJumpLimit>,
+	pub booster:Option<GameMechanicBooster>,
+	pub zone:Option<GameMechanicZone>,
+	pub stage_element:Option<GameMechanicStageElement>,
+	pub wormhole:Option<GameMechanicWormhole>,//stage_element and wormhole are in conflict
+}
+#[derive(Default,Clone)]
+pub struct ContactingAttributes{
+	pub elasticity:Option<u32>,//[1/2^32,1] 0=None (elasticity+1)/2^32
+	//friction?
+	pub surf:Option<ContactingSurf>,
+	pub ladder:Option<ContactingLadder>,
+}
+#[derive(Default,Clone)]
+pub struct IntersectingAttributes{
+	pub water:Option<IntersectingWater>,
+	pub accelerator:Option<IntersectingAccelerator>,
+}
+//Spawn(u32) NO! spawns are indexed in the map header instead of marked with attibutes
+pub enum CollisionAttributes{
+	Decoration,//visual only
+	Contact{//track whether you are contacting the object
+		contacting:ContactingAttributes,
+		general:GameMechanicAttributes,
+	},
+	Intersect{//track whether you are intersecting the object
+		intersecting:IntersectingAttributes,
+		general:GameMechanicAttributes,
+	},
+}
+impl CollisionAttributes{
+	pub fn contact() -> Self {
+		Self::Contact{
+			contacting:ContactingAttributes::default(),
+			general:GameMechanicAttributes::default()
+		}
+	}
+}
 
 pub fn generate_indexed_model_list_from_obj(data:obj::ObjData,color:[f32;4]) -> Vec<IndexedModel>{
 	let mut unique_vertex_index = std::collections::HashMap::<obj::IndexTuple,u32>::new();