abstract over bundled assets

yay build script stuff :)

Force-Push: yes
Change-Id: I694651febb02f42dac904f0dfbf4089c33ef937e

2 files changed, 2 insertions, 6 deletions

diff --git a/src/files/obj.rs b/src/files/obj.rs
index af2ce03..3ccc2ec 100644
--- a/src/files/obj.rs
+++ b/src/files/obj.rs
@@ -9,9 +9,7 @@ use std::io::Cursor;
 use tobj::{ load_obj_buf, LoadOptions };
 
 
-pub fn load_obj(permanent: &Permanent) -> Result<Model> {
-  let obj = include_bytes!("../../models/teapot.obj");
-
+pub fn load_obj(obj: &[u8], permanent: &Permanent) -> Result<Model> {
   let load_options = LoadOptions {
     single_index: true,
     triangulate: true,
diff --git a/src/files/png.rs b/src/files/png.rs
index c164613..ce24292 100644
--- a/src/files/png.rs
+++ b/src/files/png.rs
@@ -7,9 +7,7 @@ use std::io::Cursor;
 use png::Decoder;
 
 
-pub fn load_png(permanent: &Permanent) -> Result<(Texture, u32)> {
-  let png = include_bytes!("../../textures/forest_leaves_04_diff.png");
-
+pub fn load_png(png: &[u8], permanent: &Permanent) -> Result<(Texture, u32)> {
   let decoder = Decoder::new(Cursor::new(png));
   let mut reader = decoder.read_info()?;