proper 3d projection
This commit is contained in:
parent
852d3f855d
commit
40792592b0
14 changed files with 3761 additions and 209 deletions
|
|
@ -1,118 +1,230 @@
|
|||
|
||||
use std::borrow::Cow;
|
||||
use std::borrow::Cow;
|
||||
use std::sync::Arc;
|
||||
use std::time::Instant;
|
||||
use thiserror::Error;
|
||||
use winit::window::Window;
|
||||
|
||||
use cgmath::{Matrix4, Point3, Rad, Vector3, perspective};
|
||||
use futures::executor::block_on;
|
||||
use thiserror::Error;
|
||||
use wgpu::util::DeviceExt;
|
||||
use winit::window::Window;
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum ContextError {
|
||||
#[error("Failed to create WGPU surface: {0}")]
|
||||
SurfaceCreationFailure(#[from] wgpu::CreateSurfaceError),
|
||||
}
|
||||
|
||||
/// This WGSL shader generates a cube procedurally and rotates it around the Y axis.
|
||||
/// A uniform (u.time) is used as the rotation angle. After rotation, a simple
|
||||
/// perspective projection is applied (dividing x,y by z) to produce clip-space coordinates.
|
||||
const CUBE_SHADER: &str = r#"
|
||||
struct Uniforms {
|
||||
time: f32,
|
||||
// pad to 16 bytes (uniforms require 16-byte alignment)
|
||||
padding0: f32,
|
||||
padding1: f32,
|
||||
padding2: f32,
|
||||
mvp: mat4x4<f32>,
|
||||
};
|
||||
|
||||
@group(0) @binding(0)
|
||||
var<uniform> u: Uniforms;
|
||||
|
||||
// Returns a rotation matrix about the Y axis.
|
||||
fn rotationY(angle: f32) -> mat3x3<f32> {
|
||||
let c = cos(angle);
|
||||
let s = sin(angle);
|
||||
return mat3x3<f32>(
|
||||
vec3<f32>( c, 0.0, s),
|
||||
vec3<f32>(0.0, 1.0, 0.0),
|
||||
vec3<f32>(-s, 0.0, c)
|
||||
);
|
||||
}
|
||||
struct VertexInput {
|
||||
@location(0) position: vec3<f32>,
|
||||
@location(1) normal: vec3<f32>,
|
||||
};
|
||||
|
||||
struct VertexOutput {
|
||||
@builtin(position) clip_position: vec4<f32>,
|
||||
@location(0) normal: vec3<f32>,
|
||||
};
|
||||
|
||||
@vertex
|
||||
fn vs_main(@builtin(vertex_index) vid: u32) -> @builtin(position) vec4<f32> {
|
||||
// We generate 36 vertices (6 faces * 6 vertices per face)
|
||||
let face: u32 = vid / 6u; // which face (0..5)
|
||||
let corner: u32 = vid % 6u; // which corner within that face
|
||||
|
||||
// Offsets for the two triangles that make up a face:
|
||||
// (these are in a 2D space, later used to compute positions on the face)
|
||||
var offsets = array<vec2<f32>, 6>(
|
||||
vec2<f32>(-1.0, -1.0),
|
||||
vec2<f32>( 1.0, -1.0),
|
||||
vec2<f32>( 1.0, 1.0),
|
||||
vec2<f32>( 1.0, 1.0),
|
||||
vec2<f32>(-1.0, 1.0),
|
||||
vec2<f32>(-1.0, -1.0)
|
||||
);
|
||||
|
||||
var center: vec3<f32>;
|
||||
var uvec: vec3<f32>;
|
||||
var vvec: vec3<f32>;
|
||||
|
||||
// Define each face of the cube (cube of side length 1 centered at origin)
|
||||
if (face == 0u) {
|
||||
// Front face (z = +0.5)
|
||||
center = vec3<f32>(0.0, 0.0, 0.5);
|
||||
uvec = vec3<f32>(0.5, 0.0, 0.0);
|
||||
vvec = vec3<f32>(0.0, 0.5, 0.0);
|
||||
} else if (face == 1u) {
|
||||
// Back face (z = -0.5)
|
||||
center = vec3<f32>(0.0, 0.0, -0.5);
|
||||
uvec = vec3<f32>(-0.5, 0.0, 0.0);
|
||||
vvec = vec3<f32>(0.0, 0.5, 0.0);
|
||||
} else if (face == 2u) {
|
||||
// Right face (x = +0.5)
|
||||
center = vec3<f32>(0.5, 0.0, 0.0);
|
||||
uvec = vec3<f32>(0.0, 0.0, -0.5);
|
||||
vvec = vec3<f32>(0.0, 0.5, 0.0);
|
||||
} else if (face == 3u) {
|
||||
// Left face (x = -0.5)
|
||||
center = vec3<f32>(-0.5, 0.0, 0.0);
|
||||
uvec = vec3<f32>(0.0, 0.0, 0.5);
|
||||
vvec = vec3<f32>(0.0, 0.5, 0.0);
|
||||
} else if (face == 4u) {
|
||||
// Top face (y = +0.5)
|
||||
center = vec3<f32>(0.0, 0.5, 0.0);
|
||||
uvec = vec3<f32>(0.5, 0.0, 0.0);
|
||||
vvec = vec3<f32>(0.0, 0.0, -0.5);
|
||||
} else {
|
||||
// Bottom face (y = -0.5)
|
||||
center = vec3<f32>(0.0, -0.5, 0.0);
|
||||
uvec = vec3<f32>(0.5, 0.0, 0.0);
|
||||
vvec = vec3<f32>(0.0, 0.0, 0.5);
|
||||
}
|
||||
|
||||
let off = offsets[corner];
|
||||
var pos = center + off.x * uvec + off.y * vvec;
|
||||
|
||||
// Apply a rotation about the Y axis using the uniform time.
|
||||
let rot = rotationY(u.time);
|
||||
pos = rot * pos;
|
||||
|
||||
// Translate the cube so it is in front of the camera.
|
||||
pos = pos + vec3<f32>(0.0, 0.0, 2.0);
|
||||
|
||||
// Simple perspective projection: divide x and y by z.
|
||||
let projected = vec2<f32>(pos.x / pos.z, pos.y / pos.z);
|
||||
return vec4<f32>(projected, 0.0, 1.0);
|
||||
fn vs_main(input: VertexInput) -> VertexOutput {
|
||||
var output: VertexOutput;
|
||||
output.clip_position = u.mvp * vec4<f32>(input.position, 1.0);
|
||||
output.normal = input.normal;
|
||||
return output;
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn fs_main() -> @location(0) vec4<f32> {
|
||||
// Output a fixed color.
|
||||
return vec4<f32>(0.7, 0.7, 0.9, 1.0);
|
||||
fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
|
||||
let light_dir = normalize(vec3<f32>(0.5, 1.0, 0.5));
|
||||
let brightness = clamp(dot(normalize(input.normal), light_dir), 0.0, 1.0);
|
||||
return vec4<f32>(0.7 * brightness, 0.7 * brightness, 0.9 * brightness, 1.0);
|
||||
}
|
||||
"#;
|
||||
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
|
||||
struct Vertex {
|
||||
position: [f32; 3],
|
||||
normal: [f32; 3],
|
||||
}
|
||||
|
||||
impl Vertex {
|
||||
const ATTRIBS: [wgpu::VertexAttribute; 2] = [
|
||||
wgpu::VertexAttribute {
|
||||
offset: 0,
|
||||
shader_location: 0,
|
||||
format: wgpu::VertexFormat::Float32x3,
|
||||
},
|
||||
wgpu::VertexAttribute {
|
||||
offset: std::mem::size_of::<[f32; 3]>() as wgpu::BufferAddress,
|
||||
shader_location: 1,
|
||||
format: wgpu::VertexFormat::Float32x3,
|
||||
},
|
||||
];
|
||||
|
||||
fn desc<'a>() -> wgpu::VertexBufferLayout<'a> {
|
||||
wgpu::VertexBufferLayout {
|
||||
array_stride: std::mem::size_of::<Vertex>() as wgpu::BufferAddress,
|
||||
step_mode: wgpu::VertexStepMode::Vertex,
|
||||
attributes: &Self::ATTRIBS,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const CUBE_VERTICES: &[Vertex] = &[
|
||||
Vertex {
|
||||
position: [-0.5, -0.5, 0.5],
|
||||
normal: [0.0, 0.0, 1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, -0.5, 0.5],
|
||||
normal: [0.0, 0.0, 1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, 0.5, 0.5],
|
||||
normal: [0.0, 0.0, 1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, 0.5, 0.5],
|
||||
normal: [0.0, 0.0, 1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, 0.5, 0.5],
|
||||
normal: [0.0, 0.0, 1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, -0.5, 0.5],
|
||||
normal: [0.0, 0.0, 1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, -0.5, -0.5],
|
||||
normal: [0.0, 0.0, -1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, -0.5, -0.5],
|
||||
normal: [0.0, 0.0, -1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, 0.5, -0.5],
|
||||
normal: [0.0, 0.0, -1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, 0.5, -0.5],
|
||||
normal: [0.0, 0.0, -1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, 0.5, -0.5],
|
||||
normal: [0.0, 0.0, -1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, -0.5, -0.5],
|
||||
normal: [0.0, 0.0, -1.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, -0.5, 0.5],
|
||||
normal: [1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, -0.5, -0.5],
|
||||
normal: [1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, 0.5, -0.5],
|
||||
normal: [1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, 0.5, -0.5],
|
||||
normal: [1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, 0.5, 0.5],
|
||||
normal: [1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, -0.5, 0.5],
|
||||
normal: [1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, -0.5, -0.5],
|
||||
normal: [-1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, -0.5, 0.5],
|
||||
normal: [-1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, 0.5, 0.5],
|
||||
normal: [-1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, 0.5, 0.5],
|
||||
normal: [-1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, 0.5, -0.5],
|
||||
normal: [-1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, -0.5, -0.5],
|
||||
normal: [-1.0, 0.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, 0.5, 0.5],
|
||||
normal: [0.0, 1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, 0.5, 0.5],
|
||||
normal: [0.0, 1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, 0.5, -0.5],
|
||||
normal: [0.0, 1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, 0.5, -0.5],
|
||||
normal: [0.0, 1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, 0.5, -0.5],
|
||||
normal: [0.0, 1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, 0.5, 0.5],
|
||||
normal: [0.0, 1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, -0.5, -0.5],
|
||||
normal: [0.0, -1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, -0.5, -0.5],
|
||||
normal: [0.0, -1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, -0.5, 0.5],
|
||||
normal: [0.0, -1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [0.5, -0.5, 0.5],
|
||||
normal: [0.0, -1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, -0.5, 0.5],
|
||||
normal: [0.0, -1.0, 0.0],
|
||||
},
|
||||
Vertex {
|
||||
position: [-0.5, -0.5, -0.5],
|
||||
normal: [0.0, -1.0, 0.0],
|
||||
},
|
||||
];
|
||||
|
||||
pub struct WgpuCtx<'window> {
|
||||
device: wgpu::Device,
|
||||
queue: wgpu::Queue,
|
||||
|
|
@ -121,6 +233,7 @@ pub struct WgpuCtx<'window> {
|
|||
adapter: wgpu::Adapter,
|
||||
render_pipeline: wgpu::RenderPipeline,
|
||||
uniform_buffer: wgpu::Buffer,
|
||||
vertex_buffer: wgpu::Buffer,
|
||||
start_time: Instant,
|
||||
}
|
||||
|
||||
|
|
@ -149,28 +262,26 @@ impl<'window> WgpuCtx<'window> {
|
|||
)
|
||||
.await
|
||||
.expect("Failed to create rendering device");
|
||||
|
||||
let size = window.inner_size();
|
||||
let width = size.width.max(1);
|
||||
let height = size.height.max(1);
|
||||
let surface_config = surface.get_default_config(&adapter, width, height).unwrap();
|
||||
surface.configure(&device, &surface_config);
|
||||
|
||||
// Create a uniform buffer (16 bytes to satisfy alignment requirements)
|
||||
let uniform_buffer = device.create_buffer(&wgpu::BufferDescriptor {
|
||||
label: Some("Uniform Buffer"),
|
||||
size: 16,
|
||||
size: 64,
|
||||
usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
|
||||
mapped_at_creation: false,
|
||||
});
|
||||
|
||||
// Create the shader module from the inline WGSL shader.
|
||||
let vertex_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
|
||||
label: Some("Cube Vertex Buffer"),
|
||||
contents: bytemuck::cast_slice(CUBE_VERTICES),
|
||||
usage: wgpu::BufferUsages::VERTEX,
|
||||
});
|
||||
let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {
|
||||
label: Some("Cube Shader"),
|
||||
source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(CUBE_SHADER)),
|
||||
});
|
||||
|
||||
// Create a bind group layout for the uniform.
|
||||
let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
|
||||
label: Some("Uniform Bind Group Layout"),
|
||||
entries: &[wgpu::BindGroupLayoutEntry {
|
||||
|
|
@ -179,27 +290,23 @@ impl<'window> WgpuCtx<'window> {
|
|||
ty: wgpu::BindingType::Buffer {
|
||||
ty: wgpu::BufferBindingType::Uniform,
|
||||
has_dynamic_offset: false,
|
||||
min_binding_size: wgpu::BufferSize::new(16),
|
||||
min_binding_size: wgpu::BufferSize::new(64),
|
||||
},
|
||||
count: None,
|
||||
}],
|
||||
});
|
||||
|
||||
// Create the pipeline layout.
|
||||
let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
|
||||
label: Some("Cube Pipeline Layout"),
|
||||
bind_group_layouts: &[&bind_group_layout],
|
||||
push_constant_ranges: &[],
|
||||
});
|
||||
|
||||
// TODO: add proper vertex buffer
|
||||
let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
|
||||
label: Some("Cube Render Pipeline"),
|
||||
layout: Some(&pipeline_layout),
|
||||
vertex: wgpu::VertexState {
|
||||
module: &shader,
|
||||
entry_point: Some("vs_main"),
|
||||
buffers: &[],
|
||||
buffers: &[Vertex::desc()],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
},
|
||||
fragment: Some(wgpu::FragmentState {
|
||||
|
|
@ -207,7 +314,7 @@ impl<'window> WgpuCtx<'window> {
|
|||
entry_point: Some("fs_main"),
|
||||
targets: &[Some(wgpu::ColorTargetState {
|
||||
format: surface_config.format,
|
||||
blend: Some(wgpu::BlendState::REPLACE),
|
||||
blend: Some(wgpu::BlendState::ALPHA_BLENDING),
|
||||
write_mask: wgpu::ColorWrites::ALL,
|
||||
})],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
|
|
@ -216,7 +323,7 @@ impl<'window> WgpuCtx<'window> {
|
|||
topology: wgpu::PrimitiveTopology::TriangleList,
|
||||
strip_index_format: None,
|
||||
front_face: wgpu::FrontFace::Ccw,
|
||||
cull_mode: None,
|
||||
cull_mode: Some(wgpu::Face::Back),
|
||||
polygon_mode: wgpu::PolygonMode::Fill,
|
||||
unclipped_depth: false,
|
||||
conservative: false,
|
||||
|
|
@ -230,7 +337,6 @@ impl<'window> WgpuCtx<'window> {
|
|||
multiview: None,
|
||||
cache: None,
|
||||
});
|
||||
|
||||
Ok(WgpuCtx {
|
||||
device,
|
||||
queue,
|
||||
|
|
@ -239,6 +345,7 @@ impl<'window> WgpuCtx<'window> {
|
|||
adapter,
|
||||
render_pipeline,
|
||||
uniform_buffer,
|
||||
vertex_buffer,
|
||||
start_time: Instant::now(),
|
||||
})
|
||||
}
|
||||
|
|
@ -255,37 +362,47 @@ impl<'window> WgpuCtx<'window> {
|
|||
}
|
||||
|
||||
pub fn draw(&mut self) {
|
||||
// Update the uniform buffer with the elapsed time.
|
||||
let elapsed = self.start_time.elapsed().as_secs_f32();
|
||||
// Pack into 4 floats (pad to 16 bytes)
|
||||
let time_data = [elapsed, 0.0, 0.0, 0.0];
|
||||
self.queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&time_data));
|
||||
|
||||
let model = Matrix4::from_angle_x(Rad(elapsed)) * Matrix4::from_angle_y(Rad(elapsed));
|
||||
let view = Matrix4::look_at_rh(
|
||||
Point3::new(0.0, 0.0, 3.0),
|
||||
Point3::new(0.0, 0.0, 0.0),
|
||||
Vector3::unit_y(),
|
||||
);
|
||||
let aspect = self.surface_config.width as f32 / self.surface_config.height as f32;
|
||||
let proj = perspective(Rad(std::f32::consts::FRAC_PI_4), aspect, 0.1, 100.0);
|
||||
let mvp = proj * view * model;
|
||||
let mvp_array: [[f32; 4]; 4] = [
|
||||
[mvp.x.x, mvp.x.y, mvp.x.z, mvp.x.w],
|
||||
[mvp.y.x, mvp.y.y, mvp.y.z, mvp.y.w],
|
||||
[mvp.z.x, mvp.z.y, mvp.z.z, mvp.z.w],
|
||||
[mvp.w.x, mvp.w.y, mvp.w.z, mvp.w.w],
|
||||
];
|
||||
self.queue
|
||||
.write_buffer(&self.uniform_buffer, 0, bytemuck::bytes_of(&mvp_array));
|
||||
let surface_texture = self
|
||||
.surface
|
||||
.get_current_texture()
|
||||
.expect("Failed to get surface texture");
|
||||
let view = surface_texture
|
||||
let view_texture = surface_texture
|
||||
.texture
|
||||
.create_view(&wgpu::TextureViewDescriptor::default());
|
||||
|
||||
let mut encoder =
|
||||
self.device
|
||||
.create_command_encoder(&wgpu::CommandEncoderDescriptor {
|
||||
label: Some("Cube Command Encoder"),
|
||||
});
|
||||
|
||||
let mut encoder = self
|
||||
.device
|
||||
.create_command_encoder(&wgpu::CommandEncoderDescriptor {
|
||||
label: Some("Cube Command Encoder"),
|
||||
});
|
||||
{
|
||||
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
|
||||
label: Some("Cube Render Pass"),
|
||||
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
|
||||
view: &view,
|
||||
view: &view_texture,
|
||||
resolve_target: None,
|
||||
ops: wgpu::Operations {
|
||||
load: wgpu::LoadOp::Clear(wgpu::Color {
|
||||
r: 0.1,
|
||||
g: 0.2,
|
||||
b: 0.3,
|
||||
g: 0.1,
|
||||
b: 0.1,
|
||||
a: 1.0,
|
||||
}),
|
||||
store: wgpu::StoreOp::Store,
|
||||
|
|
@ -296,9 +413,8 @@ impl<'window> WgpuCtx<'window> {
|
|||
occlusion_query_set: None,
|
||||
});
|
||||
render_pass.set_pipeline(&self.render_pipeline);
|
||||
// Create a bind group on the fly for the uniform.
|
||||
let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor {
|
||||
label: Some("Uniform Bind Group (per draw)"),
|
||||
label: Some("Uniform Bind Group"),
|
||||
layout: &self.render_pipeline.get_bind_group_layout(0),
|
||||
entries: &[wgpu::BindGroupEntry {
|
||||
binding: 0,
|
||||
|
|
@ -306,10 +422,9 @@ impl<'window> WgpuCtx<'window> {
|
|||
}],
|
||||
});
|
||||
render_pass.set_bind_group(0, &bind_group, &[]);
|
||||
// Draw 36 vertices (6 faces × 6 vertices)
|
||||
render_pass.set_vertex_buffer(0, self.vertex_buffer.slice(..));
|
||||
render_pass.draw(0..36, 0..1);
|
||||
}
|
||||
|
||||
self.queue.submit(Some(encoder.finish()));
|
||||
surface_texture.present();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue