From 2a192d9a2d97704a66fd7a9c51af387f6562e47f Mon Sep 17 00:00:00 2001
From: kacper <neronim66@gmail.com>
Date: Sun, 28 Jul 2019 16:00:14 +0200
Subject: [PATCH] formatting
---
server/src/cmd.rs | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index ae0823e70a..a32f195d1e 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -589,18 +589,18 @@ fn handle_light(server: &mut Server, entity: EcsEntity, args: String, action: &C
scan_fmt!(&args, action.arg_fmt, f32, f32, f32, f32, f32, f32, f32);
let mut light_emitter = comp::LightEmitter::default();
-
+
if let (Some(r), Some(g), Some(b)) = (opt_r, opt_g, opt_b) {
- let r = clamp(r,0.0,1.0);
- let g = clamp(g,0.0,1.0);
- let b = clamp(b,0.0,1.0);
+ let r = clamp(r, 0.0, 1.0);
+ let g = clamp(g, 0.0, 1.0);
+ let b = clamp(b, 0.0, 1.0);
light_emitter.col = Rgb::new(r, g, b)
};
if let (Some(x), Some(y), Some(z)) = (opt_x, opt_y, opt_z) {
light_emitter.offset = Vec3::new(x, y, z)
};
if let Some(s) = opt_s {
- light_emitter.strength = clamp(s,0.0,100.0)
+ light_emitter.strength = clamp(s, 0.0, 100.0)
};
let pos = server
.state
@@ -643,7 +643,7 @@ fn handle_lantern(server: &mut Server, entity: EcsEntity, args: String, action:
.write_storage::<comp::LightEmitter>()
.get_mut(entity)
{
- light.strength = clamp(s,0.0,100.0);
+ light.strength = clamp(s, 0.0, 100.0);
server.clients.notify(
entity,
ServerMsg::chat(String::from("You played with flame strength.")),
@@ -670,7 +670,11 @@ fn handle_lantern(server: &mut Server, entity: EcsEntity, args: String, action:
comp::LightEmitter {
offset: Vec3::new(1.0, 0.2, 0.8),
col: Rgb::new(0.824, 0.365, 0.196),
- strength: if let Some(s) = opt_s { clamp(s,0.0,100.0) } else { 2.0 },
+ strength: if let Some(s) = opt_s {
+ clamp(s, 0.0, 100.0)
+ } else {
+ 2.0
+ },
},
);
@@ -747,15 +751,15 @@ fn handle_tell(server: &mut Server, entity: EcsEntity, args: String, action: &Ch
}
}
//#region Helper
- fn clamp(value: f32,min:f32,max:f32) -> f32 {
- if value >= min {
- if value > max {
- max
- } else {
- value
- }
+fn clamp(value: f32, min: f32, max: f32) -> f32 {
+ if value >= min {
+ if value > max {
+ max
} else {
- min
+ value
}
+ } else {
+ min
}
- //#endregion
\ No newline at end of file
+}
+//#endregion