diff --git a/types/mumath/clamp.d.ts b/types/mumath/clamp.d.ts index fe08302e37..9d674a9620 100644 --- a/types/mumath/clamp.d.ts +++ b/types/mumath/clamp.d.ts @@ -3,4 +3,4 @@ */ declare function clamp(value: number, left: number, right: number): number; -export default clamp; +export = clamp; diff --git a/types/mumath/closest.d.ts b/types/mumath/closest.d.ts index f2db4ea1ec..762bcb6548 100644 --- a/types/mumath/closest.d.ts +++ b/types/mumath/closest.d.ts @@ -3,4 +3,4 @@ */ declare function closest(value: number, list: number[]): number; -export default closest; +export = closest; diff --git a/types/mumath/index.d.ts b/types/mumath/index.d.ts index 3dcfccf565..ee0f0ff6c6 100644 --- a/types/mumath/index.d.ts +++ b/types/mumath/index.d.ts @@ -3,60 +3,16 @@ // Definitions by: Adam Zerella // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -/** - * Detects proper clamp min/max. - */ -export function clamp(value: number, left: number, right: number): number; +import clamp = require('./clamp'); +import closest = require('./closest'); +import isMultiple = require('./isMultiple'); +import len = require('./len'); +import lerp = require('./lerp'); +import mod = require('./mod'); +import order = require('./order'); +import precision = require('./precision'); +import round = require('./round'); +import scale = require('./scale'); +import within = require('./within'); -/** - * Get closest value out of a set. - */ -export function closest(value: number, list: number[]): number; - -/** - * Check if one number is multiple of other - * Same as a % b === 0, but with precision check. - */ -export function isMultiple(a: number, b: number, eps?: number): boolean; - -/** - * Return quadratic length of a vector. - */ -export function len(a: number, b: number): number; - -/** - * Return value interpolated between x and y. - */ -export function lerp(x: number, y: number, ratio: number): number; - -/** - * An enhanced mod-loop, like fmod — loops value within a frame. - */ -export function mod(value: number, max: number, min?: number): number; - -/** - * Get order of magnitude for a number. - */ -export function order(value: number): number; - -/** - * Get precision from float: - */ -export function precision(value: number): number; - -/** - * Rounds value to optional step. - */ -export function round(value: number, step?: number): number; - -/** - * Get first scale out of a list of basic scales, aligned to the power. E. g. - * step(.37, [1, 2, 5]) → .5 step(456, [1, 2]) → 1000 - * Similar to closest, but takes all possible powers of scales. - */ -export function scale(value: number, list: number[]): number; - -/** - * Whether element is between left & right, including. - */ -export function within(value: number, left: number, right: number): number; +export { clamp, closest, isMultiple, len, lerp, mod, order, precision, round, scale, within }; diff --git a/types/mumath/isMultiple.d.ts b/types/mumath/isMultiple.d.ts index 255d0ece72..31c7a09b08 100644 --- a/types/mumath/isMultiple.d.ts +++ b/types/mumath/isMultiple.d.ts @@ -4,4 +4,4 @@ */ declare function isMultiple(a: number, b: number, eps?: number): boolean; -export default isMultiple; +export = isMultiple; diff --git a/types/mumath/len.d.ts b/types/mumath/len.d.ts index 2392cff32f..b2fae8a8e5 100644 --- a/types/mumath/len.d.ts +++ b/types/mumath/len.d.ts @@ -3,4 +3,4 @@ */ declare function len(a: number, b: number): number; -export default len; +export = len; diff --git a/types/mumath/lerp.d.ts b/types/mumath/lerp.d.ts index 3ab8639c0c..5e09370be2 100644 --- a/types/mumath/lerp.d.ts +++ b/types/mumath/lerp.d.ts @@ -3,4 +3,4 @@ */ declare function lerp(x: number, y: number, ratio: number): number; -export default lerp; +export = lerp; diff --git a/types/mumath/mod.d.ts b/types/mumath/mod.d.ts index 6517271e45..ac1784fe06 100644 --- a/types/mumath/mod.d.ts +++ b/types/mumath/mod.d.ts @@ -3,4 +3,4 @@ */ declare function mod(value: number, max: number, min?: number): number; -export default mod; +export = mod; diff --git a/types/mumath/mumath-tests.ts b/types/mumath/mumath-tests.ts index 5a8fd6476f..a5b339b2fe 100644 --- a/types/mumath/mumath-tests.ts +++ b/types/mumath/mumath-tests.ts @@ -1,16 +1,16 @@ -import * as mumath from "mumath"; +import mumath = require("mumath"); -import mumathClamp from "mumath/clamp"; -import mumathClosest from "mumath/closest"; -import mumathIsMultiple from "mumath/isMultiple"; -import mumathLen from "mumath/len"; -import mumathLerp from "mumath/lerp"; -import mumathMod from "mumath/mod"; -import mumathOrder from "mumath/order"; -import mumathPrecision from "mumath/precision"; -import mumathRound from "mumath/round"; -import mumathScale from "mumath/scale"; -import mumathWithin from "mumath/within"; +import mumathClamp = require("mumath/clamp"); +import mumathClosest = require("mumath/closest"); +import mumathIsMultiple = require("mumath/isMultiple"); +import mumathLen = require("mumath/len"); +import mumathLerp = require("mumath/lerp"); +import mumathMod = require("mumath/mod"); +import mumathOrder = require("mumath/order"); +import mumathPrecision = require("mumath/precision"); +import mumathRound = require("mumath/round"); +import mumathScale = require("mumath/scale"); +import mumathWithin = require("mumath/within"); mumath.clamp(1, 2, 3); mumathClamp(1, 2, 3); diff --git a/types/mumath/order.d.ts b/types/mumath/order.d.ts index 6da624f1d3..8ce4c396fa 100644 --- a/types/mumath/order.d.ts +++ b/types/mumath/order.d.ts @@ -3,4 +3,4 @@ */ declare function order(value: number): number; -export default order; +export = order; diff --git a/types/mumath/precision.d.ts b/types/mumath/precision.d.ts index ec94b3a4ed..1b1a7290cc 100644 --- a/types/mumath/precision.d.ts +++ b/types/mumath/precision.d.ts @@ -3,4 +3,4 @@ */ declare function precision(value: number): number; -export default precision; +export = precision; diff --git a/types/mumath/round.d.ts b/types/mumath/round.d.ts index 09549f14f1..8966dc6068 100644 --- a/types/mumath/round.d.ts +++ b/types/mumath/round.d.ts @@ -3,4 +3,4 @@ */ declare function round(value: number, step?: number): number; -export default round; +export = round; diff --git a/types/mumath/scale.d.ts b/types/mumath/scale.d.ts index 2d5487ea10..2cb97bcb4f 100644 --- a/types/mumath/scale.d.ts +++ b/types/mumath/scale.d.ts @@ -5,4 +5,4 @@ */ declare function scale(value: number, list: number[]): number; -export default scale; +export = scale; diff --git a/types/mumath/within.d.ts b/types/mumath/within.d.ts index 47558c73d0..f1d7e56cbd 100644 --- a/types/mumath/within.d.ts +++ b/types/mumath/within.d.ts @@ -3,4 +3,4 @@ */ declare function within(value: number, left: number, right: number): number; -export default within; +export = within;