@lijuhong1981/jsmath 1.2.4 → 1.3.1

package/README.md

@@ -1,11 +1,11 @@
-# `@lijuhong1981/jsmath`
-
-> TODO: description
-
-## Usage
-
-```
-const jsmath = require('@lijuhong1981/jsmath');
-
-// TODO: DEMONSTRATE API
-```
+# `@lijuhong1981/jsmath`
+
+> TODO: description
+
+## Usage
+
+```
+const jsmath = require('@lijuhong1981/jsmath');
+
+// TODO: DEMONSTRATE API
+```

package/index.js

@@ -1,119 +1,26 @@
-import {
-    PI,
-    ONE_OVER_PI,
-    PI_OVER_TWO,
-    PI_OVER_THREE,
-    PI_OVER_FOUR,
-    PI_OVER_SIX,
-    THREE_PI_OVER_TWO,
-    TWO_PI,
-    ONE_OVER_TWO_PI,
-    RADIANS_PER_DEGREE,
-    DEGREES_PER_RADIAN,
-    RADIANS_PER_ARCSECOND,
-    EPSILON1,
-    EPSILON2,
-    EPSILON3,
-    EPSILON4,
-    EPSILON5,
-    EPSILON6,
-    EPSILON7,
-    EPSILON8,
-    EPSILON9,
-    EPSILON10,
-    EPSILON11,
-    EPSILON12,
-    EPSILON13,
-    EPSILON14,
-    EPSILON15,
-    EPSILON16,
-    EPSILON17,
-    EPSILON18,
-    EPSILON19,
-    EPSILON20,
-    EPSILON21,
-} from "./src/Constant.js";
-import degreesToRadians from "./src/degreesToRadians.js";
-import radiansToDegrees from "./src/radiansToDegrees.js";
-import clamp from "./src/clamp.js";
-import clampLatitude from "./src/clampLatitude.js";
-import clampLongitude from "./src/clampLongitude.js";
-import convertToRange from "./src/convertToRange.js";
-import convertToDegreesCircular from "./src/convertToDegreesCircular.js";
-import convertToRadiansCircular from "./src/convertToRadiansCircular.js";
-import convertToLatitudeRange from "./src/convertToLatitudeRange.js";
-import convertToLongitudeRange from "./src/convertToLongitudeRange.js";
-import equalsEpsilon from "./src/equalsEpsilon.js";
-import extractFraction from "./src/extractFraction.js";
-import isBetween from "./src/isBetween.js";
-import lerp from "./src/lerp.js";
-import scalarInRange from "./src/scalarInRange.js";
-import normalize from "./src/normalize.js";
-import parseNumber from "./src/parseNumber.js";
-import randomNumber from "./src/randomNumber.js";
-import randomInteger from "./src/randomInteger.js";
-import toFixed from "./src/toFixed.js";
-import Interval from "./src/Interval.js";
-import windowPositionToNDC from "./src/windowPositionToNDC.js";
-import getNDCInElement from "./src/getNDCInElement.js";
-import ndcToWindowPosition from "./src/ndcToWindowPosition.js";
-
-export {
-    PI,
-    ONE_OVER_PI,
-    PI_OVER_TWO,
-    PI_OVER_THREE,
-    PI_OVER_FOUR,
-    PI_OVER_SIX,
-    THREE_PI_OVER_TWO,
-    TWO_PI,
-    ONE_OVER_TWO_PI,
-    RADIANS_PER_DEGREE,
-    DEGREES_PER_RADIAN,
-    RADIANS_PER_ARCSECOND,
-    EPSILON1,
-    EPSILON2,
-    EPSILON3,
-    EPSILON4,
-    EPSILON5,
-    EPSILON6,
-    EPSILON7,
-    EPSILON8,
-    EPSILON9,
-    EPSILON10,
-    EPSILON11,
-    EPSILON12,
-    EPSILON13,
-    EPSILON14,
-    EPSILON15,
-    EPSILON16,
-    EPSILON17,
-    EPSILON18,
-    EPSILON19,
-    EPSILON20,
-    EPSILON21,
-    degreesToRadians,
-    radiansToDegrees,
-    clamp,
-    clampLatitude,
-    clampLongitude,
-    convertToRange,
-    convertToDegreesCircular,
-    convertToRadiansCircular,
-    convertToLatitudeRange,
-    convertToLongitudeRange,
-    equalsEpsilon,
-    extractFraction,
-    isBetween,
-    lerp,
-    scalarInRange,
-    normalize,
-    parseNumber,
-    randomNumber,
-    randomInteger,
-    toFixed,
-    Interval,
-    windowPositionToNDC,
-    getNDCInElement,
-    ndcToWindowPosition,
-};
+export * from "./src/clamp.js";
+export * from "./src/clampLatitude.js";
+export * from "./src/clampLongitude.js";
+export * as Constant from "./src/Constant.js";
+export * from "./src/convertToDegreesCircular.js";
+export * from "./src/convertToLatitudeRange.js";
+export * from "./src/convertToLongitudeRange.js";
+export * from "./src/convertToRadiansCircular.js";
+export * from "./src/convertToRange.js";
+export * from "./src/degreesToRadians.js";
+export * from "./src/equalsEpsilon.js";
+export * from "./src/extractFraction.js";
+export * from "./src/getNDCInElement.js";
+export * from "./src/Interval.js";
+export * from "./src/isBetween.js";
+export * from "./src/lerp.js";
+export * from "./src/ndcToWindowPosition.js";
+export * from "./src/normalize.js";
+export * from "./src/parseBoolean.js";
+export * from "./src/parseNumber.js";
+export * from "./src/radiansToDegrees.js";
+export * from "./src/randomInteger.js";
+export * from "./src/randomNumber.js";
+export * from "./src/scalarInRange.js";
+export * from "./src/toFixed.js";
+export * from "./src/windowPositionToNDC.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jsmath",
-  "version": "1.2.4",
+  "version": "1.3.1",
   "description": "> TODO: description",
   "author": "lijuhong1981 <lijuhong@hotmail.com>",
   "homepage": "https://github.com/lijuhong1981/jslibs#readme",
