buffer binding array?

Cargo.lock

@@ -1405,7 +1405,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "strafe-client"
-version = "0.3.0"
+version = "0.1.0"
 dependencies = [
  "async-executor",
  "bytemuck",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafe-client"
-version = "0.3.0"
+version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -16,8 +16,3 @@ obj = "0.10.2"
 pollster = "0.3.0"
 wgpu = "0.17.0"
 winit = "0.28.6"
-
-[profile.release]
-lto = true
-strip = true
-codegen-units = 1

src/framework.rs

@@ -1,10 +1,12 @@
 use std::future::Future;
 #[cfg(target_arch = "wasm32")]
 use std::str::FromStr;
+#[cfg(not(target_arch = "wasm32"))]
+use std::time::Instant;
 #[cfg(target_arch = "wasm32")]
 use web_sys::{ImageBitmapRenderingContext, OffscreenCanvas};
 use winit::{
-	event::{self, WindowEvent, DeviceEvent},
+    event::{self, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
 };
 
@@ -52,7 +54,7 @@ pub trait Example: 'static + Sized {
         queue: &wgpu::Queue,
     );
     fn update(&mut self, event: WindowEvent);
-	fn device_event(&mut self, event: DeviceEvent);
+    fn move_mouse(&mut self, delta: (f64,f64));
     fn render(
         &mut self,
         view: &wgpu::TextureView,
@@ -277,6 +279,11 @@ fn start<E: Example>(
     log::info!("Initializing the example...");
     let mut example = E::init(&config, &adapter, &device, &queue);
 
+    #[cfg(not(target_arch = "wasm32"))]
+    let mut last_frame_inst = Instant::now();
+    #[cfg(not(target_arch = "wasm32"))]
+    let (mut frame_count, mut accum_time) = (0, 0.0);
+
     log::info!("Entering render loop...");
     event_loop.run(move |event, _, control_flow| {
         let _ = (&instance, &adapter); // force ownership by the closure
@@ -348,12 +355,29 @@ fn start<E: Example>(
                 }
             },
             event::Event::DeviceEvent {
-				event,
+                event:
+                    winit::event::DeviceEvent::MouseMotion {
+                        delta,
+                    },
                 ..
             } => {
-				example.device_event(event);
+                example.move_mouse(delta);
             },
             event::Event::RedrawRequested(_) => {
+                #[cfg(not(target_arch = "wasm32"))]
+                {
+                    accum_time += last_frame_inst.elapsed().as_secs_f32();
+                    last_frame_inst = Instant::now();
+                    frame_count += 1;
+                    if frame_count == 100 {
+                        println!(
+                            "Avg frame time {}ms",
+                            accum_time * 1000.0 / frame_count as f32
+                        );
+                        accum_time = 0.0;
+                        frame_count = 0;
+                    }
+                }
 
                 let frame = match surface.get_current_texture() {
                     Ok(frame) => frame,

src/instruction.rs

@@ -1,48 +0,0 @@
-#[derive(Debug)]
-pub struct TimedInstruction<I> {
-	pub time: crate::body::TIME,
-	pub instruction: I,
-}
-
-pub trait InstructionEmitter<I> {
-	fn next_instruction(&self, time_limit:crate::body::TIME) -> Option<TimedInstruction<I>>;
-}
-pub trait InstructionConsumer<I> {
-	fn process_instruction(&mut self, instruction:TimedInstruction<I>);
-}
-
-//PROPER PRIVATE FIELDS!!!
-pub struct InstructionCollector<I> {
-	time: crate::body::TIME,
-	instruction: Option<I>,
-}
-impl<I> InstructionCollector<I> {
-	pub fn new(time:crate::body::TIME) -> Self {
-		Self{
-			time,
-			instruction:None
-		}
-	}
-
-	pub fn collect(&mut self,instruction:Option<TimedInstruction<I>>){
-		match instruction {
-			Some(unwrap_instruction) => {
-				if unwrap_instruction.time<self.time {
-					self.time=unwrap_instruction.time;
-					self.instruction=Some(unwrap_instruction.instruction);
-				}
-			},
-			None => (),
-		}
-	}
-	pub fn instruction(self) -> Option<TimedInstruction<I>> {
-		//STEAL INSTRUCTION AND DESTROY INSTRUCTIONCOLLECTOR
-		match self.instruction {
-			Some(instruction)=>Some(TimedInstruction{
-				time:self.time,
-				instruction
-			}),
-			None => None,
-		}
-	}
-}

src/lib.rs

@@ -1,4 +1 @@
 pub mod framework;
-pub mod body;
-pub mod zeroes;
-pub mod instruction;

src/main.rs

@@ -1,5 +1,4 @@
 use bytemuck::{Pod, Zeroable};
-use strafe_client::{instruction::{TimedInstruction, InstructionConsumer},body::{InputInstruction, PhysicsInstruction}};
 use std::{borrow::Cow, time::Instant};
 use wgpu::{util::DeviceExt, AstcBlock, AstcChannel};
 
@@ -9,42 +8,119 @@ const IMAGE_SIZE: u32 = 128;
 #[repr(C)]
 struct Vertex {
     pos: [f32; 3],
-	texture: [f32; 2],
     normal: [f32; 3],
+    entity_id: u32,
 }
 
 struct Entity {
-	index_count: u32,
-	index_buf: wgpu::Buffer,
+    transform: glam::Affine3A,
+    vertex_count: u32,
+    vertex_buf: wgpu::Buffer,
 }
 
-//temp?
-struct ModelData {
-	transform: glam::Mat4,
-	vertex_buf: wgpu::Buffer,
-	entities: Vec<Entity>,
+// Note: we use the Y=up coordinate space in this example.
+struct Camera {
+    time: Instant,
+    pos: glam::Vec3,
+    vel: glam::Vec3,
+    gravity: glam::Vec3,
+    friction: f32,
+    screen_size: (u32, u32),
+    offset: glam::Vec3,
+    fov: f32,
+    yaw: f32,
+    pitch: f32,
+    controls: u32,
+    mv: f32,
+    grounded: bool,
+    walkspeed: f32,
 }
 
-struct ModelGraphics {
-	transform: glam::Mat4,
-	vertex_buf: wgpu::Buffer,
-	entities: Vec<Entity>,
-	bind_group: wgpu::BindGroup,
-	model_buf: wgpu::Buffer,
+const MAGIC_ENTITIES: usize = 7;
+
+const CONTROL_MOVEFORWARD:u32 = 0b00000001;
+const CONTROL_MOVEBACK:u32 = 0b00000010;
+const CONTROL_MOVERIGHT:u32 = 0b00000100;
+const CONTROL_MOVELEFT:u32 = 0b00001000;
+const CONTROL_MOVEUP:u32 = 0b00010000;
+const CONTROL_MOVEDOWN:u32 = 0b00100000;
+const CONTROL_JUMP:u32 = 0b01000000;
+const CONTROL_ZOOM:u32 = 0b10000000;
+
+const FORWARD_DIR:glam::Vec3 = glam::Vec3::new(0.0,0.0,-1.0);
+const RIGHT_DIR:glam::Vec3 = glam::Vec3::new(1.0,0.0,0.0);
+const UP_DIR:glam::Vec3 = glam::Vec3::new(0.0,1.0,0.0);
+
+fn get_control_dir(controls: u32) -> glam::Vec3{
+    //don't get fancy just do it
+    let mut control_dir:glam::Vec3 = glam::Vec3::new(0.0,0.0,0.0);
+    if controls & CONTROL_MOVEFORWARD == CONTROL_MOVEFORWARD {
+        control_dir+=FORWARD_DIR;
+    }
+    if controls & CONTROL_MOVEBACK == CONTROL_MOVEBACK {
+        control_dir+=-FORWARD_DIR;
+    }
+    if controls & CONTROL_MOVELEFT == CONTROL_MOVELEFT {
+        control_dir+=-RIGHT_DIR;
+    }
+    if controls & CONTROL_MOVERIGHT == CONTROL_MOVERIGHT {
+        control_dir+=RIGHT_DIR;
+    }
+    if controls & CONTROL_MOVEUP == CONTROL_MOVEUP {
+        control_dir+=UP_DIR;
+    }
+    if controls & CONTROL_MOVEDOWN == CONTROL_MOVEDOWN {
+        control_dir+=-UP_DIR;
+    }
+    return control_dir
+}
+
+    #[inline]
+    fn perspective_rh(fov_y_slope: f32, aspect_ratio: f32, z_near: f32, z_far: f32) -> glam::Mat4 {
+        //glam_assert!(z_near > 0.0 && z_far > 0.0);
+        let r = z_far / (z_near - z_far);
+        glam::Mat4::from_cols(
+            glam::Vec4::new(1.0/(fov_y_slope * aspect_ratio), 0.0, 0.0, 0.0),
+            glam::Vec4::new(0.0, 1.0/fov_y_slope, 0.0, 0.0),
+            glam::Vec4::new(0.0, 0.0, r, -1.0),
+            glam::Vec4::new(0.0, 0.0, r * z_near, 0.0),
+        )
+    }
+
+impl Camera {
+    fn to_uniform_data(&self) -> [f32; 16 * 3 + 4] {
+        let aspect = self.screen_size.0 as f32 / self.screen_size.1 as f32;
+        let fov = if self.controls&CONTROL_ZOOM==0 {
+            self.fov
+        }else{
+            self.fov/5.0
+        };
+        let proj = perspective_rh(fov, aspect, 1.0, 200.0);
+        let view = (glam::Mat4::from_translation(self.pos+self.offset) * glam::Mat4::from_euler(glam::EulerRot::YXZ, self.yaw, self.pitch, 0f32)).inverse();
+        let proj_inv = proj.inverse();
+
+        let mut raw = [0f32; 16 * 3 + 4];
+        raw[..16].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&proj)[..]);
+        raw[16..32].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&proj_inv)[..]);
+        raw[32..48].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&view)[..]);
+        raw[48..51].copy_from_slice(AsRef::<[f32; 3]>::as_ref(&self.pos));
+        raw[51] = 1.0;//cam_pos is vec4
+        raw
+    }
 }
 
 pub struct Skybox {
-	start_time: std::time::Instant,
-	screen_size: (u32, u32),
-	physics: strafe_client::body::PhysicsState,
+    camera: Camera,
     sky_pipeline: wgpu::RenderPipeline,
     entity_pipeline: wgpu::RenderPipeline,
     ground_pipeline: wgpu::RenderPipeline,
-	main_bind_group: wgpu::BindGroup,
+    bind_group: wgpu::BindGroup,
     camera_buf: wgpu::Buffer,
-	models: Vec<ModelGraphics>,
+    entity_buf: wgpu::Buffer,
+    entities: Vec<Entity>,
     depth_view: wgpu::TextureView,
-	staging_belt: wgpu::util::StagingBelt,
+    camera_stagingbelt: wgpu::util::StagingBelt,
+    entity_stagingbelt: wgpu::util::StagingBelt,
 }
 
 impl Skybox {
@@ -73,75 +149,47 @@ impl Skybox {
     }
 }
 
-fn get_transform_uniform_data(transform:&glam::Mat4) -> [f32; 4*4] {
-	let mut raw = [0f32; 4*4];
-	raw[0..16].copy_from_slice(&AsRef::<[f32; 4*4]>::as_ref(transform)[..]);
+fn get_entity_uniform_data(entities:& Vec<Entity>) -> [f32; (9+3)*MAGIC_ENTITIES] {
+    let mut raw = [0f32; (9+3)*MAGIC_ENTITIES];
+    for (i,entity) in entities.iter().enumerate() {
+        raw[i*12..(i+1)*12-3].copy_from_slice(&AsRef::<[f32; 9]>::as_ref(&glam::Mat3::from(entity.transform.matrix3))[..]);
+        raw[i*12+9..(i+1)*12].copy_from_slice(AsRef::<[f32; 3]>::as_ref(&glam::Vec3::from(entity.transform.translation)));
+    }
     raw
 }
 
-fn add_obj(device:&wgpu::Device,modeldatas:& mut Vec<ModelData>,source:&[u8]){
+fn add_obj(device:&wgpu::Device,entities:& mut Vec<Entity>,source:&[u8]){
     let data = obj::ObjData::load_buf(&source[..]).unwrap();
     let mut vertices = Vec::new();
-	let mut vertex_index = std::collections::HashMap::<obj::IndexTuple,u16>::new();
     for object in data.objects {
-		let mut entities = Vec::<Entity>::new();
         for group in object.groups {
-			let mut indices = Vec::new();
+            vertices.clear();
+            let entity_id = entities.len() as u32;
             for poly in group.polys {
                 for end_index in 2..poly.0.len() {
                     for &index in &[0, end_index - 1, end_index] {
-						let vert = poly.0[index];
-						if let Some(&i)=vertex_index.get(&vert){
-							indices.push(i);
-						}else{
-							let i=vertices.len() as u16;
+                        let obj::IndexTuple(position_id, _texture_id, normal_id) =
+                            poly.0[index];
                         vertices.push(Vertex {
-								pos: data.position[vert.0],
-								texture: data.texture[vert.1.unwrap()],
-								normal: data.normal[vert.2.unwrap()],
-							});
-							vertex_index.insert(vert,i);
-							indices.push(i);
+                            pos: data.position[position_id],
+                            normal: data.normal[normal_id.unwrap()],
+                            entity_id,
+                        })
                     }
                 }
             }
-			}
-			let index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-				label: Some("Index"),
-				contents: bytemuck::cast_slice(&indices),
-				usage: wgpu::BufferUsages::INDEX,
-			});
-			entities.push(Entity {
-				index_buf,
-				index_count: indices.len() as u32,
-			});
-		}
             let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
                 label: Some("Vertex"),
                 contents: bytemuck::cast_slice(&vertices),
                 usage: wgpu::BufferUsages::VERTEX,
             });
