@p100-web/core-three 100.0.97 → 100.0.99
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/ComponentFactory.d.ts.map +1 -1
- package/dist/ComponentFactory.js +0 -4
- package/dist/ComponentFactory.js.map +1 -1
- package/dist/pcomponents/PAnimator.d.ts +4 -4
- package/dist/pcomponents/PAnimator.d.ts.map +1 -1
- package/dist/pcomponents/PAnimator.js +19 -17
- package/dist/pcomponents/PAnimator.js.map +1 -1
- package/dist/pcomponents/PBackground.d.ts +2 -2
- package/dist/pcomponents/PBackground.d.ts.map +1 -1
- package/dist/pcomponents/PBackground.js +0 -4
- package/dist/pcomponents/PBackground.js.map +1 -1
- package/dist/pcomponents/PBasicMaterial.d.ts +7 -4
- package/dist/pcomponents/PBasicMaterial.d.ts.map +1 -1
- package/dist/pcomponents/PBasicMaterial.js +30 -10
- package/dist/pcomponents/PBasicMaterial.js.map +1 -1
- package/dist/pcomponents/PMaskedMaterial.d.ts.map +1 -1
- package/dist/pcomponents/PMaskedMaterial.js +0 -4
- package/dist/pcomponents/PMaskedMaterial.js.map +1 -1
- package/dist/pcomponents/PModelGLTF.d.ts +4 -13
- package/dist/pcomponents/PModelGLTF.d.ts.map +1 -1
- package/dist/pcomponents/PModelGLTF.js +13 -24
- package/dist/pcomponents/PModelGLTF.js.map +1 -1
- package/dist/pcomponents/PModelNode.d.ts +4 -4
- package/dist/pcomponents/PModelNode.d.ts.map +1 -1
- package/dist/pcomponents/PModelNode.js +28 -26
- package/dist/pcomponents/PModelNode.js.map +1 -1
- package/dist/pcomponents/PSpriteSheet.d.ts +4 -3
- package/dist/pcomponents/PSpriteSheet.d.ts.map +1 -1
- package/dist/pcomponents/PSpriteSheet.js +4 -1
- package/dist/pcomponents/PSpriteSheet.js.map +1 -1
- package/dist/pcomponents.d.ts +0 -1
- package/dist/pcomponents.d.ts.map +1 -1
- package/dist/pcomponents.js +0 -1
- package/dist/pcomponents.js.map +1 -1
- package/package.json +2 -2
- package/dist/pcomponents/PSpriteAnimation.d.ts +0 -15
- package/dist/pcomponents/PSpriteAnimation.d.ts.map +0 -1
- package/dist/pcomponents/PSpriteAnimation.js +0 -80
- package/dist/pcomponents/PSpriteAnimation.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ComponentFactory.d.ts","sourceRoot":"","sources":["../src/ComponentFactory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAChB,UAAU,EACV,KAAK,EACL,KAAK,iBAAiB,EACtB,WAAW,EACZ,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,iBAAiB;IAChE,SAAS,CACP,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,KAAK,EACX,WAAW,EAAE,WAAW,GACvB,UAAU,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"ComponentFactory.d.ts","sourceRoot":"","sources":["../src/ComponentFactory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAChB,UAAU,EACV,KAAK,EACL,KAAK,iBAAiB,EACtB,WAAW,EACZ,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,iBAAiB;IAChE,SAAS,CACP,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,KAAK,EACX,WAAW,EAAE,WAAW,GACvB,UAAU,GAAG,IAAI;CAWrB"}
|
package/dist/ComponentFactory.js
CHANGED
|
@@ -7,10 +7,6 @@ export default class ComponentFactory {
|
|
|
7
7
|
return null;
|
|
8
8
|
}
|
|
9
9
|
const component = new Type(dbComponent, node, gameContext);
|
|
10
|
-
component.cname = dbComponent.cname;
|
|
11
|
-
component.comment = dbComponent.comment;
|
|
12
|
-
component.platform = dbComponent.platform || 0;
|
|
13
|
-
component.language = dbComponent.language || 0;
|
|
14
10
|
return component;
|
|
15
11
|
}
|
|
16
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ComponentFactory.js","sourceRoot":"","sources":["../src/ComponentFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAS5C,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,SAAS,CACP,WAAwB,EACxB,IAAW,EACX,WAAwB;QAExB,MAAM,IAAI,GAAI,UAAkB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,KAAK,CACX,0BAA0B,GAAG,WAAW,CAAC,SAAS,GAAG,OAAO,GAAG,IAAI,CAAC,IAAI,CACzE,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;
|
|
1
|
+
{"version":3,"file":"ComponentFactory.js","sourceRoot":"","sources":["../src/ComponentFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAS5C,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,SAAS,CACP,WAAwB,EACxB,IAAW,EACX,WAAwB;QAExB,MAAM,IAAI,GAAI,UAAkB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,KAAK,CACX,0BAA0B,GAAG,WAAW,CAAC,SAAS,GAAG,OAAO,GAAG,IAAI,CAAC,IAAI,CACzE,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAe,CAAC;QACzE,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Group } from "three";
|
|
2
|
-
import PModelGLTF
|
|
3
|
-
import { type IModelAnimation, PAnimator as PAnimatorBase } from "@p100-web/core";
|
|
4
|
-
export default class PAnimator extends PAnimatorBase implements
|
|
2
|
+
import PModelGLTF from "./PModelGLTF";
|
|
3
|
+
import { type IModelAnimation, INodeEventListener, INodeEventSender, NodeEvents, PAnimator as PAnimatorBase } from "@p100-web/core";
|
|
4
|
+
export default class PAnimator extends PAnimatorBase implements INodeEventListener {
|
|
5
5
|
protected _animation: IModelAnimation | null;
|
|
6
6
|
private _playedDuration;
|
|
7
7
|
private _segmentDuration;
|
|
@@ -9,8 +9,8 @@ export default class PAnimator extends PAnimatorBase implements IModelListener {
|
|
|
9
9
|
getModelComponent(): PModelGLTF | null;
|
|
10
10
|
render(): void;
|
|
11
11
|
unrender(): void;
|
|
12
|
+
onNodeEvent: (component: INodeEventSender, type: NodeEvents, model: Group) => void;
|
|
12
13
|
getAnimationClips(): string[];
|
|
13
|
-
onModelUpdate(component: PModelGLTF | null, model: Group | null): void;
|
|
14
14
|
/**
|
|
15
15
|
* Stop playback and remove event listeners
|
|
16
16
|
*/
|
|
@@ -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,
|
|
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,EAC3B,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,aAAc,YAAW,kBAAkB;IAChF,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;IAkBb,eAAe,IAAI,IAAI;IAmCvB,UAAU,aAIR;IAEF,eAAe,IAAI,IAAI;IAMvB,aAAa,GAAI,IAAI,MAAM,UAczB;IAEF,MAAM,GAAI,IAAI,MAAM,UAElB;CACH"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PAnimator as PAnimatorBase, } from "@p100-web/core";
|
|
1
|
+
import { NodeEvents, PAnimator as PAnimatorBase, } from "@p100-web/core";
|
|
2
2
|
export default class PAnimator extends PAnimatorBase {
|
|
3
3
|
constructor() {
|
|
4
4
|
super(...arguments);
|
|
@@ -6,6 +6,22 @@ export default class PAnimator extends PAnimatorBase {
|
|
|
6
6
|
this._playedDuration = 0;
|
|
7
7
|
this._segmentDuration = 0;
|
|
8
8
|
this._playing = false;
|
|
9
|
+
//
|
|
10
|
+
// INodeEventListener
|
|
11
|
+
//
|
|
12
|
+
this.onNodeEvent = (component, type, model) => {
|
|
13
|
+
if (!(type & NodeEvents.ModelLoaded))
|
|
14
|
+
return;
|
|
15
|
+
this._animation = null;
|
|
16
|
+
this.loaded = false;
|
|
17
|
+
this.validAnimation = false;
|
|
18
|
+
// We are updating the model
|
|
19
|
+
if (component !== null && model !== null) {
|
|
20
|
+
this._animation = component.getAnimation(this.clip);
|
|
21
|
+
this.validAnimation = this._animation !== null;
|
|
22
|
+
this.loaded = true;
|
|
23
|
+
}
|
|
24
|
+
};
|
|
9
25
|
this.onFinished = () => {
|
|
10
26
|
this._playedDuration = 0;
|
|
11
27
|
this._stop();
|
|
@@ -41,7 +57,7 @@ export default class PAnimator extends PAnimatorBase {
|
|
|
41
57
|
this.context.error("Animator did not find model");
|
|
42
58
|
return;
|
|
43
59
|
}
|
|
44
|
-
model.
|
|
60
|
+
model.node.addNodeEventListener(this);
|
|
45
61
|
}
|
|
46
62
|
unrender() {
|
|
47
63
|
if (this._playing) {
|
|
@@ -49,28 +65,14 @@ export default class PAnimator extends PAnimatorBase {
|
|
|
49
65
|
}
|
|
50
66
|
this._animation = null;
|
|
51
67
|
const model = this.getModelComponent();
|
|
52
|
-
model?.
|
|
68
|
+
model?.node.removeNodeEventListener(this);
|
|
53
69
|
this.loaded = false;
|
|
54
70
|
this.validAnimation = false;
|
|
55
71
|
}
|
|
56
|
-
//
|
|
57
|
-
// IModelListener
|
|
58
|
-
//
|
|
59
72
|
getAnimationClips() {
|
|
60
73
|
const model = this.getModelComponent();
|
|
61
74
|
return model?.getAnimationNames() || [];
|
|
62
75
|
}
|
|
63
|
-
onModelUpdate(component, model) {
|
|
64
|
-
this._animation = null;
|
|
65
|
-
this.loaded = false;
|
|
66
|
-
this.validAnimation = false;
|
|
67
|
-
// We are updating the model
|
|
68
|
-
if (component !== null && model !== null) {
|
|
69
|
-
this._animation = component.getAnimation(this.clip);
|
|
70
|
-
this.validAnimation = this._animation !== null;
|
|
71
|
-
this.loaded = true;
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
76
|
/**
|
|
75
77
|
* Stop playback and remove event listeners
|
|
76
78
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PAnimator.js","sourceRoot":"","sources":["../../src/pcomponents/PAnimator.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"PAnimator.js","sourceRoot":"","sources":["../../src/pcomponents/PAnimator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MeshBasicMaterial, SphereGeometry, Texture } from "three";
|
|
2
|
-
import {
|
|
2
|
+
import { PBackground as PBackgroundBase } from "@p100-web/core";
|
|
3
3
|
import { TextureTask, VideoTextureTask, ITextureTaskLoader, IVideoTextureTaskLoader } from "../assets/ThreeAssetLoader";
|
|
4
|
-
export default class PBackground extends PBackgroundBase implements ITextureTaskLoader, IVideoTextureTaskLoader
|
|
4
|
+
export default class PBackground extends PBackgroundBase implements ITextureTaskLoader, IVideoTextureTaskLoader {
|
|
5
5
|
protected _material: MeshBasicMaterial | null;
|
|
6
6
|
protected _geometry: SphereGeometry | null;
|
|
7
7
|
protected _texture: Texture | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PBackground.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PBackground.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EACjB,cAAc,EACd,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EAEL,
|
|
1
|
+
{"version":3,"file":"PBackground.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PBackground.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EACjB,cAAc,EACd,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EAEL,WAAW,IAAI,eAAe,EAC/B,MAAM,gBAAgB,CAAC;AAExB,OAAyB,EACvB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,WACnB,SAAQ,eACR,YAAW,kBAAkB,EAAE,uBAAuB;IAEtD,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IACrD,SAAS,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,CAAQ;IAClD,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAQ;IAE1C,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAuB1B,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAIzB,QAAQ;IAIR,MAAM;IA6CN,wBAAwB,GAAI,MAAM,gBAAgB,KAAG,IAAI,CAcvD;IAMF,mBAAmB,GAAI,MAAM,WAAW,KAAG,IAAI,CAc7C;CACH"}
|
|
@@ -65,12 +65,8 @@ export default class PBackground extends PBackgroundBase {
|
|
|
65
65
|
}
|
|
66
66
|
unrender() {
|
|
67
67
|
this._dispose(true);
|
|
68
|
-
// Unregister as material for PNode
|
|
69
|
-
this.node.material = null;
|
|
70
68
|
}
|
|
71
69
|
render() {
|
|
72
|
-
// Register as material for PNode
|
|
73
|
-
this.node.material = this;
|
|
74
70
|
const geometry = new SphereGeometry(this.radius, 32, 32);
|
|
75
71
|
this._geometry = geometry;
|
|
76
72
|
const mesh = new Mesh(geometry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PBackground.js","sourceRoot":"","sources":["../../src/pcomponents/PBackground.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,iBAAiB,EACjB,cAAc,GAEf,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,QAAQ,
|
|
1
|
+
{"version":3,"file":"PBackground.js","sourceRoot":"","sources":["../../src/pcomponents/PBackground.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
|
-
import { MeshBasicMaterial } from "three";
|
|
2
|
-
import { PBasicMaterial as PBasicMaterialBase } from "@p100-web/core";
|
|
1
|
+
import { MeshBasicMaterial, Texture } from "three";
|
|
2
|
+
import { INodeEventListener, INodeEventSender, PBasicMaterial as PBasicMaterialBase } from "@p100-web/core";
|
|
3
3
|
import { TextureTask, VideoTextureTask, ITextureTaskLoader, IVideoTextureTaskLoader } from "../assets/ThreeAssetLoader";
|
|
4
|
-
export default class PBasicMaterial extends PBasicMaterialBase implements ITextureTaskLoader, IVideoTextureTaskLoader {
|
|
4
|
+
export default class PBasicMaterial extends PBasicMaterialBase implements ITextureTaskLoader, IVideoTextureTaskLoader, INodeEventSender {
|
|
5
5
|
protected _material: MeshBasicMaterial | null;
|
|
6
|
+
protected _texture: Texture | null;
|
|
6
7
|
getTexture<T>(): T | null;
|
|
7
8
|
_dispose(unrender: boolean): void;
|
|
9
|
+
unrender(): void;
|
|
8
10
|
render(): void;
|
|
11
|
+
onAddNodeEventListener: (listener: INodeEventListener) => void;
|
|
9
12
|
callback_setOpacity(payloadValue: string | null): void;
|
|
10
13
|
onVideoTextureTaskLoaded: (task: VideoTextureTask) => void;
|
|
11
14
|
onTextureTaskLoaded: (task: TextureTask) => void;
|
|
12
15
|
/**
|
|
13
|
-
* Called by this component
|
|
16
|
+
* Called by this component.
|
|
14
17
|
*/
|
|
15
18
|
setTextureRepeat(): void;
|
|
16
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PBasicMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PBasicMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"PBasicMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PBasicMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAEjB,OAAO,EAER,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAEhB,cAAc,IAAI,kBAAkB,EACrC,MAAM,gBAAgB,CAAC;AAIxB,OAAyB,EACvB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,cACnB,SAAQ,kBACR,YAAW,kBAAkB,EAAE,uBAAuB,EAAE,gBAAgB;IAExE,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IACrD,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAQ;IAE1C,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAQzB,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAqB1B,QAAQ;IAMR,MAAM;IAoDN,sBAAsB,GAAI,UAAU,kBAAkB,UAgBpD;IAMF,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAWtD,wBAAwB,GAAI,MAAM,gBAAgB,KAAG,IAAI,CAmBvD;IAMF,mBAAmB,GAAI,MAAM,WAAW,KAAG,IAAI,CAmB7C;IAMF;;OAEG;IACH,gBAAgB;CAajB"}
|
|
@@ -5,6 +5,20 @@ export default class PBasicMaterial extends PBasicMaterialBase {
|
|
|
5
5
|
constructor() {
|
|
6
6
|
super(...arguments);
|
|
7
7
|
this._material = null;
|
|
8
|
+
this._texture = null;
|
|
9
|
+
//
|
|
10
|
+
// INodeEventSender
|
|
11
|
+
//
|
|
12
|
+
this.onAddNodeEventListener = (listener) => {
|
|
13
|
+
if (this.file_texture !== null && this._texture) {
|
|
14
|
+
if (this.file_texture.type === FileType.Image) {
|
|
15
|
+
listener.onNodeEvent(this, NodeEvents.ImageTextureLoaded, this._texture);
|
|
16
|
+
}
|
|
17
|
+
else if (this.file_texture.type === FileType.Video) {
|
|
18
|
+
listener.onNodeEvent(this, NodeEvents.VideoTextureLoaded, this._texture);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
};
|
|
8
22
|
//
|
|
9
23
|
// VideoTextureTask
|
|
10
24
|
//
|
|
@@ -17,6 +31,7 @@ export default class PBasicMaterial extends PBasicMaterialBase {
|
|
|
17
31
|
this.context.error("onVideoTextureLoaded and texture was null");
|
|
18
32
|
return;
|
|
19
33
|
}
|
|
34
|
+
this._texture = task.texture;
|
|
20
35
|
const texture = task.texture;
|
|
21
36
|
this._material.map = texture;
|
|
22
37
|
this._material.needsUpdate = true;
|
|
@@ -36,6 +51,7 @@ export default class PBasicMaterial extends PBasicMaterialBase {
|
|
|
36
51
|
this.context.error("onTextureLoaded and texture was null");
|
|
37
52
|
return;
|
|
38
53
|
}
|
|
54
|
+
this._texture = task.texture;
|
|
39
55
|
const texture = task.texture;
|
|
40
56
|
this._material.map = texture;
|
|
41
57
|
this._material.needsUpdate = true;
|
|
@@ -45,20 +61,21 @@ export default class PBasicMaterial extends PBasicMaterialBase {
|
|
|
45
61
|
};
|
|
46
62
|
}
|
|
47
63
|
getTexture() {
|
|
48
|
-
return this.
|
|
64
|
+
return this._texture;
|
|
49
65
|
}
|
|
50
66
|
//
|
|
51
67
|
// PComponent
|
|
52
68
|
//
|
|
53
69
|
_dispose(unrender) {
|
|
70
|
+
if (this._texture !== null) {
|
|
71
|
+
// AssetLoader will take care of cleaning up the html elements
|
|
72
|
+
this._texture.dispose();
|
|
73
|
+
this._texture = null;
|
|
74
|
+
}
|
|
54
75
|
// Check if we should dispose Material
|
|
55
76
|
if (this._material) {
|
|
56
77
|
// Do we have a texture as well?
|
|
57
|
-
|
|
58
|
-
// AssetLoader will take care of cleaning up the html elements
|
|
59
|
-
this._material.map.dispose();
|
|
60
|
-
this._material.map = null;
|
|
61
|
-
}
|
|
78
|
+
this._material.map = null;
|
|
62
79
|
this._material.needsUpdate = true;
|
|
63
80
|
// Dispose material
|
|
64
81
|
if (unrender) {
|
|
@@ -67,9 +84,12 @@ export default class PBasicMaterial extends PBasicMaterialBase {
|
|
|
67
84
|
}
|
|
68
85
|
}
|
|
69
86
|
}
|
|
87
|
+
unrender() {
|
|
88
|
+
this.node.unregisterNodeEventSender(this);
|
|
89
|
+
this._dispose(true);
|
|
90
|
+
}
|
|
70
91
|
render() {
|
|
71
|
-
|
|
72
|
-
this.node.material = this;
|
|
92
|
+
this.node.registerNodeEventSender(this);
|
|
73
93
|
if (!this.node.hasEl()) {
|
|
74
94
|
this.context.error("Material is missing Mesh");
|
|
75
95
|
return;
|
|
@@ -122,10 +142,10 @@ export default class PBasicMaterial extends PBasicMaterialBase {
|
|
|
122
142
|
// Tools
|
|
123
143
|
//
|
|
124
144
|
/**
|
|
125
|
-
* Called by this component
|
|
145
|
+
* Called by this component.
|
|
126
146
|
*/
|
|
127
147
|
setTextureRepeat() {
|
|
128
|
-
const texture = this.
|
|
148
|
+
const texture = this._texture;
|
|
129
149
|
if (texture !== null) {
|
|
130
150
|
texture.wrapS = this.repeat.x > 1 ? RepeatWrapping : ClampToEdgeWrapping;
|
|
131
151
|
texture.wrapT = this.repeat.y > 1 ? RepeatWrapping : ClampToEdgeWrapping;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PBasicMaterial.js","sourceRoot":"","sources":["../../src/pcomponents/PBasicMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,mBAAmB,EACnB,SAAS,EAET,iBAAiB,EACjB,cAAc,EAEd,OAAO,GACR,MAAM,OAAO,CAAC;AAEf,OAAO,
|
|
1
|
+
{"version":3,"file":"PBasicMaterial.js","sourceRoot":"","sources":["../../src/pcomponents/PBasicMaterial.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PMaskedMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PMaskedMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,OAAO,EACP,cAAc,EAGf,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAExE,OAAO,EAEL,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAExB,OAAyB,EACvB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,eACnB,SAAQ,mBACR,YAAW,kBAAkB,EAAE,uBAAuB;IAEtD,OAAO,CAAC,SAAS,CAA+B;IAEhD,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAIzB,WAAW;IAQX,OAAO;IAKP,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAmB1B,QAAQ;
|
|
1
|
+
{"version":3,"file":"PMaskedMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PMaskedMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,OAAO,EACP,cAAc,EAGf,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAExE,OAAO,EAEL,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAExB,OAAyB,EACvB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,eACnB,SAAQ,mBACR,YAAW,kBAAkB,EAAE,uBAAuB;IAEtD,OAAO,CAAC,SAAS,CAA+B;IAEhD,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAIzB,WAAW;IAQX,OAAO;IAKP,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAmB1B,QAAQ;IAIR,MAAM;IA6CN,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO;IAexD,wBAAwB,GAAI,MAAM,gBAAgB,KAAG,IAAI,CAcvD;IAMF,mBAAmB,GAAI,MAAM,WAAW,KAAG,IAAI,CAc7C;CACH"}
|
|
@@ -72,12 +72,8 @@ export default class PMaskedMaterial extends PMaskedMaterialBase {
|
|
|
72
72
|
}
|
|
73
73
|
unrender() {
|
|
74
74
|
this._dispose(true);
|
|
75
|
-
// Unregister as material for PNode
|
|
76
|
-
this.node.material = null;
|
|
77
75
|
}
|
|
78
76
|
render() {
|
|
79
|
-
// Register as material for PNode
|
|
80
|
-
this.node.material = this;
|
|
81
77
|
if (!this.node.hasEl()) {
|
|
82
78
|
this.context.error("Material is missing Mesh");
|
|
83
79
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PMaskedMaterial.js","sourceRoot":"","sources":["../../src/pcomponents/PMaskedMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,SAAS,EAGT,cAAc,EACd,KAAK,GAEN,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAExE,OAAO,EACL,QAAQ,EAER,WAAW,GACZ,MAAM,gBAAgB,CAAC;AASxB,MAAM,CAAC,OAAO,OAAO,eACnB,SAAQ,mBAAmB;IAD7B;;QAIU,cAAS,GAA0B,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"PMaskedMaterial.js","sourceRoot":"","sources":["../../src/pcomponents/PMaskedMaterial.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { type IModelAnimation, PModelGLTF as PModelGLTFBase } from "@p100-web/core";
|
|
1
|
+
import { Group } from "three";
|
|
2
|
+
import { type IModelAnimation, INodeEventListener, INodeEventSender, PModelGLTF as PModelGLTFBase } from "@p100-web/core";
|
|
3
3
|
import { ModelTask, type IModelTaskLoader } from "../assets/ThreeAssetLoader";
|
|
4
4
|
import ModelAnimation from "../animations/ModelAnimation";
|
|
5
|
-
|
|
6
|
-
* Interface for other components that listens to when this model has loaded
|
|
7
|
-
*/
|
|
8
|
-
interface IModelListener {
|
|
9
|
-
onModelUpdate(component: PModelGLTF | null, model: Object3D | null): void;
|
|
10
|
-
}
|
|
11
|
-
export { type IModelListener };
|
|
12
|
-
export default class PModelGLTF extends PModelGLTFBase implements IModelTaskLoader {
|
|
5
|
+
export default class PModelGLTF extends PModelGLTFBase implements IModelTaskLoader, INodeEventSender {
|
|
13
6
|
el: Group | null;
|
|
14
7
|
protected _haveReflectors: boolean;
|
|
15
8
|
protected _animations: ModelAnimation[];
|
|
16
|
-
protected listeners: IModelListener[];
|
|
17
9
|
unrender(): void;
|
|
18
10
|
render(): void;
|
|
19
|
-
addListener(listener: IModelListener): void;
|
|
20
|
-
removeListener(listener: IModelListener): void;
|
|
21
11
|
getAnimations(): IModelAnimation[];
|
|
22
12
|
onModelTaskLoaded: (task: ModelTask) => void;
|
|
13
|
+
onAddNodeEventListener: (listener: INodeEventListener) => void;
|
|
23
14
|
}
|
|
24
15
|
//# sourceMappingURL=PModelGLTF.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PModelGLTF.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelGLTF.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,
|
|
1
|
+
{"version":3,"file":"PModelGLTF.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelGLTF.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAEL,KAAK,eAAe,EACpB,kBAAkB,EAClB,gBAAgB,EAEhB,UAAU,IAAI,cAAc,EAC7B,MAAM,gBAAgB,CAAC;AAGxB,OAAyB,EACvB,SAAS,EACT,KAAK,gBAAgB,EACtB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,UACnB,SAAQ,cACR,YAAW,gBAAgB,EAAE,gBAAgB;IAE7C,EAAE,EAAE,KAAK,GAAG,IAAI,CAAQ;IAExB,SAAS,CAAC,eAAe,EAAE,OAAO,CAAS;IAC3C,SAAS,CAAC,WAAW,EAAE,cAAc,EAAE,CAAM;IAE7C,QAAQ;IAmBR,MAAM;IAeN,aAAa,IAAI,eAAe,EAAE;IAMlC,iBAAiB,GAAI,MAAM,SAAS,KAAG,IAAI,CA0EzC;IAMF,sBAAsB,GAAI,UAAU,kBAAkB,UAIpD;CACH"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Group } from "three";
|
|
2
|
-
import { Coordinates, PModelGLTF as PModelGLTFBase, } from "@p100-web/core";
|
|
2
|
+
import { Coordinates, NodeEvents, PModelGLTF as PModelGLTFBase, } from "@p100-web/core";
|
|
3
3
|
import ModelAnimation from "../animations/ModelAnimation";
|
|
4
4
|
export default class PModelGLTF extends PModelGLTFBase {
|
|
5
5
|
constructor() {
|
|
@@ -7,7 +7,6 @@ export default class PModelGLTF extends PModelGLTFBase {
|
|
|
7
7
|
this.el = null;
|
|
8
8
|
this._haveReflectors = false;
|
|
9
9
|
this._animations = [];
|
|
10
|
-
this.listeners = [];
|
|
11
10
|
// ModelTask
|
|
12
11
|
this.onModelTaskLoaded = (task) => {
|
|
13
12
|
if (!task.model) {
|
|
@@ -62,17 +61,25 @@ export default class PModelGLTF extends PModelGLTFBase {
|
|
|
62
61
|
}
|
|
63
62
|
}
|
|
64
63
|
this.loaded = true;
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}
|
|
64
|
+
// Notify other components
|
|
65
|
+
this.node.emitNodeEvent(this, NodeEvents.ModelLoaded, this.el);
|
|
68
66
|
if (!this.context.editor) {
|
|
69
67
|
this.outevent_onLoaded?.emit(null, this);
|
|
70
68
|
}
|
|
71
69
|
// Force a editor update
|
|
72
70
|
this.context.editor_render();
|
|
73
71
|
};
|
|
72
|
+
//
|
|
73
|
+
// INodeEventSender
|
|
74
|
+
//
|
|
75
|
+
this.onAddNodeEventListener = (listener) => {
|
|
76
|
+
if (this.loaded) {
|
|
77
|
+
listener.onNodeEvent(this, NodeEvents.ModelLoaded, this.el);
|
|
78
|
+
}
|
|
79
|
+
};
|
|
74
80
|
}
|
|
75
81
|
unrender() {
|
|
82
|
+
this.node.unregisterNodeEventSender(this);
|
|
76
83
|
this._animations.length = 0;
|
|
77
84
|
this.loaded = false;
|
|
78
85
|
if (this._haveReflectors) {
|
|
@@ -80,16 +87,13 @@ export default class PModelGLTF extends PModelGLTFBase {
|
|
|
80
87
|
composer?.removeSSRSelectors();
|
|
81
88
|
this._haveReflectors = false;
|
|
82
89
|
}
|
|
83
|
-
for (const listener of this.listeners) {
|
|
84
|
-
listener.onModelUpdate(null, null);
|
|
85
|
-
}
|
|
86
|
-
this.listeners.length = 0;
|
|
87
90
|
if (this.el !== null) {
|
|
88
91
|
this.context.assetLoader().disposeModel(this.el);
|
|
89
92
|
this.el = null;
|
|
90
93
|
}
|
|
91
94
|
}
|
|
92
95
|
render() {
|
|
96
|
+
this.node.registerNodeEventSender(this);
|
|
93
97
|
if (this.file_model !== null) {
|
|
94
98
|
this.node.set_el(new Group());
|
|
95
99
|
this.context
|
|
@@ -98,21 +102,6 @@ export default class PModelGLTF extends PModelGLTFBase {
|
|
|
98
102
|
}
|
|
99
103
|
}
|
|
100
104
|
//
|
|
101
|
-
// LISTENER
|
|
102
|
-
//
|
|
103
|
-
addListener(listener) {
|
|
104
|
-
this.listeners.push(listener);
|
|
105
|
-
if (this.loaded) {
|
|
106
|
-
listener.onModelUpdate(this, this.el);
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
removeListener(listener) {
|
|
110
|
-
const index = this.listeners.indexOf(listener);
|
|
111
|
-
if (index >= 0) {
|
|
112
|
-
this.listeners.splice(index, 1);
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
//
|
|
116
105
|
// ANIMATIONS
|
|
117
106
|
//
|
|
118
107
|
getAnimations() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PModelGLTF.js","sourceRoot":"","sources":["../../src/pcomponents/PModelGLTF.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"PModelGLTF.js","sourceRoot":"","sources":["../../src/pcomponents/PModelGLTF.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Object3D } from "three";
|
|
2
|
-
import PModelGLTF
|
|
3
|
-
import { PModelNode as PModelNodeBase } from "@p100-web/core";
|
|
4
|
-
export default class PModelNode extends PModelNodeBase implements
|
|
2
|
+
import PModelGLTF from "./PModelGLTF";
|
|
3
|
+
import { INodeEventListener, INodeEventSender, NodeEvents, PModelNode as PModelNodeBase } from "@p100-web/core";
|
|
4
|
+
export default class PModelNode extends PModelNodeBase implements INodeEventListener {
|
|
5
5
|
modelNode: Object3D | null;
|
|
6
6
|
findByNameRecursive(object: Object3D, name: string): Object3D | null;
|
|
7
7
|
getModelComponent(): PModelGLTF | null;
|
|
8
8
|
render(): void;
|
|
9
9
|
unrender(): void;
|
|
10
|
+
onNodeEvent: (component: INodeEventSender, type: NodeEvents, model: Object3D) => void;
|
|
10
11
|
getModelNodes(): string[];
|
|
11
|
-
onModelUpdate(component: PModelGLTF | null, model: Object3D | null): void;
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=PModelNode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PModelNode.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,UAAU,
|
|
1
|
+
{"version":3,"file":"PModelNode.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,UAAU,IAAI,cAAc,EAC7B,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,UACnB,SAAQ,cACR,YAAW,kBAAkB;IAE7B,SAAS,EAAE,QAAQ,GAAG,IAAI,CAAQ;IAElC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IASpE,iBAAiB,IAAI,UAAU,GAAG,IAAI;IAItC,MAAM,IAAI,IAAI;IAMd,QAAQ;IAYR,WAAW,GACT,WAAW,gBAAgB,EAC3B,MAAM,UAAU,EAChB,OAAO,QAAQ,KACd,IAAI,CAsBL;IAGF,aAAa,IAAI,MAAM,EAAE;CAY1B"}
|
|
@@ -1,8 +1,33 @@
|
|
|
1
|
-
import { PModelNode as PModelNodeBase } from "@p100-web/core";
|
|
1
|
+
import { NodeEvents, PModelNode as PModelNodeBase, } from "@p100-web/core";
|
|
2
2
|
export default class PModelNode extends PModelNodeBase {
|
|
3
3
|
constructor() {
|
|
4
4
|
super(...arguments);
|
|
5
5
|
this.modelNode = null;
|
|
6
|
+
//
|
|
7
|
+
// INodeEventListener
|
|
8
|
+
//
|
|
9
|
+
this.onNodeEvent = (component, type, model) => {
|
|
10
|
+
if (!(type & NodeEvents.ModelLoaded))
|
|
11
|
+
return;
|
|
12
|
+
this.modelNode = null;
|
|
13
|
+
this.loaded = false;
|
|
14
|
+
this.validNode = false;
|
|
15
|
+
this.node.clear_el();
|
|
16
|
+
if (component !== null && model !== null) {
|
|
17
|
+
if (this.nodeName !== "") {
|
|
18
|
+
this.modelNode = this.findByNameRecursive(model, this.nodeName);
|
|
19
|
+
}
|
|
20
|
+
this.validNode = this.modelNode !== null;
|
|
21
|
+
this.loaded = true;
|
|
22
|
+
if (this.modelNode) {
|
|
23
|
+
this.node.set_el(this.modelNode);
|
|
24
|
+
// Update visibility
|
|
25
|
+
this.node.update();
|
|
26
|
+
}
|
|
27
|
+
this.node.editor_updateTreeNode();
|
|
28
|
+
this.context.editor_render();
|
|
29
|
+
}
|
|
30
|
+
};
|
|
6
31
|
}
|
|
7
32
|
findByNameRecursive(object, name) {
|
|
8
33
|
if (object.name === name)
|
|
@@ -20,11 +45,11 @@ export default class PModelNode extends PModelNodeBase {
|
|
|
20
45
|
render() {
|
|
21
46
|
// Find model
|
|
22
47
|
const model = this.getModelComponent();
|
|
23
|
-
model?.
|
|
48
|
+
model?.node.addNodeEventListener(this);
|
|
24
49
|
}
|
|
25
50
|
unrender() {
|
|
26
51
|
const model = this.getModelComponent();
|
|
27
|
-
model?.
|
|
52
|
+
model?.node.removeNodeEventListener(this);
|
|
28
53
|
this.modelNode = null;
|
|
29
54
|
this.loaded = false;
|
|
30
55
|
this.validNode = false;
|
|
@@ -42,28 +67,5 @@ export default class PModelNode extends PModelNodeBase {
|
|
|
42
67
|
}
|
|
43
68
|
return models;
|
|
44
69
|
}
|
|
45
|
-
//
|
|
46
|
-
// IModelListener
|
|
47
|
-
//
|
|
48
|
-
onModelUpdate(component, model) {
|
|
49
|
-
this.modelNode = null;
|
|
50
|
-
this.loaded = false;
|
|
51
|
-
this.validNode = false;
|
|
52
|
-
this.node.clear_el();
|
|
53
|
-
if (component !== null && model !== null) {
|
|
54
|
-
if (this.nodeName !== "") {
|
|
55
|
-
this.modelNode = this.findByNameRecursive(model, this.nodeName);
|
|
56
|
-
}
|
|
57
|
-
this.validNode = this.modelNode !== null;
|
|
58
|
-
this.loaded = true;
|
|
59
|
-
if (this.modelNode) {
|
|
60
|
-
this.node.set_el(this.modelNode);
|
|
61
|
-
// Update visibility
|
|
62
|
-
this.node.update();
|
|
63
|
-
}
|
|
64
|
-
this.node.editor_updateTreeNode();
|
|
65
|
-
this.context.editor_render();
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
70
|
}
|
|
69
71
|
//# sourceMappingURL=PModelNode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PModelNode.js","sourceRoot":"","sources":["../../src/pcomponents/PModelNode.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"PModelNode.js","sourceRoot":"","sources":["../../src/pcomponents/PModelNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,UAAU,EACV,UAAU,IAAI,cAAc,GAC7B,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,UACnB,SAAQ,cAAc;IADxB;;QAIE,cAAS,GAAoB,IAAI,CAAC;QA6BlC,EAAE;QACF,sBAAsB;QACtB,EAAE;QAEF,gBAAW,GAAG,CACZ,SAA2B,EAC3B,IAAgB,EAChB,KAAe,EACT,EAAE;YACR,IAAI,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;gBAAE,OAAO;YAE7C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAErB,IAAI,SAAS,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACzC,IAAI,IAAI,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;oBACzB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAClE,CAAC;gBACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC;gBACzC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACjC,oBAAoB;oBACpB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrB,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAClC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC,CAAC;IAeJ,CAAC;IAxEC,mBAAmB,CAAC,MAAgB,EAAE,IAAY;QAChD,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;YAAE,OAAO,MAAM,CAAC;QACxC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACpD,IAAI,KAAK;gBAAE,OAAO,KAAK,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,aAAa,CAAa,YAAY,CAAC,CAAC;IACtD,CAAC;IAED,MAAM;QACJ,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvC,KAAK,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ;QACN,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvC,KAAK,EAAE,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IAkCD,kBAAkB;IAClB,aAAa;QACX,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;YACxC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;gBACtB,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;oBAClC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Texture } from "three";
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import { INodeEventSender, NodeEvents, PSpriteSheet as PSpriteSheetBase, PVector2 } from "@p100-web/core";
|
|
3
|
+
import { INodeEventListener } from "@p100-web/core";
|
|
4
|
+
export default class PSpriteSheet extends PSpriteSheetBase implements INodeEventListener {
|
|
4
5
|
private _target;
|
|
5
6
|
render(): void;
|
|
6
7
|
unrender(): void;
|
|
7
|
-
onNodeEvent: (_component:
|
|
8
|
+
onNodeEvent: (_component: INodeEventSender, type: NodeEvents, texture: Texture) => void;
|
|
8
9
|
protected callback_setIndex(payload: string | null): void;
|
|
9
10
|
setIndex(index: number): void;
|
|
10
11
|
setSize(value: PVector2): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PSpriteSheet.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PSpriteSheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"PSpriteSheet.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PSpriteSheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,IAAI,gBAAgB,EAChC,QAAQ,EACT,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,gBAAiB,YAAW,kBAAkB;IACtF,OAAO,CAAC,OAAO,CAAwB;IAEvC,MAAM;IAIN,QAAQ;IAKR,WAAW,GACT,YAAY,gBAAgB,EAC5B,MAAM,UAAU,EAChB,SAAS,OAAO,KACf,IAAI,CAOL;IAEF,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IASzD,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAS7B,OAAO,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAS/B"}
|
|
@@ -13,8 +13,11 @@ export default class PSpriteSheet extends PSpriteSheetBase {
|
|
|
13
13
|
}
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
|
-
render() {
|
|
16
|
+
render() {
|
|
17
|
+
this.node.addNodeEventListener(this);
|
|
18
|
+
}
|
|
17
19
|
unrender() {
|
|
20
|
+
this.node.removeNodeEventListener(this);
|
|
18
21
|
this._target = null;
|
|
19
22
|
}
|
|
20
23
|
callback_setIndex(payload) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PSpriteSheet.js","sourceRoot":"","sources":["../../src/pcomponents/PSpriteSheet.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"PSpriteSheet.js","sourceRoot":"","sources":["../../src/pcomponents/PSpriteSheet.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,UAAU,EACV,YAAY,IAAI,gBAAgB,GAEjC,MAAM,gBAAgB,CAAC;AAIxB,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,gBAAgB;IAA1D;;QACU,YAAO,GAAmB,IAAI,CAAC;QAWvC,gBAAW,GAAG,CACZ,UAA4B,EAC5B,IAAgB,EAChB,OAAgB,EACV,EAAE;YACR,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC;gBAAE,OAAO;YACpD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC1B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC;IA6BJ,CAAC;IAjDC,MAAM;QACJ,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAeS,iBAAiB,CAAC,OAAsB;QAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;QACvC,IAAI,KAAK,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC;YACjC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACrB,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3B,MAAM,aAAa,GAAG,KAAK,GAAG,KAAK,CAAC;QACpC,IAAI,CAAC,OAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,aAAa,GAAG,KAAK,CAAC;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,GAAG,MAAM,CAAC;IAC/C,CAAC;IAED,OAAO,CAAC,KAAe;QACrB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAA0B,CAAC;QACtD,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACpC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACpC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;CACF"}
|
package/dist/pcomponents.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
export { PSceneRoot, PTransform, PCallAction, PCallActions, PCompareNumber, PCompareBoolean, PCompareVariable, PCompareString, PVisibility, PDebug, PSceneContainer, PVarList, PVarWriter, PVarReader, PXRTools, PImageDetector, PPlaneDetector, PControllerInput, PCameraPosition, PCameraTarget, PHud, PMoveAnimation, PMoveToAnimation, PFadeAnimation, PRotateAnimation, PScaleAnimation, PIntegerAnimator, PInteger } from "@p100-web/core";
|
|
2
2
|
export { default as PProjectRoot } from "./pcomponents/PProjectRoot";
|
|
3
|
-
export { default as PSpriteAnimation } from "./pcomponents/PSpriteAnimation";
|
|
4
3
|
export { default as PBackground } from "./pcomponents/PBackground";
|
|
5
4
|
export { default as PVideoPlayer } from "./pcomponents/PVideoPlayer";
|
|
6
5
|
export { default as PBasicMaterial } from "./pcomponents/PBasicMaterial";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pcomponents.d.ts","sourceRoot":"","sources":["../src/pcomponents.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,YAAY,EACZ,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,MAAM,EACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,UAAU,EACV,QAAQ,EACR,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,IAAI,EACJ,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AAMxB,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,
|
|
1
|
+
{"version":3,"file":"pcomponents.d.ts","sourceRoot":"","sources":["../src/pcomponents.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,YAAY,EACZ,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,MAAM,EACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,UAAU,EACV,QAAQ,EACR,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,IAAI,EACJ,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AAMxB,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC"}
|
package/dist/pcomponents.js
CHANGED
|
@@ -6,7 +6,6 @@ export { PSceneRoot, PTransform, PCallAction, PCallActions, PCompareNumber, PCom
|
|
|
6
6
|
// THREE OVERRIDE COMPONENTS
|
|
7
7
|
//
|
|
8
8
|
export { default as PProjectRoot } from "./pcomponents/PProjectRoot";
|
|
9
|
-
export { default as PSpriteAnimation } from "./pcomponents/PSpriteAnimation";
|
|
10
9
|
export { default as PBackground } from "./pcomponents/PBackground";
|
|
11
10
|
export { default as PVideoPlayer } from "./pcomponents/PVideoPlayer";
|
|
12
11
|
export { default as PBasicMaterial } from "./pcomponents/PBasicMaterial";
|
package/dist/pcomponents.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pcomponents.js","sourceRoot":"","sources":["../src/pcomponents.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,qBAAqB;AACrB,EAAE;AAEF,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,YAAY,EACZ,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,MAAM,EACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,UAAU,EACV,QAAQ,EACR,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,IAAI,EACJ,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AAExB,EAAE;AACF,4BAA4B;AAC5B,EAAE;AAEF,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,
|
|
1
|
+
{"version":3,"file":"pcomponents.js","sourceRoot":"","sources":["../src/pcomponents.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,qBAAqB;AACrB,EAAE;AAEF,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,YAAY,EACZ,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,MAAM,EACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,UAAU,EACV,QAAQ,EACR,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,IAAI,EACJ,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AAExB,EAAE;AACF,4BAA4B;AAC5B,EAAE;AAEF,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@p100-web/core-three",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "100.0.
|
|
4
|
+
"version": "100.0.99",
|
|
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.0.
|
|
14
|
+
"@p100-web/core": "^100.0.99",
|
|
15
15
|
"three": "^0.179.1",
|
|
16
16
|
"troika-three-text": "^0.52.4",
|
|
17
17
|
"@tweenjs/tween.js": "^25.0.0"
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { PSpriteAnimation as PSpriteAnimationBase } from "@p100-web/core";
|
|
2
|
-
export default class PSpriteAnimation extends PSpriteAnimationBase {
|
|
3
|
-
private _tween;
|
|
4
|
-
private _state;
|
|
5
|
-
private _target;
|
|
6
|
-
private _lastFrame;
|
|
7
|
-
stop(): void;
|
|
8
|
-
render(): void;
|
|
9
|
-
unrender(): void;
|
|
10
|
-
private setTarget;
|
|
11
|
-
callback_startAnimation(): void;
|
|
12
|
-
setFrame: (state: any) => void;
|
|
13
|
-
callback_stopAnimation(): void;
|
|
14
|
-
}
|
|
15
|
-
//# sourceMappingURL=PSpriteAnimation.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"PSpriteAnimation.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PSpriteAnimation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAG1E,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IAChE,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,UAAU,CAAM;IAExB,IAAI;IAIJ,MAAM;IAEN,QAAQ;IAQR,OAAO,CAAC,SAAS;IAiBjB,uBAAuB,IAAI,IAAI;IA0B/B,QAAQ,GAAI,OAAO,GAAG,UAepB;IAEF,sBAAsB,IAAI,IAAI;CAS/B"}
|
|
@@ -1,80 +0,0 @@
|
|
|
1
|
-
import { Tween } from "@tweenjs/tween.js";
|
|
2
|
-
import { PSpriteAnimation as PSpriteAnimationBase } from "@p100-web/core";
|
|
3
|
-
export default class PSpriteAnimation extends PSpriteAnimationBase {
|
|
4
|
-
constructor() {
|
|
5
|
-
super(...arguments);
|
|
6
|
-
this._tween = null;
|
|
7
|
-
this._state = { x: 0 };
|
|
8
|
-
this._target = null;
|
|
9
|
-
this._lastFrame = -1;
|
|
10
|
-
this.setFrame = (state) => {
|
|
11
|
-
const index = Math.floor(state.x);
|
|
12
|
-
if (index === this._lastFrame) {
|
|
13
|
-
return;
|
|
14
|
-
}
|
|
15
|
-
this._lastFrame = index;
|
|
16
|
-
const width = this.size.x;
|
|
17
|
-
const height = this.size.y;
|
|
18
|
-
const currentColumn = index % width;
|
|
19
|
-
this._target.offset.x = currentColumn / width;
|
|
20
|
-
const currentRow = Math.floor(index / width);
|
|
21
|
-
this._target.offset.y = 1 - 1 / height - currentRow / height;
|
|
22
|
-
};
|
|
23
|
-
}
|
|
24
|
-
stop() {
|
|
25
|
-
this._target = null;
|
|
26
|
-
}
|
|
27
|
-
render() { }
|
|
28
|
-
unrender() {
|
|
29
|
-
this._target = null;
|
|
30
|
-
if (this._tween !== null) {
|
|
31
|
-
this._tween.stop();
|
|
32
|
-
this._tween = null;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
setTarget() {
|
|
36
|
-
const material = this.node.material;
|
|
37
|
-
if (!material || !material.isImageMaterial) {
|
|
38
|
-
this.context.error("Sprite Animation requires an Image Material component.");
|
|
39
|
-
return false;
|
|
40
|
-
}
|
|
41
|
-
const texture = material.getTexture();
|
|
42
|
-
if (texture === null) {
|
|
43
|
-
this.context.error("Sprite Animation requires a Texture.");
|
|
44
|
-
return false;
|
|
45
|
-
}
|
|
46
|
-
this._target = texture;
|
|
47
|
-
return true;
|
|
48
|
-
}
|
|
49
|
-
callback_startAnimation() {
|
|
50
|
-
if (!this.node.isRunning() || !this.node.hasEl()) {
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
if (this._target === null)
|
|
54
|
-
this.setTarget();
|
|
55
|
-
if (this._tween !== null) {
|
|
56
|
-
this._tween.stop();
|
|
57
|
-
this._tween = null;
|
|
58
|
-
}
|
|
59
|
-
const target = {
|
|
60
|
-
x: this.size.x * this.size.y - 1,
|
|
61
|
-
};
|
|
62
|
-
this._lastFrame = -1;
|
|
63
|
-
this._tween = new Tween(this._state)
|
|
64
|
-
.to(target, this.duration)
|
|
65
|
-
.repeat(this.loop ? Infinity : 0)
|
|
66
|
-
.onUpdate(this.setFrame)
|
|
67
|
-
.start();
|
|
68
|
-
this.context.addTween(this._tween);
|
|
69
|
-
}
|
|
70
|
-
callback_stopAnimation() {
|
|
71
|
-
if (!this.node.isRunning() || !this.node.hasEl()) {
|
|
72
|
-
return;
|
|
73
|
-
}
|
|
74
|
-
if (this._tween !== null) {
|
|
75
|
-
this._tween.stop();
|
|
76
|
-
this._tween = null;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
//# sourceMappingURL=PSpriteAnimation.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"PSpriteAnimation.js","sourceRoot":"","sources":["../../src/pcomponents/PSpriteAnimation.ts"],"names":[],"mappings":"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"}
|