some fiddling with documentation. Added Poly type

src/main.rs

@@ -18,7 +18,6 @@ use vulkano::sync::GpuFuture;
 use winit::{EventsLoop, WindowBuilder, WindowEvent, Event, DeviceEvent, VirtualKeyCode, ElementState};
 use winit::dpi::LogicalSize;
 use vulkano_win::VkSurfaceBuild;
-use sprite::Sprite;
 
 use crate::util::load_raw;
 
@@ -30,34 +29,15 @@ use std::sync::Arc;
 use crate::canvas::managed::handles::{CanvasTextureHandle, Handle, CanvasFontHandle};
 use crate::util::vertex::{VertexTypes, TextureVertex3D};
 use crate::compute::managed::handles::{CompuBufferHandle, CompuKernelHandle};
-
+use crate::drawables::sprite::Sprite;
+use crate::drawables::rect::Rect;
 
 pub mod util;
 pub mod vkprocessor;
-pub mod sprite;
-
+pub mod drawables;
 pub mod canvas;
 pub mod compute;
 
-/*
-
-    Trac3r : A program to convert images to 2D toolpaths
-
-    TODO:
-        + Text rendering is half implemented.
-        + Need generalized interface for render (image, texture, text)
-        + Currently using local copies of a few libraries:
-            shade_runner
-            vulkano/vulkano-win
-            vulkano/vulkano-shaders
-            vulkano/vulkano
-        + Need to generate runtime vertex definitions if I want to have on the fly shaders
-
-
-
-*/
-
-
 pub fn main() {
     hprof::start_frame();
 
@@ -125,8 +105,12 @@ pub fn main() {
     let font_handle : Arc<CanvasFontHandle> =
         processor.get_font_handle(String::from("sansation.ttf")).unwrap();
 
-    let funky_sprite = Sprite::new((0.0, -0.5), (0.5, 0.5), 0, funky_handle.clone());
+    let funky_sprite = Sprite::new((0.0, 0.5), (0.5, 0.5), 0, funky_handle.clone());
     let sfml_sprite  = Sprite::new((0.0, -0.5), (0.5, 0.5), 1, sfml_handle.clone());
+    let rect  = Rect::new((-0.5, -0.5), (0.5, 0.5), 1);
+
+
+    //let sfml_sprite  = Sprite::new((0.0, -0.5), (0.5, 0.5), 1, sfml_handle.clone());
     //let text_sprite = Text::new((-0.1,-0.1), (10.0, 10.0), font_handle.clone());
     //let test_polygon = Poly::new_with_color((-0.5, -0.5), (0.5, 0.5), 1, (1.0,0.0,0.0,0.0));
 
@@ -187,20 +171,15 @@ pub fn main() {
             break;
         }
 
-
-        let funky_sprite = Sprite::new((0.0, -0.5), (0.5, 0.5), 0, funky_handle.clone());
-
         let mut canvas_frame = CanvasFrame::default();
-        canvas_frame.draw(&funky_sprite);
-        canvas_frame.draw(&sfml_sprite);
+//        canvas_frame.draw(&funky_sprite);
+//        canvas_frame.draw(&sfml_sprite);
+//        canvas_frame.draw(&rect);
 
         let mut compu_frame = CompuFrame::new();
-//        compu_frame.add(compute_buffer.clone(), compute_kernel.clone());
+        compu_frame.add(compute_buffer.clone(), compute_kernel.clone());
 //        compu_frame.add_with_image_swap(compute_buffer.clone(), compute_kernel.clone(), &compu_sprite1);
-//
-//        let mut canvas = CanvasFrame::new();
-//        canvas.draw(&funky_sprite);
-//        canvas.draw(&test_polygon);
+
 
         {
             let g = hprof::enter("Run");
@@ -213,7 +192,6 @@ pub fn main() {
     drop(l);
 
 
-return;
     hprof::end_frame();
     hprof::profiler().print_timing();
 }