@p100-web/core-three 100.2.9 → 100.2.10
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,6 +1,6 @@
|
|
|
1
1
|
import { Group } from "three";
|
|
2
2
|
import PModelGLTF from "./PModelGLTF";
|
|
3
|
-
import { type IModelAnimation, INodeEventListener, INodeEventSender, NodeEvents, PAnimator as PAnimatorBase } from "@p100-web/core";
|
|
3
|
+
import { type IModelAnimation, INodeEventListener, INodeEventSender, NodeEvents, PAnimator as PAnimatorBase, Payload } from "@p100-web/core";
|
|
4
4
|
export default class PAnimator extends PAnimatorBase implements INodeEventListener {
|
|
5
5
|
protected _animation: IModelAnimation | null;
|
|
6
6
|
private _playedDuration;
|
|
@@ -18,6 +18,7 @@ export default class PAnimator extends PAnimatorBase implements INodeEventListen
|
|
|
18
18
|
callback_onPlay(): void;
|
|
19
19
|
onFinished: () => void;
|
|
20
20
|
callback_onStop(): void;
|
|
21
|
+
callback_onReset(value: Payload): void;
|
|
21
22
|
updateSegment: (dt: number) => void;
|
|
22
23
|
update: (dt: number) => void;
|
|
23
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PAnimator.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PAnimator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,KAAK,eAAe,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,SAAS,IAAI,aAAa,
|
|
1
|
+
{"version":3,"file":"PAnimator.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PAnimator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,KAAK,eAAe,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,SAAS,IAAI,aAAa,EAC1B,OAAO,EACR,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,SACnB,SAAQ,aACR,YAAW,kBAAkB;IAE7B,SAAS,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI,CAAQ;IAEpD,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAS;IAEzB,iBAAiB,IAAI,UAAU,GAAG,IAAI;IAItC,MAAM,IAAI,IAAI;IAUd,QAAQ;IAeR,WAAW,GACT,WAAW,gBAAgB,EAC3B,MAAM,UAAU,EAChB,OAAO,KAAK,KACX,IAAI,CAaL;IAEF,iBAAiB,IAAI,MAAM,EAAE;IAK7B;;OAEG;IACH,OAAO,CAAC,KAAK;IAcb,eAAe,IAAI,IAAI;IAoCvB,UAAU,aAIR;IAEF,eAAe,IAAI,IAAI;IAQvB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAUtC,aAAa,GAAI,IAAI,MAAM,UAczB;IAEF,MAAM,GAAI,IAAI,MAAM,UAElB;CACH"}
|
|
@@ -24,7 +24,7 @@ export default class PAnimator extends PAnimatorBase {
|
|
|
24
24
|
};
|
|
25
25
|
this.onFinished = () => {
|
|
26
26
|
this._playedDuration = 0;
|
|
27
|
-
this._stop();
|
|
27
|
+
this._stop(true);
|
|
28
28
|
this.outport_onFinished?.emit(null);
|
|
29
29
|
};
|
|
30
30
|
this.updateSegment = (dt) => {
|
|
@@ -61,7 +61,7 @@ export default class PAnimator extends PAnimatorBase {
|
|
|
61
61
|
}
|
|
62
62
|
unrender() {
|
|
63
63
|
if (this._playing) {
|
|
64
|
-
this._stop();
|
|
64
|
+
this._stop(false);
|
|
65
65
|
}
|
|
66
66
|
this._animation = null;
|
|
67
67
|
const model = this.getModelComponent();
|
|
@@ -76,7 +76,7 @@ export default class PAnimator extends PAnimatorBase {
|
|
|
76
76
|
/**
|
|
77
77
|
* Stop playback and remove event listeners
|
|
78
78
|
*/
|
|
79
|
-
_stop() {
|
|
79
|
+
_stop(emitOnStopped) {
|
|
80
80
|
if (this.segment) {
|
|
81
81
|
this.context.getCanvas().unregisterUpdate(this.updateSegment);
|
|
82
82
|
}
|
|
@@ -86,7 +86,8 @@ export default class PAnimator extends PAnimatorBase {
|
|
|
86
86
|
}
|
|
87
87
|
this._playing = false;
|
|
88
88
|
// Always call on stop
|
|
89
|
-
|
|
89
|
+
if (emitOnStopped)
|
|
90
|
+
this.outport_onStopped?.emit(null);
|
|
90
91
|
}
|
|
91
92
|
callback_onPlay() {
|
|
92
93
|
if (this.clip === "")
|
|
@@ -103,8 +104,8 @@ export default class PAnimator extends PAnimatorBase {
|
|
|
103
104
|
this._playedDuration = 0;
|
|
104
105
|
this._segmentDuration = this.to - this.from;
|
|
105
106
|
this._animation.setLoop(this.loop);
|
|
107
|
+
this._animation.setPaused(false);
|
|
106
108
|
if (this.segment) {
|
|
107
|
-
this._animation.setPaused(false);
|
|
108
109
|
this._animation.setTime(this.from);
|
|
109
110
|
this.context.getCanvas().registerUpdate(this.updateSegment);
|
|
110
111
|
}
|
|
@@ -122,13 +123,22 @@ export default class PAnimator extends PAnimatorBase {
|
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
125
|
callback_onStop() {
|
|
125
|
-
console.log("callback_onStop: ");
|
|
126
126
|
if (this.clip === "")
|
|
127
127
|
return;
|
|
128
128
|
this._playedDuration = 0;
|
|
129
129
|
// This will reset animation
|
|
130
130
|
this._animation?.stop();
|
|
131
|
-
this._stop();
|
|
131
|
+
this._stop(true);
|
|
132
|
+
}
|
|
133
|
+
callback_onReset(value) {
|
|
134
|
+
const second = value ? parseFloat(value) : 0;
|
|
135
|
+
if (this.clip === "" || !this._animation)
|
|
136
|
+
return;
|
|
137
|
+
this._playedDuration = second;
|
|
138
|
+
this._stop(false);
|
|
139
|
+
this._animation.setPaused(true);
|
|
140
|
+
this._animation.setTime(second);
|
|
141
|
+
this._animation.update(second);
|
|
132
142
|
}
|
|
133
143
|
}
|
|
134
144
|
//# sourceMappingURL=PAnimator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PAnimator.js","sourceRoot":"","sources":["../../src/pcomponents/PAnimator.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,UAAU,EACV,SAAS,IAAI,aAAa,
|
|
1
|
+
{"version":3,"file":"PAnimator.js","sourceRoot":"","sources":["../../src/pcomponents/PAnimator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@p100-web/core-three",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "100.2.
|
|
4
|
+
"version": "100.2.10",
|
|
5
5
|
"author": "Peter Drugge",
|
|
6
6
|
"license": "ISC",
|
|
7
7
|
"description": "",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"typescript": "^5.4.2"
|
|
12
12
|
},
|
|
13
13
|
"peerDependencies": {
|
|
14
|
-
"@p100-web/core": "^100.2.
|
|
14
|
+
"@p100-web/core": "^100.2.10",
|
|
15
15
|
"three": "^0.179.1",
|
|
16
16
|
"troika-three-text": "^0.52.4",
|
|
17
17
|
"@tweenjs/tween.js": "^25.0.0"
|