-		modeldatas.push(ModelData {
-			transform: glam::Mat4::default(),
+            entities.push(Entity {
+                transform: glam::Affine3A::default(),
+                vertex_count: vertices.len() as u32,
                 vertex_buf,
-			entities,
-		})
+            });
+        }
     }
-}
-
-
-fn to_uniform_data(camera: &strafe_client::body::Camera, pos: glam::Vec3) -> [f32; 16 * 3 + 4] {
-	let proj=camera.proj();
-	let proj_inv = proj.inverse();
-	let view=camera.view(pos);
-	let view_inv = view.inverse();
-
-	let mut raw = [0f32; 16 * 3 + 4];
-	raw[..16].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&proj)[..]);
-	raw[16..32].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&proj_inv)[..]);
-	raw[32..48].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&view_inv)[..]);
-	raw[48..52].copy_from_slice(AsRef::<[f32; 4]>::as_ref(&view.col(3)));
-	raw
 }
 
 impl strafe_client::framework::Example for Skybox {
@@ -149,6 +197,7 @@ impl strafe_client::framework::Example for Skybox {
         wgpu::Features::TEXTURE_COMPRESSION_ASTC
             | wgpu::Features::TEXTURE_COMPRESSION_ETC2
             | wgpu::Features::TEXTURE_COMPRESSION_BC
+            | wgpu::Features::BUFFER_BINDING_ARRAY
     }
 
     fn init(
@@ -157,15 +206,13 @@ impl strafe_client::framework::Example for Skybox {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
     ) -> Self {
-		let mut modeldatas = Vec::<ModelData>::new();
-		add_obj(device,& mut modeldatas,include_bytes!("../models/teslacyberv3.0.obj"));
-		add_obj(device,& mut modeldatas,include_bytes!("../models/suzanne.obj"));
-		add_obj(device,& mut modeldatas,include_bytes!("../models/teapot.obj"));
-		println!("models.len = {:?}", modeldatas.len());
-		modeldatas[1].transform=glam::Mat4::from_translation(glam::vec3(10.,5.,10.));
-		modeldatas[2].transform=glam::Mat4::from_translation(glam::vec3(-10.,5.,10.));
+        let mut entities = Vec::<Entity>::new();
+        add_obj(device,& mut entities,include_bytes!("../models/teslacyberv3.0.obj"));
+        add_obj(device,& mut entities,include_bytes!("../models/suzanne.obj"));
+        println!("entities.len = {:?}", entities.len());
+        entities[6].transform=glam::Affine3A::from_translation(glam::vec3(10.,5.,10.));
 
-		let main_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+        let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
             label: None,
             entries: &[
                 wgpu::BindGroupLayoutEntry {
@@ -194,20 +241,15 @@ impl strafe_client::framework::Example for Skybox {
                     ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                     count: None,
                 },
-			],
-		});
-		let model_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
-			label: None,
-			entries: &[
                 wgpu::BindGroupLayoutEntry {
-					binding: 0,
+                    binding: 3,
                     visibility: wgpu::ShaderStages::VERTEX,
                     ty: wgpu::BindingType::Buffer {
                         ty: wgpu::BufferBindingType::Uniform,
                         has_dynamic_offset: false,
                         min_binding_size: None,
                     },
-					count: None,
+                    count: Some(std::num::NonZeroU32::new(MAGIC_ENTITIES as u32).unwrap()),
                 },
             ],
         });
