Fix asset conflicts

Author: Nercury

lesson-07/shaders/triangle.frag renamed to lesson-07/assets/shaders/triangle.frag

@@ -16,8 +16,8 @@ fn main() {
         .join(env::var("PROFILE").unwrap());
 
     copy(
-        &manifest_dir.join("shaders"),
-        &executable_path.join("shaders"),
+        &manifest_dir.join("assets"),
+        &executable_path.join("assets-07"),
     );
 }
 

lesson-07/shaders/triangle.vert renamed to lesson-07/assets/shaders/triangle.vert

@@ -5,9 +5,10 @@ pub mod render_gl;
 pub mod resources;
 
 use resources::Resources;
+use std::path::Path;
 
 fn main() {
-    let res = Resources::from_exe_path().unwrap();
+    let res = Resources::from_relative_exe_path(Path::new("assets-07")).unwrap();
 
     let sdl = sdl2::init().unwrap();
     let video_subsystem = sdl.video().unwrap();

lesson-07/build.rs

@@ -21,18 +21,22 @@ pub struct Resources {
 }
 
 impl Resources {
-    pub fn from_exe_path() -> Result<Resources, Error> {
+    pub fn from_relative_exe_path(rel_path: &Path) -> Result<Resources, Error> {
         let exe_file_name = ::std::env::current_exe()
             .map_err(|_| Error::FailedToGetExePath)?;
 
         let exe_path = exe_file_name.parent()
             .ok_or(Error::FailedToGetExePath)?;
 
         Ok(Resources {
-            root_path: PathBuf::from(exe_path)
+            root_path: exe_path.join(rel_path)
         })
     }
 
+    pub fn from_exe_path() -> Result<Resources, Error> {
+        Resources::from_relative_exe_path(Path::new(""))
+    }
+
     pub fn load_cstring(&self, resource_name: &str) -> Result<ffi::CString, Error> {
         let mut file = fs::File::open(
             resource_name_to_path(&self.root_path,resource_name)

lesson-07/src/main.rs

@@ -16,8 +16,8 @@ fn main() {
         .join(env::var("PROFILE").unwrap());
 
     copy(
-        &manifest_dir.join("shaders"),
-        &executable_path.join("shaders"),
+        &manifest_dir.join("assets"),
+        &executable_path.join("assets-08"),
     );
 }
 

lesson-07/src/resources.rs

@@ -7,6 +7,7 @@ pub mod resources;
 
 use failure::err_msg;
 use resources::Resources;
+use std::path::Path;
 
 fn main() {
     if let Err(e) = run() {
@@ -15,7 +16,7 @@ fn main() {
 }
 
 fn run() -> Result<(), failure::Error> {
-    let res = Resources::from_exe_path()?;
+    let res = Resources::from_relative_exe_path(Path::new("assets-08")).unwrap();
 
     let sdl = sdl2::init().map_err(err_msg)?;
     let video_subsystem = sdl.video().map_err(err_msg)?;

lesson-08/shaders/triangle.frag renamed to lesson-08/assets/shaders/triangle.frag

@@ -24,18 +24,22 @@ pub struct Resources {
 }
 
 impl Resources {
-    pub fn from_exe_path() -> Result<Resources, Error> {
+    pub fn from_relative_exe_path(rel_path: &Path) -> Result<Resources, Error> {
         let exe_file_name = ::std::env::current_exe()
             .map_err(|_| Error::FailedToGetExePath)?;
 
         let exe_path = exe_file_name.parent()
             .ok_or(Error::FailedToGetExePath)?;
 
         Ok(Resources {
-            root_path: PathBuf::from(exe_path)
+            root_path: exe_path.join(rel_path)
         })
     }
 
+    pub fn from_exe_path() -> Result<Resources, Error> {
+        Resources::from_relative_exe_path(Path::new(""))
+    }
+
     pub fn load_cstring(&self, resource_name: &str) -> Result<ffi::CString, Error> {
         let mut file = fs::File::open(
             resource_name_to_path(&self.root_path,resource_name)

lesson-08/shaders/triangle.vert renamed to lesson-08/assets/shaders/triangle.vert

@@ -16,8 +16,8 @@ fn main() {
         .join(env::var("PROFILE").unwrap());
 
     copy(
-        &manifest_dir.join("shaders"),
-        &executable_path.join("shaders"),
+        &manifest_dir.join("assets"),
+        &executable_path.join("assets-09"),
     );
 }
 

lesson-08/build.rs

@@ -8,6 +8,7 @@ pub mod resources;
 use render_gl::data;
 use failure::err_msg;
 use resources::Resources;
+use std::path::Path;
 
 #[derive(Copy, Clone, Debug)]
 #[repr(C, packed)]
@@ -43,7 +44,7 @@ fn main() {
 }
 
 fn run() -> Result<(), failure::Error> {
-    let res = Resources::from_exe_path()?;
+    let res = Resources::from_relative_exe_path(Path::new("assets-09")).unwrap();
 
     let sdl = sdl2::init().map_err(err_msg)?;
     let video_subsystem = sdl.video().map_err(err_msg)?;

lesson-08/src/main.rs

@@ -24,18 +24,22 @@ pub struct Resources {
 }
 
 impl Resources {
-    pub fn from_exe_path() -> Result<Resources, Error> {
+    pub fn from_relative_exe_path(rel_path: &Path) -> Result<Resources, Error> {
         let exe_file_name = ::std::env::current_exe()
             .map_err(|_| Error::FailedToGetExePath)?;
 
         let exe_path = exe_file_name.parent()
             .ok_or(Error::FailedToGetExePath)?;
 
         Ok(Resources {
-            root_path: PathBuf::from(exe_path)
+            root_path: exe_path.join(rel_path)
         })
     }
 
+    pub fn from_exe_path() -> Result<Resources, Error> {
+        Resources::from_relative_exe_path(Path::new(""))
+    }
+
     pub fn load_cstring(&self, resource_name: &str) -> Result<ffi::CString, Error> {
         let mut file = fs::File::open(
             resource_name_to_path(&self.root_path,resource_name)

lesson-08/src/resources.rs

@@ -16,8 +16,8 @@ fn main() {
         .join(env::var("PROFILE").unwrap());
 
     copy(
-        &manifest_dir.join("shaders"),
-        &executable_path.join("shaders"),
+        &manifest_dir.join("assets"),
+        &executable_path.join("assets-10"),
     );
 }
 

lesson-09/shaders/triangle.frag renamed to lesson-09/assets/shaders/triangle.frag

@@ -9,6 +9,7 @@ pub mod resources;
 use render_gl::data;
 use failure::err_msg;
 use resources::Resources;
+use std::path::Path;
 
 #[derive(VertexAttribPointers)]
 #[derive(Copy, Clone, Debug)]
@@ -27,7 +28,7 @@ fn main() {
 }
 
 fn run() -> Result<(), failure::Error> {
-    let res = Resources::from_exe_path()?;
+    let res = Resources::from_relative_exe_path(Path::new("assets-10")).unwrap();
 
     let sdl = sdl2::init().map_err(err_msg)?;
     let video_subsystem = sdl.video().map_err(err_msg)?;

lesson-09/shaders/triangle.vert renamed to lesson-09/assets/shaders/triangle.vert

@@ -24,18 +24,22 @@ pub struct Resources {
 }
 
 impl Resources {
-    pub fn from_exe_path() -> Result<Resources, Error> {
+    pub fn from_relative_exe_path(rel_path: &Path) -> Result<Resources, Error> {
         let exe_file_name = ::std::env::current_exe()
             .map_err(|_| Error::FailedToGetExePath)?;
 
         let exe_path = exe_file_name.parent()
             .ok_or(Error::FailedToGetExePath)?;
 
         Ok(Resources {
-            root_path: PathBuf::from(exe_path)
+            root_path: exe_path.join(rel_path)
         })
     }
 
+    pub fn from_exe_path() -> Result<Resources, Error> {
+        Resources::from_relative_exe_path(Path::new(""))
+    }
+
     pub fn load_cstring(&self, resource_name: &str) -> Result<ffi::CString, Error> {
         let mut file = fs::File::open(
             resource_name_to_path(&self.root_path,resource_name)

lesson-09/build.rs

@@ -16,8 +16,8 @@ fn main() {
         .join(env::var("PROFILE").unwrap());
 
     copy(
-        &manifest_dir.join("shaders"),
-        &executable_path.join("shaders"),
+        &manifest_dir.join("assets"),
+        &executable_path.join("assets-11"),
     );
 }
 

lesson-09/src/main.rs

@@ -11,6 +11,7 @@ pub mod resources;
 use render_gl::data;
 use failure::err_msg;
 use resources::Resources;
+use std::path::Path;
 
 #[derive(VertexAttribPointers)]
 #[derive(Copy, Clone, Debug)]
@@ -29,7 +30,7 @@ fn main() {
 }
 
 fn run() -> Result<(), failure::Error> {
-    let res = Resources::from_exe_path()?;
+    let res = Resources::from_relative_exe_path(Path::new("assets-11")).unwrap();
 
     let sdl = sdl2::init().map_err(err_msg)?;
     let video_subsystem = sdl.video().map_err(err_msg)?;

lesson-09/src/resources.rs

@@ -24,18 +24,22 @@ pub struct Resources {
 }
 
 impl Resources {
-    pub fn from_exe_path() -> Result<Resources, Error> {
+    pub fn from_relative_exe_path(rel_path: &Path) -> Result<Resources, Error> {
         let exe_file_name = ::std::env::current_exe()
             .map_err(|_| Error::FailedToGetExePath)?;
 
         let exe_path = exe_file_name.parent()
             .ok_or(Error::FailedToGetExePath)?;
 
         Ok(Resources {
-            root_path: PathBuf::from(exe_path)
+            root_path: exe_path.join(rel_path)
         })
     }
 
+    pub fn from_exe_path() -> Result<Resources, Error> {
+        Resources::from_relative_exe_path(Path::new(""))
+    }
+
     pub fn load_cstring(&self, resource_name: &str) -> Result<ffi::CString, Error> {
         let mut file = fs::File::open(
             resource_name_to_path(&self.root_path,resource_name)

lesson-10/shaders/triangle.frag renamed to lesson-10/assets/shaders/triangle.frag

@@ -16,8 +16,8 @@ fn main() {
         .join(env::var("PROFILE").unwrap());
 
     copy(
-        &manifest_dir.join("shaders"),
-        &executable_path.join("shaders"),
+        &manifest_dir.join("assets"),
+        &executable_path.join("assets-12"),
     );
 }
 

lesson-10/shaders/triangle.vert renamed to lesson-10/assets/shaders/triangle.vert

@@ -12,6 +12,7 @@ use render_gl::data;
 use render_gl::buffer;
 use failure::err_msg;
 use resources::Resources;
+use std::path::Path;
 
 #[derive(VertexAttribPointers)]
 #[derive(Copy, Clone, Debug)]
@@ -30,7 +31,7 @@ fn main() {
 }
 
 fn run() -> Result<(), failure::Error> {
-    let res = Resources::from_exe_path()?;
+    let res = Resources::from_relative_exe_path(Path::new("assets-12")).unwrap();
 
     let sdl = sdl2::init().map_err(err_msg)?;
     let video_subsystem = sdl.video().map_err(err_msg)?;

lesson-10/build.rs

@@ -24,18 +24,22 @@ pub struct Resources {
 }
 
 impl Resources {
-    pub fn from_exe_path() -> Result<Resources, Error> {
+    pub fn from_relative_exe_path(rel_path: &Path) -> Result<Resources, Error> {
         let exe_file_name = ::std::env::current_exe()
             .map_err(|_| Error::FailedToGetExePath)?;
 
         let exe_path = exe_file_name.parent()
             .ok_or(Error::FailedToGetExePath)?;
 
         Ok(Resources {
-            root_path: PathBuf::from(exe_path)
+            root_path: exe_path.join(rel_path)
         })
     }
 
+    pub fn from_exe_path() -> Result<Resources, Error> {
+        Resources::from_relative_exe_path(Path::new(""))
+    }
+
     pub fn load_cstring(&self, resource_name: &str) -> Result<ffi::CString, Error> {
         let mut file = fs::File::open(
             resource_name_to_path(&self.root_path,resource_name)

lesson-10/src/main.rs

@@ -16,8 +16,8 @@ fn main() {
         .join(env::var("PROFILE").unwrap());
 
     copy(
-        &manifest_dir.join("shaders"),
-        &executable_path.join("shaders"),
+        &manifest_dir.join("assets"),
+        &executable_path.join("assets-13"),
     );
 }
 

lesson-10/src/resources.rs

@@ -13,6 +13,7 @@ mod debug;
 
 use failure::err_msg;
 use resources::Resources;
+use std::path::Path;
 use nalgebra as na;
 
 fn main() {
@@ -22,7 +23,7 @@ fn main() {
 }
 
 fn run() -> Result<(), failure::Error> {
-    let res = Resources::from_exe_path()?;
+    let res = Resources::from_relative_exe_path(Path::new("assets-13")).unwrap();
 
     let sdl = sdl2::init().map_err(err_msg)?;
     let video_subsystem = sdl.video().map_err(err_msg)?;

lesson-11/shaders/triangle.frag renamed to lesson-11/assets/shaders/triangle.frag

@@ -24,18 +24,22 @@ pub struct Resources {
 }
 
 impl Resources {
-    pub fn from_exe_path() -> Result<Resources, Error> {
+    pub fn from_relative_exe_path(rel_path: &Path) -> Result<Resources, Error> {
         let exe_file_name = ::std::env::current_exe()
             .map_err(|_| Error::FailedToGetExePath)?;
 
         let exe_path = exe_file_name.parent()
             .ok_or(Error::FailedToGetExePath)?;
 
         Ok(Resources {
-            root_path: PathBuf::from(exe_path)
+            root_path: exe_path.join(rel_path)
         })
     }
 
+    pub fn from_exe_path() -> Result<Resources, Error> {
+        Resources::from_relative_exe_path(Path::new(""))
+    }
+
     pub fn load_cstring(&self, resource_name: &str) -> Result<ffi::CString, Error> {
         let mut file = fs::File::open(
             resource_name_to_path(&self.root_path,resource_name)

lesson-11/shaders/triangle.vert renamed to lesson-11/assets/shaders/triangle.vert

@@ -16,8 +16,8 @@ fn main() {
         .join(env::var("PROFILE").unwrap());
 
     copy(
-        &manifest_dir.join("shaders"),
-        &executable_path.join("shaders"),
+        &manifest_dir.join("assets"),
+        &executable_path.join("assets-14-x"),
     );
 }
 

lesson-11/build.rs

@@ -12,6 +12,7 @@ mod debug;
 
 use failure::err_msg;
 use resources::Resources;
+use std::path::Path;
 use nalgebra as na;
 
 fn main() {
@@ -21,7 +22,7 @@ fn main() {
 }
 
 fn run() -> Result<(), failure::Error> {
-    let res = Resources::from_exe_path()?;
+    let res = Resources::from_relative_exe_path(Path::new("assets-14-x")).unwrap();
 
     let sdl = sdl2::init().map_err(err_msg)?;
     let video_subsystem = sdl.video().map_err(err_msg)?;