minor formatting

bwasty · bwasty · commit 89aed9919a23 · 2017-07-01T13:19:50.000+02:00
diff --git a/src/_1_getting_started/_3_3_shaders_class.rs b/src/_1_getting_started/_3_3_shaders_class.rs
@@ -40,7 +40,10 @@ pub fn main_1_3_3() {
     gl::load_with(|symbol| window.get_proc_address(symbol) as *const _);
 
     let (ourShader, VAO) = unsafe {
-        let ourShader = Shader::new("src/_1_getting_started/shaders/3.3.shader.vs", "src/_1_getting_started/shaders/3.3.shader.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/3.3.shader.vs",
+            "src/_1_getting_started/shaders/3.3.shader.fs"
+        ); // you can name your shader files however you like)
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_4_1_textures.rs b/src/_1_getting_started/_4_1_textures.rs
@@ -46,7 +46,9 @@ pub fn main_1_4_1() {
     let (ourShader, VBO, VAO, EBO, texture) = unsafe {
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/4.1.texture.vs", "src/_1_getting_started/shaders/4.1.texture.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/4.1.texture.vs",
+            "src/_1_getting_started/shaders/4.1.texture.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_4_2_textures_combined.rs b/src/_1_getting_started/_4_2_textures_combined.rs
@@ -47,7 +47,9 @@ pub fn main_1_4_2() {
     let (ourShader, VBO, VAO, EBO, texture1, texture2) = unsafe {
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/4.2.texture.vs", "src/_1_getting_started/shaders/4.2.texture.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/4.2.texture.vs",
+            "src/_1_getting_started/shaders/4.2.texture.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_5_1_transformations.rs b/src/_1_getting_started/_5_1_transformations.rs
@@ -50,7 +50,9 @@ pub fn main_1_5_1() {
     let (ourShader, VBO, VAO, EBO, texture1, texture2) = unsafe {
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/5.1.transform.vs", "src/_1_getting_started/shaders/5.1.transform.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/5.1.transform.vs",
+            "src/_1_getting_started/shaders/5.1.transform.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_6_1_coordinate_systems.rs b/src/_1_getting_started/_6_1_coordinate_systems.rs
@@ -50,7 +50,9 @@ pub fn main_1_6_1() {
     let (ourShader, VBO, VAO, EBO, texture1, texture2) = unsafe {
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/6.1.coordinate_systems.vs", "src/_1_getting_started/shaders/6.1.coordinate_systems.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/6.1.coordinate_systems.vs",
+            "src/_1_getting_started/shaders/6.1.coordinate_systems.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_6_2_coordinate_systems_depth.rs b/src/_1_getting_started/_6_2_coordinate_systems_depth.rs
@@ -54,7 +54,9 @@ pub fn main_1_6_2() {
 
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/6.2.coordinate_systems.vs", "src/_1_getting_started/shaders/6.2.coordinate_systems.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/6.2.coordinate_systems.vs",
+            "src/_1_getting_started/shaders/6.2.coordinate_systems.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_6_3_coordinate_systems_multiple.rs b/src/_1_getting_started/_6_3_coordinate_systems_multiple.rs
@@ -54,7 +54,9 @@ pub fn main_1_6_3() {
 
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/6.3.coordinate_systems.vs", "src/_1_getting_started/shaders/6.3.coordinate_systems.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/6.3.coordinate_systems.vs",
+            "src/_1_getting_started/shaders/6.3.coordinate_systems.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_7_1_camera_circle.rs b/src/_1_getting_started/_7_1_camera_circle.rs
@@ -54,7 +54,9 @@ pub fn main_1_7_1() {
 
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/7.1.camera.vs", "src/_1_getting_started/shaders/7.1.camera.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/7.1.camera.vs",
+            "src/_1_getting_started/shaders/7.1.camera.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_7_2_camera_keyboard_dt.rs b/src/_1_getting_started/_7_2_camera_keyboard_dt.rs
@@ -72,7 +72,9 @@ pub fn main_1_7_2() {
 
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/7.2.camera.vs", "src/_1_getting_started/shaders/7.2.camera.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/7.2.camera.vs",
+            "src/_1_getting_started/shaders/7.2.camera.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_7_3_camera_mouse_zoom.rs b/src/_1_getting_started/_7_3_camera_mouse_zoom.rs
@@ -84,7 +84,9 @@ pub fn main_1_7_3() {
 
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/7.3.camera.vs", "src/_1_getting_started/shaders/7.3.camera.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/7.3.camera.vs",
+            "src/_1_getting_started/shaders/7.3.camera.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_1_getting_started/_7_4_camera_class.rs b/src/_1_getting_started/_7_4_camera_class.rs
@@ -73,7 +73,9 @@ pub fn main_1_7_4() {
 
         // build and compile our shader program
         // ------------------------------------
-        let ourShader = Shader::new("src/_1_getting_started/shaders/7.4.camera.vs", "src/_1_getting_started/shaders/7.4.camera.fs"); // you can name your shader files however you like)
+        let ourShader = Shader::new(
+            "src/_1_getting_started/shaders/7.4.camera.vs",
+            "src/_1_getting_started/shaders/7.4.camera.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_2_lighting/_1_colors.rs b/src/_2_lighting/_1_colors.rs
@@ -71,8 +71,12 @@ pub fn main_2_1() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/1.colors.vs", "src/_2_lighting/shaders/1.colors.fs");
-        let lampShader = Shader::new("src/_2_lighting/shaders/1.lamp.vs", "src/_2_lighting/shaders/1.lamp.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/1.colors.vs",
+            "src/_2_lighting/shaders/1.colors.fs");
+        let lampShader = Shader::new(
+            "src/_2_lighting/shaders/1.lamp.vs",
+            "src/_2_lighting/shaders/1.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_2_lighting/_2_1_basic_lighting_diffuse.rs b/src/_2_lighting/_2_1_basic_lighting_diffuse.rs
@@ -71,8 +71,12 @@ pub fn main_2_2_1() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/2.1.basic_lighting.vs", "src/_2_lighting/shaders/2.1.basic_lighting.fs");
-        let lampShader = Shader::new("src/_2_lighting/shaders/2.1.lamp.vs", "src/_2_lighting/shaders/2.1.lamp.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/2.1.basic_lighting.vs",
+            "src/_2_lighting/shaders/2.1.basic_lighting.fs");
+        let lampShader = Shader::new(
+            "src/_2_lighting/shaders/2.1.lamp.vs",
+            "src/_2_lighting/shaders/2.1.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_2_lighting/_2_2_basic_lighting_specular.rs b/src/_2_lighting/_2_2_basic_lighting_specular.rs
@@ -71,8 +71,12 @@ pub fn main_2_2_2() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/2.2.basic_lighting.vs", "src/_2_lighting/shaders/2.2.basic_lighting.fs");
-        let lampShader = Shader::new("src/_2_lighting/shaders/2.2.lamp.vs", "src/_2_lighting/shaders/2.2.lamp.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/2.2.basic_lighting.vs",
+            "src/_2_lighting/shaders/2.2.basic_lighting.fs");
+        let lampShader = Shader::new(
+            "src/_2_lighting/shaders/2.2.lamp.vs",
+            "src/_2_lighting/shaders/2.2.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_2_lighting/_3_1_materials.rs b/src/_2_lighting/_3_1_materials.rs
@@ -71,8 +71,12 @@ pub fn main_2_3_1() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/3.1.materials.vs", "src/_2_lighting/shaders/3.1.materials.fs");
-        let lampShader = Shader::new("src/_2_lighting/shaders/3.1.lamp.vs", "src/_2_lighting/shaders/3.1.lamp.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/3.1.materials.vs",
+            "src/_2_lighting/shaders/3.1.materials.fs");
+        let lampShader = Shader::new(
+            "src/_2_lighting/shaders/3.1.lamp.vs",
+            "src/_2_lighting/shaders/3.1.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_2_lighting/_4_1_lighting_maps_diffuse_map.rs b/src/_2_lighting/_4_1_lighting_maps_diffuse_map.rs
@@ -71,8 +71,12 @@ pub fn main_2_4_1() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/4.1.lighting_maps.vs", "src/_2_lighting/shaders/4.1.lighting_maps.fs");
-        let lampShader = Shader::new("src/_2_lighting/shaders/4.1.lamp.vs", "src/_2_lighting/shaders/4.1.lamp.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/4.1.lighting_maps.vs",
+            "src/_2_lighting/shaders/4.1.lighting_maps.fs");
+        let lampShader = Shader::new(
+            "src/_2_lighting/shaders/4.1.lamp.vs",
+            "src/_2_lighting/shaders/4.1.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_2_lighting/_4_2_lighting_maps_specular_map.rs b/src/_2_lighting/_4_2_lighting_maps_specular_map.rs
@@ -71,8 +71,12 @@ pub fn main_2_4_2() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/4.2.lighting_maps.vs", "src/_2_lighting/shaders/4.2.lighting_maps.fs");
-        let lampShader = Shader::new("src/_2_lighting/shaders/4.2.lamp.vs", "src/_2_lighting/shaders/4.2.lamp.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/4.2.lighting_maps.vs",
+            "src/_2_lighting/shaders/4.2.lighting_maps.fs");
+        let lampShader = Shader::new(
+            "src/_2_lighting/shaders/4.2.lamp.vs",
+            "src/_2_lighting/shaders/4.2.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_2_lighting/_5_1_light_casters_directional.rs b/src/_2_lighting/_5_1_light_casters_directional.rs
@@ -68,7 +68,9 @@ pub fn main_2_5_1() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/5.1.light_casters.vs", "src/_2_lighting/shaders/5.1.light_casters.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/5.1.light_casters.vs",
+            "src/_2_lighting/shaders/5.1.light_casters.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_2_lighting/_5_2_light_casters_point.rs b/src/_2_lighting/_5_2_light_casters_point.rs
@@ -71,8 +71,12 @@ pub fn main_2_5_2() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/5.2.light_casters.vs", "src/_2_lighting/shaders/5.2.light_casters.fs");
-        let lampShader = Shader::new("src/_2_lighting/shaders/5.2.lamp.vs", "src/_2_lighting/shaders/5.2.lamp.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/5.2.light_casters.vs",
+            "src/_2_lighting/shaders/5.2.light_casters.fs");
+        let lampShader = Shader::new(
+            "src/_2_lighting/shaders/5.2.lamp.vs",
+            "src/_2_lighting/shaders/5.2.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_2_lighting/_5_3_light_casters_spot.rs b/src/_2_lighting/_5_3_light_casters_spot.rs
@@ -68,7 +68,9 @@ pub fn main_2_5_3() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/5.3.light_casters.vs", "src/_2_lighting/shaders/5.3.light_casters.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/5.3.light_casters.vs",
+            "src/_2_lighting/shaders/5.3.light_casters.fs");
         // let lampShader = Shader::new("src/_2_lighting/shaders/5.3.lamp.vs", "src/_2_lighting/shaders/5.3.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
diff --git a/src/_2_lighting/_5_4_light_casters_spot_soft.rs b/src/_2_lighting/_5_4_light_casters_spot_soft.rs
@@ -68,7 +68,9 @@ pub fn main_2_5_4() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/5.4.light_casters.vs", "src/_2_lighting/shaders/5.4.light_casters.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/5.4.light_casters.vs",
+            "src/_2_lighting/shaders/5.4.light_casters.fs");
         // let lampShader = Shader::new("src/_2_lighting/shaders/5.4.lamp.vs", "src/_2_lighting/shaders/5.4.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
diff --git a/src/_2_lighting/_6_multiple_lights.rs b/src/_2_lighting/_6_multiple_lights.rs
@@ -68,8 +68,12 @@ pub fn main_2_6() {
 
         // build and compile our shader program
         // ------------------------------------
-        let lightingShader = Shader::new("src/_2_lighting/shaders/6.multiple_lights.vs", "src/_2_lighting/shaders/6.multiple_lights.fs");
-        let lampShader = Shader::new("src/_2_lighting/shaders/6.lamp.vs", "src/_2_lighting/shaders/6.lamp.fs");
+        let lightingShader = Shader::new(
+            "src/_2_lighting/shaders/6.multiple_lights.vs",
+            "src/_2_lighting/shaders/6.multiple_lights.fs");
+        let lampShader = Shader::new(
+            "src/_2_lighting/shaders/6.lamp.vs",
+            "src/_2_lighting/shaders/6.lamp.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_4_advanced_opengl/_1_1_depth_testing.rs b/src/_4_advanced_opengl/_1_1_depth_testing.rs
@@ -70,7 +70,9 @@ pub fn main_4_1_1() {
 
         // build and compile our shader program
         // ------------------------------------
-        let shader = Shader::new("src/_4_advanced_opengl/shaders/1.1.depth_testing.vs", "src/_4_advanced_opengl/shaders/1.1.depth_testing.fs"); // you can name your shader files however you like)
+        let shader = Shader::new(
+            "src/_4_advanced_opengl/shaders/1.1.depth_testing.vs",
+            "src/_4_advanced_opengl/shaders/1.1.depth_testing.fs");
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_4_advanced_opengl/_1_2_depth_testing_view.rs b/src/_4_advanced_opengl/_1_2_depth_testing_view.rs
@@ -70,7 +70,9 @@ pub fn main_4_1_2() {
 
         // build and compile our shader program
         // ------------------------------------
-        let shader = Shader::new("src/_4_advanced_opengl/shaders/1.2.depth_testing.vs", "src/_4_advanced_opengl/shaders/1.2.depth_testing.fs"); // you can name your shader files however you like)
+        let shader = Shader::new(
+            "src/_4_advanced_opengl/shaders/1.2.depth_testing.vs",
+            "src/_4_advanced_opengl/shaders/1.2.depth_testing.fs"); // you can name your shader files however you like)
 
         // set up vertex data (and buffer(s)) and configure vertex attributes
         // ------------------------------------------------------------------
diff --git a/src/_7_in_practice/_1_debugging.rs b/src/_7_in_practice/_1_debugging.rs
@@ -147,7 +147,9 @@ pub fn main_7_1() {
         gl::Enable(gl::CULL_FACE);
 
         // OpenGL initial state
-        let shader = Shader::new("src/_7_in_practice/shaders/debugging.vs", "src/_7_in_practice/shaders/debugging.fs");
+        let shader = Shader::new(
+            "src/_7_in_practice/shaders/debugging.vs",
+            "src/_7_in_practice/shaders/debugging.fs");
 
         // configure 3D cube
         let (mut cubeVAO, mut cubeVBO) = (0, 0);