@@ -218,66 +260,39 @@ impl strafe_client::framework::Example for Skybox {
             source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),
         });
 
-		let physics = strafe_client::body::PhysicsState {
-			body: strafe_client::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,
+        let camera = Camera {
+            time: Instant::now(),
+            pos: glam::Vec3::new(5.0,0.0,5.0),
+            vel: glam::Vec3::new(0.0,0.0,0.0),
+            gravity: glam::Vec3 { x: 0.0, y: -100.0, z: 0.0 },
+            friction: 90.0,
+            screen_size: (config.width, config.height),
+            offset: glam::Vec3::new(0.0,4.5,0.0),
+            fov: 1.0, //fov_slope = tan(fov_y/2)
+            pitch: 0.0,
+            yaw: 0.0,
             mv: 2.7,
-			grounded: false,
+            controls:0,
+            grounded: true,
             walkspeed: 18.0,
-			contacts: std::collections::HashSet::new(),
-			models_cringe_clone: modeldatas.iter().map(|m|strafe_client::body::Model::new(m.transform)).collect(),
-			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)),
-			mouse_interpolation: strafe_client::body::MouseInterpolationState::new(),
-			controls: 0,
         };
-
-		let camera_uniforms = to_uniform_data(&physics.camera,physics.body.extrapolated_position(0));
+        let camera_uniforms = camera.to_uniform_data();
         let camera_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
             label: Some("Camera"),
             contents: bytemuck::cast_slice(&camera_uniforms),
             usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
         });
 
