mitchellhansen/Trac3r-rust
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed the colored vertex and combined into one. Half fixed texturing. Fully fixed images and compute swapping

Browse Source
This commit is contained in:
mitchellhansen
2019-09-10 21:13:48 -07:00
parent e8507f9dfc
commit 9043c2cd3c
13 changed files with 148 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/vertex_2d.rs
View File

@@ -1,22 +1,30 @@
#[derive(Default, Debug, Clone)]
pub struct Vertex2D {
pub position: [f32; 2]
}
#[derive(Default, Debug, Clone)]
pub struct ColoredVertex2D {
pub position: [f32; 2],
pub v_position: [f32; 2],
pub color : [f32; 4],
pub ti_position: [f32; 2],
}
vulkano::impl_vertex!(ColoredVertex2D, position, color);
vulkano::impl_vertex!(Vertex2D, position);
vulkano::impl_vertex!(Vertex2D, v_position, color, ti_position);
impl From<(f32, f32)> for Vertex2D {
fn from(item: (f32, f32)) -> Self {
Vertex2D { position: [item.0, item.1] }
}
}
//impl From<(f32, f32)> for Vertex2D {
// fn from(item: (f32, f32)) -> Self {
// Vertex2D {
// v_position: [],
// color: [],
// ti_position: []
// }
// }
//}
//
//impl From<((f32,f32),(f32, f32))> for Vertex2D {
// fn from(item: ((f32,f32),(f32, f32))) -> Self {
// Vertex2D {
// v_position: [],
// color: [],
// ti_position: []
// }
// }
//}