format

Author: gajop

native/src/sbc/heightmap/commands/set_heightmap_brush_command.rs

@@ -7,8 +7,8 @@ use serde::Deserialize;
 
 use crate::sbc::command_system::command::Command;
 use crate::sbc::command_system::context::Context;
-use crate::sbc::command_system::registry::register_command;
 use crate::sbc::command_system::hashmap_to_vector::hashmap_to_vector;
+use crate::sbc::command_system::registry::register_command;
 use crate::sbc::heightmap::model::terrain_manager::GreyscaleShape;
 
 // TODO: Load directly in Rust so we don't need to pass these large arrays

native/src/sbc/heightmap/commands/terrain_grass_command.rs

@@ -5,10 +5,10 @@ use log::debug;
 use serde::Deserialize;
 use spring_native::prelude::*;
 
-use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
 use crate::sbc::command_system::command::Command;
 use crate::sbc::command_system::context::Context;
 use crate::sbc::command_system::registry::register_command;
+use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
 
 const GRASS_STEP: usize = 8 * 4;
 

native/src/sbc/heightmap/commands/terrain_level_command.rs

@@ -4,11 +4,11 @@ use log::debug;
 use serde::Deserialize;
 use spring_native::prelude::*;
 
-use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
-use crate::sbc::heightmap::model::terrain_manager::TerrainManager;
 use crate::sbc::command_system::command::Command;
 use crate::sbc::command_system::context::Context;
 use crate::sbc::command_system::registry::register_command;
+use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
+use crate::sbc::heightmap::model::terrain_manager::TerrainManager;
 
 const SQUARE_SIZE: usize = 8;
 

native/src/sbc/heightmap/commands/terrain_metal_command.rs

@@ -5,10 +5,10 @@ use log::debug;
 use serde::Deserialize;
 use spring_native::prelude::*;
 
-use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
 use crate::sbc::command_system::command::Command;
 use crate::sbc::command_system::context::Context;
 use crate::sbc::command_system::registry::register_command;
+use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
 
 const METAL_RESOLUTION: usize = 16;
 

native/src/sbc/heightmap/commands/terrain_shape_modify_command.rs

@@ -3,11 +3,11 @@ use std::collections::HashMap;
 use log::debug;
 use serde::Deserialize;
 
-use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
-use crate::sbc::heightmap::model::terrain_manager::TerrainManager;
 use crate::sbc::command_system::command::Command;
 use crate::sbc::command_system::context::Context;
 use crate::sbc::command_system::registry::register_command;
+use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
+use crate::sbc::heightmap::model::terrain_manager::TerrainManager;
 
 const SQUARE_SIZE: usize = 8;
 

native/src/sbc/heightmap/commands/terrain_smooth_command.rs

@@ -5,11 +5,11 @@ use log::debug;
 use serde::Deserialize;
 use spring_native::prelude::*;
 
-use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
-use crate::sbc::heightmap::model::terrain_manager::TerrainManager;
 use crate::sbc::command_system::command::Command;
 use crate::sbc::command_system::context::Context;
 use crate::sbc::command_system::registry::register_command;
+use crate::sbc::heightmap::model::brush_modify::{BrushModify, BrushOptions, Params};
+use crate::sbc::heightmap::model::terrain_manager::TerrainManager;
 
 const SQUARE_SIZE: usize = 8;
 

native/src/sbc/textures/commands/terrain_change_texture_command.rs

@@ -185,15 +185,19 @@ impl TerrainChangeTextureCommand {
                     if k == "diffuse" {
                         paint.brush_diffuse = Some(Texture::from(s.to_string()));
                     } else {
-                        paint.brush_shading.push((k.clone(), Texture::from(s.to_string())));
+                        paint
+                            .brush_shading
+                            .push((k.clone(), Texture::from(s.to_string())));
                     }
                 }
             }
         }
         if let Some(obj) = o.shading_texture.as_object() {
             for (k, v) in obj {
                 if let Some(s) = v.as_str() {
-                    paint.shading_textures.push((k.clone(), Texture::from(s.to_string())));
+                    paint
+                        .shading_textures
+                        .push((k.clone(), Texture::from(s.to_string())));
                 }
             }
         }

native/src/sbc/textures/commands/terrain_change_texture_merged_command.rs

@@ -13,7 +13,9 @@ pub struct TerrainChangeTextureMergedCommand;
 impl Command for TerrainChangeTextureMergedCommand {
     fn execute(&mut self, ctx: &mut Context) {
         let id = ctx.current_command_id;
-        ctx.model::<TextureModel>().history.close_or_redo_stroke(Some(id));
+        ctx.model::<TextureModel>()
+            .history
+            .close_or_redo_stroke(Some(id));
     }
 
     fn unexecute(&mut self, ctx: &mut Context) {

native/src/sbc/textures/model/draw/diffuse.rs

@@ -7,7 +7,9 @@ use crate::sbc::textures::model::texture_drawing::{
 use crate::sbc::textures::model::texture_model::TextureModel;
 
 use super::options::{PaintOptions, Region};
-use super::shared::{blend_mode_expr, set_diffuse_uniforms, set_region_uniforms, SHADER_PATH_DIFFUSE};
+use super::shared::{
+    blend_mode_expr, set_diffuse_uniforms, set_region_uniforms, SHADER_PATH_DIFFUSE,
+};
 
 pub fn paint_diffuse(
     interface: &NativeInterfaceRef,
@@ -22,7 +24,8 @@ pub fn paint_diffuse(
         return;
     };
     let Some(shader) =
-        tm.shaders.get_or_compile(interface, SHADER_PATH_DIFFUSE, blend_mode_expr(opts.mode))
+        tm.shaders
+            .get_or_compile(interface, SHADER_PATH_DIFFUSE, blend_mode_expr(opts.mode))
     else {
         return;
     };
@@ -32,7 +35,13 @@ pub fn paint_diffuse(
     let size = region.size;
     let t_coord = generate_texture_coords(region.x, region.z, size, size, &opts.tex_coord_opts());
 
-    let tiles = tm.history.back_up_region(&tm.tiles, region.x, region.z, region.end_x(), region.end_z());
+    let tiles = tm.history.back_up_region(
+        &tm.tiles,
+        region.x,
+        region.z,
+        region.end_x(),
+        region.end_z(),
+    );
     let mut jobs = Vec::new();
     for tile in tiles {
         let (m_coord, v_coord) = generate_map_coords(tile.offset_x, tile.offset_z, size, size);

native/src/sbc/textures/model/draw/filter.rs

@@ -24,7 +24,9 @@ pub fn paint_filter(
 
     let size = end_x - start_x;
     let t_coord = generate_texture_coords(start_x, start_z, size, size, &opts.tex_coord_opts());
-    let tiles = tm.history.back_up_region(&tm.tiles, start_x, start_z, end_x, end_z);
+    let tiles = tm
+        .history
+        .back_up_region(&tm.tiles, start_x, start_z, end_x, end_z);
     let mut jobs = Vec::new();
     for tile in tiles {
         let (m_coord, v_coord) = generate_map_coords(tile.offset_x, tile.offset_z, size, size);