Archives
/
learn-wgpu
mirror of https://github.com/sotrh/learn-wgpu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migrated Light struct to use bytemuck derive

Browse Source
pull/126/head
Ben Hansen 4 years ago
parent 0ccb80e7e3
commit 9a221fb2c4
6 changed files with 53 additions and 75 deletions
Show Stats Download Patch File Download Diff File

19
code/intermediate/tutorial10-lighting/src/main.rs
Unescape Escape View File

@ -190,17 +190,14 @@ unsafe impl bytemuck::Pod for InstanceRaw {}
unsafe impl bytemuck::Zeroable for InstanceRaw {}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
struct Light {
position: cgmath::Vector3<f32>,
position: [f32; 3],
// Due to uniforms requiring 16 byte (4 float) spacing, we need to use a padding field here
_padding: u32,
color: cgmath::Vector3<f32>,
color: [f32; 3],
}
unsafe impl bytemuck::Zeroable for Light {}
unsafe impl bytemuck::Pod for Light {}
struct State {
surface: wgpu::Surface,
device: wgpu::Device,
@ -448,9 +445,9 @@ impl State {
.unwrap();
let light = Light {
position: (2.0, 2.0, 2.0).into(),
position: [2.0, 2.0, 2.0],
_padding: 0,
color: (1.0, 1.0, 1.0).into(),
color: [1.0, 1.0, 1.0],
};
let light_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@ -572,10 +569,10 @@ impl State {
);
// Update the light
let old_position = self.light.position;
let old_position: cgmath::Vector3<_> = self.light.position.into();
self.light.position =
cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
* old_position;
(cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
* old_position).into();
self.queue
.write_buffer(&self.light_buffer, 0, bytemuck::cast_slice(&[self.light]));
}

27
code/intermediate/tutorial11-normals/src/main.rs
Unescape Escape View File

@ -51,14 +51,14 @@ struct Uniforms {
impl Uniforms {
fn new() -> Self {
Self {
view_position: Zero::zero(),
view_proj: cgmath::Matrix4::identity(),
view_position: [0.0; 4],
view_proj: cgmath::Matrix4::identity().into(),
}
}
fn update_view_proj(&mut self, camera: &Camera) {
self.view_position = camera.eye.to_homogeneous();
self.view_proj = OPENGL_TO_WGPU_MATRIX * camera.build_view_projection_matrix();
self.view_position = camera.eye.to_homogeneous().into();
self.view_proj = (OPENGL_TO_WGPU_MATRIX * camera.build_view_projection_matrix()).into();
}
}
@ -186,17 +186,14 @@ unsafe impl bytemuck::Pod for InstanceRaw {}
unsafe impl bytemuck::Zeroable for InstanceRaw {}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
struct Light {
position: cgmath::Vector3<f32>,
position: [f32; 3],
// Due to uniforms requiring 16 byte (4 float) spacing, we need to use a padding field here
_padding: u32,
color: cgmath::Vector3<f32>,
color: [f32; 3],
}
unsafe impl bytemuck::Zeroable for Light {}
unsafe impl bytemuck::Pod for Light {}
struct State {
surface: wgpu::Surface,
device: wgpu::Device,
@ -463,9 +460,9 @@ impl State {
.unwrap();
let light = Light {
position: (2.0, 2.0, 2.0).into(),
position: [2.0, 2.0, 2.0],
_padding: 0,
color: (1.0, 1.0, 1.0).into(),
color: [1.0, 1.0, 1.0],
};
let light_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@ -619,10 +616,10 @@ impl State {
);
// Update the light
let old_position = self.light.position;
let old_position: cgmath::Vector3<_> = self.light.position.into();
self.light.position =
cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
* old_position;
(cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
* old_position).into();
self.queue
.write_buffer(&self.light_buffer, 0, bytemuck::cast_slice(&[self.light]));
}

19
code/intermediate/tutorial12-camera/src/main.rs
Unescape Escape View File

@ -64,17 +64,14 @@ unsafe impl bytemuck::Pod for InstanceRaw {}
unsafe impl bytemuck::Zeroable for InstanceRaw {}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
struct Light {
position: cgmath::Vector3<f32>,
position: [f32; 3],
// Due to uniforms requiring 16 byte (4 float) spacing, we need to use a padding field here
_padding: u32,
color: cgmath::Vector3<f32>,
color: [f32; 3],
}
unsafe impl bytemuck::Zeroable for Light {}
unsafe impl bytemuck::Pod for Light {}
struct State {
surface: wgpu::Surface,
device: wgpu::Device,
@ -341,9 +338,9 @@ impl State {
println!("Elapsed (Original): {:?}", std::time::Instant::now() - now);
let light = Light {
position: (2.0, 2.0, 2.0).into(),
position: [2.0, 2.0, 2.0],
_padding: 0,
color: (1.0, 1.0, 1.0).into(),
color: [1.0, 1.0, 1.0],
};
let light_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@ -537,10 +534,10 @@ impl State {
);
// Update the light
let old_position = self.light.position;
let old_position: cgmath::Vector3<_> = self.light.position.into();
self.light.position =
cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
* old_position;
(cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
* old_position).into();
self.queue
.write_buffer(&self.light_buffer, 0, bytemuck::cast_slice(&[self.light]));
}

19
code/intermediate/tutorial13-threading/src/main.rs
Unescape Escape View File

@ -64,17 +64,14 @@ unsafe impl bytemuck::Pod for InstanceRaw {}
unsafe impl bytemuck::Zeroable for InstanceRaw {}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
struct Light {
position: cgmath::Vector3<f32>,
position: [f32; 3],
// Due to uniforms requiring 16 byte (4 float) spacing, we need to use a padding field here
_padding: u32,
color: cgmath::Vector3<f32>,
color: [f32; 3],
}
unsafe impl bytemuck::Zeroable for Light {}
unsafe impl bytemuck::Pod for Light {}
struct State {
surface: wgpu::Surface,
device: wgpu::Device,
@ -336,9 +333,9 @@ impl State {
.unwrap();
let light = Light {
position: (2.0, 2.0, 2.0).into(),
position: [2.0, 2.0, 2.0],
_padding: 0,
color: (1.0, 1.0, 1.0).into(),
color: [1.0, 1.0, 1.0],
};
let light_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@ -528,10 +525,10 @@ impl State {
);
// Update the light
let old_position = self.light.position;
let old_position: cgmath::Vector3<_> = self.light.position.into();
self.light.position =
cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
* old_position;
(cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
* old_position).into();
self.queue
.write_buffer(&self.light_buffer, 0, bytemuck::cast_slice(&[self.light]));
}

29
code/research/performance/src/main.rs
Unescape Escape View File

@ -52,19 +52,17 @@ struct Uniforms {
impl Uniforms {
fn new() -> Self {
Self {
view_position: Zero::zero(),
view_proj: cgmath::Matrix4::identity(),
view_position: [0.0; 4],
view_proj: cgmath::Matrix4::identity().into(),
}
}
fn update_view_proj(&mut self, camera: &Camera) {
self.view_position = camera.eye.to_homogeneous();
self.view_proj = OPENGL_TO_WGPU_MATRIX * camera.build_view_projection_matrix();
self.view_position = camera.eye.to_homogeneous().into();
self.view_proj = (OPENGL_TO_WGPU_MATRIX * camera.build_view_projection_matrix()).into();
}
}
unsafe impl bytemuck::Zeroable for Uniforms {}
unsafe impl bytemuck::Pod for Uniforms {}
struct CameraController {
speed: f32,
@ -189,17 +187,14 @@ unsafe impl bytemuck::Pod for InstanceRaw {}
unsafe impl bytemuck::Zeroable for InstanceRaw {}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
struct Light {
position: cgmath::Vector3<f32>,
position: [f32; 3],
// Due to uniforms requiring 16 byte (4 float) spacing, we need to use a padding field here
_padding: u32,
color: cgmath::Vector3<f32>,
color: [f32; 3],
}
unsafe impl bytemuck::Zeroable for Light {}
unsafe impl bytemuck::Pod for Light {}
struct State {
surface: wgpu::Surface,
device: wgpu::Device,
@ -404,9 +399,9 @@ impl State {
queue.submit(&cmds);
let light = Light {
position: (2.0, 2.0, 2.0).into(),
position: [2.0, 2.0, 2.0],
_padding: 0,
color: (1.0, 1.0, 1.0).into(),
color: [1.0, 1.0, 1.0],
};
let light_buffer = device.create_buffer_with_data(
@ -560,11 +555,11 @@ impl State {
);
// Update the light
let old_position = self.light.position;
self.light.position = cgmath::Quaternion::from_axis_angle(
let old_position: cgmath::Vector3<_> = self.light.position.into();
self.light.position = (cgmath::Quaternion::from_axis_angle(
(0.0, 1.0, 0.0).into(),
cgmath::Deg(45.0) * dt.as_secs_f32(),
) * old_position;
) * old_position).into();
let staging_buffer = self.device.create_buffer_with_data(
bytemuck::cast_slice(&[self.light]),

15
docs/intermediate/tutorial10-lighting/README.md
Unescape Escape View File

@ -21,16 +21,13 @@ Before we can get into that though, we need to add a light to our scene.
```rust
// main.rs
#[repr(C)]
#[derive(Debug, Copy, Clone)]
#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
struct Light {
position: cgmath::Vector3<f32>,
position: [f32; 3],
// Due to uniforms requiring 16 byte (4 float) spacing, we need to use a padding field here
_padding: u32,
color: cgmath::Vector3<f32>,
color: [f32; 3],
}
unsafe impl bytemuck::Zeroable for Light {}
unsafe impl bytemuck::Pod for Light {}
```
Our `Light` represents a colored point in space. We're just going to use pure white light, but it's good to allow different colors of light.
@ -100,7 +97,7 @@ Let's also update the lights position in the `update()` method, so we can see wh
```rust
// Update the light
let old_position = self.light.position;
let old_position: cgmath::Vector3<_> = self.light.position.into();
self.light.position =
cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
* old_position;
@ -637,9 +634,7 @@ struct Uniforms {
view_position: [f32; 4],
view_proj: [[f32; 4]; 4],
}
//If we want to use bytemuck, we must first implement these two traits
unsafe impl bytemuck::Zeroable for Uniforms {}
unsafe impl bytemuck::Pod for Uniforms {}
impl Uniforms {
fn new() -> Self {
Self {

Write Preview
Loading…
Cancel
Save