-		//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.transform);
-			let model_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-				label: Some(format!("ModelGraphics{}",i).as_str()),
-				contents: bytemuck::cast_slice(&model_uniforms),
+        let entity_uniforms = get_entity_uniform_data(&entities);
+        let entity_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+            label: Some("EntityData"),
+            contents: bytemuck::cast_slice(&entity_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(),
-					},
-				],
-				label: Some(format!("ModelGraphics{}",i).as_str()),
-			});
-			//all of these are being moved here
-			models.push(ModelGraphics{
-				transform: modeldata.transform,
-				vertex_buf:modeldata.vertex_buf,
-				entities: modeldata.entities,
-				bind_group: model_bind_group,
-				model_buf,
-			})
-		}
 
         let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: None,
-			bind_group_layouts: &[&main_bind_group_layout, &model_bind_group_layout],
+            bind_group_layouts: &[&bind_group_layout],
             push_constant_ranges: &[],
         });
 
@@ -318,7 +333,7 @@ impl strafe_client::framework::Example for Skybox {
                 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 => Float32x3, 2 => Uint32],
                 }],
             },
             fragment: Some(wgpu::FragmentState {
@@ -451,8 +466,8 @@ impl strafe_client::framework::Example for Skybox {
             dimension: Some(wgpu::TextureViewDimension::Cube),
             ..wgpu::TextureViewDescriptor::default()
         });
-		let main_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
-			layout: &main_bind_group_layout,
+        let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
+            layout: &bind_group_layout,
             entries: &[
                 wgpu::BindGroupEntry {
                     binding: 0,
@@ -466,90 +481,86 @@ impl strafe_client::framework::Example for Skybox {
                     binding: 2,
                     resource: wgpu::BindingResource::Sampler(&sampler),
                 },
+                wgpu::BindGroupEntry {
+                    binding: 3,
+                    resource: entity_buf.as_entire_binding(),
+                },
             ],
-			label: Some("Camera"),
+            label: None,
         });
 
         let depth_view = Self::create_depth_texture(config, device);
 
         Skybox {
-			start_time: Instant::now(),
-			screen_size: (config.width,config.height),
-			physics,
+            camera,
             sky_pipeline,
             entity_pipeline,
             ground_pipeline,
-			main_bind_group,
+            bind_group,
             camera_buf,
-			models,
+            entity_buf,
+            entities,
             depth_view,
-			staging_belt: wgpu::util::StagingBelt::new(0x100),
+            camera_stagingbelt: wgpu::util::StagingBelt::new(0x100),
+            entity_stagingbelt: wgpu::util::StagingBelt::new(0x100),
         }
     }
 
     #[allow(clippy::single_match)]
     fn update(&mut self, event: winit::event::WindowEvent) {
-		//nothing atm
+        match event {
+            winit::event::WindowEvent::KeyboardInput {
+                input:
+                    winit::event::KeyboardInput {
+                        state,
+                        virtual_keycode: Some(keycode),
+                        ..
+                    },
+                ..
+            } => {
+                match (state,keycode) {
+                    (k,winit::event::VirtualKeyCode::W) => match k {
+                        winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVEFORWARD,
+                        winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVEFORWARD,
+                    }
+                    (k,winit::event::VirtualKeyCode::A) => match k {
+                        winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVELEFT,
+                        winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVELEFT,
+                    }
+                    (k,winit::event::VirtualKeyCode::S) => match k {
+                        winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVEBACK,
+                        winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVEBACK,
+                    }
+                    (k,winit::event::VirtualKeyCode::D) => match k {
+                        winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVERIGHT,
+                        winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVERIGHT,
+                    }
+                    (k,winit::event::VirtualKeyCode::E) => match k {
+                        winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVEUP,
+                        winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVEUP,
+                    }
+                    (k,winit::event::VirtualKeyCode::Q) => match k {
+                        winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_MOVEDOWN,
+                        winit::event::ElementState::Released => self.camera.controls&=!CONTROL_MOVEDOWN,
+                    }
+                    (k,winit::event::VirtualKeyCode::Space) => match k {
+                        winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_JUMP,
+                        winit::event::ElementState::Released => self.camera.controls&=!CONTROL_JUMP,
+                    }
+                    (k,winit::event::VirtualKeyCode::Z) => match k {
+                        winit::event::ElementState::Pressed => self.camera.controls|=CONTROL_ZOOM,
+                        winit::event::ElementState::Released => self.camera.controls&=!CONTROL_ZOOM,
+                    }
+                    _ => (),
+                }
+            }
+            _ => {}
+        }
     }
 
