This commit is contained in:
Piotrek
2021-04-24 20:47:04 +02:00
parent 00fd077642
commit 61ec3e5a21
8 changed files with 54 additions and 18 deletions
+2 -1
View File
@@ -30,7 +30,8 @@ impl MaterialBuffer {
// Create values
let mut materials: [Material; 256] = [Default::default(); 256];
materials[0].set_albedo(0.41,0.33,0.20);
materials[1].set_albedo(0.49,0.74,0.00);
materials[1].set_albedo(0.15,0.5,0.05);
materials[2].set_albedo(0.8,0.8,0.8);
// Create buffer
let buffer = device.create_buffer_init(
+8 -2
View File
@@ -1,5 +1,5 @@
use crate::renderer::camera::Camera;
use cgmath::SquareMatrix;
use cgmath::{SquareMatrix, Vector3, InnerSpace};
use wgpu::util::DeviceExt;
#[repr(C)]
@@ -8,13 +8,19 @@ pub struct UniformValues {
view_inv: [[f32; 4]; 4],
proj_inv: [[f32; 4]; 4],
cam_pos: [f32; 3],
padding: f32,
sun_dir: [f32; 3],
padding2: f32,
time: f32
}
impl UniformValues {
pub fn new() -> Self {
Self::default()
let sun_vec: Vector3<f32> = (1.0, 1.0, 1.0).into();
let sun_dir: [f32; 3] = sun_vec.normalize().into();
Self { sun_dir, .. Default::default() }
}
pub fn update(&mut self, camera: &Camera, time: f32) {