Pārlūkot izejas kodu

Add debug_triangle module and generate_square function

Ghastrod 1 gadu atpakaļ
vecāks
revīzija
68778a3583
5 mainītis faili ar 36 papildinājumiem un 3 dzēšanām
  1. 6 0
      src/debug_triangle.rs
  2. 0 2
      src/input.rs
  3. 6 1
      src/lib.rs
  4. 2 0
      src/main.rs
  5. 22 0
      src/simple_plane.rs

+ 6 - 0
src/debug_triangle.rs

@@ -0,0 +1,6 @@
+use crate::vertex::Vertex;
+pub const DEBUG_VERT: &[Vertex] = &[
+    Vertex { position: [0.0, 0.5, 0.0], color: [1.0, 0.0, 0.0] },
+    Vertex { position: [-0.5, -0.5, 0.0], color: [0.0, 1.0, 0.0] },
+    Vertex { position: [0.5, -0.5, 0.0], color: [0.0, 0.0, 1.0] },
+];

+ 0 - 2
src/input.rs

@@ -1,5 +1,3 @@
-
-
 pub fn handle_key_event(){
     
 }

+ 6 - 1
src/lib.rs

@@ -1,5 +1,7 @@
 use std::iter;
 
+use debug_triangle::DEBUG_VERT;
+use simple_plane::generate_square;
 use wgpu::util::DeviceExt;
 
 mod vertex;
@@ -7,6 +9,7 @@ use vertex::Vertex;
 mod simple_plane;
 use simple_plane::generate_simple_plane;
 
+mod debug_triangle;
 mod camera;
 use camera::Camera;
 use camera::CameraUniform;
@@ -343,7 +346,9 @@ impl<'a> State<'a> {
         //let (vertices, indices) = creer_plan_subdivise(1.0, 1.0, 10);
         //let vert = creer_plan_simple(1.0, 1.0);
 
-        let vert = generate_simple_plane(0.5, 1);
+        //let vert = generate_simple_plane(0.5, 1);
+        //let vert = generate_square();
+        let vert = DEBUG_VERT;
         // Create a buffer with the vertex data
         let vertex_buffer = device.create_buffer_init(
             &wgpu::util::BufferInitDescriptor{

+ 2 - 0
src/main.rs

@@ -6,6 +6,8 @@ mod camera;
 mod simple_plane;
 mod controller;
 mod input;
+mod debug_triangle;
+
 fn main() {
     pollster::block_on(run());
 }

+ 22 - 0
src/simple_plane.rs

@@ -26,3 +26,25 @@ pub fn generate_simple_plane(width: f32, division: u32)->Vec<Vertex>{
     } 
     return vertices
 }
+
+pub fn generate_square()->Vec<Vertex>{
+    let vertices = vec![
+        Vertex{
+            position: [0.5, 0.5, 0.0],
+            color: [1.0, 0.0, 0.0]
+        },
+        Vertex{
+            position: [0.5, -0.5, 0.0],
+            color: [0.0, 1.0, 0.0]
+        },
+        Vertex{
+            position: [-0.5, -0.5, 0.0],
+            color: [0.0, 0.0, 1.0]
+        },
+        Vertex{
+            position: [-0.5, 0.5, 0.0],
+            color: [1.0, 1.0, 1.0]
+        }
+    ];
+    return vertices;
+}