@shapediver/viewer.shared.types 1.9.0 → 1.10.1
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnimationData.d.ts","sourceRoot":"","sources":["../../src/data/AnimationData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAGpH,oBAAY,cAAc,GAAG;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,YAAY,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,GAAG,MAAM,EAAE,CAAC;IACjG,MAAM,EAAE,YAAY,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,GAAG,MAAM,EAAE,CAAC;IAClG,IAAI,EAAE,OAAO,GAAG,aAAa,GAAG,UAAU,CAAC;IAC3C,aAAa,EAAE,QAAQ,GAAG,MAAM,CAAC;IACjC,cAAc,CAAC,EAAE,eAAe,CAAC;CACpC,CAAA;AAED,qBAAa,aAAc,SAAQ,oBAAoB;;gBAwB/C,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,cAAc,EAAE,EACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,EAAE,CAAC,EAAE,MAAM;IAaf,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,aAAa,IAAI,MAAM,CAEjC;IAED,IAAW,aAAa,CAAC,KAAK,EAAE,MAAM,EAErC;IAED,IAAW,QAAQ,IAAI,MAAM,CAE5B;IAED,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED,IAAW,MAAM,CAAC,KAAK,EAAE,OAAO,EAE/B;IAED,IAAW,KAAK,IAAI,OAAO,CAE1B;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,OAAO,EAE9B;IAED,IAAW,KAAK,IAAI,MAAM,CAEzB;IAED,IAAW,MAAM,IAAI,cAAc,EAAE,CAEpC;IASM,KAAK,IAAI,aAAa;IAItB,iBAAiB;IAIjB,cAAc;IAId,cAAc;IAiBd,aAAa;
|
|
1
|
+
{"version":3,"file":"AnimationData.d.ts","sourceRoot":"","sources":["../../src/data/AnimationData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAGpH,oBAAY,cAAc,GAAG;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,YAAY,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,GAAG,MAAM,EAAE,CAAC;IACjG,MAAM,EAAE,YAAY,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,GAAG,MAAM,EAAE,CAAC;IAClG,IAAI,EAAE,OAAO,GAAG,aAAa,GAAG,UAAU,CAAC;IAC3C,aAAa,EAAE,QAAQ,GAAG,MAAM,CAAC;IACjC,cAAc,CAAC,EAAE,eAAe,CAAC;CACpC,CAAA;AAED,qBAAa,aAAc,SAAQ,oBAAoB;;gBAwB/C,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,cAAc,EAAE,EACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,EAAE,CAAC,EAAE,MAAM;IAaf,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,aAAa,IAAI,MAAM,CAEjC;IAED,IAAW,aAAa,CAAC,KAAK,EAAE,MAAM,EAErC;IAED,IAAW,QAAQ,IAAI,MAAM,CAE5B;IAED,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED,IAAW,MAAM,CAAC,KAAK,EAAE,OAAO,EAE/B;IAED,IAAW,KAAK,IAAI,OAAO,CAE1B;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,OAAO,EAE9B;IAED,IAAW,KAAK,IAAI,MAAM,CAEzB;IAED,IAAW,MAAM,IAAI,cAAc,EAAE,CAEpC;IASM,KAAK,IAAI,aAAa;IAItB,iBAAiB;IAIjB,cAAc;IAId,cAAc;IAiBd,aAAa;CAoDvB"}
|
|
@@ -14,6 +14,7 @@ var _AnimationData_animate, _AnimationData_animationTime, _AnimationData_duratio
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.AnimationData = void 0;
|
|
16
16
|
const viewer_shared_node_tree_1 = require("@shapediver/viewer.shared.node-tree");
|
|
17
|
+
const gl_matrix_1 = require("gl-matrix");
|
|
17
18
|
class AnimationData extends viewer_shared_node_tree_1.AbstractTreeNodeData {
|
|
18
19
|
constructor(name, tracks, start, duration, id) {
|
|
19
20
|
super(id);
|
|
@@ -103,6 +104,38 @@ class AnimationData extends viewer_shared_node_tree_1.AbstractTreeNodeData {
|
|
|
103
104
|
track.node.transformations.push(track.previousMatrix);
|
|
104
105
|
}
|
|
105
106
|
}
|
|
107
|
+
else {
|
|
108
|
+
for (let i = 0; i < __classPrivateFieldGet(this, _AnimationData_tracks, "f").length; i++) {
|
|
109
|
+
const track = __classPrivateFieldGet(this, _AnimationData_tracks, "f")[i];
|
|
110
|
+
const id = this.id + '_' + i;
|
|
111
|
+
const prevAnimation = track.node.transformations.filter(t => t.id === id);
|
|
112
|
+
track.node.transformations = track.node.transformations.filter((el) => {
|
|
113
|
+
return !prevAnimation.includes(el);
|
|
114
|
+
});
|
|
115
|
+
const j = track.times.length - 1;
|
|
116
|
+
if (track.path === 'rotation') {
|
|
117
|
+
let quaternion = gl_matrix_1.quat.fromValues(track.values[j * 4 + 0], track.values[j * 4 + 1], track.values[j * 4 + 2], track.values[j * 4 + 3]);
|
|
118
|
+
track.node.transformations.push({
|
|
119
|
+
id,
|
|
120
|
+
matrix: gl_matrix_1.mat4.fromQuat(gl_matrix_1.mat4.create(), quaternion)
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
else if (track.path === 'translation') {
|
|
124
|
+
let vector = gl_matrix_1.vec3.fromValues(track.values[j * 3 + 0], track.values[j * 3 + 1], track.values[j * 3 + 2]);
|
|
125
|
+
track.node.transformations.push({
|
|
126
|
+
id,
|
|
127
|
+
matrix: gl_matrix_1.mat4.fromTranslation(gl_matrix_1.mat4.create(), vector)
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
else if (track.path === 'scale') {
|
|
131
|
+
let vector = gl_matrix_1.vec3.fromValues(track.values[j * 3 + 0], track.values[j * 3 + 1], track.values[j * 3 + 2]);
|
|
132
|
+
track.node.transformations.push({
|
|
133
|
+
id,
|
|
134
|
+
matrix: gl_matrix_1.mat4.fromScaling(gl_matrix_1.mat4.create(), vector)
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
}
|
|
106
139
|
__classPrivateFieldSet(this, _AnimationData_animationTime, -1, "f");
|
|
107
140
|
__classPrivateFieldSet(this, _AnimationData_started, false, "f");
|
|
108
141
|
__classPrivateFieldSet(this, _AnimationData_animate, false, "f");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnimationData.js","sourceRoot":"","sources":["../../src/data/AnimationData.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iFAAoH;
|
|
1
|
+
{"version":3,"file":"AnimationData.js","sourceRoot":"","sources":["../../src/data/AnimationData.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.shared.types",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.10.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -36,11 +36,11 @@
|
|
|
36
36
|
"testEnvironment": "node"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@shapediver/viewer.shared.math": "^1.
|
|
40
|
-
"@shapediver/viewer.shared.node-tree": "^1.
|
|
41
|
-
"@shapediver/viewer.shared.services": "^1.
|
|
39
|
+
"@shapediver/viewer.shared.math": "^1.10.1",
|
|
40
|
+
"@shapediver/viewer.shared.node-tree": "^1.10.1",
|
|
41
|
+
"@shapediver/viewer.shared.services": "^1.10.1",
|
|
42
42
|
"gl-matrix": "3.3.0",
|
|
43
43
|
"tsyringe": "^4.5.0"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "513c269ddfe0719331a605a9c62de0b8a64328fd"
|
|
46
46
|
}
|