mirror of
https://github.com/guilhermewerner/wgpu-renderer
synced 2025-06-16 22:04:24 +00:00
Instance buffer
This commit is contained in:
110
src/lib.rs
110
src/lib.rs
@ -1,3 +1,4 @@
|
|||||||
|
use cgmath::prelude::*;
|
||||||
use wgpu::util::DeviceExt;
|
use wgpu::util::DeviceExt;
|
||||||
use winit::{
|
use winit::{
|
||||||
dpi::LogicalSize,
|
dpi::LogicalSize,
|
||||||
@ -121,6 +122,8 @@ pub struct State {
|
|||||||
camera_buffer: wgpu::Buffer,
|
camera_buffer: wgpu::Buffer,
|
||||||
camera_bind_group: wgpu::BindGroup,
|
camera_bind_group: wgpu::BindGroup,
|
||||||
camera_controller: CameraController,
|
camera_controller: CameraController,
|
||||||
|
instances: Vec<Instance>,
|
||||||
|
instance_buffer: wgpu::Buffer,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl State {
|
impl State {
|
||||||
@ -212,6 +215,38 @@ impl State {
|
|||||||
|
|
||||||
let num_indices = INDICES.len() as u32;
|
let num_indices = INDICES.len() as u32;
|
||||||
|
|
||||||
|
let instances = (0..NUM_INSTANCES_PER_ROW)
|
||||||
|
.flat_map(|z| {
|
||||||
|
(0..NUM_INSTANCES_PER_ROW).map(move |x| {
|
||||||
|
let position = cgmath::Vector3 {
|
||||||
|
x: x as f32,
|
||||||
|
y: 0.0,
|
||||||
|
z: z as f32,
|
||||||
|
} - INSTANCE_DISPLACEMENT;
|
||||||
|
|
||||||
|
let rotation = if position.is_zero() {
|
||||||
|
// this is needed so an object at (0, 0, 0) won't get scaled to zero
|
||||||
|
// as Quaternions can affect scale if they're not created correctly
|
||||||
|
cgmath::Quaternion::from_axis_angle(
|
||||||
|
cgmath::Vector3::unit_z(),
|
||||||
|
cgmath::Deg(0.0),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
cgmath::Quaternion::from_axis_angle(position.normalize(), cgmath::Deg(45.0))
|
||||||
|
};
|
||||||
|
|
||||||
|
Instance { position, rotation }
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
|
let instance_data = instances.iter().map(Instance::to_raw).collect::<Vec<_>>();
|
||||||
|
let instance_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
|
||||||
|
label: Some("Instance Buffer"),
|
||||||
|
contents: bytemuck::cast_slice(&instance_data),
|
||||||
|
usage: wgpu::BufferUsages::VERTEX,
|
||||||
|
});
|
||||||
|
|
||||||
// TEXTURE
|
// TEXTURE
|
||||||
|
|
||||||
let diffuse_bytes = include_bytes!("../assets/happy-tree.png"); // CHANGED!
|
let diffuse_bytes = include_bytes!("../assets/happy-tree.png"); // CHANGED!
|
||||||
@ -320,7 +355,7 @@ impl State {
|
|||||||
vertex: wgpu::VertexState {
|
vertex: wgpu::VertexState {
|
||||||
module: &shader,
|
module: &shader,
|
||||||
entry_point: "vs_main",
|
entry_point: "vs_main",
|
||||||
buffers: &[Vertex::desc()],
|
buffers: &[Vertex::desc(), InstanceRaw::desc()],
|
||||||
},
|
},
|
||||||
fragment: Some(wgpu::FragmentState {
|
fragment: Some(wgpu::FragmentState {
|
||||||
// 3.
|
// 3.
|
||||||
@ -372,6 +407,8 @@ impl State {
|
|||||||
camera_buffer,
|
camera_buffer,
|
||||||
camera_bind_group,
|
camera_bind_group,
|
||||||
camera_controller,
|
camera_controller,
|
||||||
|
instances,
|
||||||
|
instance_buffer,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -440,8 +477,9 @@ impl State {
|
|||||||
render_pass.set_bind_group(0, &self.diffuse_bind_group, &[]);
|
render_pass.set_bind_group(0, &self.diffuse_bind_group, &[]);
|
||||||
render_pass.set_bind_group(1, &self.camera_bind_group, &[]);
|
render_pass.set_bind_group(1, &self.camera_bind_group, &[]);
|
||||||
render_pass.set_vertex_buffer(0, self.vertex_buffer.slice(..));
|
render_pass.set_vertex_buffer(0, self.vertex_buffer.slice(..));
|
||||||
|
render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..));
|
||||||
render_pass.set_index_buffer(self.index_buffer.slice(..), wgpu::IndexFormat::Uint16);
|
render_pass.set_index_buffer(self.index_buffer.slice(..), wgpu::IndexFormat::Uint16);
|
||||||
render_pass.draw_indexed(0..self.num_indices, 0, 0..1);
|
render_pass.draw_indexed(0..self.num_indices, 0, 0..self.instances.len() as _);
|
||||||
}
|
}
|
||||||
|
|
||||||
// submit will accept anything that implements IntoIter
|
// submit will accept anything that implements IntoIter
|
||||||
@ -496,3 +534,71 @@ const INDICES: &[u16] = &[
|
|||||||
1, 2, 4,
|
1, 2, 4,
|
||||||
2, 3, 4,
|
2, 3, 4,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
struct Instance {
|
||||||
|
position: cgmath::Vector3<f32>,
|
||||||
|
rotation: cgmath::Quaternion<f32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Instance {
|
||||||
|
fn to_raw(&self) -> InstanceRaw {
|
||||||
|
InstanceRaw {
|
||||||
|
model: (cgmath::Matrix4::from_translation(self.position)
|
||||||
|
* cgmath::Matrix4::from(self.rotation))
|
||||||
|
.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NEW!
|
||||||
|
#[repr(C)]
|
||||||
|
#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
|
||||||
|
struct InstanceRaw {
|
||||||
|
model: [[f32; 4]; 4],
|
||||||
|
}
|
||||||
|
|
||||||
|
const NUM_INSTANCES_PER_ROW: u32 = 10;
|
||||||
|
const INSTANCE_DISPLACEMENT: cgmath::Vector3<f32> = cgmath::Vector3::new(
|
||||||
|
NUM_INSTANCES_PER_ROW as f32 * 0.5,
|
||||||
|
0.0,
|
||||||
|
NUM_INSTANCES_PER_ROW as f32 * 0.5,
|
||||||
|
);
|
||||||
|
|
||||||
|
impl InstanceRaw {
|
||||||
|
fn desc() -> wgpu::VertexBufferLayout<'static> {
|
||||||
|
use std::mem;
|
||||||
|
wgpu::VertexBufferLayout {
|
||||||
|
array_stride: mem::size_of::<InstanceRaw>() as wgpu::BufferAddress,
|
||||||
|
// We need to switch from using a step mode of Vertex to Instance
|
||||||
|
// This means that our shaders will only change to use the next
|
||||||
|
// instance when the shader starts processing a new instance
|
||||||
|
step_mode: wgpu::VertexStepMode::Instance,
|
||||||
|
attributes: &[
|
||||||
|
// A mat4 takes up 4 vertex slots as it is technically 4 vec4s. We need to define a slot
|
||||||
|
// for each vec4. We'll have to reassemble the mat4 in the shader.
|
||||||
|
wgpu::VertexAttribute {
|
||||||
|
offset: 0,
|
||||||
|
// While our vertex shader only uses locations 0, and 1 now, in later tutorials, we'll
|
||||||
|
// be using 2, 3, and 4, for Vertex. We'll start at slot 5, not conflict with them later
|
||||||
|
shader_location: 5,
|
||||||
|
format: wgpu::VertexFormat::Float32x4,
|
||||||
|
},
|
||||||
|
wgpu::VertexAttribute {
|
||||||
|
offset: mem::size_of::<[f32; 4]>() as wgpu::BufferAddress,
|
||||||
|
shader_location: 6,
|
||||||
|
format: wgpu::VertexFormat::Float32x4,
|
||||||
|
},
|
||||||
|
wgpu::VertexAttribute {
|
||||||
|
offset: mem::size_of::<[f32; 8]>() as wgpu::BufferAddress,
|
||||||
|
shader_location: 7,
|
||||||
|
format: wgpu::VertexFormat::Float32x4,
|
||||||
|
},
|
||||||
|
wgpu::VertexAttribute {
|
||||||
|
offset: mem::size_of::<[f32; 12]>() as wgpu::BufferAddress,
|
||||||
|
shader_location: 8,
|
||||||
|
format: wgpu::VertexFormat::Float32x4,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -17,13 +17,27 @@ struct VertexOutput {
|
|||||||
@location(0) tex_coords: vec2<f32>,
|
@location(0) tex_coords: vec2<f32>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct InstanceInput {
|
||||||
|
@location(5) model_matrix_0: vec4<f32>,
|
||||||
|
@location(6) model_matrix_1: vec4<f32>,
|
||||||
|
@location(7) model_matrix_2: vec4<f32>,
|
||||||
|
@location(8) model_matrix_3: vec4<f32>,
|
||||||
|
};
|
||||||
|
|
||||||
@vertex
|
@vertex
|
||||||
fn vs_main(
|
fn vs_main(
|
||||||
model: VertexInput,
|
model: VertexInput,
|
||||||
|
instance: InstanceInput,
|
||||||
) -> VertexOutput {
|
) -> VertexOutput {
|
||||||
|
let model_matrix = mat4x4<f32>(
|
||||||
|
instance.model_matrix_0,
|
||||||
|
instance.model_matrix_1,
|
||||||
|
instance.model_matrix_2,
|
||||||
|
instance.model_matrix_3,
|
||||||
|
);
|
||||||
var out: VertexOutput;
|
var out: VertexOutput;
|
||||||
out.tex_coords = model.tex_coords;
|
out.tex_coords = model.tex_coords;
|
||||||
out.clip_position = camera.view_proj * vec4<f32>(model.position, 1.0); // 2.
|
out.clip_position = camera.view_proj * model_matrix * vec4<f32>(model.position, 1.0);
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user