TEMP: teleport to spawn point

Cargo.lock

@@ -157,6 +157,12 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -184,12 +190,35 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
+[[package]]
+name = "blake3"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+ "digest",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "block-sys"
 version = "0.1.0-beta.1"
@@ -302,6 +331,12 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
@@ -360,6 +395,16 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "d3d12"
 version = "0.7.0"
@@ -382,6 +427,17 @@ dependencies = [
  "enum_primitive",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -555,6 +611,16 @@ dependencies = [
  "waker-fn",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -822,6 +888,26 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
+[[package]]
+name = "lz4"
+version = "1.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+dependencies = [
+ "libc",
+ "lz4-sys",
+]
+
+[[package]]
+name = "lz4-sys"
+version = "1.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -1198,6 +1284,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -1222,6 +1314,19 @@ name = "profiling"
 version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46b2164ebdb1dfeec5e337be164292351e11daf63a05174c6776b2f47460f0c9"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74c55e9e629af5298a40e0fa106435b2da30484c4ec76b41d19bc4d00dd8b903"
+dependencies = [
+ "quote",
+ "syn 2.0.29",
+]
 
 [[package]]
 name = "quote"
@@ -1232,6 +1337,36 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "range-alloc"
 version = "0.1.3"
@@ -1244,6 +1379,69 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
+[[package]]
+name = "rbx_binary"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e50573021d04b680018955662eba7dc4aac3de92219231798f6c9b41e38ab01"
+dependencies = [
+ "log",
+ "lz4",
+ "profiling",
+ "rbx_dom_weak",
+ "rbx_reflection",
+ "rbx_reflection_database",
+ "thiserror",
+]
+
+[[package]]
+name = "rbx_dom_weak"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "161729449bbb0cfa657ce7bcca6a160d0af06d8b8d9efdc9abe14735dccacdb9"
+dependencies = [
+ "rbx_types",
+ "serde",
+]
+
+[[package]]
+name = "rbx_reflection"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bd48487192046fec8f805f3fa29f3d7d5beb9890b0859b1a92bd8aff580343"
+dependencies = [
+ "rbx_types",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "rbx_reflection_database"
+version = "0.2.7+roblox-588"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1be6cf674182806f11ad4899dd1feafe977591f1ae035ae05a58d4b74e487276"
+dependencies = [
+ "lazy_static",
+ "rbx_reflection",
+ "rmp-serde",
+ "serde",
+]
+
+[[package]]
+name = "rbx_types"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "070106e926b8ae54c7bc443e5db4d868d7f0af51c1d7cfd7efe1364c1753d8a3"
+dependencies = [
+ "base64",
+ "bitflags 1.3.2",
+ "blake3",
+ "lazy_static",
+ "rand",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.3.5"
@@ -1288,6 +1486,28 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
 
+[[package]]
+name = "rmp"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
+dependencies = [
+ "byteorder",
+ "num-traits 0.2.16",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -1338,6 +1558,26 @@ dependencies = [
  "tiny-skia",
 ]
 
+[[package]]
+name = "serde"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -1405,7 +1645,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "strafe-client"
-version = "0.4.0"
+version = "0.5.0"
 dependencies = [
  "async-executor",
  "bytemuck",
@@ -1415,6 +1655,9 @@ dependencies = [
  "log",
  "obj",
  "pollster",
+ "rbx_binary",
+ "rbx_dom_weak",
+ "rbx_reflection_database",
  "wgpu",
  "winit",
 ]
@@ -1425,6 +1668,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
 
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -1524,6 +1773,12 @@ version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33"
 
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.11"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafe-client"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -14,6 +14,9 @@ glam = "0.24.1"
 log = "0.4.20"
 obj = "0.10.2"
 pollster = "0.3.0"
+rbx_binary = "0.7.1"
+rbx_dom_weak = "2.5.0"
+rbx_reflection_database = "0.2.7"
 wgpu = "0.17.0"
 winit = "0.28.6"
 

src/body.rs

@@ -12,6 +12,8 @@ pub enum PhysicsInstruction {
 	// 	bool,//true = Trigger; false = teleport
 	// 	bool,//true = Force
 	// )
+	//temp
+	SetPosition(glam::Vec3),
 	//Both of these conditionally activate RefreshWalkTarget (by doing what SetWalkTargetVelocity used to do and then flagging it)
 	Input(InputInstruction),
 }
@@ -254,8 +256,7 @@ pub struct PhysicsState {
 	pub hitbox_halfsize: glam::Vec3,
 	pub contacts: std::collections::HashSet::<RelativeCollision>,
 	//pub intersections: Vec<ModelId>,
-	//temp
+	pub models: Vec<ModelPhysics>,
-	pub models_cringe_clone: Vec<Model>,
 	//camera must exist in state because wormholes modify the camera, also camera punch
 	pub camera: Camera,
 	pub mouse_interpolation: MouseInterpolationState,
@@ -382,13 +383,13 @@ impl Aabb {
 type TreyMeshFace = AabbFace;
 type TreyMesh = Aabb;
 
-pub struct Model {
+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.
 	transform: glam::Mat4,
 }
 
-impl Model {
+impl ModelPhysics {
 	pub fn new(transform:glam::Mat4) -> Self {
 		Self{transform}
 	}
@@ -432,10 +433,10 @@ pub struct RelativeCollision {
 }
 
 impl RelativeCollision {
-	pub fn mesh(&self,models:&Vec<Model>) -> TreyMesh {
+	pub fn mesh(&self,models:&Vec<ModelPhysics>) -> TreyMesh {
 		return models.get(self.model as usize).unwrap().face_mesh(self.face)
 	}
-	pub fn normal(&self,models:&Vec<Model>) -> glam::Vec3 {
+	pub fn normal(&self,models:&Vec<ModelPhysics>) -> glam::Vec3 {
 		return models.get(self.model as usize).unwrap().face_normal(self.face)
 	}
 }
@@ -494,7 +495,7 @@ impl PhysicsState {
 
 	fn contact_constrain_velocity(&self,velocity:&mut glam::Vec3){
 		for contact in self.contacts.iter() {
-			let n=contact.normal(&self.models_cringe_clone);
+			let n=contact.normal(&self.models);
 			let d=velocity.dot(n);
 			if d<0f32{
 				(*velocity)-=d/n.length_squared()*n;
@@ -503,7 +504,7 @@ impl PhysicsState {
 	}
 	fn contact_constrain_acceleration(&self,acceleration:&mut glam::Vec3){
 		for contact in self.contacts.iter() {
-			let n=contact.normal(&self.models_cringe_clone);
+			let n=contact.normal(&self.models);
 			let d=acceleration.dot(n);
 			if d<0f32{
 				(*acceleration)-=d/n.length_squared()*n;
@@ -603,7 +604,7 @@ impl PhysicsState {
 		let mut best_time=time_limit;
 		let mut exit_face:Option<TreyMeshFace>=None;
 		let mesh0=self.mesh();
-		let mesh1=self.models_cringe_clone.get(collision_data.model as usize).unwrap().mesh();
+		let mesh1=self.models.get(collision_data.model as usize).unwrap().mesh();
 		let (v,a)=(-self.body.velocity,self.body.acceleration);
 		//collect x
 		match collision_data.face {
@@ -754,7 +755,7 @@ impl PhysicsState {
 		let mut best_time=time_limit;
 		let mut best_face:Option<TreyMeshFace>=None;
 		let mesh0=self.mesh();
-		let mesh1=self.models_cringe_clone.get(model_id as usize).unwrap().mesh();
+		let mesh1=self.models.get(model_id as usize).unwrap().mesh();
 		let (p,v,a)=(self.body.position,self.body.velocity,self.body.acceleration);
 		//collect x
 		for t in zeroes2(mesh0.max.x-mesh1.min.x,v.x,0.5*a.x) {
@@ -879,7 +880,7 @@ impl crate::instruction::InstructionEmitter<PhysicsInstruction> for PhysicsState
 			collector.collect(self.predict_collision_end(self.time,time_limit,collision_data));
 		}
 		//check for collision start instructions (against every part in the game with no optimization!!)
-		for i in 0..self.models_cringe_clone.len() {
+		for i in 0..self.models.len() {
 			collector.collect(self.predict_collision_start(self.time,time_limit,i as u32));
 		}
 		if self.grounded {
@@ -903,6 +904,7 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 		//selectively update body
 		match &ins.instruction {
 		    PhysicsInstruction::Input(InputInstruction::MoveMouse(_)) => (),//dodge time for mouse movement
+		    PhysicsInstruction::SetPosition(_) => self.time=ins.time,//TODO: queue instructions
     		PhysicsInstruction::Input(_)
 		    |PhysicsInstruction::ReachWalkTargetVelocity
 		    |PhysicsInstruction::CollisionStart(_)
@@ -910,6 +912,15 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 		    |PhysicsInstruction::StrafeTick => self.advance_time(ins.time),
 		}
 		match ins.instruction {
+			PhysicsInstruction::SetPosition(position)=>{
+				//temp
+				self.body.position=position;
+				//manual clear //for c in self.contacts{process_instruction(CollisionEnd(c))}
+				self.contacts.clear();
+				self.body.acceleration=self.gravity;
+				self.walk.state=WalkEnum::Reached;
+				self.grounded=false;
+			}
 			PhysicsInstruction::CollisionStart(c) => {
 				//check ground
 				match &c.face {
@@ -1018,4 +1029,4 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
 			},
 		}
 	}
-}
+}

src/framework.rs

@@ -51,7 +51,7 @@ pub trait Example: 'static + Sized {
 		device: &wgpu::Device,
 		queue: &wgpu::Queue,
 	);
-	fn update(&mut self, event: WindowEvent);
+	fn update(&mut self, device: &wgpu::Device, event: WindowEvent);
 	fn device_event(&mut self, event: DeviceEvent);
 	fn render(
 		&mut self,
@@ -344,7 +344,7 @@ fn start<E: Example>(
 					println!("{:#?}", instance.generate_report());
 				}
 				_ => {
-					example.update(event);
+					example.update(&device,event);
 				}
 			},
 			event::Event::DeviceEvent {

src/lib.rs

@@ -2,3 +2,4 @@ pub mod framework;
 pub mod body;
 pub mod zeroes;
 pub mod instruction;
+pub mod load_roblox;

src/load_roblox.rs

@@ -0,0 +1,27 @@
+fn class_is_a(class: &str, superclass: &str) -> bool {
+	if class==superclass {
+		return true
+	}
+	let class_descriptor=rbx_reflection_database::get().classes.get(class);
+	if let Some(descriptor) = &class_descriptor {
+		if let Some(class_super) = &descriptor.superclass {
+			return class_is_a(&class_super, superclass)
+		}
+	}
+	return false
+}
+pub fn get_objects<R: std::io::Read>(buf_thing: R, superclass: &str) -> Result<std::vec::Vec<rbx_dom_weak::Instance>, Box<dyn std::error::Error>> {
+	// Using buffered I/O is recommended with rbx_binary
+	let dom = rbx_binary::from_reader(buf_thing)?;
+
+	let mut objects = std::vec::Vec::<rbx_dom_weak::Instance>::new();
+	//move matching instances into objects
+	let (_,mut instances) = dom.into_raw();
+	for (_,instance) in instances.drain() {
+		if class_is_a(instance.class.as_str(), superclass) {
+			objects.push(instance);
+		}
+	}
+
+	return Ok(objects)
+}

src/main.rs

@@ -11,6 +11,7 @@ struct Vertex {
 	pos: [f32; 3],
 	texture: [f32; 2],
 	normal: [f32; 3],
+	color: [f32; 4],
 }
 
 struct Entity {
@@ -18,19 +19,38 @@ struct Entity {
 	index_buf: wgpu::Buffer,
 }
 
+struct ModelInstance {
+	transform: glam::Mat4,
+	color: glam::Vec4,
+}
+
 struct ModelData {
-	transforms: Vec<glam::Mat4>,
+	instances: Vec<ModelInstance>,
 	vertices: Vec<Vertex>,
 	entities: Vec<Vec<u16>>,
 }
 
+impl ModelData {
+	const COLOR_FLOATS_WHITE: [f32;4] = [1.0,1.0,1.0,1.0];
+	const COLOR_VEC4_WHITE: glam::Vec4 = glam::vec4(1.0,1.0,1.0,1.0);
+}
+
 struct ModelGraphics {
-	transforms: Vec<glam::Mat4>,
+	instances: Vec<ModelInstance>,
 	vertex_buf: wgpu::Buffer,
 	entities: Vec<Entity>,
 	bind_group: wgpu::BindGroup,
 	model_buf: wgpu::Buffer,
 }
+
+pub struct GraphicsSamplers{
+	repeat: wgpu::Sampler,
+}
+
+pub struct GraphicsBindGroupLayouts{
+	model: wgpu::BindGroupLayout,
+}
+
 pub struct GraphicsBindGroups {
 	camera: wgpu::BindGroup,
 	skybox_texture: wgpu::BindGroup,
@@ -47,10 +67,14 @@ pub struct GraphicsData {
 	physics: strafe_client::body::PhysicsState,
 	pipelines: GraphicsPipelines,
 	bind_groups: GraphicsBindGroups,
+	bind_group_layouts: GraphicsBindGroupLayouts,
+	samplers: GraphicsSamplers,
+	temp_squid_texture_view: wgpu::TextureView,
 	camera_buf: wgpu::Buffer,
 	models: Vec<ModelGraphics>,
 	depth_view: wgpu::TextureView,
 	staging_belt: wgpu::util::StagingBelt,
+	handy_unit_cube: obj::ObjData,
 }
 
 impl GraphicsData {
@@ -77,19 +101,132 @@ impl GraphicsData {
 
 		depth_texture.create_view(&wgpu::TextureViewDescriptor::default())
 	}
+
+	fn generate_modeldatas_roblox<R: std::io::Read>(&self,input:R) -> (Vec<ModelData>,glam::Vec3){
+		let mut spawn_point=glam::Vec3::ZERO;
+		let mut modeldatas=generate_modeldatas(self.handy_unit_cube.clone(),ModelData::COLOR_FLOATS_WHITE);
+		match strafe_client::load_roblox::get_objects(input, "BasePart") {
+			Ok(objects)=>{
+				for object in objects.iter() {
+					if let (
+							Some(rbx_dom_weak::types::Variant::CFrame(cf)),
+							Some(rbx_dom_weak::types::Variant::Vector3(size)),
+							Some(rbx_dom_weak::types::Variant::Float32(transparency)),
+							Some(rbx_dom_weak::types::Variant::Color3uint8(color3)),
+							Some(rbx_dom_weak::types::Variant::Enum(shape)),
+						) = (
+							object.properties.get("CFrame"),
+							object.properties.get("Size"),
+							object.properties.get("Transparency"),
+							object.properties.get("Color"),
+							object.properties.get("Shape"),//this will also skip unions
+						)
+					{
+						let transform=glam::Mat4::from_translation(
+							glam::Vec3::new(cf.position.x,cf.position.y,cf.position.z)
+						)
+						* glam::Mat4::from_mat3(
+							glam::Mat3::from_cols(
+								glam::Vec3::new(cf.orientation.x.x,cf.orientation.y.x,cf.orientation.z.x),
+								glam::Vec3::new(cf.orientation.x.y,cf.orientation.y.y,cf.orientation.z.y),
+								glam::Vec3::new(cf.orientation.x.z,cf.orientation.y.z,cf.orientation.z.z),
+							),
+						)
+						* glam::Mat4::from_scale(
+							glam::Vec3::new(size.x,size.y,size.z)/2.0
+						);
+						if object.name=="MapStart"{
+							spawn_point=glam::Vec4Swizzles::xyz(transform*glam::Vec3::Y.extend(1.0))+glam::vec3(0.0,2.5,0.0);
+							println!("Found MapStart{:?}",spawn_point);
+						}
+						if *transparency==1.0||shape.to_u32()!=1 {
+							continue;
+						}
+						modeldatas[0].instances.push(ModelInstance {
+							transform,
+							color: glam::vec4(color3.r as f32/255f32, color3.g as f32/255f32, color3.b as f32/255f32, 1.0-*transparency),
+						})
+					}
+				}
+			},
+			Err(e) => println!("lmao err {:?}", e),
+		}
+		(modeldatas,spawn_point)
+	}
+	fn generate_model_physics(&mut self,modeldatas:&Vec<ModelData>){
+		self.physics.models.append(&mut modeldatas.iter().map(|m|
+			//make aabb and run vertices to get realistic bounds
+			m.instances.iter().map(|t|strafe_client::body::ModelPhysics::new(t.transform))
+		).flatten().collect());
+	}
+	fn generate_model_graphics(&mut self,device:&wgpu::Device,mut modeldatas:Vec<ModelData>){
+		//drain the modeldata vec so entities can be /moved/ to models.entities
+		self.models.reserve(modeldatas.len());
+		for (i,modeldata) in modeldatas.drain(..).enumerate() {
+			let model_uniforms = get_instances_buffer_data(&modeldata.instances);
+			let model_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+				label: Some(format!("ModelGraphics{}",i).as_str()),
+				contents: bytemuck::cast_slice(&model_uniforms),
+				usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
+			});
+			let model_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
+				layout: &self.bind_group_layouts.model,
+				entries: &[
+					wgpu::BindGroupEntry {
+						binding: 0,
+						resource: model_buf.as_entire_binding(),
+					},
+					wgpu::BindGroupEntry {
+						binding: 1,
+						resource: wgpu::BindingResource::TextureView(&self.temp_squid_texture_view),
+					},
+					wgpu::BindGroupEntry {
+						binding: 2,
+						resource: wgpu::BindingResource::Sampler(&self.samplers.repeat),
+					},
+				],
+				label: Some(format!("ModelGraphics{}",i).as_str()),
+			});
+			let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+				label: Some("Vertex"),
+				contents: bytemuck::cast_slice(&modeldata.vertices),
+				usage: wgpu::BufferUsages::VERTEX,
+			});
+			//all of these are being moved here
+			self.models.push(ModelGraphics{
+				instances:modeldata.instances,
+				vertex_buf,
+				entities: modeldata.entities.iter().map(|indices|{
+					let index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+						label: Some("Index"),
+						contents: bytemuck::cast_slice(&indices),
+						usage: wgpu::BufferUsages::INDEX,
+					});
+					Entity {
+						index_buf,
+						index_count: indices.len() as u32,
+					}
+				}).collect(),
+				bind_group: model_bind_group,
+				model_buf,
+			})
+		}
+	}
 }
 
-fn get_transform_uniform_data(transforms:&Vec<glam::Mat4>) -> Vec<f32> {
+fn get_instances_buffer_data(instances:&Vec<ModelInstance>) -> Vec<f32> {
-	let mut raw = Vec::with_capacity(4*4*transforms.len());
+	const SIZE: usize=4*4+4;//let size=std::mem::size_of::<ModelInstance>();
-	for (i,t) in transforms.iter().enumerate(){
+	let mut raw = Vec::with_capacity(SIZE*instances.len());
-    	let mut v = raw.split_off(4*4*i);
+	for (i,mi) in instances.iter().enumerate(){
-    	raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(t)[..]);
+    	let mut v = raw.split_off(SIZE*i);
+    	raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(&mi.transform)[..]);
+    	raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.color));
     	raw.append(&mut v);
 	}
 	raw
 }
 
-fn generate_modeldatas(data:obj::ObjData) -> Vec<ModelData>{
+fn generate_modeldatas(data:obj::ObjData,color:[f32;4]) -> Vec<ModelData>{
 	let mut modeldatas=Vec::new();
 	let mut vertices = Vec::new();
 	let mut vertex_index = std::collections::HashMap::<obj::IndexTuple,u16>::new();
@@ -111,6 +248,7 @@ fn generate_modeldatas(data:obj::ObjData) -> Vec<ModelData>{
 								pos: data.position[vert.0],
 								texture: data.texture[vert.1.unwrap()],
 								normal: data.normal[vert.2.unwrap()],
+								color,
 							});
 							vertex_index.insert(vert,i);
 							indices.push(i);
@@ -121,7 +259,7 @@ fn generate_modeldatas(data:obj::ObjData) -> Vec<ModelData>{
 			entities.push(indices);
 		}
 		modeldatas.push(ModelData {
-			transforms: vec![],
+			instances: Vec::new(),
 			vertices:vertices.clone(),
 			entities,
 		});
@@ -150,46 +288,129 @@ impl strafe_client::framework::Example for GraphicsData {
 			| wgpu::Features::TEXTURE_COMPRESSION_ETC2
 			| wgpu::Features::TEXTURE_COMPRESSION_BC
 	}
-
+	fn required_features() -> wgpu::Features {
+		wgpu::Features::STORAGE_RESOURCE_BINDING_ARRAY
+	}
+	fn required_limits() -> wgpu::Limits {
+		wgpu::Limits::default() //framework.rs was using goofy limits that caused me a multi-day headache
+	}
 	fn init(
 		config: &wgpu::SurfaceConfiguration,
 		_adapter: &wgpu::Adapter,
 		device: &wgpu::Device,
 		queue: &wgpu::Queue,
 	) -> Self {
-		let ground=obj::ObjData{
+		let unit_cube=obj::ObjData{
-			position: vec![[-1.0,0.0,-1.0],[1.0,0.0,-1.0],[1.0,0.0,1.0],[-1.0,0.0,1.0]],
+			position: vec![
-			texture: vec![[-10.0,-10.0],[10.0,-10.0],[10.0,10.0],[-10.0,10.0]],
+				[-1.,-1., 1.],//left bottom back
-			normal: vec![[0.0,1.0,0.0]],
+				[ 1.,-1., 1.],//right bottom back
+				[ 1., 1., 1.],//right top back
+				[-1., 1., 1.],//left top back
+				[-1., 1.,-1.],//left top front
+				[ 1., 1.,-1.],//right top front
+				[ 1.,-1.,-1.],//right bottom front
+				[-1.,-1.,-1.],//left bottom front
+			],
+			texture: vec![[0.0,0.0],[1.0,0.0],[1.0,1.0],[0.0,1.0]],
+			normal: vec![
+				[1.,0.,0.],//AabbFace::Right
+				[0.,1.,0.],//AabbFace::Top
+				[0.,0.,1.],//AabbFace::Back
+				[-1.,0.,0.],//AabbFace::Left
+				[0.,-1.,0.],//AabbFace::Bottom
+				[0.,0.,-1.],//AabbFace::Front
+			],
 			objects: vec![obj::Object{
-				name: "Ground Object".to_owned(),
+				name: "Unit Cube".to_owned(),
 				groups: vec![obj::Group{
-					name: "Ground Group".to_owned(),
+					name: "Cube Vertices".to_owned(),
 					index: 0,
 					material: None,
-					polys: vec![obj::SimplePolygon(vec![
+					polys: vec![
-						obj::IndexTuple(0,Some(0),Some(0)),
+						// back (0, 0, 1)
-						obj::IndexTuple(1,Some(1),Some(0)),
+						obj::SimplePolygon(vec![
-						obj::IndexTuple(2,Some(2),Some(0)),
+							obj::IndexTuple(0,Some(0),Some(2)),
-						obj::IndexTuple(3,Some(3),Some(0)),
+							obj::IndexTuple(1,Some(1),Some(2)),
-					])]
+							obj::IndexTuple(2,Some(2),Some(2)),
+							obj::IndexTuple(3,Some(3),Some(2)),
+						]),
+						// front (0, 0,-1)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(4,Some(0),Some(5)),
+							obj::IndexTuple(5,Some(1),Some(5)),
+							obj::IndexTuple(6,Some(2),Some(5)),
+							obj::IndexTuple(7,Some(3),Some(5)),
+						]),
+						// right (1, 0, 0)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(6,Some(0),Some(0)),
+							obj::IndexTuple(5,Some(1),Some(0)),
+							obj::IndexTuple(2,Some(2),Some(0)),
+							obj::IndexTuple(1,Some(3),Some(0)),
+						]),
+						// left (-1, 0, 0)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(0,Some(0),Some(3)),
+							obj::IndexTuple(3,Some(1),Some(3)),
+							obj::IndexTuple(4,Some(2),Some(3)),
+							obj::IndexTuple(7,Some(3),Some(3)),
+						]),
+						// top (0, 1, 0)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(5,Some(1),Some(1)),
+							obj::IndexTuple(4,Some(0),Some(1)),
+							obj::IndexTuple(3,Some(3),Some(1)),
+							obj::IndexTuple(2,Some(2),Some(1)),
+						]),
+						// bottom (0,-1, 0)
+						obj::SimplePolygon(vec![
+							obj::IndexTuple(1,Some(1),Some(4)),
+							obj::IndexTuple(0,Some(0),Some(4)),
+							obj::IndexTuple(7,Some(3),Some(4)),
+							obj::IndexTuple(6,Some(2),Some(4)),
+						]),
+					],
 				}]
 			}],
 			material_libs: Vec::new(),
 		};
 		let mut modeldatas = Vec::<ModelData>::new();
-		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/teslacyberv3.0.obj")[..]).unwrap()));
+		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/teslacyberv3.0.obj")[..]).unwrap(),ModelData::COLOR_FLOATS_WHITE));
-		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/suzanne.obj")[..]).unwrap()));
+		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/suzanne.obj")[..]).unwrap(),ModelData::COLOR_FLOATS_WHITE));
-		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/teapot.obj")[..]).unwrap()));
+		modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/teapot.obj")[..]).unwrap(),ModelData::COLOR_FLOATS_WHITE));
-		modeldatas.append(&mut generate_modeldatas(ground));
+		modeldatas.append(&mut generate_modeldatas(unit_cube.clone(),ModelData::COLOR_FLOATS_WHITE));
 		println!("models.len = {:?}", modeldatas.len());
-		modeldatas[0].transforms.push(glam::Mat4::from_translation(glam::vec3(10.,0.,-10.)));
+		modeldatas[0].instances.push(ModelInstance{
-		modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(10.,5.,10.)));
+			transform:glam::Mat4::from_translation(glam::vec3(10.,0.,-10.)),
-		modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(20.,5.,10.)));
+			color:ModelData::COLOR_VEC4_WHITE,
-		modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(10.,5.,20.)));
+		});
-		modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(20.,5.,20.)));
+		//quad monkeys
-		modeldatas[2].transforms.push(glam::Mat4::from_translation(glam::vec3(-10.,5.,10.)));
+		modeldatas[1].instances.push(ModelInstance{
-		modeldatas[3].transforms.push(glam::Mat4::from_translation(glam::vec3(0.,0.,0.))*glam::Mat4::from_scale(glam::vec3(160.0, 1.0, 160.0)));
+			transform:glam::Mat4::from_translation(glam::vec3(10.,5.,10.)),
+			color:ModelData::COLOR_VEC4_WHITE,
+		});
+		modeldatas[1].instances.push(ModelInstance{
+			transform:glam::Mat4::from_translation(glam::vec3(20.,5.,10.)),
+			color:glam::vec4(1.0,0.0,0.0,1.0),
+		});
+		modeldatas[1].instances.push(ModelInstance{
+			transform:glam::Mat4::from_translation(glam::vec3(10.,5.,20.)),
+			color:glam::vec4(0.0,1.0,0.0,1.0),
+		});
+		modeldatas[1].instances.push(ModelInstance{
+			transform:glam::Mat4::from_translation(glam::vec3(20.,5.,20.)),
+			color:glam::vec4(0.0,0.0,1.0,1.0),
+		});
+		//teapot
+		modeldatas[2].instances.push(ModelInstance{
+			transform:glam::Mat4::from_translation(glam::vec3(-10.,5.,10.)),
+			color:ModelData::COLOR_VEC4_WHITE,
+		});
+		//ground
+		modeldatas[3].instances.push(ModelInstance{
+			transform:glam::Mat4::from_translation(glam::vec3(0.,0.,0.))*glam::Mat4::from_scale(glam::vec3(160.0, 1.0, 160.0)),
+			color:ModelData::COLOR_VEC4_WHITE,
+		});
 
 		let camera_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
 			label: None,