-	fn device_event(&mut self, event: winit::event::DeviceEvent) {
-		//there's no way this is the best way get a timestamp.
-		let time=self.start_time.elapsed().as_nanos() as i64;
-		match event {
-			winit::event::DeviceEvent::Key(winit::event::KeyboardInput {
-				state,
-				scancode: keycode,
-				..
-			}) => {
-				let s=match state {
-					winit::event::ElementState::Pressed => true,
-					winit::event::ElementState::Released => false,
-				};
-				if let Some(input_instruction)=match keycode {
-					17 => Some(InputInstruction::MoveForward(s)),//W
-					30 => Some(InputInstruction::MoveLeft(s)),//A
-					31 => Some(InputInstruction::MoveBack(s)),//S
-					32 => Some(InputInstruction::MoveRight(s)),//D
-					18 => Some(InputInstruction::MoveUp(s)),//E
-					16 => Some(InputInstruction::MoveDown(s)),//Q
-					57 => Some(InputInstruction::Jump(s)),//Space
-					44 => Some(InputInstruction::Zoom(s)),//Z
-					19 => if s{Some(InputInstruction::Reset)}else{None},//R
-					_ => None,
-				}
-				{
-					self.physics.run(time);
-					self.physics.process_instruction(TimedInstruction{
-						time,
-						instruction:PhysicsInstruction::Input(input_instruction),
-					})
-				}
-			},
-			winit::event::DeviceEvent::MouseMotion {
-			    delta,//these (f64,f64) are integers on my machine
-			} => {
-				//do not step the physics because the mouse polling rate is higher than the physics can run.
-				//essentially the previous input will be overwritten until a true step runs
-				//which is fine because they run all the time.
-				self.physics.process_instruction(TimedInstruction{
-					time,
-					instruction:PhysicsInstruction::Input(InputInstruction::MoveMouse(glam::ivec2(delta.0 as i32,delta.1 as i32))),
-				})
-			},
-			winit::event::DeviceEvent::MouseWheel {
-			    delta,
-			} => {
-				println!("mousewheel{:?}",delta);
-				if true{//self.physics.use_scroll
-					self.physics.run(time);
-					self.physics.process_instruction(TimedInstruction{
-						time,
-						instruction:PhysicsInstruction::Input(InputInstruction::Jump(true)),//activates the immediate jump path, but the style modifier prevents controls&CONTROL_JUMP bit from being set to auto jump
-					})
-				}
-			}
-			_=>(),
-		}
+    fn move_mouse(&mut self, delta: (f64,f64)) {
+        self.camera.pitch+=(delta.1/-512.) as f32;
+        self.camera.yaw+=(delta.0/-512.) as f32;
     }
 
     fn resize(
@@ -559,8 +570,7 @@ impl strafe_client::framework::Example for Skybox {
         _queue: &wgpu::Queue,
     ) {
         self.depth_view = Self::create_depth_texture(config, device);
-		self.screen_size = (config.width, config.height);
-		self.physics.camera.set_fov_aspect(1.0,(config.width as f32)/(config.height as f32));
+        self.camera.screen_size = (config.width, config.height);
     }
 
     fn render(
@@ -570,16 +580,45 @@ impl strafe_client::framework::Example for Skybox {
         queue: &wgpu::Queue,
         _spawner: &strafe_client::framework::Spawner,
     ) {
-		let time=self.start_time.elapsed().as_nanos() as i64;
+        let time = Instant::now();
 
-		self.physics.run(time);
+        //physique
+        let dt=(time-self.camera.time).as_secs_f32();
+        self.camera.time=time;
+        let camera_mat=glam::Mat3::from_euler(glam::EulerRot::YXZ,self.camera.yaw,0f32,0f32);
+        let control_dir=camera_mat*get_control_dir(self.camera.controls&(CONTROL_MOVELEFT|CONTROL_MOVERIGHT|CONTROL_MOVEFORWARD|CONTROL_MOVEBACK)).normalize_or_zero();
+        let d=self.camera.vel.dot(control_dir);
+        if d<self.camera.mv {
+            self.camera.vel+=(self.camera.mv-d)*control_dir;
+        }
+        self.camera.vel+=self.camera.gravity*dt;
+        self.camera.pos+=self.camera.vel*dt;
+        if self.camera.pos.y<0.0{
+            self.camera.pos.y=0.0;
+            self.camera.vel.y=0.0;
+            self.camera.grounded=true;
+        }
+        if self.camera.grounded&&(self.camera.controls&CONTROL_JUMP)!=0 {
+            self.camera.grounded=false;
+            self.camera.vel+=glam::Vec3::new(0.0,0.715588/2.0*100.0,0.0);
+        }
+        if self.camera.grounded {
+            let applied_friction=self.camera.friction*dt;
+            let targetv=control_dir*self.camera.walkspeed;
+            let diffv=targetv-self.camera.vel;
+            if applied_friction*applied_friction<diffv.length_squared() {
+                self.camera.vel+=applied_friction*diffv.normalize();
+            } else {
+                self.camera.vel=targetv;
+            }
+        }
 
         let mut encoder =
             device.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: None });
 
         // update rotation
-		let camera_uniforms = to_uniform_data(&self.physics.camera,self.physics.body.extrapolated_position(time));
-		self.staging_belt
+        let camera_uniforms = self.camera.to_uniform_data();
+        self.camera_stagingbelt
             .write_buffer(
                 &mut encoder,
                 &self.camera_buf,
@@ -588,20 +627,21 @@ impl strafe_client::framework::Example for Skybox {
                 device,
             )
             .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.transform);
-			self.staging_belt
+
+        self.camera_stagingbelt.finish();
+
+        let entity_uniforms = get_entity_uniform_data(&self.entities);
+        self.entity_stagingbelt
             .write_buffer(
                 &mut encoder,
-					&model.model_buf,//description of where data will be written when command is executed
+                &self.entity_buf,//description of where data will be written when command is executed
                 0,//offset in staging belt?
-					wgpu::BufferSize::new((model_uniforms.len() * 4) as wgpu::BufferAddress).unwrap(),
+                wgpu::BufferSize::new((entity_uniforms.len() * 4) as wgpu::BufferAddress).unwrap(),
                 device,
             )
-				.copy_from_slice(bytemuck::cast_slice(&model_uniforms));
-		}
-		self.staging_belt.finish();
+            .copy_from_slice(bytemuck::cast_slice(&entity_uniforms));
+
+        self.entity_stagingbelt.finish();
 
         {
             let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
@@ -629,22 +669,15 @@ impl strafe_client::framework::Example for Skybox {
                 }),
             });
 
