buffer binding array?

Cargo.lock

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

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafe-client"
-version = "0.2.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/main.rs

@@ -8,28 +8,14 @@ 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,
+    transform: glam::Affine3A,
-	index_buf: wgpu::Buffer,
+    vertex_count: u32,
-}
-
-//temp?
-struct ModelData {
-	transform: glam::Mat4,
     vertex_buf: wgpu::Buffer,
-	entities: Vec<Entity>,
-}
-
-struct Model {
-	transform: glam::Mat4,
-	vertex_buf: wgpu::Buffer,
-	entities: Vec<Entity>,
-	bind_group: wgpu::BindGroup,
-	model_buf: wgpu::Buffer,
 }
 
 // Note: we use the Y=up coordinate space in this example.
@@ -50,6 +36,8 @@ struct Camera {
     walkspeed: f32,
 }
 
+const MAGIC_ENTITIES: usize = 7;
+
 const CONTROL_MOVEFORWARD:u32 = 0b00000001;
 const CONTROL_MOVEBACK:u32 = 0b00000010;
 const CONTROL_MOVERIGHT:u32 = 0b00000100;
@@ -107,16 +95,16 @@ impl Camera {
         }else{
             self.fov/5.0
         };
-		let proj = perspective_rh(fov, aspect, 0.5, 1000.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 view = glam::Mat4::from_translation(self.pos+self.offset) * glam::Mat4::from_euler(glam::EulerRot::YXZ, self.yaw, self.pitch, 0f32);
-		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[32..48].copy_from_slice(&AsRef::<[f32; 16]>::as_ref(&view)[..]);
-		raw[48..52].copy_from_slice(AsRef::<[f32; 4]>::as_ref(&view.col(3)));
+        raw[48..51].copy_from_slice(AsRef::<[f32; 3]>::as_ref(&self.pos));
+        raw[51] = 1.0;//cam_pos is vec4
         raw
     }
 }
@@ -126,11 +114,13 @@ pub struct Skybox {
     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<Model>,
+    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 {
@@ -159,59 +149,46 @@ impl Skybox {
     }
 }
 
-fn get_transform_uniform_data(transform:&glam::Mat4) -> [f32; 4*4] {
+fn get_entity_uniform_data(entities:& Vec<Entity>) -> [f32; (9+3)*MAGIC_ENTITIES] {
-	let mut raw = [0f32; 4*4];
+    let mut raw = [0f32; (9+3)*MAGIC_ENTITIES];
-	raw[0..16].copy_from_slice(&AsRef::<[f32; 4*4]>::as_ref(transform)[..]);
+    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];
+                        let obj::IndexTuple(position_id, _texture_id, normal_id) =
-						if let Some(&i)=vertex_index.get(&vert){
+                            poly.0[index];
-							indices.push(i as u16);
-						}else{
-							let i=vertices.len() as u16;
                         vertices.push(Vertex {
-								pos: data.position[vert.0],
+                            pos: data.position[position_id],
-								texture: data.texture[vert.1.unwrap()],
+                            normal: data.normal[normal_id.unwrap()],
-								normal: data.normal[vert.2.unwrap()],
+                            entity_id,
-							});
+                        })
-							vertex_index.insert(vert,i);
-							indices.push(i);
                     }
                 }
             }
-			}
-			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 {
+            entities.push(Entity {
-			transform: glam::Mat4::default(),
+                transform: glam::Affine3A::default(),
+                vertex_count: vertices.len() as u32,
                 vertex_buf,
-			entities,
+            });
-		})
+        }
     }
 }
 
@@ -220,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(
@@ -228,15 +206,13 @@ impl strafe_client::framework::Example for Skybox {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
     ) -> Self {
-		let mut modeldatas = Vec::<ModelData>::new();
+        let mut entities = Vec::<Entity>::new();
-		add_obj(device,& mut modeldatas,include_bytes!("../models/teslacyberv3.0.obj"));
+        add_obj(device,& mut entities,include_bytes!("../models/teslacyberv3.0.obj"));
-		add_obj(device,& mut modeldatas,include_bytes!("../models/suzanne.obj"));
+        add_obj(device,& mut entities,include_bytes!("../models/suzanne.obj"));
-		add_obj(device,& mut modeldatas,include_bytes!("../models/teapot.obj"));
+        println!("entities.len = {:?}", entities.len());
-		println!("models.len = {:?}", modeldatas.len());
+        entities[6].transform=glam::Affine3A::from_translation(glam::vec3(10.,5.,10.));
-		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 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 {
@@ -265,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()),
                 },
             ],
         });
