Refactor redundant conditionals

Author: coder543

src/sim_data.rs

@@ -59,23 +59,25 @@ impl Star {
         let g: f64;
         let b: f64;
         let mut t: f64;
+
         if bv < -0.4 {
             bv = -0.4;
         }
         if bv > 2.0 {
             bv = 2.0;
         }
+
         if (bv >= -0.40) && (bv < 0.00) {
             t = (bv + 0.40) / (0.00 + 0.40);
             r = 0.61 + (0.11 * t) + (0.1 * t * t);
         } else if (bv >= 0.00) && (bv < 0.40) {
             t = (bv - 0.00) / (0.40 - 0.00);
             r = 0.83 + (0.17 * t);
-        } else if (bv >= 0.40) && (bv < 2.10) {
-            r = 1.00;
         } else {
-            r = 1.0;
+            // if (bv >= 0.40) && (bv < 2.10)
+            r = 1.00;
         }
+
         if (bv >= -0.40) && (bv < 0.00) {
             t = (bv + 0.40) / (0.00 + 0.40);
             g = 0.70 + (0.07 * t) + (0.1 * t * t);
@@ -91,15 +93,15 @@ impl Star {
         } else {
             g = 1.0;
         }
-        if (bv >= -0.40) && (bv < 0.40) {
-            b = 1.00;
-        } else if (bv >= 0.40) && (bv < 1.50) {
+
+        if (bv >= 0.40) && (bv < 1.50) {
             t = (bv - 0.40) / (1.50 - 0.40);
             b = 1.00 - (0.47 * t) + (0.1 * t * t);
         } else if (bv >= 1.50) && (bv < 1.94) {
             t = (bv - 1.50) / (1.94 - 1.50);
             b = 0.63 - (0.6 * t * t);
         } else {
+            // if (bv >= -0.40) && (bv < 0.40)
             b = 1.0;
         }