refactor(render): seperate vertex buffer logic

1 files changed, 54 insertions, 52 deletions

diff --git a/examples/render-triangles/src/main.rs b/examples/render-triangles/src/main.rs
index 2db2f1a..63c589b 100644
--- a/examples/render-triangles/src/main.rs
+++ b/examples/render-triangles/src/main.rs
@@ -15,64 +15,66 @@
 
 //! Renders ./example.bsp
 
-// extern crate stockton_types;
-// extern crate stockton_bsp;
-// extern crate stockton_render;
-// extern crate winit;
-// extern crate simple_logger;
-// extern crate rand;
+extern crate stockton_types;
+extern crate stockton_bsp;
+extern crate stockton_render;
+extern crate winit;
+extern crate simple_logger;
+extern crate rand;
 
-// use stockton_render::draw::{RenderingContext, Tri2};
-// use stockton_types::Vector2;
+use stockton_render::draw::{RenderingContext, Tri2};
+use stockton_types::Vector2;
 
-// use winit::{Event, WindowEvent, VirtualKeyCode, ElementState};
-// use rand::prelude::*;
+use winit::{Event, WindowEvent, VirtualKeyCode, ElementState};
+use rand::prelude::*;
 
 fn main() {
 
-	// simple_logger::init().unwrap();
+	simple_logger::init().unwrap();
 
-	// // Create the renderer.
-	// let mut ctx = RenderingContext::new().unwrap();
-	// let mut rng = thread_rng();
-	// let mut vertices: VertexLump<Tri2> = VertexLump::new(&mut ctx);
-	// let mut running = true;
-	// let mut vertices_dirty = false;
+	// Create the renderer.
+	let mut ctx = RenderingContext::new().unwrap();
+	let mut rng = thread_rng();
+	let mut running = true;
+	let mut add_tri = false;
 
- //    while running {
- //    	ctx.events_loop.poll_events(|event| {
- //    		match event {
-	// 	    	// TODO: Handle resize
-	// 	    	Event::WindowEvent {
-	// 	    		event: WindowEvent::KeyboardInput { input,  .. },
-	// 	    		..
-	// 	    	} => match input.state {
-	// 	    		ElementState::Released => match input.virtual_keycode {
-	// 		    		Some(VirtualKeyCode::Escape) => running = false,
-	// 		    		Some(VirtualKeyCode::Space) => {
-	// 		    			vertices.add(Tri2 ([
-	// 		    				Vector2::new(
-	// 		    					rng.gen_range(-1.0, 1.0),
-	// 		    					rng.gen_range(-1.0, 1.0),
-	// 		    					),
-	// 		    				Vector2::new(
-	// 		    					rng.gen_range(-1.0, 1.0),
-	// 		    					rng.gen_range(-1.0, 1.0),
-	// 		    					),
-	// 		    				Vector2::new(
-	// 		    					rng.gen_range(-1.0, 1.0),
-	// 		    					rng.gen_range(-1.0, 1.0),
-	// 		    					)
-	// 	    				]));
-	// 		    		},
-	// 		    		_ => ()
-	// 		    	},
-	// 		    	_ => ()
-	// 		    }
- //    			_ => ()
- //    		}
- //    	});
+    while running {
+    	ctx.events_loop.poll_events(|event| {
+    		match event {
+		    	// TODO: Handle resize
+		    	Event::WindowEvent {
+		    		event: WindowEvent::KeyboardInput { input,  .. },
+		    		..
+		    	} => match input.state {
+		    		ElementState::Released => match input.virtual_keycode {
+			    		Some(VirtualKeyCode::Escape) => running = false,
+			    		Some(VirtualKeyCode::Space) => add_tri = true,
+			    		_ => ()
+			    	},
+			    	_ => ()
+			    }
+    			_ => ()
+    		}
+    	});
 
- //    	vertices.draw(&mut ctx).unwrap();
-	// }
+    	if add_tri {
+    		ctx.add_map_vert(Tri2 ([
+				Vector2::new(
+					rng.gen_range(-1.0, 1.0),
+					rng.gen_range(-1.0, 1.0),
+					),
+				Vector2::new(
+					rng.gen_range(-1.0, 1.0),
+					rng.gen_range(-1.0, 1.0),
+					),
+				Vector2::new(
+					rng.gen_range(-1.0, 1.0),
+					rng.gen_range(-1.0, 1.0),
+					)
+			])).unwrap();
+			add_tri = false;
+    	}
+
+    	ctx.draw_vertices().unwrap();
+	}
 }