@@ -293,7 +264,7 @@ impl strafe_client::framework::Example for Skybox {
             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::new(0.0,-100.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),
@@ -312,9 +283,16 @@ impl strafe_client::framework::Example for Skybox {
             usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
         });
 
+        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 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: &[],
         });
 
@@ -355,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 {
@@ -488,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 {
+        let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
-			layout: &main_bind_group_layout,
+            layout: &bind_group_layout,
             entries: &[
                 wgpu::BindGroupEntry {
                     binding: 0,
@@ -503,38 +481,13 @@ impl strafe_client::framework::Example for Skybox {
                     binding: 2,
                     resource: wgpu::BindingResource::Sampler(&sampler),
                 },
-			],
-			label: Some("Camera"),
-		});
-
-		//drain the modeldata vec so entities can be /moved/ to models.entities
-		let mut models = Vec::<Model>::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!("Model{}",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,
+                    binding: 3,
-						resource: model_buf.as_entire_binding(),
+                    resource: entity_buf.as_entire_binding(),
                 },
             ],
-				label: Some(format!("Model{}",i).as_str()),
+            label: None,
         });
-			//all of these are being moved here
-			models.push(Model{
-				transform: modeldata.transform,
-				vertex_buf:modeldata.vertex_buf,
-				entities: modeldata.entities,
-				bind_group: model_bind_group,
-				model_buf,
-			})
-		}
 
         let depth_view = Self::create_depth_texture(config, device);
 
@@ -543,11 +496,13 @@ impl strafe_client::framework::Example for Skybox {
             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),
         }
     }
 
@@ -604,8 +559,8 @@ impl strafe_client::framework::Example for Skybox {
     }
 
     fn move_mouse(&mut self, delta: (f64,f64)) {
-		self.camera.pitch=(self.camera.pitch as f64+delta.1/-2048.) as f32;
+        self.camera.pitch+=(delta.1/-512.) as f32;
-		self.camera.yaw=(self.camera.yaw as f64+delta.0/-2048.) as f32;
+        self.camera.yaw+=(delta.0/-512.) as f32;
     }
 
     fn resize(
@@ -663,7 +618,7 @@ impl strafe_client::framework::Example for Skybox {
 
         // update rotation
         let camera_uniforms = self.camera.to_uniform_data();
-		self.staging_belt
+        self.camera_stagingbelt
             .write_buffer(
                 &mut encoder,
                 &self.camera_buf,
@@ -672,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() {
+        self.camera_stagingbelt.finish();
-			let model_uniforms = get_transform_uniform_data(&model.transform);
+
-			self.staging_belt
+        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));
+            .copy_from_slice(bytemuck::cast_slice(&entity_uniforms));
-		}
+
-		self.staging_belt.finish();
+        self.entity_stagingbelt.finish();
 
         {
             let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
@@ -713,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() {
+            for entity in self.entities.iter() {
-				rpass.set_bind_group(1, &model.bind_group, &[]);
+                rpass.set_vertex_buffer(0, entity.vertex_buf.slice(..));
-				rpass.set_vertex_buffer(0, model.vertex_buf.slice(..));
+                rpass.draw(0..entity.vertex_count, 0..1);
-
-				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);
-				}
             }
 
             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);
@@ -737,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>(
+    strafe_client::framework::run::<Skybox>("Strafe Client v0.1");
-		format!("Strafe Client v{}",
-			env!("CARGO_PKG_VERSION")
-		).as_str()
-	);
 }

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(1) normal: vec3<f32>,
-	@location(2) normal: vec3<f32>,
     @location(3) view: vec3<f32>,
 };
 
-@group(1)
+
-@binding(0)
+struct EntityTransform {
-var<uniform> r_EntityTransform: mat4x4<f32>;
+    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(1) normal: vec3<f32>,
-	@location(2) 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.normal = r_EntityTransforms[entity_id].matrix3 * normal;
-	result.texture=texture;
+    result.view = position - r_data.cam_pos.xyz;
-	result.view = position.xyz - r_data.cam_pos.xyz;
+    result.position = r_data.proj * r_data.view * vec4<f32>(position, 1.0);
-	result.position = r_data.proj * r_data.view * position;
     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 * dot(normal, incident) * normal;
-	let reflected = incident - 2.0 * d * 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 {