@shapediver/viewer.shared.types
Advanced tools
Comparing version 1.9.0 to 1.10.1
@@ -17,2 +17,3 @@ "use strict"; | ||
const viewer_shared_node_tree_1 = require("@shapediver/viewer.shared.node-tree"); | ||
const gl_matrix_1 = require("gl-matrix"); | ||
class AnimationData extends viewer_shared_node_tree_1.AbstractTreeNodeData { | ||
@@ -107,2 +108,34 @@ constructor(name, tracks, start, duration, id) { | ||
} | ||
else { | ||
for (let i = 0; i < __classPrivateFieldGet(this, _AnimationData_tracks, "f").length; i++) { | ||
const track = __classPrivateFieldGet(this, _AnimationData_tracks, "f")[i]; | ||
const id = this.id + '_' + i; | ||
const prevAnimation = track.node.transformations.filter(t => t.id === id); | ||
track.node.transformations = track.node.transformations.filter((el) => { | ||
return !prevAnimation.includes(el); | ||
}); | ||
const j = track.times.length - 1; | ||
if (track.path === 'rotation') { | ||
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]); | ||
track.node.transformations.push({ | ||
id, | ||
matrix: gl_matrix_1.mat4.fromQuat(gl_matrix_1.mat4.create(), quaternion) | ||
}); | ||
} | ||
else if (track.path === 'translation') { | ||
let vector = gl_matrix_1.vec3.fromValues(track.values[j * 3 + 0], track.values[j * 3 + 1], track.values[j * 3 + 2]); | ||
track.node.transformations.push({ | ||
id, | ||
matrix: gl_matrix_1.mat4.fromTranslation(gl_matrix_1.mat4.create(), vector) | ||
}); | ||
} | ||
else if (track.path === 'scale') { | ||
let vector = gl_matrix_1.vec3.fromValues(track.values[j * 3 + 0], track.values[j * 3 + 1], track.values[j * 3 + 2]); | ||
track.node.transformations.push({ | ||
id, | ||
matrix: gl_matrix_1.mat4.fromScaling(gl_matrix_1.mat4.create(), vector) | ||
}); | ||
} | ||
} | ||
} | ||
__classPrivateFieldSet(this, _AnimationData_animationTime, -1, "f"); | ||
@@ -109,0 +142,0 @@ __classPrivateFieldSet(this, _AnimationData_started, false, "f"); |
{ | ||
"name": "@shapediver/viewer.shared.types", | ||
"version": "1.9.0", | ||
"version": "1.10.1", | ||
"description": "", | ||
@@ -39,9 +39,9 @@ "keywords": [], | ||
"dependencies": { | ||
"@shapediver/viewer.shared.math": "^1.9.0", | ||
"@shapediver/viewer.shared.node-tree": "^1.9.0", | ||
"@shapediver/viewer.shared.services": "^1.9.0", | ||
"@shapediver/viewer.shared.math": "^1.10.1", | ||
"@shapediver/viewer.shared.node-tree": "^1.10.1", | ||
"@shapediver/viewer.shared.services": "^1.10.1", | ||
"gl-matrix": "3.3.0", | ||
"tsyringe": "^4.5.0" | ||
}, | ||
"gitHead": "fe27c1e7a529779c4476b683101a5bf69c521d1b" | ||
"gitHead": "513c269ddfe0719331a605a9c62de0b8a64328fd" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
162440
1878