Skip to content

Commit 89aed99

Browse files
committed
minor formatting
1 parent 28ee3ef commit 89aed99

25 files changed

+100
-33
lines changed

Diff for: src/_1_getting_started/_3_3_shaders_class.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ pub fn main_1_3_3() {
4040
gl::load_with(|symbol| window.get_proc_address(symbol) as *const _);
4141

4242
let (ourShader, VAO) = unsafe {
43-
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)
43+
let ourShader = Shader::new(
44+
"src/_1_getting_started/shaders/3.3.shader.vs",
45+
"src/_1_getting_started/shaders/3.3.shader.fs"
46+
); // you can name your shader files however you like)
4447

4548
// set up vertex data (and buffer(s)) and configure vertex attributes
4649
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_4_1_textures.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ pub fn main_1_4_1() {
4646
let (ourShader, VBO, VAO, EBO, texture) = unsafe {
4747
// build and compile our shader program
4848
// ------------------------------------
49-
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)
49+
let ourShader = Shader::new(
50+
"src/_1_getting_started/shaders/4.1.texture.vs",
51+
"src/_1_getting_started/shaders/4.1.texture.fs");
5052

5153
// set up vertex data (and buffer(s)) and configure vertex attributes
5254
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_4_2_textures_combined.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ pub fn main_1_4_2() {
4747
let (ourShader, VBO, VAO, EBO, texture1, texture2) = unsafe {
4848
// build and compile our shader program
4949
// ------------------------------------
50-
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)
50+
let ourShader = Shader::new(
51+
"src/_1_getting_started/shaders/4.2.texture.vs",
52+
"src/_1_getting_started/shaders/4.2.texture.fs");
5153

5254
// set up vertex data (and buffer(s)) and configure vertex attributes
5355
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_5_1_transformations.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ pub fn main_1_5_1() {
5050
let (ourShader, VBO, VAO, EBO, texture1, texture2) = unsafe {
5151
// build and compile our shader program
5252
// ------------------------------------
53-
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)
53+
let ourShader = Shader::new(
54+
"src/_1_getting_started/shaders/5.1.transform.vs",
55+
"src/_1_getting_started/shaders/5.1.transform.fs");
5456

5557
// set up vertex data (and buffer(s)) and configure vertex attributes
5658
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_6_1_coordinate_systems.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ pub fn main_1_6_1() {
5050
let (ourShader, VBO, VAO, EBO, texture1, texture2) = unsafe {
5151
// build and compile our shader program
5252
// ------------------------------------
53-
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)
53+
let ourShader = Shader::new(
54+
"src/_1_getting_started/shaders/6.1.coordinate_systems.vs",
55+
"src/_1_getting_started/shaders/6.1.coordinate_systems.fs");
5456

5557
// set up vertex data (and buffer(s)) and configure vertex attributes
5658
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_6_2_coordinate_systems_depth.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ pub fn main_1_6_2() {
5454

5555
// build and compile our shader program
5656
// ------------------------------------
57-
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)
57+
let ourShader = Shader::new(
58+
"src/_1_getting_started/shaders/6.2.coordinate_systems.vs",
59+
"src/_1_getting_started/shaders/6.2.coordinate_systems.fs");
5860

5961
// set up vertex data (and buffer(s)) and configure vertex attributes
6062
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_6_3_coordinate_systems_multiple.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ pub fn main_1_6_3() {
5454

5555
// build and compile our shader program
5656
// ------------------------------------
57-
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)
57+
let ourShader = Shader::new(
58+
"src/_1_getting_started/shaders/6.3.coordinate_systems.vs",
59+
"src/_1_getting_started/shaders/6.3.coordinate_systems.fs");
5860

5961
// set up vertex data (and buffer(s)) and configure vertex attributes
6062
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_7_1_camera_circle.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ pub fn main_1_7_1() {
5454

5555
// build and compile our shader program
5656
// ------------------------------------
57-
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)
57+
let ourShader = Shader::new(
58+
"src/_1_getting_started/shaders/7.1.camera.vs",
59+
"src/_1_getting_started/shaders/7.1.camera.fs");
5860

5961
// set up vertex data (and buffer(s)) and configure vertex attributes
6062
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_7_2_camera_keyboard_dt.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ pub fn main_1_7_2() {
7272

7373
// build and compile our shader program
7474
// ------------------------------------
75-
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)
75+
let ourShader = Shader::new(
76+
"src/_1_getting_started/shaders/7.2.camera.vs",
77+
"src/_1_getting_started/shaders/7.2.camera.fs");
7678

7779
// set up vertex data (and buffer(s)) and configure vertex attributes
7880
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_7_3_camera_mouse_zoom.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ pub fn main_1_7_3() {
8484

8585
// build and compile our shader program
8686
// ------------------------------------
87-
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)
87+
let ourShader = Shader::new(
88+
"src/_1_getting_started/shaders/7.3.camera.vs",
89+
"src/_1_getting_started/shaders/7.3.camera.fs");
8890

8991
// set up vertex data (and buffer(s)) and configure vertex attributes
9092
// ------------------------------------------------------------------

Diff for: src/_1_getting_started/_7_4_camera_class.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ pub fn main_1_7_4() {
7373

7474
// build and compile our shader program
7575
// ------------------------------------
76-
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)
76+
let ourShader = Shader::new(
77+
"src/_1_getting_started/shaders/7.4.camera.vs",
78+
"src/_1_getting_started/shaders/7.4.camera.fs");
7779

7880
// set up vertex data (and buffer(s)) and configure vertex attributes
7981
// ------------------------------------------------------------------

Diff for: src/_2_lighting/_1_colors.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ pub fn main_2_1() {
7171

7272
// build and compile our shader program
7373
// ------------------------------------
74-
let lightingShader = Shader::new("src/_2_lighting/shaders/1.colors.vs", "src/_2_lighting/shaders/1.colors.fs");
75-
let lampShader = Shader::new("src/_2_lighting/shaders/1.lamp.vs", "src/_2_lighting/shaders/1.lamp.fs");
74+
let lightingShader = Shader::new(
75+
"src/_2_lighting/shaders/1.colors.vs",
76+
"src/_2_lighting/shaders/1.colors.fs");
77+
let lampShader = Shader::new(
78+
"src/_2_lighting/shaders/1.lamp.vs",
79+
"src/_2_lighting/shaders/1.lamp.fs");
7680

7781
// set up vertex data (and buffer(s)) and configure vertex attributes
7882
// ------------------------------------------------------------------

Diff for: src/_2_lighting/_2_1_basic_lighting_diffuse.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ pub fn main_2_2_1() {
7171

7272
// build and compile our shader program
7373
// ------------------------------------
74-
let lightingShader = Shader::new("src/_2_lighting/shaders/2.1.basic_lighting.vs", "src/_2_lighting/shaders/2.1.basic_lighting.fs");
75-
let lampShader = Shader::new("src/_2_lighting/shaders/2.1.lamp.vs", "src/_2_lighting/shaders/2.1.lamp.fs");
74+
let lightingShader = Shader::new(
75+
"src/_2_lighting/shaders/2.1.basic_lighting.vs",
76+
"src/_2_lighting/shaders/2.1.basic_lighting.fs");
77+
let lampShader = Shader::new(
78+
"src/_2_lighting/shaders/2.1.lamp.vs",
79+
"src/_2_lighting/shaders/2.1.lamp.fs");
7680

7781
// set up vertex data (and buffer(s)) and configure vertex attributes
7882
// ------------------------------------------------------------------

Diff for: src/_2_lighting/_2_2_basic_lighting_specular.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ pub fn main_2_2_2() {
7171

7272
// build and compile our shader program
7373
// ------------------------------------
74-
let lightingShader = Shader::new("src/_2_lighting/shaders/2.2.basic_lighting.vs", "src/_2_lighting/shaders/2.2.basic_lighting.fs");
75-
let lampShader = Shader::new("src/_2_lighting/shaders/2.2.lamp.vs", "src/_2_lighting/shaders/2.2.lamp.fs");
74+
let lightingShader = Shader::new(
75+
"src/_2_lighting/shaders/2.2.basic_lighting.vs",
76+
"src/_2_lighting/shaders/2.2.basic_lighting.fs");
77+
let lampShader = Shader::new(
78+
"src/_2_lighting/shaders/2.2.lamp.vs",
79+
"src/_2_lighting/shaders/2.2.lamp.fs");
7680

7781
// set up vertex data (and buffer(s)) and configure vertex attributes
7882
// ------------------------------------------------------------------

Diff for: src/_2_lighting/_3_1_materials.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ pub fn main_2_3_1() {
7171

7272
// build and compile our shader program
7373
// ------------------------------------
74-
let lightingShader = Shader::new("src/_2_lighting/shaders/3.1.materials.vs", "src/_2_lighting/shaders/3.1.materials.fs");
75-
let lampShader = Shader::new("src/_2_lighting/shaders/3.1.lamp.vs", "src/_2_lighting/shaders/3.1.lamp.fs");
74+
let lightingShader = Shader::new(
75+
"src/_2_lighting/shaders/3.1.materials.vs",
76+
"src/_2_lighting/shaders/3.1.materials.fs");
77+
let lampShader = Shader::new(
78+
"src/_2_lighting/shaders/3.1.lamp.vs",
79+
"src/_2_lighting/shaders/3.1.lamp.fs");
7680

7781
// set up vertex data (and buffer(s)) and configure vertex attributes
7882
// ------------------------------------------------------------------

Diff for: src/_2_lighting/_4_1_lighting_maps_diffuse_map.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ pub fn main_2_4_1() {
7171

7272
// build and compile our shader program
7373
// ------------------------------------
74-
let lightingShader = Shader::new("src/_2_lighting/shaders/4.1.lighting_maps.vs", "src/_2_lighting/shaders/4.1.lighting_maps.fs");
75-
let lampShader = Shader::new("src/_2_lighting/shaders/4.1.lamp.vs", "src/_2_lighting/shaders/4.1.lamp.fs");
74+
let lightingShader = Shader::new(
75+
"src/_2_lighting/shaders/4.1.lighting_maps.vs",
76+
"src/_2_lighting/shaders/4.1.lighting_maps.fs");
77+
let lampShader = Shader::new(
78+
"src/_2_lighting/shaders/4.1.lamp.vs",
79+
"src/_2_lighting/shaders/4.1.lamp.fs");
7680

7781
// set up vertex data (and buffer(s)) and configure vertex attributes
7882
// ------------------------------------------------------------------

Diff for: src/_2_lighting/_4_2_lighting_maps_specular_map.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ pub fn main_2_4_2() {
7171

7272
// build and compile our shader program
7373
// ------------------------------------
74-
let lightingShader = Shader::new("src/_2_lighting/shaders/4.2.lighting_maps.vs", "src/_2_lighting/shaders/4.2.lighting_maps.fs");
75-
let lampShader = Shader::new("src/_2_lighting/shaders/4.2.lamp.vs", "src/_2_lighting/shaders/4.2.lamp.fs");
74+
let lightingShader = Shader::new(
75+
"src/_2_lighting/shaders/4.2.lighting_maps.vs",
76+
"src/_2_lighting/shaders/4.2.lighting_maps.fs");
77+
let lampShader = Shader::new(
78+
"src/_2_lighting/shaders/4.2.lamp.vs",
79+
"src/_2_lighting/shaders/4.2.lamp.fs");
7680

7781
// set up vertex data (and buffer(s)) and configure vertex attributes
7882
// ------------------------------------------------------------------

Diff for: src/_2_lighting/_5_1_light_casters_directional.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ pub fn main_2_5_1() {
6868

6969
// build and compile our shader program
7070
// ------------------------------------
71-
let lightingShader = Shader::new("src/_2_lighting/shaders/5.1.light_casters.vs", "src/_2_lighting/shaders/5.1.light_casters.fs");
71+
let lightingShader = Shader::new(
72+
"src/_2_lighting/shaders/5.1.light_casters.vs",
73+
"src/_2_lighting/shaders/5.1.light_casters.fs");
7274

7375
// set up vertex data (and buffer(s)) and configure vertex attributes
7476
// ------------------------------------------------------------------

Diff for: src/_2_lighting/_5_2_light_casters_point.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ pub fn main_2_5_2() {
7171

7272
// build and compile our shader program
7373
// ------------------------------------
74-
let lightingShader = Shader::new("src/_2_lighting/shaders/5.2.light_casters.vs", "src/_2_lighting/shaders/5.2.light_casters.fs");
75-
let lampShader = Shader::new("src/_2_lighting/shaders/5.2.lamp.vs", "src/_2_lighting/shaders/5.2.lamp.fs");
74+
let lightingShader = Shader::new(
75+
"src/_2_lighting/shaders/5.2.light_casters.vs",
76+
"src/_2_lighting/shaders/5.2.light_casters.fs");
77+
let lampShader = Shader::new(
78+
"src/_2_lighting/shaders/5.2.lamp.vs",
79+
"src/_2_lighting/shaders/5.2.lamp.fs");
7680

7781
// set up vertex data (and buffer(s)) and configure vertex attributes
7882
// ------------------------------------------------------------------

Diff for: src/_2_lighting/_5_3_light_casters_spot.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ pub fn main_2_5_3() {
6868

6969
// build and compile our shader program
7070
// ------------------------------------
71-
let lightingShader = Shader::new("src/_2_lighting/shaders/5.3.light_casters.vs", "src/_2_lighting/shaders/5.3.light_casters.fs");
71+
let lightingShader = Shader::new(
72+
"src/_2_lighting/shaders/5.3.light_casters.vs",
73+
"src/_2_lighting/shaders/5.3.light_casters.fs");
7274
// let lampShader = Shader::new("src/_2_lighting/shaders/5.3.lamp.vs", "src/_2_lighting/shaders/5.3.lamp.fs");
7375

7476
// set up vertex data (and buffer(s)) and configure vertex attributes

Diff for: src/_2_lighting/_5_4_light_casters_spot_soft.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ pub fn main_2_5_4() {
6868

6969
// build and compile our shader program
7070
// ------------------------------------
71-
let lightingShader = Shader::new("src/_2_lighting/shaders/5.4.light_casters.vs", "src/_2_lighting/shaders/5.4.light_casters.fs");
71+
let lightingShader = Shader::new(
72+
"src/_2_lighting/shaders/5.4.light_casters.vs",
73+
"src/_2_lighting/shaders/5.4.light_casters.fs");
7274
// let lampShader = Shader::new("src/_2_lighting/shaders/5.4.lamp.vs", "src/_2_lighting/shaders/5.4.lamp.fs");
7375

7476
// set up vertex data (and buffer(s)) and configure vertex attributes

Diff for: src/_2_lighting/_6_multiple_lights.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,12 @@ pub fn main_2_6() {
6868

6969
// build and compile our shader program
7070
// ------------------------------------
71-
let lightingShader = Shader::new("src/_2_lighting/shaders/6.multiple_lights.vs", "src/_2_lighting/shaders/6.multiple_lights.fs");
72-
let lampShader = Shader::new("src/_2_lighting/shaders/6.lamp.vs", "src/_2_lighting/shaders/6.lamp.fs");
71+
let lightingShader = Shader::new(
72+
"src/_2_lighting/shaders/6.multiple_lights.vs",
73+
"src/_2_lighting/shaders/6.multiple_lights.fs");
74+
let lampShader = Shader::new(
75+
"src/_2_lighting/shaders/6.lamp.vs",
76+
"src/_2_lighting/shaders/6.lamp.fs");
7377

7478
// set up vertex data (and buffer(s)) and configure vertex attributes
7579
// ------------------------------------------------------------------

Diff for: src/_4_advanced_opengl/_1_1_depth_testing.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ pub fn main_4_1_1() {
7070

7171
// build and compile our shader program
7272
// ------------------------------------
73-
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)
73+
let shader = Shader::new(
74+
"src/_4_advanced_opengl/shaders/1.1.depth_testing.vs",
75+
"src/_4_advanced_opengl/shaders/1.1.depth_testing.fs");
7476

7577
// set up vertex data (and buffer(s)) and configure vertex attributes
7678
// ------------------------------------------------------------------

Diff for: src/_4_advanced_opengl/_1_2_depth_testing_view.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ pub fn main_4_1_2() {
7070

7171
// build and compile our shader program
7272
// ------------------------------------
73-
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)
73+
let shader = Shader::new(
74+
"src/_4_advanced_opengl/shaders/1.2.depth_testing.vs",
75+
"src/_4_advanced_opengl/shaders/1.2.depth_testing.fs"); // you can name your shader files however you like)
7476

7577
// set up vertex data (and buffer(s)) and configure vertex attributes
7678
// ------------------------------------------------------------------

Diff for: src/_7_in_practice/_1_debugging.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,9 @@ pub fn main_7_1() {
147147
gl::Enable(gl::CULL_FACE);
148148

149149
// OpenGL initial state
150-
let shader = Shader::new("src/_7_in_practice/shaders/debugging.vs", "src/_7_in_practice/shaders/debugging.fs");
150+
let shader = Shader::new(
151+
"src/_7_in_practice/shaders/debugging.vs",
152+
"src/_7_in_practice/shaders/debugging.fs");
151153

152154
// configure 3D cube
153155
let (mut cubeVAO, mut cubeVBO) = (0, 0);

0 commit comments

Comments
 (0)