@p100-web/core-three 100.0.86 → 100.0.87
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/ThreeCanvas.d.ts.map +1 -1
- package/dist/ThreeCanvas.js +0 -1
- package/dist/ThreeCanvas.js.map +1 -1
- package/dist/ThreeEngine.d.ts +4 -10
- package/dist/ThreeEngine.d.ts.map +1 -1
- package/dist/ThreeEngine.js +9 -21
- package/dist/ThreeEngine.js.map +1 -1
- package/dist/assets/ThreeAssetLoader.d.ts +98 -0
- package/dist/assets/ThreeAssetLoader.d.ts.map +1 -0
- package/dist/assets/ThreeAssetLoader.js +487 -0
- package/dist/assets/ThreeAssetLoader.js.map +1 -0
- package/dist/index.d.ts +1 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -4
- package/dist/index.js.map +1 -1
- package/dist/pcomponents/PAnimator.d.ts +2 -2
- package/dist/pcomponents/PAnimator.d.ts.map +1 -1
- package/dist/pcomponents/PAnimator.js +1 -8
- package/dist/pcomponents/PAnimator.js.map +1 -1
- package/dist/pcomponents/PBackground.d.ts +5 -6
- package/dist/pcomponents/PBackground.d.ts.map +1 -1
- package/dist/pcomponents/PBackground.js +44 -59
- package/dist/pcomponents/PBackground.js.map +1 -1
- package/dist/pcomponents/PBasicMaterial.d.ts +4 -5
- package/dist/pcomponents/PBasicMaterial.d.ts.map +1 -1
- package/dist/pcomponents/PBasicMaterial.js +46 -60
- package/dist/pcomponents/PBasicMaterial.js.map +1 -1
- package/dist/pcomponents/PEnvironment.d.ts +4 -5
- package/dist/pcomponents/PEnvironment.d.ts.map +1 -1
- package/dist/pcomponents/PEnvironment.js +31 -51
- package/dist/pcomponents/PEnvironment.js.map +1 -1
- package/dist/pcomponents/PImageCache.d.ts +11 -0
- package/dist/pcomponents/PImageCache.d.ts.map +1 -0
- package/dist/pcomponents/PImageCache.js +35 -0
- package/dist/pcomponents/PImageCache.js.map +1 -0
- package/dist/pcomponents/PLight.js +23 -0
- package/dist/pcomponents/PLight.js.map +1 -1
- package/dist/pcomponents/PMaskedMaterial.d.ts +5 -5
- package/dist/pcomponents/PMaskedMaterial.d.ts.map +1 -1
- package/dist/pcomponents/PMaskedMaterial.js +41 -58
- package/dist/pcomponents/PMaskedMaterial.js.map +1 -1
- package/dist/pcomponents/PModelAnnotation.d.ts.map +1 -1
- package/dist/pcomponents/PModelAnnotation.js +2 -0
- package/dist/pcomponents/PModelAnnotation.js.map +1 -1
- package/dist/pcomponents/PModelGLTF.d.ts +4 -8
- package/dist/pcomponents/PModelGLTF.d.ts.map +1 -1
- package/dist/pcomponents/PModelGLTF.js +16 -19
- package/dist/pcomponents/PModelGLTF.js.map +1 -1
- package/dist/pcomponents/PModelNode.d.ts.map +1 -1
- package/dist/pcomponents/PModelNode.js +1 -8
- package/dist/pcomponents/PModelNode.js.map +1 -1
- package/dist/pcomponents/PPhysicalMaterial.d.ts +3 -4
- package/dist/pcomponents/PPhysicalMaterial.d.ts.map +1 -1
- package/dist/pcomponents/PPhysicalMaterial.js +20 -30
- package/dist/pcomponents/PPhysicalMaterial.js.map +1 -1
- package/dist/pcomponents/PSound.d.ts +4 -4
- package/dist/pcomponents/PSound.d.ts.map +1 -1
- package/dist/pcomponents/PSound.js +26 -18
- package/dist/pcomponents/PSound.js.map +1 -1
- package/dist/pcomponents/PSprite.d.ts +3 -4
- package/dist/pcomponents/PSprite.d.ts.map +1 -1
- package/dist/pcomponents/PSprite.js +18 -24
- package/dist/pcomponents/PSprite.js.map +1 -1
- package/dist/pcomponents.d.ts +2 -1
- package/dist/pcomponents.d.ts.map +1 -1
- package/dist/pcomponents.js +2 -1
- package/dist/pcomponents.js.map +1 -1
- package/package.json +2 -2
- package/dist/media/AudioLoader.d.ts +0 -32
- package/dist/media/AudioLoader.d.ts.map +0 -1
- package/dist/media/AudioLoader.js +0 -110
- package/dist/media/AudioLoader.js.map +0 -1
- package/dist/media/EnvironmentLoader.d.ts +0 -40
- package/dist/media/EnvironmentLoader.d.ts.map +0 -1
- package/dist/media/EnvironmentLoader.js +0 -120
- package/dist/media/EnvironmentLoader.js.map +0 -1
- package/dist/media/ImageLoader.d.ts +0 -36
- package/dist/media/ImageLoader.d.ts.map +0 -1
- package/dist/media/ImageLoader.js +0 -160
- package/dist/media/ImageLoader.js.map +0 -1
- package/dist/media/MediaLoader.d.ts +0 -14
- package/dist/media/MediaLoader.d.ts.map +0 -1
- package/dist/media/MediaLoader.js +0 -70
- package/dist/media/MediaLoader.js.map +0 -1
- package/dist/media/ModelLoader.d.ts +0 -49
- package/dist/media/ModelLoader.d.ts.map +0 -1
- package/dist/media/ModelLoader.js +0 -223
- package/dist/media/ModelLoader.js.map +0 -1
- package/dist/media/VideoLoader.d.ts +0 -35
- package/dist/media/VideoLoader.d.ts.map +0 -1
- package/dist/media/VideoLoader.js +0 -105
- package/dist/media/VideoLoader.js.map +0 -1
|
@@ -1,11 +1,24 @@
|
|
|
1
|
-
import { Sprite, SpriteMaterial
|
|
1
|
+
import { Sprite, SpriteMaterial } from "three";
|
|
2
2
|
import { PSprite as PSpriteBase } from "@p100-web/core";
|
|
3
3
|
export default class PSprite extends PSpriteBase {
|
|
4
4
|
constructor() {
|
|
5
5
|
super(...arguments);
|
|
6
6
|
this._material_back = null;
|
|
7
7
|
this._material_front = null;
|
|
8
|
-
|
|
8
|
+
//
|
|
9
|
+
// TextureTask
|
|
10
|
+
//
|
|
11
|
+
this.onTextureTaskLoaded = (task) => {
|
|
12
|
+
if (task.texture === null) {
|
|
13
|
+
this.context.error("onTextureLoaded and texture was null");
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
const texture = task.texture;
|
|
17
|
+
this._material_back.map = texture;
|
|
18
|
+
this._material_front.map = texture;
|
|
19
|
+
this._material_back.needsUpdate = true;
|
|
20
|
+
this._material_front.needsUpdate = true;
|
|
21
|
+
};
|
|
9
22
|
}
|
|
10
23
|
_unrenderMaterial(material, unrender) {
|
|
11
24
|
if (material.map) {
|
|
@@ -19,12 +32,6 @@ export default class PSprite extends PSpriteBase {
|
|
|
19
32
|
}
|
|
20
33
|
}
|
|
21
34
|
_unrender(unrender) {
|
|
22
|
-
if (this.file_image) {
|
|
23
|
-
this.context
|
|
24
|
-
.imageLoader()
|
|
25
|
-
.disposeImage(this, this.file_image, this._cacheKey);
|
|
26
|
-
this._cacheKey = 0;
|
|
27
|
-
}
|
|
28
35
|
if (this._material_back)
|
|
29
36
|
this._unrenderMaterial(this._material_back, unrender);
|
|
30
37
|
if (this._material_front)
|
|
@@ -57,23 +64,10 @@ export default class PSprite extends PSpriteBase {
|
|
|
57
64
|
mesh_front.add(mesh_back);
|
|
58
65
|
this.node.set_el(mesh_front);
|
|
59
66
|
if (this.file_image !== null) {
|
|
60
|
-
this.context
|
|
67
|
+
this.context
|
|
68
|
+
.assetLoader()
|
|
69
|
+
.addTextureTask(this, this.file_image);
|
|
61
70
|
}
|
|
62
71
|
}
|
|
63
|
-
//
|
|
64
|
-
// IImageLoader
|
|
65
|
-
//
|
|
66
|
-
onImageLoaded(file, data, cacheKey) {
|
|
67
|
-
this._cacheKey = cacheKey;
|
|
68
|
-
const texture = new Texture();
|
|
69
|
-
texture.userData.id = file._id;
|
|
70
|
-
texture.image = data;
|
|
71
|
-
texture.needsUpdate = true;
|
|
72
|
-
texture.colorSpace = SRGBColorSpace;
|
|
73
|
-
this._material_back.map = texture;
|
|
74
|
-
this._material_front.map = texture;
|
|
75
|
-
this._material_back.needsUpdate = true;
|
|
76
|
-
this._material_front.needsUpdate = true;
|
|
77
|
-
}
|
|
78
72
|
}
|
|
79
73
|
//# sourceMappingURL=PSprite.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PSprite.js","sourceRoot":"","sources":["../../src/pcomponents/PSprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"PSprite.js","sourceRoot":"","sources":["../../src/pcomponents/PSprite.ts"],"names":[],"mappings":"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"}
|
package/dist/pcomponents.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { PSceneRoot, PTransform, PCallAction, PCallActions, PCompareNumber, PCompareBoolean, PCompareVariable, PCompareString, PVisibility, PDebug, PSceneContainer, PVarList, PVarWriter, PVarReader,
|
|
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, } from "@p100-web/core";
|
|
2
2
|
export { default as PProjectRoot } from "./pcomponents/PProjectRoot";
|
|
3
3
|
export { default as PSpriteAnimation } from "./pcomponents/PSpriteAnimation";
|
|
4
4
|
export { default as PBackground } from "./pcomponents/PBackground";
|
|
@@ -23,4 +23,5 @@ export { default as PModelNode } from "./pcomponents/PModelNode";
|
|
|
23
23
|
export { default as PMaterialModifier } from "./pcomponents/PMaterialModifier";
|
|
24
24
|
export { default as PModelAnnotations } from "./pcomponents/PModelAnnotations";
|
|
25
25
|
export { default as PModelAnnotation } from "./pcomponents/PModelAnnotation";
|
|
26
|
+
export { default as PImageCache } from "./pcomponents/PImageCache";
|
|
26
27
|
//# sourceMappingURL=pcomponents.d.ts.map
|
|
@@ -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,
|
|
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,GAChB,MAAM,gBAAgB,CAAC;AAMxB,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,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;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"}
|
package/dist/pcomponents.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
//
|
|
2
2
|
// DEFAULT COMPONENTS
|
|
3
3
|
//
|
|
4
|
-
export { PSceneRoot, PTransform, PCallAction, PCallActions, PCompareNumber, PCompareBoolean, PCompareVariable, PCompareString, PVisibility, PDebug, PSceneContainer, PVarList, PVarWriter, PVarReader,
|
|
4
|
+
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, } from "@p100-web/core";
|
|
5
5
|
//
|
|
6
6
|
// THREE OVERRIDE COMPONENTS
|
|
7
7
|
//
|
|
@@ -29,4 +29,5 @@ export { default as PModelNode } from "./pcomponents/PModelNode";
|
|
|
29
29
|
export { default as PMaterialModifier } from "./pcomponents/PMaterialModifier";
|
|
30
30
|
export { default as PModelAnnotations } from "./pcomponents/PModelAnnotations";
|
|
31
31
|
export { default as PModelAnnotation } from "./pcomponents/PModelAnnotation";
|
|
32
|
+
export { default as PImageCache } from "./pcomponents/PImageCache";
|
|
32
33
|
//# sourceMappingURL=pcomponents.js.map
|
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,
|
|
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,GAChB,MAAM,gBAAgB,CAAC;AAExB,EAAE;AACF,4BAA4B;AAC5B,EAAE;AAEF,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,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;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"}
|
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.87",
|
|
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.87",
|
|
15
15
|
"three": "^0.179.1",
|
|
16
16
|
"troika-three-text": "^0.52.4",
|
|
17
17
|
"@tweenjs/tween.js": "^25.0.0"
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
import { IAudioLoader, PFile, GameContext } from "@p100-web/core";
|
|
2
|
-
interface AudioQueueItem {
|
|
3
|
-
file: PFile;
|
|
4
|
-
promise?: Promise<any>;
|
|
5
|
-
resolve?: (value: any) => void;
|
|
6
|
-
reject?: () => void;
|
|
7
|
-
components: IAudioLoader[];
|
|
8
|
-
}
|
|
9
|
-
interface AudioQueue {
|
|
10
|
-
[key: string]: AudioQueueItem;
|
|
11
|
-
}
|
|
12
|
-
export default class PAudioLoader {
|
|
13
|
-
private _audioLoader;
|
|
14
|
-
private _queue;
|
|
15
|
-
private _baseUrl;
|
|
16
|
-
private _context;
|
|
17
|
-
debug: boolean;
|
|
18
|
-
debugDelay: boolean;
|
|
19
|
-
constructor(url: string, context: GameContext);
|
|
20
|
-
dispose(): void;
|
|
21
|
-
queue(): Promise<any>;
|
|
22
|
-
disposeAudio(owner: IAudioLoader, file: PFile): void;
|
|
23
|
-
onDelayedLoaded: (file: PFile, value: AudioBuffer) => void;
|
|
24
|
-
onLoaded: (file: PFile, buffer: AudioBuffer) => void;
|
|
25
|
-
onError: (file: PFile, value: any) => void;
|
|
26
|
-
load(owner: IAudioLoader, file: PFile): void;
|
|
27
|
-
getQueue(): AudioQueue;
|
|
28
|
-
hasQueue(): boolean;
|
|
29
|
-
debugLog(): void;
|
|
30
|
-
}
|
|
31
|
-
export {};
|
|
32
|
-
//# sourceMappingURL=AudioLoader.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"AudioLoader.d.ts","sourceRoot":"","sources":["../../src/media/AudioLoader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElE,UAAU,cAAc;IACtB,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,EAAE,YAAY,EAAE,CAAC;CAC5B;AAED,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;CAC/B;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAA4B;IAI5C,KAAK,EAAE,OAAO,CAAS;IACvB,UAAU,EAAE,OAAO,CAAS;gBAEhB,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAM7C,OAAO;IAKP,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAIrB,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK;IAQ7C,eAAe,GAAI,MAAM,KAAK,EAAE,OAAO,WAAW,UAGhD;IAEF,QAAQ,GAAI,MAAM,KAAK,EAAE,QAAQ,WAAW,UAgB1C;IAEF,OAAO,GAAI,MAAM,KAAK,EAAE,OAAO,GAAG,UAWhC;IAEF,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK;IAwDrC,QAAQ;IAIR,QAAQ;IAIR,QAAQ;CAGT"}
|
|
@@ -1,110 +0,0 @@
|
|
|
1
|
-
import { AudioLoader } from "three";
|
|
2
|
-
export default class PAudioLoader {
|
|
3
|
-
constructor(url, context) {
|
|
4
|
-
this._audioLoader = new AudioLoader();
|
|
5
|
-
this._context = null;
|
|
6
|
-
// private _modelCache: ModelCache;
|
|
7
|
-
this.debug = false;
|
|
8
|
-
this.debugDelay = false;
|
|
9
|
-
this.onDelayedLoaded = (file, value) => {
|
|
10
|
-
if (this.debug)
|
|
11
|
-
console.log("Delaying media...", file);
|
|
12
|
-
setTimeout(this.onLoaded, 3000, file, value);
|
|
13
|
-
};
|
|
14
|
-
this.onLoaded = (file, buffer) => {
|
|
15
|
-
const id = file._id;
|
|
16
|
-
const queueItem = this._queue[id];
|
|
17
|
-
if (this.debug)
|
|
18
|
-
console.log("onLoaded: ", file.name);
|
|
19
|
-
// Remove from queue
|
|
20
|
-
delete this._queue[id];
|
|
21
|
-
if (queueItem.components.length > 0) {
|
|
22
|
-
for (const target of queueItem.components) {
|
|
23
|
-
target.onAudioLoaded(file, buffer);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
else {
|
|
27
|
-
console.log("No textures were waiting for the media");
|
|
28
|
-
}
|
|
29
|
-
queueItem.resolve(file);
|
|
30
|
-
};
|
|
31
|
-
this.onError = (file, value) => {
|
|
32
|
-
console.log("ERROR value: ", value);
|
|
33
|
-
const id = file._id;
|
|
34
|
-
const queueItem = this._queue[id];
|
|
35
|
-
if (queueItem) {
|
|
36
|
-
// Remove from queue
|
|
37
|
-
delete this._queue[id];
|
|
38
|
-
}
|
|
39
|
-
this._context?.error("Failed to load: " + id);
|
|
40
|
-
};
|
|
41
|
-
this._queue = {};
|
|
42
|
-
this._baseUrl = url;
|
|
43
|
-
this._context = context;
|
|
44
|
-
}
|
|
45
|
-
dispose() {
|
|
46
|
-
this._context = null;
|
|
47
|
-
this._queue = {};
|
|
48
|
-
}
|
|
49
|
-
queue() {
|
|
50
|
-
return Promise.all(Object.values(this._queue).map((q) => q.promise));
|
|
51
|
-
}
|
|
52
|
-
disposeAudio(owner, file) {
|
|
53
|
-
const id = file._id;
|
|
54
|
-
const queued = this._queue[id];
|
|
55
|
-
if (queued) {
|
|
56
|
-
queued.components = queued.components.filter((t) => t !== owner);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
load(owner, file) {
|
|
60
|
-
const url = file.url;
|
|
61
|
-
const queue = this._queue;
|
|
62
|
-
// Are we loading the item?
|
|
63
|
-
if (queue[file._id]) {
|
|
64
|
-
if (this.debug)
|
|
65
|
-
console.log("--> Using queued audio item", url);
|
|
66
|
-
const item = queue[file._id];
|
|
67
|
-
// Add texture to target list
|
|
68
|
-
item.components = [...item.components, owner];
|
|
69
|
-
return;
|
|
70
|
-
}
|
|
71
|
-
if (this.debug)
|
|
72
|
-
console.log("--> Loading audio", url);
|
|
73
|
-
// No, we need to load it
|
|
74
|
-
const queueItem = {
|
|
75
|
-
file: file,
|
|
76
|
-
components: [owner],
|
|
77
|
-
};
|
|
78
|
-
queue[file._id] = queueItem;
|
|
79
|
-
const loader = this._audioLoader;
|
|
80
|
-
queueItem.promise = new Promise((resolve, reject) => {
|
|
81
|
-
queueItem.resolve = resolve;
|
|
82
|
-
queueItem.reject = reject;
|
|
83
|
-
const url = this._baseUrl + file.url;
|
|
84
|
-
if (this.debugDelay) {
|
|
85
|
-
loader.load(url, (audioBuffer) => {
|
|
86
|
-
this.onDelayedLoaded(file, audioBuffer);
|
|
87
|
-
}, undefined, (error) => {
|
|
88
|
-
this.onError(file, error);
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
92
|
-
loader.load(url, (audioBuffer) => {
|
|
93
|
-
this.onLoaded(file, audioBuffer);
|
|
94
|
-
}, undefined, (error) => {
|
|
95
|
-
this.onError(file, error);
|
|
96
|
-
});
|
|
97
|
-
}
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
|
-
getQueue() {
|
|
101
|
-
return this._queue;
|
|
102
|
-
}
|
|
103
|
-
hasQueue() {
|
|
104
|
-
return Object.keys(this._queue).length > 0;
|
|
105
|
-
}
|
|
106
|
-
debugLog() {
|
|
107
|
-
console.log(this._queue);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
//# sourceMappingURL=AudioLoader.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"AudioLoader.js","sourceRoot":"","sources":["../../src/media/AudioLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
import { DataTexture } from "three";
|
|
2
|
-
import { IEnvironmentLoader, PFile, GameContext } from "@p100-web/core";
|
|
3
|
-
interface EnvironmentQueueItem {
|
|
4
|
-
file: PFile;
|
|
5
|
-
promise?: Promise<any>;
|
|
6
|
-
resolve?: (value: any) => void;
|
|
7
|
-
reject?: () => void;
|
|
8
|
-
components: IEnvironmentLoader[];
|
|
9
|
-
}
|
|
10
|
-
interface EnvironmentQueue {
|
|
11
|
-
[key: string]: EnvironmentQueueItem;
|
|
12
|
-
}
|
|
13
|
-
/**
|
|
14
|
-
* RGBE Loader
|
|
15
|
-
*/
|
|
16
|
-
export default class EnvironmentLoader {
|
|
17
|
-
private _loader;
|
|
18
|
-
private _queue;
|
|
19
|
-
private _baseUrl;
|
|
20
|
-
private _context;
|
|
21
|
-
debug: boolean;
|
|
22
|
-
debugDelay: boolean;
|
|
23
|
-
constructor(url: string, context: GameContext);
|
|
24
|
-
dispose(): void;
|
|
25
|
-
queue(): Promise<any>;
|
|
26
|
-
disposeQueue(): void;
|
|
27
|
-
disposeEnvironment(owner: IEnvironmentLoader, file: PFile): void;
|
|
28
|
-
onLoaded: (id: string, texture: DataTexture) => Promise<void>;
|
|
29
|
-
onError: (id: string, error: unknown) => void;
|
|
30
|
-
/**
|
|
31
|
-
* Creates and returns a group that will be populated with the loaded model
|
|
32
|
-
* when it has been loaded. Non cached.
|
|
33
|
-
*/
|
|
34
|
-
load(owner: IEnvironmentLoader, file: PFile): boolean;
|
|
35
|
-
getQueue(): EnvironmentQueue;
|
|
36
|
-
hasQueue(): boolean;
|
|
37
|
-
debugLog(): void;
|
|
38
|
-
}
|
|
39
|
-
export {};
|
|
40
|
-
//# sourceMappingURL=EnvironmentLoader.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentLoader.d.ts","sourceRoot":"","sources":["../../src/media/EnvironmentLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAGZ,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGxE,UAAU,oBAAoB;IAC5B,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,EAAE,kBAAkB,EAAE,CAAC;CAClC;AAED,UAAU,gBAAgB;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAc;IAE9B,KAAK,EAAE,OAAO,CAAS;IACvB,UAAU,EAAE,OAAO,CAAS;gBAEhB,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAO7C,OAAO;IAKP,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAIrB,YAAY;IAQZ,kBAAkB,CAAC,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,KAAK;IASzD,QAAQ,GAAU,IAAI,MAAM,EAAE,SAAS,WAAW,mBAuChD;IAEF,OAAO,GAAI,IAAI,MAAM,EAAE,OAAO,OAAO,UAUnC;IAEF;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,KAAK;IA0C3C,QAAQ;IAIR,QAAQ;IAIR,QAAQ;CAGT"}
|
|
@@ -1,120 +0,0 @@
|
|
|
1
|
-
import { EquirectangularReflectionMapping, PMREMGenerator, } from "three";
|
|
2
|
-
import { RGBELoader } from "three/addons/loaders/RGBELoader.js";
|
|
3
|
-
/**
|
|
4
|
-
* RGBE Loader
|
|
5
|
-
*/
|
|
6
|
-
export default class EnvironmentLoader {
|
|
7
|
-
constructor(url, context) {
|
|
8
|
-
this.debug = false;
|
|
9
|
-
this.debugDelay = false;
|
|
10
|
-
this.onLoaded = async (id, texture) => {
|
|
11
|
-
const queueItem = this._queue[id];
|
|
12
|
-
if (!queueItem) {
|
|
13
|
-
this._context?.error("[EnvironmentLoader] Missing QueueItem");
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
|
-
const file = queueItem.file;
|
|
17
|
-
// Save id on loaded model
|
|
18
|
-
if (this.debug)
|
|
19
|
-
console.log("EnvironmentLoader.onLoaded: ", texture);
|
|
20
|
-
texture.mapping = EquirectangularReflectionMapping;
|
|
21
|
-
// Optionally process with PMREMGenerator for better reflections
|
|
22
|
-
const pcanvas = this._context.getPCanvas();
|
|
23
|
-
const pmremGenerator = new PMREMGenerator(pcanvas.getThreeRenderer());
|
|
24
|
-
const envMap = pmremGenerator.fromEquirectangular(texture).texture;
|
|
25
|
-
envMap.userData.id = id;
|
|
26
|
-
texture.dispose();
|
|
27
|
-
pmremGenerator.dispose();
|
|
28
|
-
// Remove from queue
|
|
29
|
-
delete this._queue[id];
|
|
30
|
-
if (queueItem.components.length > 0) {
|
|
31
|
-
for (const target of queueItem.components) {
|
|
32
|
-
// Notify event listeners
|
|
33
|
-
target.onEnvironmentLoaded(file, envMap);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
console.log("No textures were waiting for the media");
|
|
38
|
-
}
|
|
39
|
-
queueItem.resolve(file);
|
|
40
|
-
};
|
|
41
|
-
this.onError = (id, error) => {
|
|
42
|
-
console.log("ERROR value: ", id, error);
|
|
43
|
-
const queueItem = this._queue[id];
|
|
44
|
-
if (queueItem) {
|
|
45
|
-
// Remove from queue
|
|
46
|
-
delete this._queue[id];
|
|
47
|
-
}
|
|
48
|
-
this._context?.error("Failed to load: " + id);
|
|
49
|
-
};
|
|
50
|
-
this._loader = new RGBELoader();
|
|
51
|
-
this._queue = {};
|
|
52
|
-
this._baseUrl = url;
|
|
53
|
-
this._context = context;
|
|
54
|
-
}
|
|
55
|
-
dispose() {
|
|
56
|
-
this._context = null;
|
|
57
|
-
this._queue = {};
|
|
58
|
-
}
|
|
59
|
-
queue() {
|
|
60
|
-
return Promise.all(Object.values(this._queue).map((q) => q.promise));
|
|
61
|
-
}
|
|
62
|
-
disposeQueue() {
|
|
63
|
-
console.log("disposeQueue()");
|
|
64
|
-
}
|
|
65
|
-
//
|
|
66
|
-
// LOADING
|
|
67
|
-
//
|
|
68
|
-
disposeEnvironment(owner, file) {
|
|
69
|
-
const id = file._id;
|
|
70
|
-
const queued = this._queue[id];
|
|
71
|
-
if (this.debug)
|
|
72
|
-
console.log("[IL] --> dipose environment", file.name);
|
|
73
|
-
if (queued) {
|
|
74
|
-
queued.components = queued.components.filter((t) => t !== owner);
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
/**
|
|
78
|
-
* Creates and returns a group that will be populated with the loaded model
|
|
79
|
-
* when it has been loaded. Non cached.
|
|
80
|
-
*/
|
|
81
|
-
load(owner, file) {
|
|
82
|
-
//loader.setCrossOrigin(this.crossOrigin);
|
|
83
|
-
//loader.setPath(this.path);
|
|
84
|
-
const queue = this._queue;
|
|
85
|
-
// Are we loading the item?
|
|
86
|
-
if (queue[file._id]) {
|
|
87
|
-
if (this.debug)
|
|
88
|
-
console.log("--> Using queued environment item", file.url);
|
|
89
|
-
const item = queue[file._id];
|
|
90
|
-
// Add group to target list
|
|
91
|
-
item.components = [...item.components, owner];
|
|
92
|
-
return true;
|
|
93
|
-
}
|
|
94
|
-
if (this.debug)
|
|
95
|
-
console.log("--> Loading environment", file.url);
|
|
96
|
-
// No, we need to load it
|
|
97
|
-
const queueItem = {
|
|
98
|
-
file: file,
|
|
99
|
-
components: [owner],
|
|
100
|
-
};
|
|
101
|
-
queue[file._id] = queueItem;
|
|
102
|
-
queueItem.promise = new Promise((resolve, reject) => {
|
|
103
|
-
queueItem.resolve = resolve;
|
|
104
|
-
queueItem.reject = reject;
|
|
105
|
-
const url = this._baseUrl + file.url;
|
|
106
|
-
this._loader.load(url, (result) => this.onLoaded(file._id, result), undefined, (error) => this.onError(file._id, error));
|
|
107
|
-
});
|
|
108
|
-
return true;
|
|
109
|
-
}
|
|
110
|
-
getQueue() {
|
|
111
|
-
return this._queue;
|
|
112
|
-
}
|
|
113
|
-
hasQueue() {
|
|
114
|
-
return Object.keys(this._queue).length > 0;
|
|
115
|
-
}
|
|
116
|
-
debugLog() {
|
|
117
|
-
console.log(this._queue);
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
//# sourceMappingURL=EnvironmentLoader.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentLoader.js","sourceRoot":"","sources":["../../src/media/EnvironmentLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
import { type IImageLoader, type IMediaLoader_Image, PFile, GameContext } from "@p100-web/core";
|
|
2
|
-
interface ImageQueueItem {
|
|
3
|
-
file: PFile;
|
|
4
|
-
promise?: Promise<any>;
|
|
5
|
-
resolve?: (value: any) => void;
|
|
6
|
-
reject?: () => void;
|
|
7
|
-
components: IImageLoader[];
|
|
8
|
-
}
|
|
9
|
-
interface ImageQueue {
|
|
10
|
-
[key: string]: ImageQueueItem;
|
|
11
|
-
}
|
|
12
|
-
export default class ImageLoader implements IMediaLoader_Image {
|
|
13
|
-
private _imageLoader;
|
|
14
|
-
private _queue;
|
|
15
|
-
private _cache;
|
|
16
|
-
private _context;
|
|
17
|
-
debug: boolean;
|
|
18
|
-
debugDelay: boolean;
|
|
19
|
-
constructor(baseUrl: string, context: GameContext);
|
|
20
|
-
dispose(): void;
|
|
21
|
-
queue(): Promise<any>;
|
|
22
|
-
disposeImage(owner: IImageLoader, file: PFile, cacheKey: number): void;
|
|
23
|
-
onDelayedImageLoaded: (value: any) => void;
|
|
24
|
-
onImageLoaded: (value: any) => void;
|
|
25
|
-
onImageError: (value: any) => void;
|
|
26
|
-
/**
|
|
27
|
-
* Creates and returns a texture that will be populated with the map
|
|
28
|
-
* when it has been loaded.
|
|
29
|
-
*/
|
|
30
|
-
load(owner: IImageLoader, file: PFile): void;
|
|
31
|
-
getQueue(): ImageQueue;
|
|
32
|
-
hasQueue(): boolean;
|
|
33
|
-
debugLog(): void;
|
|
34
|
-
}
|
|
35
|
-
export {};
|
|
36
|
-
//# sourceMappingURL=ImageLoader.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ImageLoader.d.ts","sourceRoot":"","sources":["../../src/media/ImageLoader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEhG,UAAU,cAAc;IACtB,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,EAAE,YAAY,EAAE,CAAC;CAC5B;AAID,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;CAC/B;AAiCD,MAAM,CAAC,OAAO,OAAO,WAAY,YAAW,kBAAkB;IAC5D,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAA4B;IAE5C,KAAK,EAAE,OAAO,CAAS;IACvB,UAAU,EAAE,OAAO,CAAS;gBAEhB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAOjD,OAAO;IAMP,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAQrB,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM;IAoB/D,oBAAoB,GAAI,OAAO,GAAG,UAGhC;IAEF,aAAa,GAAI,OAAO,GAAG,UAsBzB;IAEF,YAAY,GAAI,OAAO,GAAG,UAWxB;IAEF;;;OAGG;IAEH,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK;IA8CrC,QAAQ;IAIR,QAAQ;IAIR,QAAQ;CAQT"}
|