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

Move Vertex to more appropriate location

Browse Source
This commit is contained in:
Hanno Braun 2024-11-22 19:37:25 +01:00
parent f4838b14ee
commit 3440690452
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
experiments/2024-10-30/src/render/pipelines/mod.rs
View File

@ -4,6 +4,8 @@ use glam::Mat4;
pub use self::pipeline::Pipeline; pub use self::pipeline::Pipeline;
use self::pipeline::Vertex;
pub struct Pipelines { pub struct Pipelines {
pub vertices: Pipeline<VerticesVertex>, pub vertices: Pipeline<VerticesVertex>,
pub triangles: Pipeline<TrianglesVertex>, pub triangles: Pipeline<TrianglesVertex>,
@ -53,10 +55,6 @@ impl Uniforms {
} }
} }
pub trait Vertex {
const ATTRIBUTES: &[wgpu::VertexAttribute];
}
#[derive(Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)] #[derive(Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)]
#[repr(C)] #[repr(C)]
pub struct TrianglesVertex { pub struct TrianglesVertex {

6
experiments/2024-10-30/src/render/pipelines/pipeline.rs
View File

@ -2,8 +2,6 @@ use std::marker::PhantomData;
use crate::render::geometry::Geometry; use crate::render::geometry::Geometry;
use super::Vertex;
pub struct Pipeline<V> { pub struct Pipeline<V> {
render_pipeline: wgpu::RenderPipeline, render_pipeline: wgpu::RenderPipeline,
bind_group: wgpu::BindGroup, bind_group: wgpu::BindGroup,
@ -152,3 +150,7 @@ impl<V> Pipeline<V> {
} }
} }
} }
pub trait Vertex {
const ATTRIBUTES: &[wgpu::VertexAttribute];
}