@@ -234,7 +455,7 @@ impl strafe_client::framework::Example for GraphicsData {
 					binding: 0,
 					visibility: wgpu::ShaderStages::VERTEX,
 					ty: wgpu::BindingType::Buffer {
-						ty: wgpu::BufferBindingType::Uniform,
+						ty: wgpu::BufferBindingType::Storage { read_only: true },
 						has_dynamic_offset: false,
 						min_binding_size: None,
 					},
@@ -299,7 +520,7 @@ impl strafe_client::framework::Example for GraphicsData {
 			grounded: false,
 			walkspeed: 18.0,
 			contacts: std::collections::HashSet::new(),
-			models_cringe_clone: modeldatas.iter().map(|m|m.transforms.iter().map(|t|strafe_client::body::Model::new(*t))).flatten().collect(),
+			models: Vec::new(),
 			walk: strafe_client::body::WalkState::new(),
 			hitbox_halfsize: glam::vec3(1.0,2.5,1.0),
 			camera: strafe_client::body::Camera::from_offset(glam::vec3(0.0,4.5-2.5,0.0),(config.width as f32)/(config.height as f32)),
@@ -385,9 +606,13 @@ impl strafe_client::framework::Example for GraphicsData {
 
 		//squid
 		let squid_texture_view={
+			let bytes = &include_bytes!("../images/squid.dds")[..];
+
+			let image = ddsfile::Dds::read(&mut std::io::Cursor::new(&bytes)).unwrap();
+
 			let size = wgpu::Extent3d {
-				width: 1076,
+				width: image.get_width(),
-				height: 1076,
+				height: image.get_height(),
 				depth_or_array_layers: 1,
 			};
 
@@ -397,10 +622,6 @@ impl strafe_client::framework::Example for GraphicsData {
 			};
 			let max_mips = layer_size.max_mips(wgpu::TextureDimension::D2);
 
-			let bytes = &include_bytes!("../images/squid.dds")[..];
-
-			let image = ddsfile::Dds::read(&mut std::io::Cursor::new(&bytes)).unwrap();
-
 			let texture = device.create_texture_with_data(
 				queue,
 				&wgpu::TextureDescriptor {
@@ -423,58 +644,6 @@ impl strafe_client::framework::Example for GraphicsData {
 			})
 		};
 
-		//drain the modeldata vec so entities can be /moved/ to models.entities
-		let mut models = Vec::<ModelGraphics>::with_capacity(modeldatas.len());
-		for (i,modeldata) in modeldatas.drain(..).enumerate() {
-			let model_uniforms = get_transform_uniform_data(&modeldata.transforms);
-			let model_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-				label: Some(format!("ModelGraphics{}",i).as_str()),
-				contents: bytemuck::cast_slice(&model_uniforms),
-				usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
-			});
-			let model_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
-				layout: &model_bind_group_layout,
-				entries: &[
-					wgpu::BindGroupEntry {
-						binding: 0,
-						resource: model_buf.as_entire_binding(),
-					},
-					wgpu::BindGroupEntry {
-						binding: 1,
-						resource: wgpu::BindingResource::TextureView(&squid_texture_view),
-					},
-					wgpu::BindGroupEntry {
-						binding: 2,
-						resource: wgpu::BindingResource::Sampler(&repeat_sampler),
-					},
-				],
-				label: Some(format!("ModelGraphics{}",i).as_str()),
-			});
-			let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-				label: Some("Vertex"),
-				contents: bytemuck::cast_slice(&modeldata.vertices),
-				usage: wgpu::BufferUsages::VERTEX,
-			});
-			//all of these are being moved here
-			models.push(ModelGraphics{
-				transforms:modeldata.transforms,
-				vertex_buf,
-				entities: modeldata.entities.iter().map(|indices|{
-					let index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-						label: Some("Index"),
-						contents: bytemuck::cast_slice(&indices),
-						usage: wgpu::BufferUsages::INDEX,
-					});
-					Entity {
-						index_buf,
-						index_count: indices.len() as u32,
-					}
-				}).collect(),
-				bind_group: model_bind_group,
-				model_buf,
-			})
-		}
-
 		let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
 			label: None,
 			bind_group_layouts: &[
@@ -522,7 +691,7 @@ impl strafe_client::framework::Example for GraphicsData {
 				buffers: &[wgpu::VertexBufferLayout {
 					array_stride: std::mem::size_of::<Vertex>() as wgpu::BufferAddress,
 					step_mode: wgpu::VertexStepMode::Vertex,
-					attributes: &wgpu::vertex_attr_array![0 => Float32x3, 1 => Float32x2, 2 => Float32x3],
+					attributes: &wgpu::vertex_attr_array![0 => Float32x3, 1 => Float32x2, 2 => Float32x3, 3 => Float32x4],
 				}],
 			},
 			fragment: Some(wgpu::FragmentState {
@@ -578,7 +747,8 @@ impl strafe_client::framework::Example for GraphicsData {
 
 		let depth_view = Self::create_depth_texture(config, device);
 
-		GraphicsData {
+		let mut graphics=GraphicsData {
+			handy_unit_cube:unit_cube,
 			start_time: Instant::now(),
 			screen_size: (config.width,config.height),
 			physics,
@@ -591,15 +761,46 @@ impl strafe_client::framework::Example for GraphicsData {
 				skybox_texture:skybox_texture_bind_group,
 			},
 			camera_buf,
-			models,
+			models: Vec::new(),
 			depth_view,
 			staging_belt: wgpu::util::StagingBelt::new(0x100),
-		}
+			bind_group_layouts: GraphicsBindGroupLayouts { model: model_bind_group_layout },
+			samplers: GraphicsSamplers { repeat: repeat_sampler },
+			temp_squid_texture_view: squid_texture_view,
+		};
+
+		graphics.generate_model_physics(&modeldatas);
+		graphics.generate_model_graphics(&device,modeldatas);
+
+		return graphics;
 	}
 
 	#[allow(clippy::single_match)]
-	fn update(&mut self, event: winit::event::WindowEvent) {
+	fn update(&mut self, device: &wgpu::Device, event: winit::event::WindowEvent) {
-		//nothing atm
+		match event {
+			winit::event::WindowEvent::DroppedFile(path) => {
+				println!("opening file: {:?}", &path);
+				//oh boy! let's load the map!
+				if let Ok(file)=std::fs::File::open(path){
+					let input = std::io::BufReader::new(file);
+					let (modeldatas,spawn_point)=self.generate_modeldatas_roblox(input);
+					//if generate_modeldatas succeeds, clear the previous ones
+					self.models.clear();
+					self.physics.models.clear();
+					self.generate_model_physics(&modeldatas);
+					self.generate_model_graphics(device,modeldatas);
+					//manual reset
+					let time=self.physics.time;
+					strafe_client::instruction::InstructionConsumer::process_instruction(&mut self.physics, strafe_client::instruction::TimedInstruction{
+						time,
+						instruction: strafe_client::body::PhysicsInstruction::SetPosition(spawn_point),
+					})
+				}else{
+					println!("Could not open file");
+				}
+			},
+			_=>(),
+		}
 	}
 
 	fn device_event(&mut self, event: winit::event::DeviceEvent) {
@@ -700,7 +901,7 @@ impl strafe_client::framework::Example for GraphicsData {
 			.copy_from_slice(bytemuck::cast_slice(&camera_uniforms));
 		//This code only needs to run when the uniforms change
 		for model in self.models.iter() {
-			let model_uniforms = get_transform_uniform_data(&model.transforms);
+			let model_uniforms = get_instances_buffer_data(&model.instances);
 			self.staging_belt
 				.write_buffer(
 					&mut encoder,
@@ -749,7 +950,7 @@ impl strafe_client::framework::Example for GraphicsData {
 
 				for entity in model.entities.iter() {
 					rpass.set_index_buffer(entity.index_buf.slice(..), wgpu::IndexFormat::Uint16);
-					rpass.draw_indexed(0..entity.index_count, 0, 0..model.transforms.len() as u32);
+					rpass.draw_indexed(0..entity.index_count, 0, 0..model.instances.len() as u32);
 				}
 			}
 

src/shader.wgsl

@@ -41,15 +41,17 @@ fn vs_sky(@builtin(vertex_index) vertex_index: u32) -> SkyOutput {
 	return result;
 }
 
-const MAX_ENTITY_INSTANCES=1024;
+struct ModelInstance{
+	transform:mat4x4<f32>,
+	//texture_transform:mat3x3<f32>,
+	color:vec4<f32>,
+}
+//my fancy idea is to create a megatexture for each model that includes all the textures each intance will need
+//the texture transform then maps the texture coordinates to the location of the specific texture
 //group 1 is the model
 @group(1)
 @binding(0)
-var<uniform> entity_transforms: array<mat4x4<f32>,MAX_ENTITY_INSTANCES>;
+var<storage> model_instances: array<ModelInstance>;
-//var<uniform> entity_texture_transforms: array<mat3x3<f32>,MAX_ENTITY_INSTANCES>;
-//my fancy idea is to create a megatexture for each model that includes all the textures each intance will need
-//the texture transform then maps the texture coordinates to the location of the specific texture
-//how to do no texture?
 @group(1)
 @binding(1)
 var model_texture: texture_2d<f32>;
@@ -62,6 +64,7 @@ struct EntityOutputTexture {
 	@location(1) texture: vec2<f32>,
 	@location(2) normal: vec3<f32>,
 	@location(3) view: vec3<f32>,
+	@location(4) color: vec4<f32>,
 };
 @vertex
 fn vs_entity_texture(
@@ -69,11 +72,13 @@ fn vs_entity_texture(
 	@location(0) pos: vec3<f32>,
 	@location(1) texture: vec2<f32>,
 	@location(2) normal: vec3<f32>,
+	@location(3) color: vec4<f32>,
 ) -> EntityOutputTexture {
-	var position: vec4<f32> = entity_transforms[instance] * vec4<f32>(pos, 1.0);
+	var position: vec4<f32> = model_instances[instance].transform * vec4<f32>(pos, 1.0);
 	var result: EntityOutputTexture;
-	result.normal = (entity_transforms[instance] * vec4<f32>(normal, 0.0)).xyz;
+	result.normal = (model_instances[instance].transform * vec4<f32>(normal, 0.0)).xyz;
-	result.texture=texture;//(entity_texture_transforms[instance] * vec3<f32>(texture, 1.0)).xy;
+	result.texture=texture;//(model_instances[instance].texture_transform * vec3<f32>(texture, 1.0)).xy;
+	result.color=model_instances[instance].color * color;
 	result.view = position.xyz - camera.cam_pos.xyz;
 	result.position = camera.proj * camera.view * position;
 	return result;
@@ -99,7 +104,7 @@ fn fs_entity_texture(vertex: EntityOutputTexture) -> @location(0) vec4<f32> {
 	let d = dot(normal, incident);
 	let reflected = incident - 2.0 * d * normal;
 
-	let fragment_color = textureSample(model_texture, model_sampler, vertex.texture).rgb;
+	let fragment_color = textureSample(model_texture, model_sampler, vertex.texture)*vertex.color;
 	let reflected_color = textureSample(cube_texture, cube_sampler, reflected).rgb;
-	return vec4<f32>(mix(vec3<f32>(0.1) + 0.5 * reflected_color,fragment_color,1.0-pow(1.0-abs(d),2.0)), 1.0);
+	return mix(vec4<f32>(vec3<f32>(0.1) + 0.5 * reflected_color,1.0),fragment_color,1.0-pow(1.0-abs(d),2.0));
 }