figureone 1.9.1 → 1.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/index.js
CHANGED
|
@@ -15572,6 +15572,7 @@ var FigureElementCollection = /*#__PURE__*/function (_FigureElement2) {
|
|
|
15572
15572
|
cube: shapes.cube.bind(shapes),
|
|
15573
15573
|
prism: shapes.prism.bind(shapes),
|
|
15574
15574
|
cameraControl: shapes.cameraControl.bind(shapes),
|
|
15575
|
+
rotateControl: shapes.rotateControl.bind(shapes),
|
|
15575
15576
|
gesture: shapes.gesture.bind(shapes),
|
|
15576
15577
|
arrow: shapes.arrow.bind(shapes),
|
|
15577
15578
|
line: shapes.line.bind(shapes),
|
|
@@ -54658,26 +54659,27 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
54658
54659
|
/* harmony import */ var _Element__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../Element */ "./src/js/figure/Element.ts");
|
|
54659
54660
|
/* harmony import */ var _webgl_shaders__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../webgl/shaders */ "./src/js/figure/webgl/shaders.ts");
|
|
54660
54661
|
/* harmony import */ var _tools_math__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../tools/math */ "./src/js/tools/math.ts");
|
|
54661
|
-
/* harmony import */ var
|
|
54662
|
-
/* harmony import */ var
|
|
54663
|
-
/* harmony import */ var
|
|
54664
|
-
/* harmony import */ var
|
|
54665
|
-
/* harmony import */ var
|
|
54666
|
-
/* harmony import */ var
|
|
54667
|
-
/* harmony import */ var
|
|
54668
|
-
/* harmony import */ var
|
|
54669
|
-
/* harmony import */ var
|
|
54670
|
-
/* harmony import */ var
|
|
54671
|
-
/* harmony import */ var
|
|
54672
|
-
/* harmony import */ var
|
|
54673
|
-
/* harmony import */ var
|
|
54674
|
-
/* harmony import */ var
|
|
54675
|
-
/* harmony import */ var
|
|
54676
|
-
/* harmony import */ var
|
|
54677
|
-
/* harmony import */ var
|
|
54678
|
-
/* harmony import */ var
|
|
54679
|
-
/* harmony import */ var
|
|
54680
|
-
/* harmony import */ var
|
|
54662
|
+
/* harmony import */ var _tools_m3__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../tools/m3 */ "./src/js/tools/m3.ts");
|
|
54663
|
+
/* harmony import */ var _tools_tools__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../tools/tools */ "./src/js/tools/tools.ts");
|
|
54664
|
+
/* harmony import */ var _DrawingObjects_GLObject_GLObject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../DrawingObjects/GLObject/GLObject */ "./src/js/figure/DrawingObjects/GLObject/GLObject.ts");
|
|
54665
|
+
/* harmony import */ var _Animation_Animation__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../Animation/Animation */ "./src/js/figure/Animation/Animation.ts");
|
|
54666
|
+
/* harmony import */ var _FigureElementPrimitiveMorph__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./FigureElementPrimitiveMorph */ "./src/js/figure/FigurePrimitives/FigureElementPrimitiveMorph.ts");
|
|
54667
|
+
/* harmony import */ var _FigureElementPrimitive2DText__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./FigureElementPrimitive2DText */ "./src/js/figure/FigurePrimitives/FigureElementPrimitive2DText.ts");
|
|
54668
|
+
/* harmony import */ var _FigureElementPrimitiveGLText__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./FigureElementPrimitiveGLText */ "./src/js/figure/FigurePrimitives/FigureElementPrimitiveGLText.ts");
|
|
54669
|
+
/* harmony import */ var _Text__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./Text */ "./src/js/figure/FigurePrimitives/Text.ts");
|
|
54670
|
+
/* harmony import */ var _DrawingObjects_HTMLObject_HTMLObject__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../DrawingObjects/HTMLObject/HTMLObject */ "./src/js/figure/DrawingObjects/HTMLObject/HTMLObject.ts");
|
|
54671
|
+
/* harmony import */ var _geometries_lines_lines__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../geometries/lines/lines */ "./src/js/figure/geometries/lines/lines.ts");
|
|
54672
|
+
/* harmony import */ var _geometries_polygon_polygon__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../geometries/polygon/polygon */ "./src/js/figure/geometries/polygon/polygon.ts");
|
|
54673
|
+
/* harmony import */ var _geometries_rectangle__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../geometries/rectangle */ "./src/js/figure/geometries/rectangle.ts");
|
|
54674
|
+
/* harmony import */ var _geometries_ellipse__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../geometries/ellipse */ "./src/js/figure/geometries/ellipse.ts");
|
|
54675
|
+
/* harmony import */ var _geometries_arc__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../geometries/arc */ "./src/js/figure/geometries/arc.ts");
|
|
54676
|
+
/* harmony import */ var _geometries_triangle__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../geometries/triangle */ "./src/js/figure/geometries/triangle.ts");
|
|
54677
|
+
/* harmony import */ var _geometries_arrow__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../geometries/arrow */ "./src/js/figure/geometries/arrow.ts");
|
|
54678
|
+
/* harmony import */ var _geometries_line__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../geometries/line */ "./src/js/figure/geometries/line.ts");
|
|
54679
|
+
/* harmony import */ var _geometries_copy_copy__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../geometries/copy/copy */ "./src/js/figure/geometries/copy/copy.ts");
|
|
54680
|
+
/* harmony import */ var _geometries_buffer__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../geometries/buffer */ "./src/js/figure/geometries/buffer.ts");
|
|
54681
|
+
/* harmony import */ var _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../../tools/geometry/scene */ "./src/js/tools/geometry/scene.ts");
|
|
54682
|
+
/* harmony import */ var _FigureElementPrimitiveGesture__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./FigureElementPrimitiveGesture */ "./src/js/figure/FigurePrimitives/FigureElementPrimitiveGesture.ts");
|
|
54681
54683
|
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); }
|
|
54682
54684
|
function _construct(t, e, r) { if (_isNativeReflectConstruct()) return Reflect.construct.apply(null, arguments); var o = [null]; o.push.apply(o, e); var p = new (t.bind.apply(t, o))(); return r && _setPrototypeOf(p, r.prototype), p; }
|
|
54683
54685
|
function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
|
|
@@ -54709,6 +54711,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
|
|
|
54709
54711
|
|
|
54710
54712
|
|
|
54711
54713
|
|
|
54714
|
+
|
|
54712
54715
|
// eslint-disable-next-line import/no-cycle
|
|
54713
54716
|
// eslint-disable-next-line import/no-cycle
|
|
54714
54717
|
|
|
@@ -54804,7 +54807,7 @@ function setupPulse(element, options) {
|
|
|
54804
54807
|
element.pulseDefault.scale = options.pulse;
|
|
54805
54808
|
} else {
|
|
54806
54809
|
// eslint-disable-next-line no-param-reassign
|
|
54807
|
-
element.pulseDefault = (0,
|
|
54810
|
+
element.pulseDefault = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, element.pulseDefault, options.pulse);
|
|
54808
54811
|
}
|
|
54809
54812
|
}
|
|
54810
54813
|
}
|
|
@@ -54878,7 +54881,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
54878
54881
|
optionsIn[_key] = arguments[_key];
|
|
54879
54882
|
}
|
|
54880
54883
|
// Setup the default options
|
|
54881
|
-
var oIn =
|
|
54884
|
+
var oIn = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn));
|
|
54882
54885
|
// The mask recolor (textureMap) path supports one or more mask textures,
|
|
54883
54886
|
// supplied as `mask` (single) or `masks` (array). Normalize the input: a
|
|
54884
54887
|
// non-array `masks` is coerced to an array, and an empty/absent `masks`
|
|
@@ -54937,7 +54940,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
54937
54940
|
loadColor: [0, 0, 1, 0.5]
|
|
54938
54941
|
},
|
|
54939
54942
|
tints: [],
|
|
54940
|
-
name: (0,
|
|
54943
|
+
name: (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.generateUniqueId)('primitive_'),
|
|
54941
54944
|
color: this.defaultColor,
|
|
54942
54945
|
drawNumber: 0,
|
|
54943
54946
|
transform: [['s', 1], ['r', 0, 0, 0, 1], ['t', 0, 0, 0]],
|
|
@@ -54975,7 +54978,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
54975
54978
|
}
|
|
54976
54979
|
|
|
54977
54980
|
// Combine default and input options
|
|
54978
|
-
var options = (0,
|
|
54981
|
+
var options = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, defaultOptions, oIn);
|
|
54979
54982
|
options.transform = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getTransform)(options.transform);
|
|
54980
54983
|
if (options.position != null) {
|
|
54981
54984
|
options.position = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(options.position);
|
|
@@ -54983,7 +54986,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
54983
54986
|
}
|
|
54984
54987
|
|
|
54985
54988
|
// User shaders to create a gl drawing object
|
|
54986
|
-
var glObject = new
|
|
54989
|
+
var glObject = new _DrawingObjects_GLObject_GLObject__WEBPACK_IMPORTED_MODULE_7__["default"](this.webgl[0], options.vertexShader, options.fragmentShader);
|
|
54987
54990
|
|
|
54988
54991
|
// Set the glPrimitive
|
|
54989
54992
|
glObject.setPrimitive(options.glPrimitive.toUpperCase());
|
|
@@ -55064,7 +55067,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55064
55067
|
usage: 'STATIC',
|
|
55065
55068
|
size: 2
|
|
55066
55069
|
};
|
|
55067
|
-
var b = (0,
|
|
55070
|
+
var b = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, defaultAttribute, buffer);
|
|
55068
55071
|
glObject.addAttribute(b.name, b.size, b.data, b.type, b.normalize, b.stride, b.offset, b.usageIn);
|
|
55069
55072
|
});
|
|
55070
55073
|
glObject.initAttributes();
|
|
@@ -55077,7 +55080,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55077
55080
|
type: 'FLOAT',
|
|
55078
55081
|
length: 1
|
|
55079
55082
|
};
|
|
55080
|
-
var u = (0,
|
|
55083
|
+
var u = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, defaultUniform, uniform);
|
|
55081
55084
|
glObject.addUniform(u.name, u.length, u.type, u.value);
|
|
55082
55085
|
});
|
|
55083
55086
|
}
|
|
@@ -55208,7 +55211,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55208
55211
|
element.scenarios = options.scenarios;
|
|
55209
55212
|
}
|
|
55210
55213
|
if (options.scene != null) {
|
|
55211
|
-
if (options.scene instanceof
|
|
55214
|
+
if (options.scene instanceof _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"]) {
|
|
55212
55215
|
element.scene = options.scene;
|
|
55213
55216
|
} else {
|
|
55214
55217
|
element.setScene(options.scene);
|
|
@@ -55234,13 +55237,13 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55234
55237
|
for (var _len2 = arguments.length, optionsIn = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
|
|
55235
55238
|
optionsIn[_key2] = arguments[_key2];
|
|
55236
55239
|
}
|
|
55237
|
-
var oIn =
|
|
55240
|
+
var oIn = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn));
|
|
55238
55241
|
var defaultOptions = {
|
|
55239
55242
|
dimension: 3,
|
|
55240
55243
|
light: oIn.lines ? null : 'directional',
|
|
55241
55244
|
usage: 'STATIC'
|
|
55242
55245
|
};
|
|
55243
|
-
var options = (0,
|
|
55246
|
+
var options = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, defaultOptions, oIn);
|
|
55244
55247
|
var dim = options.dimension;
|
|
55245
55248
|
var processOptions = function processOptions(o, u) {
|
|
55246
55249
|
if (o.usage == null) {
|
|
@@ -55253,13 +55256,13 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55253
55256
|
// and colors
|
|
55254
55257
|
if (o.copy != null) {
|
|
55255
55258
|
if (o.vertices != null) {
|
|
55256
|
-
o.vertices = (0,
|
|
55259
|
+
o.vertices = (0,_geometries_copy_copy__WEBPACK_IMPORTED_MODULE_22__.copyPoints)(o.vertices, o.copy, 'points');
|
|
55257
55260
|
}
|
|
55258
55261
|
if (o.normals != null) {
|
|
55259
|
-
o.normals = (0,
|
|
55262
|
+
o.normals = (0,_geometries_copy_copy__WEBPACK_IMPORTED_MODULE_22__.copyPoints)(o.normals, o.copy, 'normals');
|
|
55260
55263
|
}
|
|
55261
55264
|
if (o.colors != null) {
|
|
55262
|
-
var count = (0,
|
|
55265
|
+
var count = (0,_geometries_copy_copy__WEBPACK_IMPORTED_MODULE_22__.getCopyCount)(o.copy);
|
|
55263
55266
|
var out = [];
|
|
55264
55267
|
for (var i = 0; i < count; i += 1) {
|
|
55265
55268
|
out.push.apply(out, _toConsumableArray(o.colors.map(function (c) {
|
|
@@ -55269,7 +55272,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55269
55272
|
o.colors = out;
|
|
55270
55273
|
}
|
|
55271
55274
|
if (o.texture != null && o.texture.coords != null) {
|
|
55272
|
-
var _count = (0,
|
|
55275
|
+
var _count = (0,_geometries_copy_copy__WEBPACK_IMPORTED_MODULE_22__.getCopyCount)(o.copy);
|
|
55273
55276
|
var _out = [];
|
|
55274
55277
|
for (var _i = 0; _i < _count; _i += 1) {
|
|
55275
55278
|
_out.push.apply(_out, _toConsumableArray(o.texture.coords.slice()));
|
|
@@ -55340,8 +55343,8 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55340
55343
|
}, {
|
|
55341
55344
|
key: "generic3DBase",
|
|
55342
55345
|
value: function generic3DBase(defaultOptions, optionsIn, getPointsFn) {
|
|
55343
|
-
var options = (0,
|
|
55344
|
-
var element = this.generic3((0,
|
|
55346
|
+
var options = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, defaultOptions, optionsIn);
|
|
55347
|
+
var element = this.generic3((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, options, {
|
|
55345
55348
|
points: [],
|
|
55346
55349
|
normals: options.lines ? null : [],
|
|
55347
55350
|
glPrimitive: options.lines ? 'LINES' : undefined
|
|
@@ -55353,7 +55356,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55353
55356
|
element.custom.options = options;
|
|
55354
55357
|
element.custom.getPoints = getPointsFn;
|
|
55355
55358
|
element.custom.updatePoints = function (updateOptions) {
|
|
55356
|
-
var o = (0,
|
|
55359
|
+
var o = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, element.custom.options, {
|
|
55357
55360
|
transform: [],
|
|
55358
55361
|
position: [0, 0]
|
|
55359
55362
|
}, updateOptions);
|
|
@@ -55366,12 +55369,12 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55366
55369
|
points = _element$custom$getPo2[0],
|
|
55367
55370
|
normals = _element$custom$getPo2[1];
|
|
55368
55371
|
if (o.lines == null || o.lines === false) {
|
|
55369
|
-
element.custom.updateGeneric3((0,
|
|
55372
|
+
element.custom.updateGeneric3((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, o, {
|
|
55370
55373
|
points: points,
|
|
55371
55374
|
normals: normals
|
|
55372
55375
|
}));
|
|
55373
55376
|
} else {
|
|
55374
|
-
element.custom.updateGeneric3((0,
|
|
55377
|
+
element.custom.updateGeneric3((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, o, {
|
|
55375
55378
|
points: points,
|
|
55376
55379
|
normals: null
|
|
55377
55380
|
}));
|
|
@@ -55391,7 +55394,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55391
55394
|
sides: 10,
|
|
55392
55395
|
normals: 'flat',
|
|
55393
55396
|
center: [0, 0, 0]
|
|
55394
|
-
},
|
|
55397
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn)), function (o) {
|
|
55395
55398
|
return (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.sphere)(o);
|
|
55396
55399
|
});
|
|
55397
55400
|
}
|
|
@@ -55403,7 +55406,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55403
55406
|
}
|
|
55404
55407
|
return this.generic3DBase({
|
|
55405
55408
|
side: this.defaultLength
|
|
55406
|
-
},
|
|
55409
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn)), function (o) {
|
|
55407
55410
|
return (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.cube)(o);
|
|
55408
55411
|
});
|
|
55409
55412
|
}
|
|
@@ -55415,7 +55418,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55415
55418
|
}
|
|
55416
55419
|
return this.generic3DBase({
|
|
55417
55420
|
length: this.defaultLength / 3
|
|
55418
|
-
},
|
|
55421
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn)), function (o) {
|
|
55419
55422
|
return (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.prism)(o);
|
|
55420
55423
|
});
|
|
55421
55424
|
}
|
|
@@ -55429,7 +55432,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55429
55432
|
radius: this.defaultLength / 20,
|
|
55430
55433
|
sides: 10,
|
|
55431
55434
|
normals: 'flat'
|
|
55432
|
-
},
|
|
55435
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn)), function (o) {
|
|
55433
55436
|
return (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.cylinder)(o);
|
|
55434
55437
|
});
|
|
55435
55438
|
}
|
|
@@ -55444,7 +55447,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55444
55447
|
sides: 10,
|
|
55445
55448
|
normals: 'flat',
|
|
55446
55449
|
length: 1
|
|
55447
|
-
},
|
|
55450
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn)), function (o) {
|
|
55448
55451
|
return (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.cone)(o);
|
|
55449
55452
|
});
|
|
55450
55453
|
}
|
|
@@ -55458,7 +55461,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55458
55461
|
width: this.defaultLength / 40,
|
|
55459
55462
|
sides: 10,
|
|
55460
55463
|
normals: 'curve'
|
|
55461
|
-
},
|
|
55464
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn)), function (o) {
|
|
55462
55465
|
return (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.line3)(o);
|
|
55463
55466
|
});
|
|
55464
55467
|
}
|
|
@@ -55471,7 +55474,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55471
55474
|
return this.generic3DBase({
|
|
55472
55475
|
sides: 10,
|
|
55473
55476
|
normals: 'flat'
|
|
55474
|
-
},
|
|
55477
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn)), function (o) {
|
|
55475
55478
|
return (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.revolve)(o);
|
|
55476
55479
|
});
|
|
55477
55480
|
}
|
|
@@ -55484,7 +55487,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55484
55487
|
return this.generic3DBase({
|
|
55485
55488
|
normals: 'flat',
|
|
55486
55489
|
lines: false
|
|
55487
|
-
},
|
|
55490
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn)), function (o) {
|
|
55488
55491
|
return _tools_g2__WEBPACK_IMPORTED_MODULE_0__.surface.surface(o);
|
|
55489
55492
|
});
|
|
55490
55493
|
}
|
|
@@ -55512,7 +55515,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55512
55515
|
value: function morph() {
|
|
55513
55516
|
var _this = this;
|
|
55514
55517
|
var defaultOptions = {
|
|
55515
|
-
name: (0,
|
|
55518
|
+
name: (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.generateUniqueId)('primitive_'),
|
|
55516
55519
|
color: this.defaultColor,
|
|
55517
55520
|
points: [],
|
|
55518
55521
|
glPrimitive: 'TRIANGLES',
|
|
@@ -55522,7 +55525,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55522
55525
|
for (var _len1 = arguments.length, optionsIn = new Array(_len1), _key1 = 0; _key1 < _len1; _key1++) {
|
|
55523
55526
|
optionsIn[_key1] = arguments[_key1];
|
|
55524
55527
|
}
|
|
55525
|
-
var options =
|
|
55528
|
+
var options = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}, defaultOptions].concat(optionsIn));
|
|
55526
55529
|
options.transform = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getTransform)(options.transform);
|
|
55527
55530
|
if (options.position != null) {
|
|
55528
55531
|
options.position = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(options.position);
|
|
@@ -55534,7 +55537,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55534
55537
|
colorVertex = true;
|
|
55535
55538
|
fragmentShader = 'vertexColor';
|
|
55536
55539
|
}
|
|
55537
|
-
var glObject = new
|
|
55540
|
+
var glObject = new _DrawingObjects_GLObject_GLObject__WEBPACK_IMPORTED_MODULE_7__["default"](this.webgl[0], ['morpher', options.points.length, colorVertex], fragmentShader);
|
|
55538
55541
|
glObject.setPrimitive(options.glPrimitive.toUpperCase());
|
|
55539
55542
|
var shapeNameMap = {};
|
|
55540
55543
|
if (options.names != null) {
|
|
@@ -55553,7 +55556,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55553
55556
|
usage: 'STATIC',
|
|
55554
55557
|
size: 2
|
|
55555
55558
|
};
|
|
55556
|
-
var b = (0,
|
|
55559
|
+
var b = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, defaultBuffer);
|
|
55557
55560
|
glObject.addAttribute(attribute, b.size, points, b.type, b.normalize, b.stride, b.offset, b.usageIn);
|
|
55558
55561
|
});
|
|
55559
55562
|
if (colorVertex) {
|
|
@@ -55578,7 +55581,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55578
55581
|
usage: 'STATIC',
|
|
55579
55582
|
size: 4
|
|
55580
55583
|
};
|
|
55581
|
-
var b = (0,
|
|
55584
|
+
var b = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, defaultBuffer);
|
|
55582
55585
|
glObject.addAttribute(attribute, b.size, colors, b.type, b.normalize, b.stride, b.offset, b.usageIn);
|
|
55583
55586
|
});
|
|
55584
55587
|
options.color = this.defaultColor;
|
|
@@ -55586,7 +55589,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55586
55589
|
glObject.addUniform('u_from', 1, 'INT');
|
|
55587
55590
|
glObject.addUniform('u_to', 1, 'INT');
|
|
55588
55591
|
glObject.addUniform('u_percent', 1, 'FLOAT');
|
|
55589
|
-
var element = new
|
|
55592
|
+
var element = new _FigureElementPrimitiveMorph__WEBPACK_IMPORTED_MODULE_9__["default"](glObject, options.transform, options.color, null, options.name);
|
|
55590
55593
|
element.shapeNameMap = shapeNameMap;
|
|
55591
55594
|
element.setPoints(0);
|
|
55592
55595
|
element.fnMap.add('_morphCallback', function (percentage, customProperties) {
|
|
@@ -55598,7 +55601,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55598
55601
|
for (var _len10 = arguments.length, opt = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
|
|
55599
55602
|
opt[_key10] = arguments[_key10];
|
|
55600
55603
|
}
|
|
55601
|
-
var o =
|
|
55604
|
+
var o = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}, {
|
|
55602
55605
|
progression: 'easeinout',
|
|
55603
55606
|
element: element
|
|
55604
55607
|
}].concat(opt));
|
|
@@ -55608,7 +55611,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55608
55611
|
};
|
|
55609
55612
|
o.callback = '_morphCallback';
|
|
55610
55613
|
o.timeKeeper = _this.timeKeeper;
|
|
55611
|
-
return new
|
|
55614
|
+
return new _Animation_Animation__WEBPACK_IMPORTED_MODULE_8__.CustomAnimationStep(o);
|
|
55612
55615
|
};
|
|
55613
55616
|
element.animations.customSteps.push({
|
|
55614
55617
|
step: element.animations.morph.bind(this),
|
|
@@ -55726,7 +55729,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55726
55729
|
for (var _len11 = arguments.length, optionsIn = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
|
|
55727
55730
|
optionsIn[_key11] = arguments[_key11];
|
|
55728
55731
|
}
|
|
55729
|
-
var oIn =
|
|
55732
|
+
var oIn = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn));
|
|
55730
55733
|
var element = this.generic3.apply(this, [{
|
|
55731
55734
|
dimension: 2,
|
|
55732
55735
|
light: null,
|
|
@@ -55814,7 +55817,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55814
55817
|
drawBorderBuffer: 0,
|
|
55815
55818
|
simple: false
|
|
55816
55819
|
};
|
|
55817
|
-
var o = (0,
|
|
55820
|
+
var o = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, defaultOptions, optionsIn);
|
|
55818
55821
|
if (o.linePrimitives === false) {
|
|
55819
55822
|
o.lineNum = 2;
|
|
55820
55823
|
}
|
|
@@ -55823,19 +55826,19 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55823
55826
|
var drawBorder;
|
|
55824
55827
|
var drawBorderBuffer;
|
|
55825
55828
|
if (o.simple) {
|
|
55826
|
-
var _makeFastPolyLine = (0,
|
|
55829
|
+
var _makeFastPolyLine = (0,_geometries_lines_lines__WEBPACK_IMPORTED_MODULE_14__.makeFastPolyLine)(o.points, o.width, o.close);
|
|
55827
55830
|
var _makeFastPolyLine2 = _slicedToArray(_makeFastPolyLine, 3);
|
|
55828
55831
|
points = _makeFastPolyLine2[0];
|
|
55829
55832
|
drawBorder = _makeFastPolyLine2[1];
|
|
55830
55833
|
drawBorderBuffer = _makeFastPolyLine2[2];
|
|
55831
55834
|
} else if (o.cornersOnly) {
|
|
55832
|
-
var _makePolyLineCorners = (0,
|
|
55835
|
+
var _makePolyLineCorners = (0,_geometries_lines_lines__WEBPACK_IMPORTED_MODULE_14__.makePolyLineCorners)(o.points, o.width, o.close, o.cornerLength, o.widthIs, o.cornerStyle, o.cornerSize, o.cornerSides, o.minAutoCornerAngle, o.linePrimitives, o.lineNum, o.drawBorderBuffer);
|
|
55833
55836
|
var _makePolyLineCorners2 = _slicedToArray(_makePolyLineCorners, 3);
|
|
55834
55837
|
points = _makePolyLineCorners2[0];
|
|
55835
55838
|
drawBorder = _makePolyLineCorners2[1];
|
|
55836
55839
|
drawBorderBuffer = _makePolyLineCorners2[2];
|
|
55837
55840
|
} else {
|
|
55838
|
-
var _makePolyLine = (0,
|
|
55841
|
+
var _makePolyLine = (0,_geometries_lines_lines__WEBPACK_IMPORTED_MODULE_14__.makePolyLine)(o.points, o.width, o.close, o.widthIs, o.cornerStyle, o.cornerSize, o.cornerSides, o.minAutoCornerAngle, o.dash, o.linePrimitives, o.lineNum, o.drawBorder, o.drawBorderBuffer, o.arrow);
|
|
55839
55842
|
var _makePolyLine2 = _slicedToArray(_makePolyLine, 3);
|
|
55840
55843
|
points = _makePolyLine2[0];
|
|
55841
55844
|
drawBorder = _makePolyLine2[1];
|
|
@@ -55871,7 +55874,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55871
55874
|
for (var _len12 = arguments.length, optionsIn = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
|
|
55872
55875
|
optionsIn[_key12] = arguments[_key12];
|
|
55873
55876
|
}
|
|
55874
|
-
var options =
|
|
55877
|
+
var options = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn));
|
|
55875
55878
|
var element = this.generic.apply(this, [{
|
|
55876
55879
|
transform: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Transform().scale(1).rotate(0).translate(),
|
|
55877
55880
|
border: 'draw',
|
|
@@ -55896,7 +55899,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55896
55899
|
drawBorderBuffer: 0
|
|
55897
55900
|
};
|
|
55898
55901
|
element.custom.updatePoints = function (updateOptions) {
|
|
55899
|
-
var _this2$getPolylineTri = _this2.getPolylineTris((0,
|
|
55902
|
+
var _this2$getPolylineTri = _this2.getPolylineTris((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, element.custom.options, updateOptions)),
|
|
55900
55903
|
_this2$getPolylineTri2 = _slicedToArray(_this2$getPolylineTri, 5),
|
|
55901
55904
|
o = _this2$getPolylineTri2[0],
|
|
55902
55905
|
points = _this2$getPolylineTri2[1],
|
|
@@ -55904,7 +55907,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55904
55907
|
drawBorderBuffer = _this2$getPolylineTri2[3],
|
|
55905
55908
|
drawType = _this2$getPolylineTri2[4];
|
|
55906
55909
|
element.custom.options = o;
|
|
55907
|
-
element.custom.updateGeneric((0,
|
|
55910
|
+
element.custom.updateGeneric((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, o, {
|
|
55908
55911
|
points: points,
|
|
55909
55912
|
drawBorder: drawBorder,
|
|
55910
55913
|
drawBorderBuffer: drawBorderBuffer,
|
|
@@ -55931,12 +55934,12 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55931
55934
|
if (o.sidesToDraw > o.sides) {
|
|
55932
55935
|
o.sidesToDraw = o.sides;
|
|
55933
55936
|
}
|
|
55934
|
-
var points = (0,
|
|
55937
|
+
var points = (0,_geometries_polygon_polygon__WEBPACK_IMPORTED_MODULE_15__.getPolygonPoints)(o);
|
|
55935
55938
|
// let { drawBorderBuffer } = o;
|
|
55936
55939
|
var drawBorderOffset = 0;
|
|
55937
55940
|
var drawBorder;
|
|
55938
55941
|
if (o.line != null) {
|
|
55939
|
-
o.line = (0,
|
|
55942
|
+
o.line = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, {
|
|
55940
55943
|
width: this.defaultLineWidth,
|
|
55941
55944
|
widthIs: 'mid'
|
|
55942
55945
|
}, o.line);
|
|
@@ -55974,7 +55977,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
55974
55977
|
if (drawBorderOffset === 0) {
|
|
55975
55978
|
drawBorder = [points];
|
|
55976
55979
|
} else {
|
|
55977
|
-
drawBorder = [(0,
|
|
55980
|
+
drawBorder = [(0,_geometries_polygon_polygon__WEBPACK_IMPORTED_MODULE_15__.getPolygonPoints)((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, o, {
|
|
55978
55981
|
radius: o.radius + drawBorderOffset
|
|
55979
55982
|
}))];
|
|
55980
55983
|
}
|
|
@@ -56007,7 +56010,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56007
56010
|
return [];
|
|
56008
56011
|
};
|
|
56009
56012
|
element.custom.updatePoints = function (updateOptions) {
|
|
56010
|
-
var borderOptions = (0,
|
|
56013
|
+
var borderOptions = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, element.custom.options, updateOptions);
|
|
56011
56014
|
var _element$custom$getBo = element.custom.getBorder(borderOptions),
|
|
56012
56015
|
_element$custom$getBo2 = _slicedToArray(_element$custom$getBo, 2),
|
|
56013
56016
|
o = _element$custom$getBo2[0],
|
|
@@ -56018,10 +56021,10 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56018
56021
|
points = _element$custom$getFi2[0],
|
|
56019
56022
|
drawType = _element$custom$getFi2[1];
|
|
56020
56023
|
element.custom.options = o;
|
|
56021
|
-
element.custom.updateGeneric((0,
|
|
56024
|
+
element.custom.updateGeneric((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, o, {
|
|
56022
56025
|
points: points,
|
|
56023
56026
|
drawBorder: border,
|
|
56024
|
-
drawBorderBuffer: (0,
|
|
56027
|
+
drawBorderBuffer: (0,_geometries_buffer__WEBPACK_IMPORTED_MODULE_23__.getBufferBorder)([border], o.drawBorderBuffer, element.custom.skipConcave, element.custom.bufferOffset),
|
|
56025
56028
|
drawType: drawType
|
|
56026
56029
|
}));
|
|
56027
56030
|
} else {
|
|
@@ -56036,7 +56039,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56036
56039
|
o.line.drawBorder = 'positive';
|
|
56037
56040
|
bufferOffsetToUse = 'positive';
|
|
56038
56041
|
}
|
|
56039
|
-
var _element$custom$getLi = element.custom.getLine((0,
|
|
56042
|
+
var _element$custom$getLi = element.custom.getLine((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, o.line, {
|
|
56040
56043
|
points: border
|
|
56041
56044
|
})),
|
|
56042
56045
|
_element$custom$getLi2 = _slicedToArray(_element$custom$getLi, 5),
|
|
@@ -56049,8 +56052,8 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56049
56052
|
if (element.custom.bufferOffset === 'positive') {
|
|
56050
56053
|
drawBorder.reverse();
|
|
56051
56054
|
}
|
|
56052
|
-
var drawBorderBuffer = (0,
|
|
56053
|
-
element.custom.updateGeneric((0,
|
|
56055
|
+
var drawBorderBuffer = (0,_geometries_buffer__WEBPACK_IMPORTED_MODULE_23__.getBufferBorder)(drawBorder, o.drawBorderBuffer, element.custom.skipConcave, bufferOffsetToUse);
|
|
56056
|
+
element.custom.updateGeneric((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, o, {
|
|
56054
56057
|
points: _points,
|
|
56055
56058
|
drawBorder: drawBorder,
|
|
56056
56059
|
drawBorderBuffer: drawBorderBuffer,
|
|
@@ -56078,7 +56081,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56078
56081
|
direction: 1,
|
|
56079
56082
|
rotation: 0,
|
|
56080
56083
|
offset: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Point(0, 0)
|
|
56081
|
-
},
|
|
56084
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56082
56085
|
element.custom.getBorder = function (o) {
|
|
56083
56086
|
var border = _this4.getPolygonBorder(o);
|
|
56084
56087
|
if (o.sidesToDraw !== o.sides) {
|
|
@@ -56095,7 +56098,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56095
56098
|
return border;
|
|
56096
56099
|
};
|
|
56097
56100
|
element.custom.getFill = function (border, fillOptions) {
|
|
56098
|
-
return [(0,
|
|
56101
|
+
return [(0,_geometries_polygon_polygon__WEBPACK_IMPORTED_MODULE_15__.getTrisFillPolygon)(fillOptions.offset, border, fillOptions.sides, fillOptions.sidesToDraw), 'TRIANGLES'];
|
|
56099
56102
|
};
|
|
56100
56103
|
// element.custom.getLine = (o: OBJ_PolyLineTris) => this.getPolylineTris(o);
|
|
56101
56104
|
|
|
@@ -56110,7 +56113,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56110
56113
|
}
|
|
56111
56114
|
return sidesToDraw * 6;
|
|
56112
56115
|
};
|
|
56113
|
-
element.custom.updatePoints(
|
|
56116
|
+
element.custom.updatePoints(_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56114
56117
|
return element;
|
|
56115
56118
|
}
|
|
56116
56119
|
|
|
@@ -56131,7 +56134,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56131
56134
|
direction: 1,
|
|
56132
56135
|
rotation: 0,
|
|
56133
56136
|
offset: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Point(0, 0)
|
|
56134
|
-
},
|
|
56137
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56135
56138
|
element.custom.getBorder = function (o) {
|
|
56136
56139
|
if (o.innerRadius == null) {
|
|
56137
56140
|
o.innerRadius = o.radius / 3;
|
|
@@ -56143,9 +56146,9 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56143
56146
|
return result;
|
|
56144
56147
|
};
|
|
56145
56148
|
element.custom.getFill = function (border, fillOptions) {
|
|
56146
|
-
return [(0,
|
|
56149
|
+
return [(0,_geometries_polygon_polygon__WEBPACK_IMPORTED_MODULE_15__.getTrisFillPolygon)(fillOptions.offset, border, fillOptions.sides, fillOptions.sidesToDraw), 'TRIANGLES'];
|
|
56147
56150
|
};
|
|
56148
|
-
element.custom.updatePoints(
|
|
56151
|
+
element.custom.updatePoints(_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56149
56152
|
return element;
|
|
56150
56153
|
}
|
|
56151
56154
|
|
|
@@ -56169,7 +56172,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56169
56172
|
sides: 1
|
|
56170
56173
|
},
|
|
56171
56174
|
offset: [0, 0]
|
|
56172
|
-
},
|
|
56175
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56173
56176
|
element.custom.getBorder = function (o) {
|
|
56174
56177
|
if (o.line != null && o.line.widthIs === 'inside') {
|
|
56175
56178
|
o.line.widthIs = 'positive';
|
|
@@ -56180,13 +56183,13 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56180
56183
|
if (o.offset != null) {
|
|
56181
56184
|
o.offset = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(o.offset);
|
|
56182
56185
|
}
|
|
56183
|
-
return [o, (0,
|
|
56186
|
+
return [o, (0,_geometries_rectangle__WEBPACK_IMPORTED_MODULE_16__.getRectangleBorder)(o)];
|
|
56184
56187
|
};
|
|
56185
56188
|
element.custom.getFill = function (border) {
|
|
56186
|
-
return [(0,
|
|
56189
|
+
return [(0,_geometries_rectangle__WEBPACK_IMPORTED_MODULE_16__.rectangleBorderToTris)(border), 'TRIANGLES'];
|
|
56187
56190
|
};
|
|
56188
56191
|
// element.custom.getLine = (o: OBJ_PolyLineTris) => this.getPolylineTris(o);
|
|
56189
|
-
element.custom.updatePoints(
|
|
56192
|
+
element.custom.updatePoints(_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56190
56193
|
return element;
|
|
56191
56194
|
}
|
|
56192
56195
|
}, {
|
|
@@ -56205,7 +56208,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56205
56208
|
yAlign: 'baseline',
|
|
56206
56209
|
transform: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Transform().scale(1).rotate(0).translate(0, 0),
|
|
56207
56210
|
// color: this.defaultColor,
|
|
56208
|
-
name: (0,
|
|
56211
|
+
name: (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.generateUniqueId)('primitive_'),
|
|
56209
56212
|
vertexShader: {
|
|
56210
56213
|
dimension: 2,
|
|
56211
56214
|
color: 'texture'
|
|
@@ -56272,7 +56275,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56272
56275
|
yAlign: 'baseline',
|
|
56273
56276
|
transform: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Transform().scale(1).rotate(0).translate(0, 0),
|
|
56274
56277
|
color: this.defaultColor,
|
|
56275
|
-
name: (0,
|
|
56278
|
+
name: (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.generateUniqueId)('primitive_'),
|
|
56276
56279
|
vertexShader: {
|
|
56277
56280
|
dimension: 2,
|
|
56278
56281
|
color: 'texture'
|
|
@@ -56297,7 +56300,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56297
56300
|
for (var _len18 = arguments.length, fo = new Array(_len18), _key18 = 0; _key18 < _len18; _key18++) {
|
|
56298
56301
|
fo[_key18] = arguments[_key18];
|
|
56299
56302
|
}
|
|
56300
|
-
return _construct(
|
|
56303
|
+
return _construct(_FigureElementPrimitiveGLText__WEBPACK_IMPORTED_MODULE_11__["default"], fo);
|
|
56301
56304
|
};
|
|
56302
56305
|
var element = this.gl(o);
|
|
56303
56306
|
element.setup(o);
|
|
@@ -56328,7 +56331,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56328
56331
|
element.scenarios = options.scenarios;
|
|
56329
56332
|
}
|
|
56330
56333
|
if (options.scene != null) {
|
|
56331
|
-
if (options.scene instanceof
|
|
56334
|
+
if (options.scene instanceof _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"]) {
|
|
56332
56335
|
element.scene = options.scene;
|
|
56333
56336
|
} else {
|
|
56334
56337
|
element.setScene(options.scene);
|
|
@@ -56352,7 +56355,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56352
56355
|
yAlign: 'baseline',
|
|
56353
56356
|
transform: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Transform().scale(1).rotate(0).translate(0, 0),
|
|
56354
56357
|
color: this.defaultColor,
|
|
56355
|
-
name: (0,
|
|
56358
|
+
name: (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.generateUniqueId)('primitive_'),
|
|
56356
56359
|
adjustments: {
|
|
56357
56360
|
width: 0,
|
|
56358
56361
|
ascent: 0,
|
|
@@ -56369,14 +56372,14 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56369
56372
|
for (var _len20 = arguments.length, fo = new Array(_len20), _key20 = 0; _key20 < _len20; _key20++) {
|
|
56370
56373
|
fo[_key20] = arguments[_key20];
|
|
56371
56374
|
}
|
|
56372
|
-
return _construct(
|
|
56375
|
+
return _construct(_FigureElementPrimitiveGLText__WEBPACK_IMPORTED_MODULE_11__["default"], fo);
|
|
56373
56376
|
};
|
|
56374
56377
|
o.transform = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getTransform)(o.transform);
|
|
56375
56378
|
if (o.position != null) {
|
|
56376
56379
|
o.position = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(o.position);
|
|
56377
56380
|
o.transform.updateTranslation(o.position);
|
|
56378
56381
|
}
|
|
56379
|
-
var element = new
|
|
56382
|
+
var element = new _FigureElementPrimitive2DText__WEBPACK_IMPORTED_MODULE_10__["default"](this.draw2D[0], o);
|
|
56380
56383
|
return this.elementSetup(element, o);
|
|
56381
56384
|
}
|
|
56382
56385
|
}, {
|
|
@@ -56396,15 +56399,15 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56396
56399
|
for (var _len21 = arguments.length, options = new Array(_len21), _key21 = 0; _key21 < _len21; _key21++) {
|
|
56397
56400
|
options[_key21] = arguments[_key21];
|
|
56398
56401
|
}
|
|
56399
|
-
var combinedOptions =
|
|
56402
|
+
var combinedOptions = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options));
|
|
56400
56403
|
for (var i = options.length - 1; i >= 0; i -= 1) {
|
|
56401
|
-
if (options[i].scene != null && options[i].scene instanceof
|
|
56404
|
+
if (options[i].scene != null && options[i].scene instanceof _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"]) {
|
|
56402
56405
|
combinedOptions.scene = options[i].scene;
|
|
56403
56406
|
break;
|
|
56404
56407
|
}
|
|
56405
56408
|
}
|
|
56406
56409
|
for (var _i2 = options.length - 1; _i2 >= 0; _i2 -= 1) {
|
|
56407
|
-
if (options[_i2].changeScene != null && options[_i2].changeScene instanceof
|
|
56410
|
+
if (options[_i2].changeScene != null && options[_i2].changeScene instanceof _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"]) {
|
|
56408
56411
|
combinedOptions.changeScene = options[_i2].changeScene;
|
|
56409
56412
|
break;
|
|
56410
56413
|
}
|
|
@@ -56413,16 +56416,16 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56413
56416
|
scene = combinedOptions.scene;
|
|
56414
56417
|
if (scene == null) {
|
|
56415
56418
|
scene = this.scene;
|
|
56416
|
-
} else if (!(scene instanceof
|
|
56417
|
-
scene = new
|
|
56419
|
+
} else if (!(scene instanceof _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"])) {
|
|
56420
|
+
scene = new _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"](scene);
|
|
56418
56421
|
}
|
|
56419
|
-
if (changeScene != null && !(changeScene instanceof
|
|
56420
|
-
changeScene = new
|
|
56422
|
+
if (changeScene != null && !(changeScene instanceof _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"])) {
|
|
56423
|
+
changeScene = new _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"](changeScene);
|
|
56421
56424
|
}
|
|
56422
56425
|
defaultOptions.width = scene.right - scene.left;
|
|
56423
56426
|
defaultOptions.height = scene.top - scene.bottom;
|
|
56424
56427
|
defaultOptions.position = [scene.left + defaultOptions.width / 2, scene.bottom + defaultOptions.height / 2];
|
|
56425
|
-
var o = (0,
|
|
56428
|
+
var o = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjectsWithOptions)({}, defaultOptions, combinedOptions);
|
|
56426
56429
|
var element = this.rectangle({
|
|
56427
56430
|
width: o.width,
|
|
56428
56431
|
height: o.height,
|
|
@@ -56434,7 +56437,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56434
56437
|
for (var _len22 = arguments.length, fo = new Array(_len22), _key22 = 0; _key22 < _len22; _key22++) {
|
|
56435
56438
|
fo[_key22] = arguments[_key22];
|
|
56436
56439
|
}
|
|
56437
|
-
return _construct(
|
|
56440
|
+
return _construct(_FigureElementPrimitiveGesture__WEBPACK_IMPORTED_MODULE_25__["default"], fo);
|
|
56438
56441
|
}
|
|
56439
56442
|
});
|
|
56440
56443
|
element.setup(o);
|
|
@@ -56454,7 +56457,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56454
56457
|
for (var _len23 = arguments.length, options = new Array(_len23), _key23 = 0; _key23 < _len23; _key23++) {
|
|
56455
56458
|
options[_key23] = arguments[_key23];
|
|
56456
56459
|
}
|
|
56457
|
-
var o =
|
|
56460
|
+
var o = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjectsWithOptions.apply(void 0, [{
|
|
56458
56461
|
except: 'controlScene'
|
|
56459
56462
|
}, {}, {
|
|
56460
56463
|
left: 0,
|
|
@@ -56486,7 +56489,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56486
56489
|
}
|
|
56487
56490
|
for (var i = options.length - 1; i >= 0; i -= 1) {
|
|
56488
56491
|
if (options[i].controlScene != null) {
|
|
56489
|
-
if (options[i].controlScene instanceof
|
|
56492
|
+
if (options[i].controlScene instanceof _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"]) {
|
|
56490
56493
|
element.custom.sceneToChange = options[i].controlScene;
|
|
56491
56494
|
i = -1;
|
|
56492
56495
|
} else if (typeof options[i].controlScene === 'string') {
|
|
@@ -56495,7 +56498,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56495
56498
|
}
|
|
56496
56499
|
}
|
|
56497
56500
|
}
|
|
56498
|
-
element.scene = new
|
|
56501
|
+
element.scene = new _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"]({
|
|
56499
56502
|
style: '2D',
|
|
56500
56503
|
left: 0,
|
|
56501
56504
|
right: 1,
|
|
@@ -56568,6 +56571,170 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56568
56571
|
return element;
|
|
56569
56572
|
}
|
|
56570
56573
|
|
|
56574
|
+
/**
|
|
56575
|
+
* {@link FigureElementPrimitive} that rotates a 3D element with touch and drag
|
|
56576
|
+
* gestures.
|
|
56577
|
+
*
|
|
56578
|
+
* This produces the same on-screen motion as {@link OBJ_CameraControl}, but
|
|
56579
|
+
* rotates the *object* instead of orbiting the camera. As the scene's lights
|
|
56580
|
+
* are fixed in world space, the object's faces are shaded differently as it
|
|
56581
|
+
* turns (with `cameraControl` the shading stays fixed relative to the object).
|
|
56582
|
+
*
|
|
56583
|
+
* @see {@link OBJ_RotateControl} for options and examples.
|
|
56584
|
+
*/
|
|
56585
|
+
}, {
|
|
56586
|
+
key: "rotateControl",
|
|
56587
|
+
value: function rotateControl() {
|
|
56588
|
+
for (var _len24 = arguments.length, options = new Array(_len24), _key24 = 0; _key24 < _len24; _key24++) {
|
|
56589
|
+
options[_key24] = arguments[_key24];
|
|
56590
|
+
}
|
|
56591
|
+
var o = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjectsWithOptions.apply(void 0, [{
|
|
56592
|
+
except: 'controlElement'
|
|
56593
|
+
}, {}, {
|
|
56594
|
+
left: 0,
|
|
56595
|
+
bottom: 0,
|
|
56596
|
+
width: 1,
|
|
56597
|
+
height: 1,
|
|
56598
|
+
controlElement: null,
|
|
56599
|
+
color: [0, 0, 0, 0],
|
|
56600
|
+
axis: [0, 1, 0],
|
|
56601
|
+
sensitivity: 5,
|
|
56602
|
+
xSensitivity: 1,
|
|
56603
|
+
ySensitivity: 1,
|
|
56604
|
+
back: false
|
|
56605
|
+
}].concat(options));
|
|
56606
|
+
var element = this.rectangle({
|
|
56607
|
+
width: o.width,
|
|
56608
|
+
height: o.height,
|
|
56609
|
+
position: [o.left, o.bottom],
|
|
56610
|
+
xAlign: 'left',
|
|
56611
|
+
yAlign: 'bottom',
|
|
56612
|
+
move: {
|
|
56613
|
+
freely: false
|
|
56614
|
+
},
|
|
56615
|
+
color: o.color
|
|
56616
|
+
});
|
|
56617
|
+
// When `back` is false the control captures all drags (so dragging the
|
|
56618
|
+
// object - or anywhere - rotates it). When true, touchable objects (e.g.
|
|
56619
|
+
// movable elements) are touched first and the object only rotates when
|
|
56620
|
+
// dragging empty space.
|
|
56621
|
+
element._custom.cameraControlBack = false;
|
|
56622
|
+
if (o.back) {
|
|
56623
|
+
element._custom.cameraControlBack = true;
|
|
56624
|
+
}
|
|
56625
|
+
for (var i = options.length - 1; i >= 0; i -= 1) {
|
|
56626
|
+
if (options[i].controlElement != null) {
|
|
56627
|
+
element.custom.elementToRotate = options[i].controlElement;
|
|
56628
|
+
i = -1;
|
|
56629
|
+
}
|
|
56630
|
+
}
|
|
56631
|
+
element.scene = new _tools_geometry_scene__WEBPACK_IMPORTED_MODULE_24__["default"]({
|
|
56632
|
+
style: '2D',
|
|
56633
|
+
left: 0,
|
|
56634
|
+
right: 1,
|
|
56635
|
+
bottom: 0,
|
|
56636
|
+
top: 1
|
|
56637
|
+
});
|
|
56638
|
+
|
|
56639
|
+
// Resolve the target element and capture the fixed (P0) camera the first
|
|
56640
|
+
// time the control is used - by then the element is linked to its scene.
|
|
56641
|
+
// A `controlElement` must be supplied: defaulting to the parent is unsafe
|
|
56642
|
+
// because the control is itself a child of that parent, so rotating it would
|
|
56643
|
+
// corrupt the control's own gesture coordinates. With no target the control
|
|
56644
|
+
// is a safe no-op.
|
|
56645
|
+
element.custom.setup = false;
|
|
56646
|
+
var setupState = function setupState() {
|
|
56647
|
+
var target = element.custom.elementToRotate;
|
|
56648
|
+
if (typeof target === 'string') {
|
|
56649
|
+
var rootElement = element.getRootElement();
|
|
56650
|
+
target = rootElement != null ? rootElement.getElement(target) : null;
|
|
56651
|
+
}
|
|
56652
|
+
if (target == null) {
|
|
56653
|
+
return false;
|
|
56654
|
+
}
|
|
56655
|
+
var scene = target.getScene();
|
|
56656
|
+
if (scene == null || scene.camera == null) {
|
|
56657
|
+
return false;
|
|
56658
|
+
}
|
|
56659
|
+
var axis = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(o.axis);
|
|
56660
|
+
element.custom.target = target;
|
|
56661
|
+
element.custom.axis = axis;
|
|
56662
|
+
element.custom.lookAt = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(scene.camera.lookAt);
|
|
56663
|
+
element.custom.up = axis.toArray();
|
|
56664
|
+
element.custom.cameraMatrix0 = _tools_m3__WEBPACK_IMPORTED_MODULE_5__.lookAt((0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(scene.camera.position).toArray(), element.custom.lookAt.toArray(), element.custom.up);
|
|
56665
|
+
element.custom.cameraPosition = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(scene.camera.position);
|
|
56666
|
+
element.custom.targetPosition = target.getPosition();
|
|
56667
|
+
element.custom.setup = true;
|
|
56668
|
+
return true;
|
|
56669
|
+
};
|
|
56670
|
+
|
|
56671
|
+
// Apply the object transform that reproduces the virtual camera's view from
|
|
56672
|
+
// the fixed real camera: M = cameraMatrix(P0) . inverse(view at P).
|
|
56673
|
+
var applyRotation = function applyRotation() {
|
|
56674
|
+
var matrix = _tools_m3__WEBPACK_IMPORTED_MODULE_5__.mul(element.custom.cameraMatrix0, _tools_m3__WEBPACK_IMPORTED_MODULE_5__.inverse(_tools_m3__WEBPACK_IMPORTED_MODULE_5__.lookAt(element.custom.cameraPosition.toArray(), element.custom.lookAt.toArray(), element.custom.up)));
|
|
56675
|
+
var p = element.custom.targetPosition;
|
|
56676
|
+
element.custom.target.setTransform(new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Transform([['c'].concat(_toConsumableArray(matrix)), ['t', p.x, p.y, p.z]]));
|
|
56677
|
+
};
|
|
56678
|
+
|
|
56679
|
+
// Fires once per touch-down. Swallow the first move's delta as a baseline so
|
|
56680
|
+
// the grab does not produce a one-frame jump ('flash') at the drag start.
|
|
56681
|
+
element.notifications.add('startBeingMoved', function () {
|
|
56682
|
+
element.custom.skipNext = true;
|
|
56683
|
+
});
|
|
56684
|
+
element.notifications.add('beforeMove', function () {
|
|
56685
|
+
element.custom.position = element.getPosition();
|
|
56686
|
+
element.custom.moving = true;
|
|
56687
|
+
});
|
|
56688
|
+
element.notifications.add('beforeMoveFreely', function () {
|
|
56689
|
+
element.custom.position = element.getPosition();
|
|
56690
|
+
element.custom.moving = true;
|
|
56691
|
+
});
|
|
56692
|
+
element.notifications.add('setTransform', function () {
|
|
56693
|
+
if (element.custom.moving === false) {
|
|
56694
|
+
return;
|
|
56695
|
+
}
|
|
56696
|
+
if (!element.custom.setup && !setupState()) {
|
|
56697
|
+
element.transform.updateTranslation(element.custom.position);
|
|
56698
|
+
element.custom.moving = false;
|
|
56699
|
+
return;
|
|
56700
|
+
}
|
|
56701
|
+
if (element.custom.skipNext) {
|
|
56702
|
+
element.custom.skipNext = false;
|
|
56703
|
+
element.transform.updateTranslation(element.custom.position);
|
|
56704
|
+
element.custom.moving = false;
|
|
56705
|
+
return;
|
|
56706
|
+
}
|
|
56707
|
+
var delta = element.getPosition().sub(element.custom.position);
|
|
56708
|
+
var deltaAz = -delta.x * o.sensitivity * o.xSensitivity;
|
|
56709
|
+
var deltaEl = delta.y * o.sensitivity * o.ySensitivity;
|
|
56710
|
+
var L = element.custom.lookAt;
|
|
56711
|
+
var U = element.custom.axis;
|
|
56712
|
+
var P = element.custom.cameraPosition;
|
|
56713
|
+
|
|
56714
|
+
// cameraControl's exact azimuth/elevation update, applied to the virtual
|
|
56715
|
+
// camera position so the motion matches cameraControl identically.
|
|
56716
|
+
var panAxis = U;
|
|
56717
|
+
var tiltAxis = U.crossProduct(P.sub(L)).normalize();
|
|
56718
|
+
var deltaAngle = 0.001;
|
|
56719
|
+
var angleToLock = Math.abs(Math.acos(P.sub(L).normalize().dotProduct(L.add(U).normalize())));
|
|
56720
|
+
if (deltaEl < 0 && angleToLock < Math.PI / 2) {
|
|
56721
|
+
if (deltaEl < -angleToLock + deltaAngle) {
|
|
56722
|
+
deltaEl = -angleToLock + deltaAngle;
|
|
56723
|
+
}
|
|
56724
|
+
}
|
|
56725
|
+
if (deltaEl > 0 && angleToLock > Math.PI / 2) {
|
|
56726
|
+
angleToLock = Math.PI - angleToLock;
|
|
56727
|
+
deltaEl = _tools_math__WEBPACK_IMPORTED_MODULE_4__.round(Math.min(angleToLock - deltaAngle, deltaEl), 4);
|
|
56728
|
+
}
|
|
56729
|
+
var t = [['r', deltaEl].concat(_toConsumableArray(tiltAxis.toArray())), ['r', deltaAz].concat(_toConsumableArray(panAxis.toArray()))];
|
|
56730
|
+
element.custom.cameraPosition = P.transformBy((0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getTransform)(t).matrix());
|
|
56731
|
+
applyRotation();
|
|
56732
|
+
element.transform.updateTranslation(element.custom.position);
|
|
56733
|
+
element.custom.moving = false;
|
|
56734
|
+
});
|
|
56735
|
+
return element;
|
|
56736
|
+
}
|
|
56737
|
+
|
|
56571
56738
|
/**
|
|
56572
56739
|
* {@link FigureElementPrimitive} that draws an ellipse.
|
|
56573
56740
|
* @see {@link OBJ_Ellipse} for options and examples.
|
|
@@ -56575,8 +56742,8 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56575
56742
|
}, {
|
|
56576
56743
|
key: "ellipse",
|
|
56577
56744
|
value: function ellipse() {
|
|
56578
|
-
for (var
|
|
56579
|
-
options[
|
|
56745
|
+
for (var _len25 = arguments.length, options = new Array(_len25), _key25 = 0; _key25 < _len25; _key25++) {
|
|
56746
|
+
options[_key25] = arguments[_key25];
|
|
56580
56747
|
}
|
|
56581
56748
|
var element = this.genericBase('ellipse', {
|
|
56582
56749
|
width: this.defaultLength,
|
|
@@ -56584,7 +56751,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56584
56751
|
xAlign: 'center',
|
|
56585
56752
|
yAlign: 'middle',
|
|
56586
56753
|
sides: 20
|
|
56587
|
-
},
|
|
56754
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56588
56755
|
element.custom.getBorder = function (o) {
|
|
56589
56756
|
if (o.line != null && o.line.widthIs === 'inside') {
|
|
56590
56757
|
o.line.widthIs = 'positive';
|
|
@@ -56592,13 +56759,13 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56592
56759
|
if (o.line != null && o.line.widthIs === 'outside') {
|
|
56593
56760
|
o.line.widthIs = 'negative';
|
|
56594
56761
|
}
|
|
56595
|
-
return [o, (0,
|
|
56762
|
+
return [o, (0,_geometries_ellipse__WEBPACK_IMPORTED_MODULE_17__.getEllipseBorder)(o)];
|
|
56596
56763
|
};
|
|
56597
56764
|
element.custom.getFill = function (border) {
|
|
56598
|
-
return [(0,
|
|
56765
|
+
return [(0,_geometries_ellipse__WEBPACK_IMPORTED_MODULE_17__.ellipseBorderToTris)(border), 'TRIANGLES'];
|
|
56599
56766
|
};
|
|
56600
56767
|
// element.custom.getLine = (o: OBJ_PolyLineTris) => this.getPolylineTris(o);
|
|
56601
|
-
element.custom.updatePoints(
|
|
56768
|
+
element.custom.updatePoints(_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56602
56769
|
return element;
|
|
56603
56770
|
}
|
|
56604
56771
|
|
|
@@ -56609,8 +56776,8 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56609
56776
|
}, {
|
|
56610
56777
|
key: "arc",
|
|
56611
56778
|
value: function arc() {
|
|
56612
|
-
for (var
|
|
56613
|
-
options[
|
|
56779
|
+
for (var _len26 = arguments.length, options = new Array(_len26), _key26 = 0; _key26 < _len26; _key26++) {
|
|
56780
|
+
options[_key26] = arguments[_key26];
|
|
56614
56781
|
}
|
|
56615
56782
|
var element = this.genericBase('arc', {
|
|
56616
56783
|
radius: this.defaultLength / 2,
|
|
@@ -56619,7 +56786,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56619
56786
|
angle: 1,
|
|
56620
56787
|
offset: [0, 0],
|
|
56621
56788
|
fillCenter: false
|
|
56622
|
-
},
|
|
56789
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56623
56790
|
element.custom.getBorder = function (o) {
|
|
56624
56791
|
if (o.line != null && o.line.widthIs === 'inside') {
|
|
56625
56792
|
o.line.widthIs = 'positive';
|
|
@@ -56631,13 +56798,13 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56631
56798
|
o.offset = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(o.offset);
|
|
56632
56799
|
}
|
|
56633
56800
|
element.custom.close = false;
|
|
56634
|
-
return [o, (0,
|
|
56801
|
+
return [o, (0,_geometries_arc__WEBPACK_IMPORTED_MODULE_18__.getArcBorder)(o)];
|
|
56635
56802
|
};
|
|
56636
56803
|
element.custom.getFill = function (border) {
|
|
56637
|
-
return [(0,
|
|
56804
|
+
return [(0,_geometries_arc__WEBPACK_IMPORTED_MODULE_18__.arcBorderToTris)(border), 'TRIANGLES'];
|
|
56638
56805
|
};
|
|
56639
56806
|
// element.custom.getLine = (o: OBJ_PolyLineTris) => this.getPolylineTris(o);
|
|
56640
|
-
element.custom.updatePoints(
|
|
56807
|
+
element.custom.updatePoints(_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56641
56808
|
return element;
|
|
56642
56809
|
}
|
|
56643
56810
|
|
|
@@ -56648,8 +56815,8 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56648
56815
|
}, {
|
|
56649
56816
|
key: "triangle",
|
|
56650
56817
|
value: function triangle() {
|
|
56651
|
-
for (var
|
|
56652
|
-
options[
|
|
56818
|
+
for (var _len27 = arguments.length, options = new Array(_len27), _key27 = 0; _key27 < _len27; _key27++) {
|
|
56819
|
+
options[_key27] = arguments[_key27];
|
|
56653
56820
|
}
|
|
56654
56821
|
var element = this.genericBase('triangle', {
|
|
56655
56822
|
width: this.defaultLength,
|
|
@@ -56659,7 +56826,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56659
56826
|
top: 'center',
|
|
56660
56827
|
direction: 1,
|
|
56661
56828
|
rotation: 0
|
|
56662
|
-
},
|
|
56829
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56663
56830
|
element.custom.getBorder = function (o) {
|
|
56664
56831
|
if (o.xAlign == null) {
|
|
56665
56832
|
if (o.points != null) {
|
|
@@ -56686,8 +56853,8 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56686
56853
|
// } else {
|
|
56687
56854
|
// element.custom.bufferOffset = 'negative';
|
|
56688
56855
|
// }
|
|
56689
|
-
var border = (0,
|
|
56690
|
-
if (o.direction === -1 || (0,
|
|
56856
|
+
var border = (0,_geometries_triangle__WEBPACK_IMPORTED_MODULE_19__.getTriangleBorder)(o);
|
|
56857
|
+
if (o.direction === -1 || (0,_geometries_triangle__WEBPACK_IMPORTED_MODULE_19__.getTriangleDirection)(border) === -1) {
|
|
56691
56858
|
border.reverse();
|
|
56692
56859
|
}
|
|
56693
56860
|
return [o, border];
|
|
@@ -56699,7 +56866,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56699
56866
|
element.custom.getFill = function (border) {
|
|
56700
56867
|
return [border, 'TRIANGLES'];
|
|
56701
56868
|
};
|
|
56702
|
-
element.custom.updatePoints(
|
|
56869
|
+
element.custom.updatePoints(_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56703
56870
|
return element;
|
|
56704
56871
|
}
|
|
56705
56872
|
|
|
@@ -56710,8 +56877,8 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56710
56877
|
}, {
|
|
56711
56878
|
key: "arrow",
|
|
56712
56879
|
value: function arrow() {
|
|
56713
|
-
for (var
|
|
56714
|
-
options[
|
|
56880
|
+
for (var _len28 = arguments.length, options = new Array(_len28), _key28 = 0; _key28 < _len28; _key28++) {
|
|
56881
|
+
options[_key28] = arguments[_key28];
|
|
56715
56882
|
}
|
|
56716
56883
|
var element = this.genericBase('arrow', {
|
|
56717
56884
|
length: this.defaultLength / 2,
|
|
@@ -56724,7 +56891,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56724
56891
|
tail: false,
|
|
56725
56892
|
drawPosition: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Point(0, 0)
|
|
56726
56893
|
// barb: this.defaultLength / 8,
|
|
56727
|
-
},
|
|
56894
|
+
}, _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56728
56895
|
element.custom.getBorder = function (o) {
|
|
56729
56896
|
if (o.line != null && o.line.widthIs === 'inside') {
|
|
56730
56897
|
o.line.widthIs = 'positive';
|
|
@@ -56732,17 +56899,17 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56732
56899
|
if (o.line != null && o.line.widthIs === 'outside') {
|
|
56733
56900
|
o.line.widthIs = 'negative';
|
|
56734
56901
|
}
|
|
56735
|
-
var optionsWithDefaultArrow = (0,
|
|
56736
|
-
var _getArrow = (0,
|
|
56902
|
+
var optionsWithDefaultArrow = (0,_geometries_arrow__WEBPACK_IMPORTED_MODULE_20__.defaultArrowOptions)(o);
|
|
56903
|
+
var _getArrow = (0,_geometries_arrow__WEBPACK_IMPORTED_MODULE_20__.getArrow)(optionsWithDefaultArrow),
|
|
56737
56904
|
_getArrow2 = _slicedToArray(_getArrow, 2),
|
|
56738
56905
|
border = _getArrow2[0],
|
|
56739
56906
|
borderBuffer = _getArrow2[1];
|
|
56740
56907
|
return [optionsWithDefaultArrow, border, borderBuffer];
|
|
56741
56908
|
};
|
|
56742
56909
|
element.custom.getFill = function (border, o) {
|
|
56743
|
-
return [(0,
|
|
56910
|
+
return [(0,_geometries_arrow__WEBPACK_IMPORTED_MODULE_20__.getArrowTris)(border, o), 'TRIANGLES'];
|
|
56744
56911
|
};
|
|
56745
|
-
element.custom.updatePoints(
|
|
56912
|
+
element.custom.updatePoints(_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options)));
|
|
56746
56913
|
return element;
|
|
56747
56914
|
}
|
|
56748
56915
|
|
|
@@ -56753,8 +56920,8 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56753
56920
|
}, {
|
|
56754
56921
|
key: "grid",
|
|
56755
56922
|
value: function grid() {
|
|
56756
|
-
for (var
|
|
56757
|
-
optionsIn[
|
|
56923
|
+
for (var _len29 = arguments.length, optionsIn = new Array(_len29), _key29 = 0; _key29 < _len29; _key29++) {
|
|
56924
|
+
optionsIn[_key29] = arguments[_key29];
|
|
56758
56925
|
}
|
|
56759
56926
|
var element = this.generic.apply(this, [{
|
|
56760
56927
|
transform: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Transform().scale(1).rotate(0).translate(),
|
|
@@ -56771,7 +56938,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56771
56938
|
}
|
|
56772
56939
|
};
|
|
56773
56940
|
var getTris = function getTris(points) {
|
|
56774
|
-
return (0,
|
|
56941
|
+
return (0,_geometries_lines_lines__WEBPACK_IMPORTED_MODULE_14__.makePolyLine)(points, element.custom.options.line.width, false, 'mid', 'auto',
|
|
56775
56942
|
// cornerStyle doesn't matter
|
|
56776
56943
|
0.1,
|
|
56777
56944
|
// cornerSize doesn't matter
|
|
@@ -56782,7 +56949,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56782
56949
|
element.custom.options.line.dash, element.custom.options.line.linePrimitives, element.custom.options.line.lineNum, [[]], 0);
|
|
56783
56950
|
};
|
|
56784
56951
|
element.custom.updatePoints = function (updateOptions) {
|
|
56785
|
-
var o = (0,
|
|
56952
|
+
var o = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, element.custom.options, updateOptions);
|
|
56786
56953
|
element.custom.options = o;
|
|
56787
56954
|
// Prioritize Num over Step. Only define Num from Step if Num is undefined.
|
|
56788
56955
|
var bounds = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getRect)(o.bounds);
|
|
@@ -56835,7 +57002,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56835
57002
|
var _getTris = getTris([yLineStart, yLineStop]),
|
|
56836
57003
|
_getTris2 = _slicedToArray(_getTris, 1),
|
|
56837
57004
|
yLine = _getTris2[0];
|
|
56838
|
-
yTris = (0,
|
|
57005
|
+
yTris = (0,_geometries_copy_copy__WEBPACK_IMPORTED_MODULE_22__.copyPoints)(yLine, [{
|
|
56839
57006
|
along: 'x',
|
|
56840
57007
|
num: xNum - 1,
|
|
56841
57008
|
step: xStep
|
|
@@ -56845,7 +57012,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56845
57012
|
var _getTris3 = getTris([xLineStart, xLineStop]),
|
|
56846
57013
|
_getTris4 = _slicedToArray(_getTris3, 1),
|
|
56847
57014
|
xLine = _getTris4[0];
|
|
56848
|
-
xTris = (0,
|
|
57015
|
+
xTris = (0,_geometries_copy_copy__WEBPACK_IMPORTED_MODULE_22__.copyPoints)(xLine, [{
|
|
56849
57016
|
along: 'y',
|
|
56850
57017
|
num: yNum - 1,
|
|
56851
57018
|
step: yStep
|
|
@@ -56866,14 +57033,14 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56866
57033
|
drawBorderBuffer = [[border[0].add(-buf, -buf), border[1].add(buf, -buf), border[2].add(buf, buf), border[3].add(-buf, buf)]];
|
|
56867
57034
|
}
|
|
56868
57035
|
}
|
|
56869
|
-
element.custom.updateGeneric((0,
|
|
57036
|
+
element.custom.updateGeneric((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, o, {
|
|
56870
57037
|
points: [].concat(_toConsumableArray(xTris), _toConsumableArray(yTris)),
|
|
56871
57038
|
drawBorder: drawBorder,
|
|
56872
57039
|
drawBorderBuffer: drawBorderBuffer,
|
|
56873
57040
|
drawType: o.line.linePrimitives ? 'LINES' : 'TRIANGLES'
|
|
56874
57041
|
}));
|
|
56875
57042
|
};
|
|
56876
|
-
element.custom.updatePoints(
|
|
57043
|
+
element.custom.updatePoints(_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(optionsIn)));
|
|
56877
57044
|
return element;
|
|
56878
57045
|
}
|
|
56879
57046
|
|
|
@@ -56884,18 +57051,18 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56884
57051
|
}, {
|
|
56885
57052
|
key: "line",
|
|
56886
57053
|
value: function line() {
|
|
56887
|
-
for (var
|
|
56888
|
-
options[
|
|
57054
|
+
for (var _len30 = arguments.length, options = new Array(_len30), _key30 = 0; _key30 < _len30; _key30++) {
|
|
57055
|
+
options[_key30] = arguments[_key30];
|
|
56889
57056
|
}
|
|
56890
|
-
var element = this.polyline(
|
|
57057
|
+
var element = this.polyline(_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}, {
|
|
56891
57058
|
transform: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Transform().scale(1).rotate(0).translate()
|
|
56892
57059
|
}].concat(options, [{
|
|
56893
57060
|
points: [[0, 0], [0, 1]],
|
|
56894
57061
|
dash: [],
|
|
56895
57062
|
arrow: null
|
|
56896
57063
|
}])));
|
|
56897
|
-
var joinedOptions =
|
|
56898
|
-
element.custom.options = (0,
|
|
57064
|
+
var joinedOptions = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}].concat(options));
|
|
57065
|
+
element.custom.options = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, element.custom.options, {
|
|
56899
57066
|
p1: [0, 0],
|
|
56900
57067
|
angle: 0,
|
|
56901
57068
|
length: this.defaultLength,
|
|
@@ -56933,14 +57100,14 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56933
57100
|
|
|
56934
57101
|
element.custom.updatePolyline = element.custom.updatePoints;
|
|
56935
57102
|
element.custom.updatePoints = function (updateOptions) {
|
|
56936
|
-
var o = (0,
|
|
56937
|
-
var _getLine = (0,
|
|
57103
|
+
var o = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, element.custom.options, updateOptions);
|
|
57104
|
+
var _getLine = (0,_geometries_line__WEBPACK_IMPORTED_MODULE_21__["default"])(o),
|
|
56938
57105
|
_getLine2 = _slicedToArray(_getLine, 3),
|
|
56939
57106
|
updatedPoints = _getLine2[0],
|
|
56940
57107
|
updatedBorder = _getLine2[1],
|
|
56941
57108
|
updatedTouchBorder = _getLine2[2];
|
|
56942
57109
|
// element.custom.setupLine(updatedPoints, o);
|
|
56943
|
-
element.custom.updatePolyline((0,
|
|
57110
|
+
element.custom.updatePolyline((0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, o, {
|
|
56944
57111
|
points: updatedPoints,
|
|
56945
57112
|
border: updatedBorder,
|
|
56946
57113
|
touchBorder: updatedTouchBorder
|
|
@@ -56968,7 +57135,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56968
57135
|
}, {
|
|
56969
57136
|
key: "textGL",
|
|
56970
57137
|
value: function textGL(options) {
|
|
56971
|
-
return (0,
|
|
57138
|
+
return (0,_Text__WEBPACK_IMPORTED_MODULE_12__["default"])(this.webgl[0], options);
|
|
56972
57139
|
}
|
|
56973
57140
|
|
|
56974
57141
|
/*
|
|
@@ -56999,10 +57166,10 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
56999
57166
|
touchBorder: 'buffer',
|
|
57000
57167
|
defaultTextTouchBorder: 0
|
|
57001
57168
|
};
|
|
57002
|
-
for (var
|
|
57003
|
-
optionsIn[
|
|
57169
|
+
for (var _len31 = arguments.length, optionsIn = new Array(_len31), _key31 = 0; _key31 < _len31; _key31++) {
|
|
57170
|
+
optionsIn[_key31] = arguments[_key31];
|
|
57004
57171
|
}
|
|
57005
|
-
var options =
|
|
57172
|
+
var options = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}, defaultOptions].concat(optionsIn));
|
|
57006
57173
|
for (var i = 0; i < optionsIn.length; i += 1) {
|
|
57007
57174
|
if (optionsIn[i].font != null) {
|
|
57008
57175
|
if (optionsIn[i].font.src) {
|
|
@@ -57223,7 +57390,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
57223
57390
|
wrap: true,
|
|
57224
57391
|
id: "id__temp_".concat(Math.round(Math.random() * 10000))
|
|
57225
57392
|
};
|
|
57226
|
-
var options = (0,
|
|
57393
|
+
var options = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects)({}, defaultOptions, optionsIn);
|
|
57227
57394
|
options.element = optionsIn.element;
|
|
57228
57395
|
var element;
|
|
57229
57396
|
var parent;
|
|
@@ -57252,7 +57419,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
57252
57419
|
if (parent == null) {
|
|
57253
57420
|
parent = this.htmlCanvas;
|
|
57254
57421
|
}
|
|
57255
|
-
var hT = new
|
|
57422
|
+
var hT = new _DrawingObjects_HTMLObject_HTMLObject__WEBPACK_IMPORTED_MODULE_13__["default"](parent, options.id, new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Point(0, 0), options.yAlign, options.xAlign, options.element);
|
|
57256
57423
|
var p = (0,_tools_g2__WEBPACK_IMPORTED_MODULE_0__.getPoint)(options.position);
|
|
57257
57424
|
var figureElement = new _Element__WEBPACK_IMPORTED_MODULE_2__.FigureElementPrimitive(hT, new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Transform().scale(1, 1).translate(p.x, p.y), [1, 1, 1, 1]);
|
|
57258
57425
|
figureElement.timeKeeper = this.timeKeeper;
|
|
@@ -57284,7 +57451,7 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
57284
57451
|
element.style.position = 'absolute';
|
|
57285
57452
|
element.setAttribute('id', id);
|
|
57286
57453
|
this.htmlCanvas.appendChild(element);
|
|
57287
|
-
var hT = new
|
|
57454
|
+
var hT = new _DrawingObjects_HTMLObject_HTMLObject__WEBPACK_IMPORTED_MODULE_13__["default"](this.htmlCanvas, id, new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Point(0, 0), yAlign, xAlign, elementToAdd);
|
|
57288
57455
|
var figureElement = new _Element__WEBPACK_IMPORTED_MODULE_2__.FigureElementPrimitive(hT, new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Transform().scale(1, 1).translate(location.x, location.y), [1, 1, 1, 1]);
|
|
57289
57456
|
figureElement.timeKeeper = this.timeKeeper;
|
|
57290
57457
|
figureElement.recorder = this.recorder;
|
|
@@ -57294,17 +57461,17 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
57294
57461
|
key: "htmlImage",
|
|
57295
57462
|
value: function htmlImage() {
|
|
57296
57463
|
var defaultOptions = {
|
|
57297
|
-
id: (0,
|
|
57464
|
+
id: (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.generateUniqueId)('id__html_image_'),
|
|
57298
57465
|
classes: '',
|
|
57299
57466
|
position: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Point(0, 0),
|
|
57300
57467
|
yAlign: 'middle',
|
|
57301
57468
|
xAlign: 'left',
|
|
57302
57469
|
src: ''
|
|
57303
57470
|
};
|
|
57304
|
-
for (var
|
|
57305
|
-
optionsIn[
|
|
57471
|
+
for (var _len32 = arguments.length, optionsIn = new Array(_len32), _key32 = 0; _key32 < _len32; _key32++) {
|
|
57472
|
+
optionsIn[_key32] = arguments[_key32];
|
|
57306
57473
|
}
|
|
57307
|
-
var options =
|
|
57474
|
+
var options = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}, defaultOptions].concat(optionsIn));
|
|
57308
57475
|
var image = document.createElement('img');
|
|
57309
57476
|
image.src = options.src;
|
|
57310
57477
|
var id = options.id,
|
|
@@ -57324,17 +57491,17 @@ var FigurePrimitives = /*#__PURE__*/function () {
|
|
|
57324
57491
|
value: function htmlText() {
|
|
57325
57492
|
var defaultOptions = {
|
|
57326
57493
|
text: '',
|
|
57327
|
-
id: (0,
|
|
57494
|
+
id: (0,_tools_tools__WEBPACK_IMPORTED_MODULE_6__.generateUniqueId)('id__html_text_'),
|
|
57328
57495
|
classes: '',
|
|
57329
57496
|
position: new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Point(0, 0),
|
|
57330
57497
|
yAlign: 'middle',
|
|
57331
57498
|
xAlign: 'left'
|
|
57332
57499
|
// color: this.defaultColor,
|
|
57333
57500
|
};
|
|
57334
|
-
for (var
|
|
57335
|
-
optionsIn[
|
|
57501
|
+
for (var _len33 = arguments.length, optionsIn = new Array(_len33), _key33 = 0; _key33 < _len33; _key33++) {
|
|
57502
|
+
optionsIn[_key33] = arguments[_key33];
|
|
57336
57503
|
}
|
|
57337
|
-
var options =
|
|
57504
|
+
var options = _tools_tools__WEBPACK_IMPORTED_MODULE_6__.joinObjects.apply(void 0, [{}, defaultOptions].concat(optionsIn));
|
|
57338
57505
|
var inside = document.createElement('div');
|
|
57339
57506
|
(0,_tools_htmlGenerator__WEBPACK_IMPORTED_MODULE_1__.setHTML)(inside, options.text, options.modifiers);
|
|
57340
57507
|
var id = options.id,
|
|
@@ -82301,8 +82468,8 @@ var tools = {
|
|
|
82301
82468
|
*/
|
|
82302
82469
|
|
|
82303
82470
|
var Fig = {
|
|
82304
|
-
version: "1.
|
|
82305
|
-
gitHash: "
|
|
82471
|
+
version: "1.10.0",
|
|
82472
|
+
gitHash: "3bfb48350",
|
|
82306
82473
|
tools: tools,
|
|
82307
82474
|
Figure: _js_figure_Figure__WEBPACK_IMPORTED_MODULE_5__["default"],
|
|
82308
82475
|
Recorder: _js_figure_Recorder_Recorder__WEBPACK_IMPORTED_MODULE_7__.Recorder,
|