rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-03 17:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prepare for drawing vertices

Browse Source
This commit is contained in:
Hanno Braun 2024-11-21 18:56:33 +01:00
parent dad052f57a
commit cbaa544bc6
2 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
experiments/2024-10-30/src/render/geometry.rs
View File

@ -1,5 +1,8 @@
use glam::Vec3;
use wgpu::util::DeviceExt;
use crate::geometry::Operation;
use super::shaders::TrianglesVertex;
pub struct Geometry {
@ -9,6 +12,46 @@ pub struct Geometry {
}
impl Geometry {
pub fn triangles(
device: &wgpu::Device,
operation: &impl Operation,
) -> Self {
let mut mesh_triangles = Vec::new();
operation.triangles(&mut mesh_triangles);
let mut indices = Vec::new();
let mut vertices = Vec::new();
for triangle in &mesh_triangles {
let triangle = triangle.vertices.map(|vertex| {
Vec3::from(
vertex.point.coords.map(|coord| coord.value() as f32),
)
});
let normal = {
let [a, b, c] = triangle;
let ab = b - a;
let ac = c - a;
ab.cross(ac)
};
for point in triangle {
let index = vertices.len() as u32;
let vertex = TrianglesVertex {
position: point.into(),
normal: normal.into(),
};
indices.push(index);
vertices.push(vertex);
}
}
Self::new(device, &vertices, &indices)
}
pub fn new(
device: &wgpu::Device,
vertices: &[TrianglesVertex],

37
experiments/2024-10-30/src/render/renderer.rs
View File

@ -10,7 +10,7 @@ use crate::geometry::Operation;
use super::{
geometry::Geometry,
pipeline::Pipeline,
shaders::{Shaders, TrianglesVertex, Uniforms},
shaders::{Shaders, Uniforms},
};
pub struct Renderer {
@ -94,40 +94,7 @@ impl Renderer {
}
pub fn render(&self, operation: &impl Operation) {
let mut mesh_triangles = Vec::new();
operation.triangles(&mut mesh_triangles);
let mut indices = Vec::new();
let mut vertices = Vec::new();
for triangle in &mesh_triangles {
let triangle = triangle.vertices.map(|vertex| {
Vec3::from(
vertex.point.coords.map(|coord| coord.value() as f32),
)
});
let normal = {
let [a, b, c] = triangle;
let ab = b - a;
let ac = c - a;
ab.cross(ac)
};
for point in triangle {
let index = vertices.len() as u32;
let vertex = TrianglesVertex {
position: point.into(),
normal: normal.into(),
};
indices.push(index);
vertices.push(vertex);
}
}
let triangles = Geometry::new(&self.device, &vertices, &indices);
let triangles = Geometry::triangles(&self.device, operation);
let mut encoder = self
.device