From 38a320ae71bb72b455cac18b5569e7df94b44d07 Mon Sep 17 00:00:00 2001 From: brd55 Date: Sun, 4 Jun 2023 14:59:18 -0400 Subject: [PATCH] Updated BladeAngle to always respect min and max --- style_editor.html | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/style_editor.html b/style_editor.html index 8bb72dc..e2a1b3d 100644 --- a/style_editor.html +++ b/style_editor.html @@ -7801,17 +7801,12 @@ } run(blade) { super.run(blade); - if (IN_FRAME) { - var min = this.MIN.getInteger(0); - var max = this.MAX.getInteger(0); - var v = fract( (BLADE_ANGLE + Math.PI / 2) / Math.PI); - if (v > 1) v = 2 - v; - v *= 32768.0; - this.var_ = clamp((v - min) * 32768 / (max - min), 0, 32768); - } else { - var v = Math.sin(millis() * Math.PI / 10000.0)/2.0 + 0.5; - this.var_ = clamp(v * 32768, 0, 32768); - } + var v = IN_FRAME ? fract( (BLADE_ANGLE + Math.PI / 2) / Math.PI) : Math.sin(millis() * Math.PI / 10000.0)/2.0 + 0.5; + var min = this.MIN.getInteger(0); + var max = this.MAX.getInteger(0); + if (v > 1) v = 2 - v; + v *= 32768.0; + this.var_ = clamp((v - min) * 32768 / (max - min), 0, 32768); } getInteger(led) { return this.var_; } };