@@ -18,5 +18,5 @@
   "bugs": {
     "url": "https://github.com/lijuhong1981/jslibs/issues"
   },
-  "gitHead": "75538582d4f88fbef4e366404a96264c40bb05d8"
+  "gitHead": "cae3f4be65fe0454718936b9ab5a4d29af4fdda0"
 }

package/src/Interval.js

@@ -268,7 +268,7 @@ class Interval {
     /**
      * 将一个区间对象的所有属性打包到一个数组中
      * @param {Interval} interval 需要打包的区间对象
-     * @param {Array} array 打包到的数组
+     * @param {Array} array 打包到的目标数组，可不填
      * @param {Integer} startingIndex 数组起始索引，默认0
      * @returns {Array} 打包后的数组
      */
@@ -283,7 +283,7 @@ class Interval {
 
     /**
      * 将当前区间对象属性打包至数组
-     * @param {Array} array 打包到的数组
+     * @param {Array} array 打包到的目标数组，可不填
      * @param {Integer} startingIndex 数组起始索引，默认0
      * @returns {Array} 打包后的数组
      */
@@ -333,4 +333,5 @@ class Interval {
 
 Interval.packedLength = 4;
 
-export default Interval;
+export default Interval;
+export { Interval };

package/src/clamp.js

@@ -9,4 +9,5 @@ function clamp(value, rangeMinimum, rangeMaximum) {
     return value < rangeMinimum ? rangeMinimum : value > rangeMaximum ? rangeMaximum : value;
 };
 
-export default clamp;
+export default clamp;
+export { clamp };

package/src/clampLatitude.js

@@ -14,4 +14,5 @@ function clampLatitude(latitude, degrees = true) {
         return clamp(latitude, -PI_OVER_TWO, PI_OVER_TWO);
 };
 
-export default clampLatitude;
+export default clampLatitude;
+export { clampLatitude };

package/src/clampLongitude.js

@@ -13,4 +13,5 @@ function clampLongitude(longitude, degrees = true) {
         return clamp(longitude, -Math.PI, Math.PI);
 };
 
-export default clampLongitude;
+export default clampLongitude;
+export { clampLongitude };

package/src/convertToDegreesCircular.js

@@ -10,4 +10,5 @@ function convertToDegreesCircular(degrees, minValue = 0) {
     return convertToRange(degrees, minValue, minValue + 360);
 };
 
-export default convertToDegreesCircular;
+export default convertToDegreesCircular;
+export { convertToDegreesCircular };

package/src/convertToLatitudeRange.js

@@ -27,4 +27,5 @@ function convertToLatitudeRange(latitude, degrees = true) {
     return latitude;
 };
 
-export default convertToLatitudeRange;
+export default convertToLatitudeRange;
+export { convertToLatitudeRange };

package/src/convertToLongitudeRange.js

@@ -13,4 +13,5 @@ function convertToLongitudeRange(longitude, degrees = true) {
         return convertToRange(longitude, -Math.PI, Math.PI);
 };
 
-export default convertToLongitudeRange;
+export default convertToLongitudeRange;
+export { convertToLongitudeRange };

package/src/convertToRadiansCircular.js

@@ -11,4 +11,5 @@ function convertToRadiansCircular(radians, minValue = 0) {
     return convertToRange(radians, minValue, minValue + TWO_PI);
 };
 
-export default convertToRadiansCircular;
+export default convertToRadiansCircular;
+export { convertToRadiansCircular };

package/src/convertToRange.js

@@ -20,4 +20,5 @@ function convertToRange(value, rangeMinimum, rangeMaximum) {
     return value;
 };
 
-export default convertToRange;
+export default convertToRange;
+export { convertToRange };

package/src/degreesToRadians.js

@@ -9,4 +9,5 @@ function degreesToRadians(degrees) {
     return degrees * RADIANS_PER_DEGREE;
 };
 
-export default degreesToRadians;
+export default degreesToRadians;
+export { degreesToRadians };

package/src/equalsEpsilon.js

@@ -2,11 +2,12 @@
  * 比较两个数值是否近似相等
  * @param {Number} left 
  * @param {Number} right
- * @param {Number} epsilon=0 近似精度，Math.abs(left - right)小于或等于该值时返回true
+ * @param {Number} epsilon 近似精度，Math.abs(left - right)小于或等于该值时返回true
  * @returns {Boolean}
  */
 function equalsEpsilon(left, right, epsilon = 0) {
     return Math.abs(left - right) <= epsilon;
 };
 
-export default equalsEpsilon;
+export default equalsEpsilon;
+export { equalsEpsilon };

package/src/extractFraction.js

@@ -12,4 +12,5 @@ function extractFraction(value) {
         return 0.0;
 };
 
-export default extractFraction;
+export default extractFraction;
+export { extractFraction };

package/src/getNDCInElement.js

@@ -11,4 +11,5 @@ function getNDCInElement(element, posInElement, result = {}) {
     return windowPositionToNDC(posInElement, element.clientWidth, element.clientHeight, result);
 };
 
-export default getNDCInElement;
+export default getNDCInElement;
+export { getNDCInElement };

package/src/isBetween.js

@@ -15,4 +15,5 @@ function isBetween(value, rangeMinimum, rangeMaximum, equalsMinimum = true, equa
     return true;
 };
 
-export default isBetween;
+export default isBetween;
+export { isBetween };

package/src/lerp.js

@@ -14,4 +14,5 @@ function lerp(start, end, scalar, needClamp = true) {
     return start + (end - start) * scalar;
 };
 
-export default lerp;
+export default lerp;
+export { lerp };

package/src/ndcToWindowPosition.js

@@ -1,21 +1,16 @@
-import Check from '@lijuhong1981/jscheck/src/Check.js';
-import isValid from '@lijuhong1981/jscheck/src/isValid.js';
-
 /**
  * ndc坐标(NormalizedDeviceCoordinates)转换为窗口像素坐标
  * @param {Object} ndc 需转换的ndc坐标, {x: 0.5, y: -0.5, z: 0.0}
  * @param {Number} width 窗口像素宽
  * @param {Number} height 窗口像素高
  * @param {Object} result 输出结果对象
- * @returns {Object} 输出结果对象, 如：{x: 123, y: 321}
+ * @param {Boolean} checkInvisible 是否检查不可见，默认true
+ * @returns {Object|undefined} 输出结果对象, 如：{x: 123, y: 321}，返回undefined表示不可见
  */
-function ndcToWindowPosition(ndc, width, height, result = {}) {
-    Check.typeOf.object('ndc', ndc);
-    Check.typeOf.number('width', width);
-    Check.typeOf.number('height', height);
+function ndcToWindowPosition(ndc, width, height, result = {}, checkInvisible = true) {
 
     // invisible
-    if (isValid(ndc.z) && (ndc.z < 0 || ndc.z > 1))
+    if (checkInvisible && (ndc.z < 0 || ndc.z > 1))
         return;
 
     const x = (ndc.x + 1) / 2 * width;
@@ -27,4 +22,5 @@ function ndcToWindowPosition(ndc, width, height, result = {}) {
     return result;
 }
 
-export default ndcToWindowPosition;
+export default ndcToWindowPosition;
+export { ndcToWindowPosition };

package/src/normalize.js

@@ -12,4 +12,5 @@ function normalize(value, rangeMinimum, rangeMaximum) {
     return scalarInRange(value, rangeMinimum, rangeMaximum, true);
 };
 
-export default normalize;
+export default normalize;
+export { normalize };

package/src/parseBoolean.js

@@ -0,0 +1,11 @@
+/**
+ * 
+ * @param {Boolean|String} value
+ * @returns {Boolean}
+ */
+function parseBoolean(value) {
+    return value === true || value === 'true';
+};
+
+export default parseBoolean;
+export { parseBoolean };

package/src/parseNumber.js

@@ -13,4 +13,5 @@ function parseNumber(value) {
     }
 }
 
-export default parseNumber;
+export default parseNumber;
+export { parseNumber };

package/src/radiansToDegrees.js

@@ -9,4 +9,5 @@ function radiansToDegrees(radians) {
     return radians * DEGREES_PER_RADIAN;
 }
 
-export default radiansToDegrees;
+export default radiansToDegrees;
+export { radiansToDegrees };

package/src/randomInteger.js

@@ -10,4 +10,5 @@ function randomInteger(rangeMinimum = 0, rangeMaximum = Number.MAX_SAFE_INTEGER
     return Math.floor(randomNumber(rangeMinimum, rangeMaximum + 1));
 };
 
-export default randomInteger;
+export default randomInteger;
+export { randomInteger };

package/src/randomNumber.js

@@ -8,4 +8,5 @@ function randomNumber(rangeMinimum = 0, rangeMaximum = Number.MAX_SAFE_INTEGER)
     return Math.random() * (rangeMaximum - rangeMinimum) + rangeMinimum;
 };
 
-export default randomNumber;
+export default randomNumber;
+export { randomNumber };

package/src/scalarInRange.js

@@ -15,4 +15,5 @@ function scalarInRange(value, rangeMinimum, rangeMaximum, needClamp = false) {
     return scalar;
 };
 
-export default scalarInRange;
+export default scalarInRange;
+export { scalarInRange };

package/src/toFixed.js

@@ -8,4 +8,5 @@ function toFixed(value, decimalNumber = 2) {
     return parseFloat(value.toFixed(decimalNumber));
 }
 
-export default toFixed;
+export default toFixed;
+export { toFixed };

package/src/windowPositionToNDC.js

@@ -1,5 +1,3 @@
-import Check from '@lijuhong1981/jscheck/src/Check.js';
-
 /**
  * 窗口像素坐标转换为NDC坐标(NormalizedDeviceCoordinates)
  * @param {Object} posInWindow 需转换的窗口像素坐标，{x: 500, y: 300}
@@ -9,9 +7,6 @@ import Check from '@lijuhong1981/jscheck/src/Check.js';
  * @returns {Object} 输出结果对象, 如：{x: 0.5, y: -0.5}
  */
 function windowPositionToNDC(posInWindow, width, height, result = {}) {
-    Check.typeOf.object('posInWindow', posInWindow);
-    Check.typeOf.number('width', width);
-    Check.typeOf.number('height', height);
 
     result.x = (posInWindow.x / width) * 2 - 1;
     result.y = -(posInWindow.y / height) * 2 + 1;
@@ -19,4 +14,5 @@ function windowPositionToNDC(posInWindow, width, height, result = {}) {
     return result;
 };
 
-export default windowPositionToNDC;
+export default windowPositionToNDC;
+export { windowPositionToNDC };