figureone 1.0.4 → 1.0.6

package/index.js

@@ -63149,6 +63149,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _FontManager__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../FontManager */ "./src/js/figure/FontManager.ts");
 /* harmony import */ var _DrawingObjects_TextObject_TextObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../DrawingObjects/TextObject/TextObject */ "./src/js/figure/DrawingObjects/TextObject/TextObject.ts");
 /* harmony import */ var _tools_tools__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../tools/tools */ "./src/js/tools/tools.ts");
+/* harmony import */ var _tools_errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../tools/errors */ "./src/js/tools/errors.ts");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -63164,6 +63165,8 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 
 
 
+
+
 /* eslint-disable max-len */
 /*
  GLText asks for atlas from webgl
@@ -63274,15 +63277,14 @@ var Atlas = /*#__PURE__*/function () {
 
     // Otherwise generate the atlas automatically
     if (options.font == null) {
-      throw new Error('FigureOne Atlas Error: Either `src` or `font` must be defined to create an atlas');
+      throw (0,_tools_errors__WEBPACK_IMPORTED_MODULE_3__.figureOneError)(1000);
     }
     if (options.scene == null) {
-      throw new Error('FigureOne Atlas Error: Must define a scene to create an atlas from a font');
+      throw (0,_tools_errors__WEBPACK_IMPORTED_MODULE_3__.figureOneError)(1001);
     }
     this.scene = o.scene;
     this.font = new _DrawingObjects_TextObject_TextObject__WEBPACK_IMPORTED_MODULE_1__.FigureFont(o.font);
     this.fontManager = new _FontManager__WEBPACK_IMPORTED_MODULE_0__["default"]();
-    this.canvas = document.createElement('canvas');
     var _this$fontManager$wat = this.fontManager.watch(this.font, {
         timeout: o.timeout,
         maxCount: o.maxCount,
@@ -63353,10 +63355,21 @@ var Atlas = /*#__PURE__*/function () {
         fontSizePX *= mDim / dimension * 0.95;
         dimension = Math.floor(Math.ceil(Math.sqrt(glyphs.length) + 2) * fontSizePX * 1.5);
       }
-      var canvas = document.createElement('canvas');
-      canvas.width = dimension;
-      canvas.height = dimension;
-      var ctx = canvas.getContext('2d');
+      var canvas;
+      var ctx = null;
+      for (var attempt = 0; attempt < 4; attempt += 1) {
+        canvas = document.createElement('canvas');
+        canvas.width = dimension;
+        canvas.height = dimension;
+        ctx = canvas.getContext('2d');
+        if (ctx != null) break;
+        fontSizePX *= 0.5;
+        this.fontSize = fontSizePX;
+        dimension = Math.floor(Math.ceil(Math.sqrt(glyphs.length) + 2) * fontSizePX * 1.5);
+      }
+      if (ctx == null) {
+        throw (0,_tools_errors__WEBPACK_IMPORTED_MODULE_3__.figureOneError)(1002, "dimension: ".concat(dimension));
+      }
       ctx.font = "".concat(font.style, " ").concat(font.weight, " ").concat(fontSizePX, "px ").concat(font.family);
       var x = fontSizePX;
       var y = fontSizePX;
@@ -63426,7 +63439,6 @@ var Atlas = /*#__PURE__*/function () {
       // const image = canvas.toDataURL("image/png").replace("image/png", "image/octet-stream");
       // window.location.href=image;
       this.webgl.addTexture(this.font.getTextureID(), ctx.canvas, [0, 0, 0, 0], false, null, true);
-      // canvas.remove();
     }
   }]);
 }();
@@ -64269,8 +64281,7 @@ var WebGLInstance = /*#__PURE__*/function () {
         id: id,
         state: 'loading',
         onLoad: [],
-        index: index,
-        data: null
+        index: index
       };
       var texture = this.textures[id];
       if (onLoad != null) {
@@ -64284,14 +64295,12 @@ var WebGLInstance = /*#__PURE__*/function () {
         image.src = data;
         // When the image is loaded, set the texture to it
         image.addEventListener('load', function () {
-          texture.data = image;
           _this.setTextureData(id, image, repeat);
           _this.onLoad(id);
           texture.state = 'loaded';
         });
       } else {
-        texture.data = data;
-        // Otherwise, the data is an image so set it directly
+        // Otherwise, the data is an image/canvas so set it directly
         this.setTextureData(id, data, repeat);
         this.onLoad(id);
         texture.state = 'loaded';
@@ -64320,9 +64329,17 @@ var WebGLInstance = /*#__PURE__*/function () {
     key: "recreateAtlases",
     value: function recreateAtlases() {
       var _this2 = this;
+      var errors = [];
       Object.keys(this.atlases).forEach(function (textureID) {
-        return _this2.atlases[textureID].recreate();
+        try {
+          _this2.atlases[textureID].recreate();
+        } catch (e) {
+          errors.push(e instanceof Error ? e : new Error(String(e)));
+        }
       });
+      if (errors.length > 0) {
+        throw errors[0];
+      }
     }
   }, {
     key: "deleteTexture",
@@ -66791,6 +66808,32 @@ function surface(options) {
 }
 
 
+/***/ },
+
+/***/ "./src/js/tools/errors.ts"
+/*!********************************!*\
+  !*** ./src/js/tools/errors.ts ***!
+  \********************************/
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__),
+/* harmony export */   figureOneError: () => (/* binding */ figureOneError)
+/* harmony export */ });
+var errors = {
+  // Atlas errors (1xxx)
+  1000: 'Either `src` or `font` must be defined to create an atlas',
+  1001: 'Must define a scene to create an atlas from a font',
+  1002: 'Failed to get 2D canvas context for atlas'
+};
+function figureOneError(code, detail) {
+  var message = errors[code];
+  var full = detail ? "".concat(message, " (").concat(detail, ")") : message;
+  return new Error("F1-".concat(code, ": ").concat(full));
+}
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (errors);
+
 /***/ },
 
 /***/ "./src/js/tools/g2.ts"
@@ -79094,8 +79137,8 @@ var tools = {
  */
 
 var Fig = {
-  version: "1.0.4",
-  gitHash: "c27ef9fac",
+  version: "1.0.6",
+  gitHash: "0610a714a",
   tools: tools,
   Figure: _js_figure_Figure__WEBPACK_IMPORTED_MODULE_5__["default"],
   Recorder: _js_figure_Recorder_Recorder__WEBPACK_IMPORTED_MODULE_7__.Recorder,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "figureone",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Draw, animate and interact with shapes, text, plots and equations in Javascript. Create interactive slide shows, and interactive videos.",
   "main": "index.js",
   "types": "types/index.d.ts",

package/types/js/figure/webgl/Atlas.d.ts

@@ -30,7 +30,6 @@ export default class Atlas {
     dimension: number;
     loaded: boolean;
     scene: Scene;
-    canvas: HTMLCanvasElement;
     fontManager: FontManager;
     notifications: NotificationManager;
     map: OBJ_AtlasMap;

package/types/js/tools/errors.d.ts

@@ -0,0 +1,8 @@
+declare const errors: {
+    readonly 1000: "Either `src` or `font` must be defined to create an atlas";
+    readonly 1001: "Must define a scene to create an atlas from a font";
+    readonly 1002: "Failed to get 2D canvas context for atlas";
+};
+export type FigureOneErrorCode = keyof typeof errors;
+export declare function figureOneError(code: FigureOneErrorCode, detail?: string): Error;
+export default errors;