Fastcheck

Author: CuddlyBunion341

src/client/player/systems/controller.rs

@@ -5,23 +5,20 @@ const SPAWN_POINT: Vec3 = Vec3::new(128.0, 96.0, -128.0);
 
 pub fn setup_player_camera(mut commands: Commands) {
     commands.spawn((
-            Name::new("Player cam?"),
+        Name::new("Player cam?"),
         Camera3d::default(),
         // Projection::Perspective(PerspectiveProjection {
         //     fov: TAU / 5.0,
         //     ..default()
         // }),
-        Projection::Orthographic(
-            OrthographicProjection {
-                scale: 0.125,
-                near: 0.0001,
-                far: 1000.0,
-                viewport_origin: Vec2::new(0.5, 0.5),
-                scaling_mode: ScalingMode::WindowSize,
-                area: Rect::new(-1.0, -1.0, 1.0, 1.0),
-            }
-            .into(),
-        ),
+        Projection::Orthographic(OrthographicProjection {
+            scale: 0.125,
+            near: 0.0001,
+            far: 1000.0,
+            viewport_origin: Vec2::new(0.5, 0.5),
+            scaling_mode: ScalingMode::WindowSize,
+            area: Rect::new(-1.0, -1.0, 1.0, 1.0),
+        }),
         RenderPlayer {
             logical_entity: Entity::from_raw(0),
         },

src/server/terrain/resources.rs

@@ -1,5 +1,3 @@
-use std::fmt::Display;
-
 use crate::prelude::*;
 
 use bevy::utils::HashMap;
@@ -99,12 +97,12 @@ impl Default for TerrainGeneratorParams {
 pub enum TextureType {
     Height,
     HeightAdjust,
-    Density
+    Density,
 }
 
 #[derive(Resource)]
 pub struct NoiseTextureList {
-    pub noise_textures: HashMap<TextureType, NoiseTexture>
+    pub noise_textures: HashMap<TextureType, NoiseTexture>,
 }
 
 impl Default for NoiseTextureList {
@@ -115,9 +113,7 @@ impl Default for NoiseTextureList {
         noise_textures.insert(TextureType::HeightAdjust, NoiseTexture::default());
         noise_textures.insert(TextureType::Density, NoiseTexture::default());
 
-        NoiseTextureList {
-            noise_textures,
-        }
+        NoiseTextureList { noise_textures }
     }
 }
 

src/server/terrain/systems.rs

@@ -37,7 +37,10 @@ mod visualizer {
     use renet::{DefaultChannel, RenetServer};
     use rsmc::{Chunk, ChunkManager, NetworkingMessage, CHUNK_SIZE};
 
-    use super::{terrain_events, terrain_resources::{self, NoiseFunctionParams, NoiseTexture, TextureType}};
+    use super::{
+        terrain_events,
+        terrain_resources::{self, NoiseFunctionParams, TextureType},
+    };
 
     fn map_range(value: f64, min: f64, max: f64, new_min: f64, new_max: f64) -> f64 {
         ((value - min) / (max - min)) * (new_max - new_min) + new_min
@@ -46,7 +49,6 @@ mod visualizer {
     fn generate_terrain_heightmap(
         generator: &terrain_resources::Generator,
         texture_type: &TextureType,
-        origin: Vec3,
         size: Vec3,
         draw_chunk_border: bool,
     ) -> ImageData {
@@ -59,31 +61,30 @@ mod visualizer {
             for z in 0..height {
                 let index = x + z * width;
 
-                if draw_chunk_border {
-                    if x % CHUNK_SIZE == 0 || z % CHUNK_SIZE == 0 {
-                        data[index] = 255;
-                        continue;
-                    }
+                if draw_chunk_border && (x % CHUNK_SIZE == 0 || z % CHUNK_SIZE == 0) {
+                    data[index] = 255;
+                    continue;
                 }
 
                 match texture_type {
                     TextureType::Height => {
-                        let sample_position = Vec2::new((origin.x + x as f32) / 1.0, (origin.z + z as f32) / 1.0);
+                        let sample_position = Vec2::new(x as f32, z as f32);
                         let value = generator.normalized_spline_terrain_sample(sample_position);
-                        let value = ( value * size.y as f64 ) / 2.0 + 0.5;
+                        let value = (value * size.y as f64) / 2.0 + 0.5;
 
-                        data[index] = value as u8; 
+                        data[index] = value as u8;
                     }
                     TextureType::HeightAdjust => {
-                        let sample_position = Vec2::new((origin.x + x as f32) / 1.0, (origin.z + z as f32) / 1.0);
-                        let value = generator.sample_2d(sample_position, &generator.params.height_adjust_params);
+                        let sample_position = Vec2::new(x as f32, z as f32);
+                        let value = generator
+                            .sample_2d(sample_position, &generator.params.height_adjust_params);
                         let value = map_range(value, -1.0, 1.0, 0.0, 255.0);
 
-                        data[index] = value as u8; 
+                        data[index] = value as u8;
                     }
                     TextureType::Density => {
                         // TODO: change to sample3D
-                        let pos = Vec2::new(origin.x + x as f32, origin.z + z as f32);
+                        let pos = Vec2::new(x as f32, z as f32);
                         let value = generator.sample_2d(pos, &generator.params.density_params);
                         let value = map_range(value, -1.0, 1.0, 0.0, 255.0);
 
@@ -124,7 +125,7 @@ mod visualizer {
                     generator.generate_chunk(&mut chunk);
                     chunk
                 })
-            .collect();
+                .collect();
 
             new_chunks.into_iter().for_each(|chunk| {
                 chunk_manager.insert_chunk(chunk);
@@ -161,17 +162,19 @@ mod visualizer {
             let image_data = generate_terrain_heightmap(
                 &generator,
                 &texture_type,
-                Vec3::ZERO,
                 Vec3::new(width as f32, height as f32, depth as f32),
-                true
+                true,
             );
 
-            let entry = noise_texture_list.noise_textures.get_mut(&texture_type).expect("Noise texture not loaded, please initialize the resource properly.");
+            let entry = noise_texture_list
+                .noise_textures
+                .get_mut(&texture_type)
+                .expect("Noise texture not loaded, please initialize the resource properly.");
 
             entry.texture = Some(contexts.ctx_mut().load_texture(
-                    "terrain-texture",
-                    image_data,
-                    TextureOptions::default(),
+                "terrain-texture",
+                image_data,
+                TextureOptions::default(),
             ));
             entry.size = Vec2::new(width as f32, height as f32);
         }
@@ -180,28 +183,57 @@ mod visualizer {
     pub fn prepare_visualizer_texture_system(
         mut event_writer: EventWriter<terrain_events::RegenerateHeightMapEvent>,
     ) {
-        event_writer.send(terrain_events::RegenerateHeightMapEvent(TextureType::Height));
-        event_writer.send(terrain_events::RegenerateHeightMapEvent(TextureType::HeightAdjust));
-        event_writer.send(terrain_events::RegenerateHeightMapEvent(TextureType::Density));
+        event_writer.send(terrain_events::RegenerateHeightMapEvent(
+            TextureType::Height,
+        ));
+        event_writer.send(terrain_events::RegenerateHeightMapEvent(
+            TextureType::HeightAdjust,
+        ));
+        event_writer.send(terrain_events::RegenerateHeightMapEvent(
+            TextureType::Density,
+        ));
     }
 
     macro_rules! add_slider {
         ($ui:expr, $changed:expr, $value:expr, $range:expr, $text:expr) => {{
-            $changed = $changed || $ui
-                .add(egui::widgets::Slider::new($value, $range).text($text))
-                .changed();
-            }};
+            $changed = $changed
+                || $ui
+                    .add(egui::widgets::Slider::new($value, $range).text($text))
+                    .changed();
+        }};
     }
 
-    fn add_sliders_for_noise_params(ui: &mut egui::Ui, changed: &mut bool, params: &mut NoiseFunctionParams) {
+    fn add_sliders_for_noise_params(
+        ui: &mut egui::Ui,
+        changed: &mut bool,
+        params: &mut NoiseFunctionParams,
+    ) {
         params.frequency = 1.0 / params.frequency;
 
         let mut loc_changed = false;
 
         add_slider!(ui, loc_changed, &mut params.octaves, 1..=8, "octaves");
-        add_slider!(ui, loc_changed, &mut params.lacuranity, 0.001..=4.0, "lacuranity");
-        add_slider!(ui, loc_changed, &mut params.frequency, 10.0..=800.0, "frequency");
-        add_slider!(ui, loc_changed, &mut params.persistence, 0.001..=1.0, "persistence");
+        add_slider!(
+            ui,
+            loc_changed,
+            &mut params.lacuranity,
+            0.001..=4.0,
+            "lacuranity"
+        );
+        add_slider!(
+            ui,
+            loc_changed,
+            &mut params.frequency,
+            10.0..=800.0,
+            "frequency"
+        );
+        add_slider!(
+            ui,
+            loc_changed,
+            &mut params.persistence,
+            0.001..=1.0,
+            "persistence"
+        );
 
         params.frequency = 1.0 / params.frequency;
 

src/server/terrain/util/generator.rs

@@ -179,7 +179,7 @@ impl Generator {
 
         sample /= weight_sum;
 
-        sample as f64
+        sample
 
         // sample.abs() * 2.0 - 1.0
     }