changeset 700:ccb739c5b66c

examples: factorise file reading into a buffer.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Fri, 23 Aug 2019 13:05:48 +0200
parents 2a60f12bd5bd
children b6c351ca0a35
files examples/anmrenderer.rs examples/eclrenderer.rs examples/stdrenderer.rs
diffstat 3 files changed, 29 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/examples/anmrenderer.rs	Fri Aug 23 02:40:27 2019 +0200
+++ b/examples/anmrenderer.rs	Fri Aug 23 13:05:48 2019 +0200
@@ -87,6 +87,14 @@
     mvp: Uniform<[[f32; 4]; 4]>,
 }
 
+fn load_file_into_vec(filename: &str) -> Vec<u8> {
+    let file = File::open(filename).unwrap();
+    let mut file = BufReader::new(file);
+    let mut buf = vec![];
+    file.read_to_end(&mut buf).unwrap();
+    buf
+}
+
 fn main() {
     // Parse arguments.
     let args: Vec<_> = env::args().collect();
@@ -99,10 +107,7 @@
     let script: u8 = args[3].parse().expect("number");
 
     // Open the ANM file.
-    let file = File::open(anm_filename).unwrap();
-    let mut file = BufReader::new(file);
-    let mut buf = vec![];
-    file.read_to_end(&mut buf).unwrap();
+    let buf = load_file_into_vec(anm_filename);
     let anm0 = Anm0::from_slice(&buf).unwrap();
 
     if !anm0.scripts.contains_key(&script) {
--- a/examples/eclrenderer.rs	Fri Aug 23 02:40:27 2019 +0200
+++ b/examples/eclrenderer.rs	Fri Aug 23 13:05:48 2019 +0200
@@ -88,6 +88,14 @@
     mvp: Uniform<[[f32; 4]; 4]>,
 }
 
+fn load_file_into_vec(filename: &str) -> Vec<u8> {
+    let file = File::open(filename).unwrap();
+    let mut file = BufReader::new(file);
+    let mut buf = vec![];
+    file.read_to_end(&mut buf).unwrap();
+    buf
+}
+
 fn main() {
     // Parse arguments.
     let args: Vec<_> = env::args().collect();
@@ -102,17 +110,11 @@
     let sub: u16 = args[5].parse().expect("number");
 
     // Open the ECL file.
-    let file = File::open(ecl_filename).unwrap();
-    let mut file = BufReader::new(file);
-    let mut buf = vec![];
-    file.read_to_end(&mut buf).unwrap();
+    let buf = load_file_into_vec(ecl_filename);
     let (_, ecl) = Ecl::from_slice(&buf).unwrap();
 
     // Open the ANM file.
-    let file = File::open(anm_filename).unwrap();
-    let mut file = BufReader::new(file);
-    let mut buf = vec![];
-    file.read_to_end(&mut buf).unwrap();
+    let buf = load_file_into_vec(anm_filename);
     let anm0 = Anm0::from_slice(&buf).unwrap();
     let anm0 = Rc::new(RefCell::new(anm0));
 
--- a/examples/stdrenderer.rs	Fri Aug 23 02:40:27 2019 +0200
+++ b/examples/stdrenderer.rs	Fri Aug 23 13:05:48 2019 +0200
@@ -107,6 +107,14 @@
     fog_color: Uniform<[f32; 4]>,
 }
 
+fn load_file_into_vec(filename: &str) -> Vec<u8> {
+    let file = File::open(filename).unwrap();
+    let mut file = BufReader::new(file);
+    let mut buf = vec![];
+    file.read_to_end(&mut buf).unwrap();
+    buf
+}
+
 fn main() {
     // Parse arguments.
     let args: Vec<_> = env::args().collect();
@@ -119,17 +127,11 @@
     let png_filename = &args[3];
 
     // Open the STD file.
-    let file = File::open(std_filename).unwrap();
-    let mut file = BufReader::new(file);
-    let mut buf = vec![];
-    file.read_to_end(&mut buf).unwrap();
+    let buf = load_file_into_vec(std_filename);
     let (_, stage) = Stage::from_slice(&buf).unwrap();
 
     // Open the ANM file.
-    let file = File::open(anm_filename).unwrap();
-    let mut file = BufReader::new(file);
-    let mut buf = vec![];
-    file.read_to_end(&mut buf).unwrap();
+    let buf = load_file_into_vec(anm_filename);
     let anm0 = Anm0::from_slice(&buf).unwrap();
 
     // TODO: seed this PRNG with a valid seed.