-			rpass.set_bind_group(0, &self.main_bind_group, &[]);
+            rpass.set_bind_group(0, &self.bind_group, &[]);
 
             rpass.set_pipeline(&self.entity_pipeline);
-			for model in self.models.iter() {
-				rpass.set_bind_group(1, &model.bind_group, &[]);
-				rpass.set_vertex_buffer(0, model.vertex_buf.slice(..));
-
-				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..1);
-				}
+            for entity in self.entities.iter() {
+                rpass.set_vertex_buffer(0, entity.vertex_buf.slice(..));
+                rpass.draw(0..entity.vertex_count, 0..1);
             }
 
             rpass.set_pipeline(&self.ground_pipeline);
-			//rpass.set_index_buffer(&[0u16,1,2,1,2,3][..] as wgpu::BufferSlice, wgpu::IndexFormat::Uint16);
-			//rpass.draw_indexed(0..4, 0, 0..1);
             rpass.draw(0..6, 0..1);
 
             rpass.set_pipeline(&self.sky_pipeline);
@@ -653,14 +686,11 @@ impl strafe_client::framework::Example for Skybox {
 
         queue.submit(std::iter::once(encoder.finish()));
 
-		self.staging_belt.recall();
+        self.camera_stagingbelt.recall();
+        self.entity_stagingbelt.recall();
     }
 }
 
 fn main() {
-	strafe_client::framework::run::<Skybox>(
-		format!("Strafe Client v{}",
-			env!("CARGO_PKG_VERSION")
-		).as_str()
-	);
+    strafe_client::framework::run::<Skybox>("Strafe Client v0.1");
 }

