diff --git a/src/main.rs b/src/main.rs index d4a9b6e..43677d1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -65,30 +65,32 @@ fn main() { glium::texture::SrgbTexture2d::new(&display, image).unwrap() }); - let mut uniform_sampler_2d_str: String = "".to_string(); - for i in 1..BIOMES_NUMBER { - uniform_sampler_2d_str += &format!(", tex{}", i); - } + let uniform_sampler_2d_str = (0..BIOMES_NUMBER) + .map(|i| format!("tex{}", i)) + .collect::>() + .join(", "); - let mut switch_v_biome_str: String = "".to_string(); - for i in 0..BIOMES_NUMBER { - switch_v_biome_str += &format!( - " + let switch_v_biome_str = (0..BIOMES_NUMBER) + .map(|i| { + format!( + " case {}u: f_color = texture(tex{}, v_tex_coords); break; ", - i, i - ); - } - switch_v_biome_str += &format!( - " + i, i + ) + }) + .collect::>() + .join("") + + &format!( + " default: // case {}u: f_color = texture(tex{}, v_tex_coords); ", - BIOMES_NUMBER - 1, - BIOMES_NUMBER - 1 - ); + BIOMES_NUMBER - 1, + BIOMES_NUMBER - 1 + ); let fragment = &format!( " @@ -99,7 +101,7 @@ fn main() { out vec4 f_color; - uniform sampler2D tex0{}; + uniform sampler2D {}; void main() {{ switch (v_biome) {{ diff --git a/src/support/camera.rs b/src/support/camera.rs index 81c916d..540236c 100644 --- a/src/support/camera.rs +++ b/src/support/camera.rs @@ -13,7 +13,7 @@ pub struct CameraState { rotate_right: bool, } -const SPEED: f32 = 1.0; //1.0; +const SPEED: f32 = 100.0; //1.0; impl CameraState { pub fn new() -> CameraState { diff --git a/src/support/mod.rs b/src/support/mod.rs index 8711cb9..b575e14 100644 --- a/src/support/mod.rs +++ b/src/support/mod.rs @@ -101,7 +101,7 @@ pub fn load_ground(display: &Display) -> VertexBufferAny { .path() .to_str() .unwrap() - .replace("Extensions/LemnosLife/Map/Altis/Ground/", "") + .replace(ground_folder, "") .replace(".height", ""); println!("{}", file_name); let file_name_parts: Vec<&str> = file_name.split(' ').collect();