@combeenation/3d-viewer 5.0.0-beta5 → 5.0.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/dist/lib-cjs/api/classes/placementAnimation.js +4 -1
- package/dist/lib-cjs/api/classes/placementAnimation.js.map +1 -1
- package/dist/lib-cjs/api/manager/variantInstanceManager.d.ts +3 -1
- package/dist/lib-cjs/api/manager/variantInstanceManager.js +23 -12
- package/dist/lib-cjs/api/manager/variantInstanceManager.js.map +1 -1
- package/package.json +1 -1
- package/src/api/classes/placementAnimation.ts +4 -1
- package/src/api/manager/variantInstanceManager.ts +22 -4
- package/src/pagesconfig.json +4 -0
|
@@ -48,8 +48,11 @@ var PlacementAnimation = /** @class */ (function () {
|
|
|
48
48
|
this._animationDefinition = lodash_es_1.cloneDeep(_animation);
|
|
49
49
|
}
|
|
50
50
|
this.prepareAnimationDefinition();
|
|
51
|
+
// create (shallow) copy for GSAP which doesn't contain `shortestWay`,
|
|
52
|
+
// because that's not part of the original `TweenVars` input typing and therefore leads to warnings
|
|
53
|
+
var _b = this._animationDefinition, shortestWay = _b.shortestWay, gsapTweenVars = tslib_1.__rest(_b, ["shortestWay"]);
|
|
51
54
|
this._timeline = gsap_1.gsap.timeline({
|
|
52
|
-
defaults:
|
|
55
|
+
defaults: gsapTweenVars,
|
|
53
56
|
paused: true,
|
|
54
57
|
});
|
|
55
58
|
this.preparePlacementDefinition();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"placementAnimation.js","sourceRoot":"","sources":["../../../../src/api/classes/placementAnimation.ts"],"names":[],"mappings":";;;;AAAA,2EAA0E;AAC1E,iEAA4D;AAC5D,6BAA4B;AAC5B,uCAAiE;AACjE,kDAAiD;AACjD,oDAAmD;AAEnD;;;;;GAKG;AACH;IAOE;;OAEG;IACH,4BACkB,OAAe,EACrB,UAAwC,EACxC,UAAyC;;QAFnC,YAAO,GAAP,OAAO,CAAQ;QACrB,eAAU,GAAV,UAAU,CAA8B;QACxC,eAAU,GAAV,UAAU,CAA+B;QAEnD,IAAI,oBAAQ,CAAC,UAAU,CAAC,EAAE;YACxB,IAAM,oBAAoB,GAAG,yBAAW,CAAC,GAAG,CAAuB,kBAAkB,CAAC,CAAC;YACvF,IAAI,CAAC,oBAAoB,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;aACvE;YACD,IAAM,mBAAmB,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAC7D,IAAI,CAAC,mBAAmB,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,2BAAwB,UAAU,sCAAkC,CAAC,CAAC;aACvF;YACD,IAAI,CAAC,oBAAoB,GAAG,qBAAS,CAAC,mBAAmB,CAAC,CAAC;SAC5D;aAAM;YACL,IAAI,CAAC,oBAAoB,GAAG,qBAAS,CAAC,UAAU,CAAwB,CAAC;SAC1E;QACD,IAAI,oBAAQ,CAAC,UAAU,CAAC,EAAE;YACxB,IAAM,mBAAmB,SAAG,yBAAW,CAAC,GAAG,CAAuB,kBAAkB,CAAC,0CAAG,UAAU,CAAC,CAAC;YACpG,IAAI,CAAC,mBAAmB,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,2BAAwB,UAAU,sCAAkC,CAAC,CAAC;aACvF;YACD,IAAI,CAAC,oBAAoB,GAAG,qBAAS,CAAC,mBAAmB,CAAC,CAAC;SAC5D;aAAM;YACL,IAAI,CAAC,oBAAoB,GAAG,qBAAS,CAAC,UAAU,CAAwB,CAAC;SAC1E;QAED,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,WAAI,CAAC,QAAQ,CAAC;YAC7B,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"placementAnimation.js","sourceRoot":"","sources":["../../../../src/api/classes/placementAnimation.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { VariantInstance } from '../classes/variantInstance';
|
|
|
7
7
|
*/
|
|
8
8
|
export declare class VariantInstanceManager extends EventBroadcaster {
|
|
9
9
|
protected rootVariant: Variant;
|
|
10
|
+
protected variantInstancePromises: Map<string, Promise<VariantInstance>>;
|
|
10
11
|
protected variantInstances: Map<string, VariantInstance>;
|
|
11
12
|
protected variantInstanceDefinitions: Map<string, VariantInstanceDefinition>;
|
|
12
13
|
protected parameters: ParameterBag;
|
|
@@ -36,7 +37,8 @@ export declare class VariantInstanceManager extends EventBroadcaster {
|
|
|
36
37
|
/**
|
|
37
38
|
* Retrieves a {@link VariantInstance}.
|
|
38
39
|
* If the instance has been created, the created instance will be returned.
|
|
39
|
-
* If the instance is registered, the instance will be created.
|
|
40
|
+
* If the instance is registered, the instance will be created and returned.
|
|
41
|
+
* if the instance has already been requested and is currently pending, the dedicated promise will be returned.
|
|
40
42
|
* If none of these apply, an Error is thrown.
|
|
41
43
|
*
|
|
42
44
|
* @emits {@link Event.VARIANT_INSTANCE_CREATED}
|
|
@@ -20,6 +20,7 @@ var VariantInstanceManager = /** @class */ (function (_super) {
|
|
|
20
20
|
function VariantInstanceManager(rootVariant) {
|
|
21
21
|
var _this = _super.call(this) || this;
|
|
22
22
|
_this.rootVariant = rootVariant;
|
|
23
|
+
_this.variantInstancePromises = new Map();
|
|
23
24
|
_this.variantInstances = new Map();
|
|
24
25
|
_this.variantInstanceDefinitions = new Map();
|
|
25
26
|
_this.parameters = {};
|
|
@@ -69,26 +70,36 @@ var VariantInstanceManager = /** @class */ (function (_super) {
|
|
|
69
70
|
/**
|
|
70
71
|
* Retrieves a {@link VariantInstance}.
|
|
71
72
|
* If the instance has been created, the created instance will be returned.
|
|
72
|
-
* If the instance is registered, the instance will be created.
|
|
73
|
+
* If the instance is registered, the instance will be created and returned.
|
|
74
|
+
* if the instance has already been requested and is currently pending, the dedicated promise will be returned.
|
|
73
75
|
* If none of these apply, an Error is thrown.
|
|
74
76
|
*
|
|
75
77
|
* @emits {@link Event.VARIANT_INSTANCE_CREATED}
|
|
76
78
|
*/
|
|
77
79
|
VariantInstanceManager.prototype.get = function (name) {
|
|
78
80
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
79
|
-
var definition;
|
|
81
|
+
var definition, vip;
|
|
82
|
+
var _this = this;
|
|
80
83
|
return tslib_1.__generator(this, function (_a) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
84
|
+
// 1) see if we have an instance of that name already and return it if found
|
|
85
|
+
if (this.variantInstances.has(name)) {
|
|
86
|
+
return [2 /*return*/, this.variantInstances.get(name)]; // cannot be null, hence the exclamation mark
|
|
87
|
+
}
|
|
88
|
+
// 2) try to get promise from list of requested instances and return it if found
|
|
89
|
+
if (this.variantInstancePromises.has(name)) {
|
|
90
|
+
return [2 /*return*/, this.variantInstancePromises.get(name)];
|
|
91
|
+
}
|
|
92
|
+
// 3) see if there's a definition of that name, create an instance from it and store the related promise
|
|
93
|
+
if (this.variantInstanceDefinitions.has(name)) {
|
|
94
|
+
definition = this.variantInstanceDefinitions.get(name);
|
|
95
|
+
vip = this.createFromDefinition(definition);
|
|
96
|
+
this.variantInstancePromises.set(name, vip);
|
|
97
|
+
// remove promise after it has been finished
|
|
98
|
+
vip.then(function () { return _this.variantInstancePromises.delete(name); });
|
|
99
|
+
return [2 /*return*/, vip];
|
|
91
100
|
}
|
|
101
|
+
//* if we are here, no instance definition of that name exists. throw error.
|
|
102
|
+
throw Error("VariantInstance with name \"" + name + "\" neither created nor configured.");
|
|
92
103
|
});
|
|
93
104
|
});
|
|
94
105
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variantInstanceManager.js","sourceRoot":"","sources":["../../../../src/api/manager/variantInstanceManager.ts"],"names":[],"mappings":";;;;AAAA,uCAAkC;AAClC,oDAAmD;AACnD,0CAAyC;AACzC,gEAA+D;AAC/D,kDAAiD;AAEjD,8DAA6D;AAE7D;;;GAGG;AACH;IAA4C,kDAAgB;
|
|
1
|
+
{"version":3,"file":"variantInstanceManager.js","sourceRoot":"","sources":["../../../../src/api/manager/variantInstanceManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -50,8 +50,11 @@ export class PlacementAnimation implements AnimationInterface {
|
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
this.prepareAnimationDefinition();
|
|
53
|
+
// create (shallow) copy for GSAP which doesn't contain `shortestWay`,
|
|
54
|
+
// because that's not part of the original `TweenVars` input typing and therefore leads to warnings
|
|
55
|
+
const { shortestWay, ...gsapTweenVars } = this._animationDefinition;
|
|
53
56
|
this._timeline = gsap.timeline({
|
|
54
|
-
defaults:
|
|
57
|
+
defaults: gsapTweenVars,
|
|
55
58
|
paused: true,
|
|
56
59
|
});
|
|
57
60
|
|
|
@@ -11,6 +11,8 @@ import { VariantInstance } from '../classes/variantInstance';
|
|
|
11
11
|
* {@link Viewer} instance via its {@link Viewer.variantInstances}
|
|
12
12
|
*/
|
|
13
13
|
export class VariantInstanceManager extends EventBroadcaster {
|
|
14
|
+
protected variantInstancePromises: Map<string, Promise<VariantInstance>> = new Map();
|
|
15
|
+
|
|
14
16
|
protected variantInstances: Map<string, VariantInstance> = new Map();
|
|
15
17
|
|
|
16
18
|
protected variantInstanceDefinitions: Map<string, VariantInstanceDefinition> = new Map();
|
|
@@ -61,19 +63,35 @@ export class VariantInstanceManager extends EventBroadcaster {
|
|
|
61
63
|
/**
|
|
62
64
|
* Retrieves a {@link VariantInstance}.
|
|
63
65
|
* If the instance has been created, the created instance will be returned.
|
|
64
|
-
* If the instance is registered, the instance will be created.
|
|
66
|
+
* If the instance is registered, the instance will be created and returned.
|
|
67
|
+
* if the instance has already been requested and is currently pending, the dedicated promise will be returned.
|
|
65
68
|
* If none of these apply, an Error is thrown.
|
|
66
69
|
*
|
|
67
70
|
* @emits {@link Event.VARIANT_INSTANCE_CREATED}
|
|
68
71
|
*/
|
|
69
72
|
public async get(name: string): Promise<VariantInstance> {
|
|
73
|
+
// 1) see if we have an instance of that name already and return it if found
|
|
70
74
|
if (this.variantInstances.has(name)) {
|
|
71
|
-
return this.variantInstances.get(name)!;
|
|
75
|
+
return this.variantInstances.get(name)!; // cannot be null, hence the exclamation mark
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
// 2) try to get promise from list of requested instances and return it if found
|
|
79
|
+
if (this.variantInstancePromises.has(name)) {
|
|
80
|
+
return this.variantInstancePromises.get(name)!;
|
|
72
81
|
}
|
|
82
|
+
|
|
83
|
+
// 3) see if there's a definition of that name, create an instance from it and store the related promise
|
|
73
84
|
if (this.variantInstanceDefinitions.has(name)) {
|
|
74
|
-
const definition = this.variantInstanceDefinitions.get(name)!;
|
|
75
|
-
|
|
85
|
+
const definition = this.variantInstanceDefinitions.get(name)!; // cannot be null
|
|
86
|
+
const vip = this.createFromDefinition(definition);
|
|
87
|
+
this.variantInstancePromises.set(name, vip);
|
|
88
|
+
// remove promise after it has been finished
|
|
89
|
+
vip.then(() => this.variantInstancePromises.delete(name));
|
|
90
|
+
|
|
91
|
+
return vip;
|
|
76
92
|
}
|
|
93
|
+
|
|
94
|
+
//* if we are here, no instance definition of that name exists. throw error.
|
|
77
95
|
throw Error(`VariantInstance with name "${name}" neither created nor configured.`);
|
|
78
96
|
}
|
|
79
97
|
|