|
@@ -1,4 +1,4 @@
|
|
|
-import * as MathUtils from './MathUtils.js';
|
|
|
+import { clamp, euclideanModulo, lerp } from './MathUtils.js';
|
|
|
|
|
|
const _colorKeywords = { 'aliceblue': 0xF0F8FF, 'antiquewhite': 0xFAEBD7, 'aqua': 0x00FFFF, 'aquamarine': 0x7FFFD4, 'azure': 0xF0FFFF,
|
|
|
'beige': 0xF5F5DC, 'bisque': 0xFFE4C4, 'black': 0x000000, 'blanchedalmond': 0xFFEBCD, 'blue': 0x0000FF, 'blueviolet': 0x8A2BE2,
|
|
@@ -121,9 +121,9 @@ class Color {
|
|
|
setHSL( h, s, l ) {
|
|
|
|
|
|
// h,s,l ranges are in 0.0 - 1.0
|
|
|
- h = MathUtils.euclideanModulo( h, 1 );
|
|
|
- s = MathUtils.clamp( s, 0, 1 );
|
|
|
- l = MathUtils.clamp( l, 0, 1 );
|
|
|
+ h = euclideanModulo( h, 1 );
|
|
|
+ s = clamp( s, 0, 1 );
|
|
|
+ l = clamp( l, 0, 1 );
|
|
|
|
|
|
if ( s === 0 ) {
|
|
|
|
|
@@ -492,9 +492,9 @@ class Color {
|
|
|
this.getHSL( _hslA );
|
|
|
color.getHSL( _hslB );
|
|
|
|
|
|
- const h = MathUtils.lerp( _hslA.h, _hslB.h, alpha );
|
|
|
- const s = MathUtils.lerp( _hslA.s, _hslB.s, alpha );
|
|
|
- const l = MathUtils.lerp( _hslA.l, _hslB.l, alpha );
|
|
|
+ const h = lerp( _hslA.h, _hslB.h, alpha );
|
|
|
+ const s = lerp( _hslA.s, _hslB.s, alpha );
|
|
|
+ const l = lerp( _hslA.l, _hslB.l, alpha );
|
|
|
|
|
|
this.setHSL( h, s, l );
|
|
|
|