src/shader.wgsl

@@ -53,7 +53,7 @@ fn vs_ground(@builtin(vertex_index) vertex_index: u32) -> GroundOutput {
         f32(tmp1) * 2.0 - 1.0,
         0.0,
         f32(tmp2) * 2.0 - 1.0
-	) * 160.0;
+    ) * 100.0;
 
     var result: GroundOutput;
     result.pos = pos;
@@ -63,27 +63,30 @@ fn vs_ground(@builtin(vertex_index) vertex_index: u32) -> GroundOutput {
 
 struct EntityOutput {
     @builtin(position) position: vec4<f32>,
-	@location(1) texture: vec2<f32>,
-	@location(2) normal: vec3<f32>,
+    @location(1) normal: vec3<f32>,
     @location(3) view: vec3<f32>,
 };
 
-@group(1)
-@binding(0)
-var<uniform> r_EntityTransform: mat4x4<f32>;
+
+struct EntityTransform {
+    matrix3: mat3x3<f32>,
+    translation: vec3<f32>,
+};
+@group(0)
+@binding(3)
+var<uniform> r_EntityTransforms: array<EntityTransform, 7>;
 
 @vertex
 fn vs_entity(
     @location(0) pos: vec3<f32>,
-	@location(1) texture: vec2<f32>,
-	@location(2) normal: vec3<f32>,
+    @location(1) normal: vec3<f32>,
+    @location(2) entity_id: u32,
 ) -> EntityOutput {
-	var position: vec4<f32> = r_EntityTransform * vec4<f32>(pos, 1.0);
+    var position: vec3<f32> = r_EntityTransforms[entity_id].matrix3 * pos+r_EntityTransforms[entity_id].translation;
     var result: EntityOutput;
-	result.normal = (r_EntityTransform * vec4<f32>(normal, 0.0)).xyz;
-	result.texture=texture;
-	result.view = position.xyz - r_data.cam_pos.xyz;
-	result.position = r_data.proj * r_data.view * position;
+    result.normal = r_EntityTransforms[entity_id].matrix3 * normal;
+    result.view = position - r_data.cam_pos.xyz;
+    result.position = r_data.proj * r_data.view * vec4<f32>(position, 1.0);
     return result;
 }
 
@@ -103,13 +106,10 @@ fn fs_sky(vertex: SkyOutput) -> @location(0) vec4<f32> {
 fn fs_entity(vertex: EntityOutput) -> @location(0) vec4<f32> {
     let incident = normalize(vertex.view);
     let normal = normalize(vertex.normal);
-	let d = dot(normal, incident);
-	let reflected = incident - 2.0 * d * normal;
+    let reflected = incident - 2.0 * dot(normal, incident) * normal;
 
-	let dir = vec3<f32>(-1.0)+2.0*vec3<f32>(vertex.texture.x,0.0,vertex.texture.y);
-	let texture_color = textureSample(r_texture, r_sampler, dir).rgb;
     let reflected_color = textureSample(r_texture, r_sampler, reflected).rgb;
-	return vec4<f32>(mix(vec3<f32>(0.1) + 0.5 * reflected_color,texture_color,1.0-pow(1.0-abs(d),2.0)), 1.0);
+    return vec4<f32>(vec3<f32>(0.1) + 0.5 * reflected_color, 1.0);
 }
 
 fn modulo_euclidean (a: f32, b: f32) -> f32 {

src/sweep.rs

@@ -1,8 +0,0 @@
-
-//something that implements body + hitbox + transform can predict collision
-impl crate::sweep::PredictCollision for Model {
-	fn predict_collision(&self,other:&Model) -> Option<crate::event::EventStruct> {
-		//math!
-		None
-	}
-}

src/zeroes.rs

@@ -1,27 +0,0 @@
-//find roots of polynomials
-pub fn zeroes2(a0:f32,a1:f32,a2:f32) -> Vec<f32>{
-	if a2==0f32{
-		return zeroes1(a0, a1);
-	}
-	let mut radicand=a1*a1-4f32*a2*a0;
-	if 0f32<radicand {
-		radicand=radicand.sqrt();
-		if 0f32<a2 {
-			return vec![(-a1-radicand)/(2f32*a2),(-a1+radicand)/(2f32*a2)];
-		} else {
-			return vec![(-a1+radicand)/(2f32*a2),(-a1-radicand)/(2f32*a2)];
-		}
-	} else if radicand==0f32 {
-		return vec![-a1/(2f32*a2)];
-	} else {
-		return vec![];
-	}
-}
-#[inline]
-pub fn zeroes1(a0:f32,a1:f32) -> Vec<f32> {
-	if a1==0f32{
-		return vec![];
-	} else {
-		return vec![-a0/a1];
-	}
-}