@zephyr3d/scene 0.9.4 → 0.9.5

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.
Files changed (102) hide show
  1. package/dist/animation/animationmask.js +224 -0
  2. package/dist/animation/animationmask.js.map +1 -0
  3. package/dist/animation/animationset.js +268 -67
  4. package/dist/animation/animationset.js.map +1 -1
  5. package/dist/animation/animationtrack.js.map +1 -1
  6. package/dist/animation/eulerrotationtrack.js +3 -0
  7. package/dist/animation/eulerrotationtrack.js.map +1 -1
  8. package/dist/animation/fixed_geometry_cache_track.js +7 -0
  9. package/dist/animation/fixed_geometry_cache_track.js.map +1 -1
  10. package/dist/animation/ik_modifier.js.map +1 -1
  11. package/dist/animation/joint_dynamics/collision.js +6 -4
  12. package/dist/animation/joint_dynamics/collision.js.map +1 -1
  13. package/dist/animation/joint_dynamics/controller.js +390 -43
  14. package/dist/animation/joint_dynamics/controller.js.map +1 -1
  15. package/dist/animation/joint_dynamics/joint_dynamics_system.js +62 -3
  16. package/dist/animation/joint_dynamics/joint_dynamics_system.js.map +1 -1
  17. package/dist/animation/joint_dynamics/solver.js +4 -3
  18. package/dist/animation/joint_dynamics/solver.js.map +1 -1
  19. package/dist/animation/joint_dynamics/types.js.map +1 -1
  20. package/dist/animation/joint_dynamics_modifier.js +2 -0
  21. package/dist/animation/joint_dynamics_modifier.js.map +1 -1
  22. package/dist/animation/morphtarget.js +3 -72
  23. package/dist/animation/morphtarget.js.map +1 -1
  24. package/dist/animation/morphtrack.js +3 -0
  25. package/dist/animation/morphtrack.js.map +1 -1
  26. package/dist/animation/pca_geometry_cache_track.js +3 -0
  27. package/dist/animation/pca_geometry_cache_track.js.map +1 -1
  28. package/dist/animation/proptrack.js +3 -0
  29. package/dist/animation/proptrack.js.map +1 -1
  30. package/dist/animation/rotationtrack.js +3 -0
  31. package/dist/animation/rotationtrack.js.map +1 -1
  32. package/dist/animation/scaletrack.js +3 -0
  33. package/dist/animation/scaletrack.js.map +1 -1
  34. package/dist/animation/skeleton.js +254 -79
  35. package/dist/animation/skeleton.js.map +1 -1
  36. package/dist/animation/skeleton_modifier.js.map +1 -1
  37. package/dist/animation/spring_modifier.js.map +1 -1
  38. package/dist/animation/translationtrack.js +3 -0
  39. package/dist/animation/translationtrack.js.map +1 -1
  40. package/dist/app/engine.js +171 -107
  41. package/dist/app/engine.js.map +1 -1
  42. package/dist/app/scriptregistry.js +251 -80
  43. package/dist/app/scriptregistry.js.map +1 -1
  44. package/dist/asset/assetmanager.js +344 -365
  45. package/dist/asset/assetmanager.js.map +1 -1
  46. package/dist/asset/loaders/gltf/gltf_loader.js +17 -14
  47. package/dist/asset/loaders/gltf/gltf_loader.js.map +1 -1
  48. package/dist/asset/loaders/loader.js +1 -6
  49. package/dist/asset/loaders/loader.js.map +1 -1
  50. package/dist/asset/loaders/zabc/zabc_loader.js.map +1 -1
  51. package/dist/asset/model.js +1000 -131
  52. package/dist/asset/model.js.map +1 -1
  53. package/dist/avatar/wardrobe.js +474 -0
  54. package/dist/avatar/wardrobe.js.map +1 -0
  55. package/dist/index.d.ts +1125 -199
  56. package/dist/index.js +3 -2
  57. package/dist/index.js.map +1 -1
  58. package/dist/material/mixins/lightmodel/pbrmetallicroughness.js +6 -3
  59. package/dist/material/mixins/lightmodel/pbrmetallicroughness.js.map +1 -1
  60. package/dist/material/mixins/pbr/common.js +72 -15
  61. package/dist/material/mixins/pbr/common.js.map +1 -1
  62. package/dist/material/msdf_text_sprite.js +4 -4
  63. package/dist/material/msdf_text_sprite.js.map +1 -1
  64. package/dist/material/pbrblueprint.js +102 -102
  65. package/dist/material/pbrblueprint.js.map +1 -1
  66. package/dist/render/envlight.js +54 -1
  67. package/dist/render/envlight.js.map +1 -1
  68. package/dist/render/sky.js +9 -0
  69. package/dist/render/sky.js.map +1 -1
  70. package/dist/scene/batchgroup.js +11 -13
  71. package/dist/scene/batchgroup.js.map +1 -1
  72. package/dist/scene/environment.js +15 -2
  73. package/dist/scene/environment.js.map +1 -1
  74. package/dist/scene/mesh.js +79 -16
  75. package/dist/scene/mesh.js.map +1 -1
  76. package/dist/scene/scene.js +1 -0
  77. package/dist/scene/scene.js.map +1 -1
  78. package/dist/scene/scene_node.js +203 -2
  79. package/dist/scene/scene_node.js.map +1 -1
  80. package/dist/text/font/font_asset.js.map +1 -1
  81. package/dist/text/msdf/generator.js.map +1 -1
  82. package/dist/text/msdf/shape.js +4 -1
  83. package/dist/text/msdf/shape.js.map +1 -1
  84. package/dist/text/runtime/msdf_text_atlas_manager.js +4 -1
  85. package/dist/text/runtime/msdf_text_atlas_manager.js.map +1 -1
  86. package/dist/utility/blueprint/material/inputs.js +1157 -1154
  87. package/dist/utility/blueprint/material/inputs.js.map +1 -1
  88. package/dist/utility/bounding_volume.js.map +1 -1
  89. package/dist/utility/pmrem.js +34 -8
  90. package/dist/utility/pmrem.js.map +1 -1
  91. package/dist/utility/serialization/manager.js +22 -9
  92. package/dist/utility/serialization/manager.js.map +1 -1
  93. package/dist/utility/serialization/scene/animation.js +700 -7
  94. package/dist/utility/serialization/scene/animation.js.map +1 -1
  95. package/dist/utility/serialization/scene/mesh.js +64 -4
  96. package/dist/utility/serialization/scene/mesh.js.map +1 -1
  97. package/dist/utility/serialization/scene/node.js +187 -8
  98. package/dist/utility/serialization/scene/node.js.map +1 -1
  99. package/dist/utility/serialization/types.js.map +1 -1
  100. package/dist/utility/textures/sheenlut.js +138 -0
  101. package/dist/utility/textures/sheenlut.js.map +1 -0
  102. package/package.json +2 -2
@@ -26,17 +26,17 @@ import '../shaders/atmosphere.js';
26
26
  import { BoundingBox } from '../utility/bounding_volume.js';
27
27
 
28
28
  const tmpMatrix = new Matrix4x4();
29
- /**
30
- * Batch group node
31
- * @public
29
+ /**
30
+ * Batch group node
31
+ * @public
32
32
  */ class BatchGroup extends GraphNode {
33
33
  _renderQueueMap;
34
34
  _bindGroupAllocator;
35
35
  _changeTag;
36
36
  _staticBV;
37
- /**
38
- * Creates an instance of mesh node
39
- * @param scene - The scene to which the mesh node belongs
37
+ /**
38
+ * Creates an instance of mesh node
39
+ * @param scene - The scene to which the mesh node belongs
40
40
  */ constructor(scene){
41
41
  super(scene);
42
42
  this._renderQueueMap = new Map();
@@ -93,18 +93,16 @@ const tmpMatrix = new Matrix4x4();
93
93
  });
94
94
  });
95
95
  }
96
- /**
97
- * {@inheritDoc Drawable.getName}
98
- */ getName() {
96
+ /** Gets the batch group name. */ getName() {
99
97
  return this._name;
100
98
  }
101
- /**
102
- * {@inheritDoc SceneNode.isBatchGroup}
99
+ /**
100
+ * {@inheritDoc SceneNode.isBatchGroup}
103
101
  */ isBatchGroup() {
104
102
  return true;
105
103
  }
106
- /**
107
- * Force the batch state to be rebuilt
104
+ /**
105
+ * Force the batch state to be rebuilt
108
106
  */ invalidate() {
109
107
  this._changeTag++;
110
108
  }
@@ -1 +1 @@
1
- {"version":3,"file":"batchgroup.js","sources":["../../src/scene/batchgroup.ts"],"sourcesContent":["import { GraphNode } from './graph_node';\nimport type { CullVisitor, RenderPass } from '../render';\nimport { RenderQueue, InstanceBindGroupAllocator } from '../render';\nimport type { Scene } from './scene';\nimport { BoundingBox, type BoundingVolume } from '../utility/bounding_volume';\nimport { Matrix4x4 } from '@zephyr3d/base';\n\nconst tmpMatrix = new Matrix4x4();\n\n/**\n * Batch group node\n * @public\n */\nexport class BatchGroup extends GraphNode {\n private readonly _renderQueueMap: Map<\n RenderPass,\n {\n queue: RenderQueue;\n tag: number;\n }\n >;\n private readonly _bindGroupAllocator: InstanceBindGroupAllocator;\n private _changeTag: number;\n private _staticBV: boolean;\n /**\n * Creates an instance of mesh node\n * @param scene - The scene to which the mesh node belongs\n */\n constructor(scene: Scene) {\n super(scene);\n this._renderQueueMap = new Map();\n this._changeTag = 0;\n this._bindGroupAllocator = new InstanceBindGroupAllocator();\n this._staticBV = false;\n const bvCallback = () => {\n if (!this._staticBV) {\n this.invalidateBoundingVolume();\n }\n };\n const primitiveCallback = () => {\n bvCallback();\n this.invalidate();\n };\n const materialCallback = () => {\n this.invalidate();\n };\n this.on('visiblechanged', (node) => {\n node.iterate((child) => {\n if (child.isMesh()) {\n this.invalidate();\n return true;\n }\n return false;\n });\n });\n this.on('nodeattached', (node) => {\n node.iterate((child) => {\n if (child.isMesh()) {\n child.placeToOctree = false;\n if (!this._staticBV) {\n this.invalidateBoundingVolume();\n }\n child.on('bvchanged', bvCallback);\n child.on('primitive_changed', primitiveCallback);\n child.on('material_changed', materialCallback);\n this.invalidate();\n }\n });\n });\n this.on('noderemoved', (node) => {\n node.iterate((child) => {\n if (child.isMesh()) {\n child.placeToOctree = true;\n if (!this._staticBV) {\n this.invalidateBoundingVolume();\n }\n child.off('bvchanged', bvCallback);\n child.off('primitive_changed', primitiveCallback);\n child.off('material_changed', materialCallback);\n this.invalidate();\n }\n });\n });\n }\n /**\n * {@inheritDoc Drawable.getName}\n */\n getName() {\n return this._name;\n }\n /**\n * {@inheritDoc SceneNode.isBatchGroup}\n */\n isBatchGroup(): this is BatchGroup {\n return true;\n }\n /**\n * Force the batch state to be rebuilt\n */\n invalidate() {\n this._changeTag++;\n }\n /** @internal */\n protected _onDetached() {\n super._onDetached();\n // Usually the node will be garbage collected after it is detached,\n // We should reset the render queue to release the render bundles.\n this._renderQueueMap.forEach((val) => {\n val.queue.reset();\n });\n this.invalidate();\n }\n /** @internal */\n protected _onAttached() {\n // Reset the render queue when attached to a new scene.\n this.invalidate();\n }\n /** @internal */\n computeBoundingVolume() {\n const bv = new BoundingBox();\n const invWorldMatrix = Matrix4x4.invertAffine(this.worldMatrix);\n bv.beginExtend();\n this.iterate((node) => {\n if (node.isMesh()) {\n Matrix4x4.multiplyAffine(invWorldMatrix, node.worldMatrix, tmpMatrix);\n const wb = node.getBoundingVolume()!.transform(tmpMatrix).toAABB();\n bv.extend(wb.minPoint);\n bv.extend(wb.maxPoint);\n }\n });\n return bv.isValid() ? bv : null;\n }\n /** @internal */\n setBoundingVolume(bv: BoundingVolume) {\n this._staticBV = !!bv;\n super.setBoundingVolume(bv);\n }\n /** @internal */\n cull(cullVisitor: CullVisitor) {\n let queueInfo = this._renderQueueMap.get(cullVisitor.renderPass);\n if (!queueInfo) {\n queueInfo = {\n queue: new RenderQueue(cullVisitor.renderPass, this._bindGroupAllocator),\n tag: -1\n };\n this._renderQueueMap.set(cullVisitor.renderPass, queueInfo);\n }\n if (queueInfo.tag !== this._changeTag) {\n queueInfo.tag = this._changeTag;\n queueInfo.queue.reset();\n const frustumCulling = cullVisitor.frustumCulling;\n const renderQueue = cullVisitor.renderQueue;\n cullVisitor.frustumCulling = false;\n cullVisitor.renderQueue = queueInfo.queue;\n this.iterate((node) => {\n if (node.isMesh()) {\n cullVisitor.visit(node);\n }\n });\n queueInfo.queue.end(cullVisitor.camera, true);\n cullVisitor.frustumCulling = frustumCulling;\n cullVisitor.renderQueue = renderQueue;\n }\n cullVisitor.pushRenderQueue(queueInfo.queue);\n }\n}\n"],"names":["tmpMatrix","Matrix4x4","BatchGroup","GraphNode","_renderQueueMap","_bindGroupAllocator","_changeTag","_staticBV","scene","Map","InstanceBindGroupAllocator","bvCallback","invalidateBoundingVolume","primitiveCallback","invalidate","materialCallback","on","node","iterate","child","isMesh","placeToOctree","off","getName","_name","isBatchGroup","_onDetached","forEach","val","queue","reset","computeBoundingVolume","bv","BoundingBox","invWorldMatrix","invertAffine","worldMatrix","beginExtend","multiplyAffine","wb","getBoundingVolume","transform","toAABB","extend","minPoint","maxPoint","isValid","setBoundingVolume","cull","cullVisitor","queueInfo","get","renderPass","RenderQueue","tag","set","frustumCulling","renderQueue","visit","end","camera","pushRenderQueue"],"mappings":"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"}
1
+ {"version":3,"file":"batchgroup.js","sources":["../../src/scene/batchgroup.ts"],"sourcesContent":["import { GraphNode } from './graph_node';\r\nimport type { CullVisitor, RenderPass } from '../render';\r\nimport { RenderQueue, InstanceBindGroupAllocator } from '../render';\r\nimport type { Scene } from './scene';\r\nimport { BoundingBox, type BoundingVolume } from '../utility/bounding_volume';\r\nimport { Matrix4x4 } from '@zephyr3d/base';\r\n\r\nconst tmpMatrix = new Matrix4x4();\r\n\r\n/**\r\n * Batch group node\r\n * @public\r\n */\r\nexport class BatchGroup extends GraphNode {\r\n private readonly _renderQueueMap: Map<\r\n RenderPass,\r\n {\r\n queue: RenderQueue;\r\n tag: number;\r\n }\r\n >;\r\n private readonly _bindGroupAllocator: InstanceBindGroupAllocator;\r\n private _changeTag: number;\r\n private _staticBV: boolean;\r\n /**\r\n * Creates an instance of mesh node\r\n * @param scene - The scene to which the mesh node belongs\r\n */\r\n constructor(scene: Scene) {\r\n super(scene);\r\n this._renderQueueMap = new Map();\r\n this._changeTag = 0;\r\n this._bindGroupAllocator = new InstanceBindGroupAllocator();\r\n this._staticBV = false;\r\n const bvCallback = () => {\r\n if (!this._staticBV) {\r\n this.invalidateBoundingVolume();\r\n }\r\n };\r\n const primitiveCallback = () => {\r\n bvCallback();\r\n this.invalidate();\r\n };\r\n const materialCallback = () => {\r\n this.invalidate();\r\n };\r\n this.on('visiblechanged', (node) => {\r\n node.iterate((child) => {\r\n if (child.isMesh()) {\r\n this.invalidate();\r\n return true;\r\n }\r\n return false;\r\n });\r\n });\r\n this.on('nodeattached', (node) => {\r\n node.iterate((child) => {\r\n if (child.isMesh()) {\r\n child.placeToOctree = false;\r\n if (!this._staticBV) {\r\n this.invalidateBoundingVolume();\r\n }\r\n child.on('bvchanged', bvCallback);\r\n child.on('primitive_changed', primitiveCallback);\r\n child.on('material_changed', materialCallback);\r\n this.invalidate();\r\n }\r\n });\r\n });\r\n this.on('noderemoved', (node) => {\r\n node.iterate((child) => {\r\n if (child.isMesh()) {\r\n child.placeToOctree = true;\r\n if (!this._staticBV) {\r\n this.invalidateBoundingVolume();\r\n }\r\n child.off('bvchanged', bvCallback);\r\n child.off('primitive_changed', primitiveCallback);\r\n child.off('material_changed', materialCallback);\r\n this.invalidate();\r\n }\r\n });\r\n });\r\n }\r\n /** Gets the batch group name. */\r\n getName() {\r\n return this._name;\r\n }\r\n /**\r\n * {@inheritDoc SceneNode.isBatchGroup}\r\n */\r\n isBatchGroup(): this is BatchGroup {\r\n return true;\r\n }\r\n /**\r\n * Force the batch state to be rebuilt\r\n */\r\n invalidate() {\r\n this._changeTag++;\r\n }\r\n /** @internal */\r\n protected _onDetached() {\r\n super._onDetached();\r\n // Usually the node will be garbage collected after it is detached,\r\n // We should reset the render queue to release the render bundles.\r\n this._renderQueueMap.forEach((val) => {\r\n val.queue.reset();\r\n });\r\n this.invalidate();\r\n }\r\n /** @internal */\r\n protected _onAttached() {\r\n // Reset the render queue when attached to a new scene.\r\n this.invalidate();\r\n }\r\n /** @internal */\r\n computeBoundingVolume() {\r\n const bv = new BoundingBox();\r\n const invWorldMatrix = Matrix4x4.invertAffine(this.worldMatrix);\r\n bv.beginExtend();\r\n this.iterate((node) => {\r\n if (node.isMesh()) {\r\n Matrix4x4.multiplyAffine(invWorldMatrix, node.worldMatrix, tmpMatrix);\r\n const wb = node.getBoundingVolume()!.transform(tmpMatrix).toAABB();\r\n bv.extend(wb.minPoint);\r\n bv.extend(wb.maxPoint);\r\n }\r\n });\r\n return bv.isValid() ? bv : null;\r\n }\r\n /** @internal */\r\n setBoundingVolume(bv: BoundingVolume) {\r\n this._staticBV = !!bv;\r\n super.setBoundingVolume(bv);\r\n }\r\n /** @internal */\r\n cull(cullVisitor: CullVisitor) {\r\n let queueInfo = this._renderQueueMap.get(cullVisitor.renderPass);\r\n if (!queueInfo) {\r\n queueInfo = {\r\n queue: new RenderQueue(cullVisitor.renderPass, this._bindGroupAllocator),\r\n tag: -1\r\n };\r\n this._renderQueueMap.set(cullVisitor.renderPass, queueInfo);\r\n }\r\n if (queueInfo.tag !== this._changeTag) {\r\n queueInfo.tag = this._changeTag;\r\n queueInfo.queue.reset();\r\n const frustumCulling = cullVisitor.frustumCulling;\r\n const renderQueue = cullVisitor.renderQueue;\r\n cullVisitor.frustumCulling = false;\r\n cullVisitor.renderQueue = queueInfo.queue;\r\n this.iterate((node) => {\r\n if (node.isMesh()) {\r\n cullVisitor.visit(node);\r\n }\r\n });\r\n queueInfo.queue.end(cullVisitor.camera, true);\r\n cullVisitor.frustumCulling = frustumCulling;\r\n cullVisitor.renderQueue = renderQueue;\r\n }\r\n cullVisitor.pushRenderQueue(queueInfo.queue);\r\n }\r\n}\r\n"],"names":["tmpMatrix","Matrix4x4","BatchGroup","GraphNode","_renderQueueMap","_bindGroupAllocator","_changeTag","_staticBV","scene","Map","InstanceBindGroupAllocator","bvCallback","invalidateBoundingVolume","primitiveCallback","invalidate","materialCallback","on","node","iterate","child","isMesh","placeToOctree","off","getName","_name","isBatchGroup","_onDetached","forEach","val","queue","reset","computeBoundingVolume","bv","BoundingBox","invWorldMatrix","invertAffine","worldMatrix","beginExtend","multiplyAffine","wb","getBoundingVolume","transform","toAABB","extend","minPoint","maxPoint","isValid","setBoundingVolume","cull","cullVisitor","queueInfo","get","renderPass","RenderQueue","tag","set","frustumCulling","renderQueue","visit","end","camera","pushRenderQueue"],"mappings":"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"}
@@ -33,6 +33,7 @@ import '../shaders/atmosphere.js';
33
33
  _ambientDown;
34
34
  _ambientUp;
35
35
  _radianceMap;
36
+ _sheenRadianceMap;
36
37
  _irradianceMap;
37
38
  _irradianceSH;
38
39
  _irradianceSHFB;
@@ -57,6 +58,7 @@ import '../shaders/atmosphere.js';
57
58
  }
58
59
  });
59
60
  this._radianceMap = new DRef();
61
+ this._sheenRadianceMap = new DRef();
60
62
  this._irradianceMap = new DRef();
61
63
  this._irradianceSH = new DRef();
62
64
  this._irradianceSHFB = new DRef();
@@ -65,7 +67,7 @@ import '../shaders/atmosphere.js';
65
67
  }
66
68
  /** @internal */ getHash(ctx) {
67
69
  const irradianceSource = this.type === 'ibl' ? this._irradianceSHFB.get() ? 'fb' : this._irradianceSH.get() ? 'buf' : 'none' : 'na';
68
- return !ctx || ctx.drawEnvLight ? `${this.type}:${this._envLight.hasRadiance() ? '1' : '0'}:${this._envLight.hasIrradiance() ? '1' : '0'}:${irradianceSource}` : 'none';
70
+ return !ctx || ctx.drawEnvLight ? `${this.type}:${this._envLight.hasRadiance() ? '1' : '0'}:${this._envLight.hasSheenRadiance() ? '1' : '0'}:${this._envLight.hasIrradiance() ? '1' : '0'}:${irradianceSource}` : 'none';
69
71
  }
70
72
  /** @internal */ get envLight() {
71
73
  return this._envLight;
@@ -103,6 +105,15 @@ import '../shaders/atmosphere.js';
103
105
  this._envLight.radianceMap = this.radianceMap;
104
106
  }
105
107
  }
108
+ /** Charlie-filtered sheen radiance map for environment light type ibl */ get sheenRadianceMap() {
109
+ return this._sheenRadianceMap.get();
110
+ }
111
+ set sheenRadianceMap(tex) {
112
+ this._sheenRadianceMap.set(tex);
113
+ if (this.type === 'ibl') {
114
+ this._envLight.sheenRadianceMap = this.sheenRadianceMap;
115
+ }
116
+ }
106
117
  /** Irradiance SH buffer for environment light type ibl */ get irradianceSH() {
107
118
  return this._irradianceSH.get();
108
119
  }
@@ -140,9 +151,10 @@ import '../shaders/atmosphere.js';
140
151
  break;
141
152
  case 'ibl':
142
153
  if (this._envLight?.getType() !== val) {
143
- this._envLight = new EnvShIBL(this.radianceMap, this.irradianceSH, this.irradianceSHFB);
154
+ this._envLight = new EnvShIBL(this.radianceMap, this.irradianceSH, this.irradianceSHFB, this.sheenRadianceMap);
144
155
  }
145
156
  this._envLight.radianceMap = this.radianceMap;
157
+ this._envLight.sheenRadianceMap = this.sheenRadianceMap;
146
158
  this._envLight.irradianceSH = this.irradianceSH;
147
159
  this._envLight.irradianceSHFB = this.irradianceSHFB;
148
160
  this._envLight.irradianceWindow = this.irradianceWindow;
@@ -163,6 +175,7 @@ import '../shaders/atmosphere.js';
163
175
  super.onDispose();
164
176
  this._envLight?.dispose();
165
177
  this._radianceMap.dispose();
178
+ this._sheenRadianceMap.dispose();
166
179
  this._irradianceMap.dispose();
167
180
  this._irradianceSHFB.dispose();
168
181
  this._irradianceSH.dispose();
@@ -1 +1 @@
1
- {"version":3,"file":"environment.js","sources":["../../src/scene/environment.ts"],"sourcesContent":["import type { Immutable, Nullable, Vector4 } from '@zephyr3d/base';\r\nimport { Vector3, DRef, Disposable } from '@zephyr3d/base';\r\nimport { ObservableVector4 } from '@zephyr3d/base';\r\nimport type { DrawContext, EnvironmentLighting } from '../render';\r\nimport { EnvShIBL } from '../render';\r\nimport { EnvConstantAmbient, EnvHemisphericAmbient } from '../render';\r\nimport { SkyRenderer } from '../render/sky';\r\nimport type { FrameBuffer, GPUDataBuffer, TextureCube } from '@zephyr3d/device';\r\n\r\n/**\r\n * Wrapper for environmant lighting\r\n * @public\r\n */\r\nexport class EnvLightWrapper extends Disposable {\r\n private _envLight: Nullable<EnvironmentLighting>;\r\n private readonly _ambientColor: ObservableVector4;\r\n private readonly _ambientDown: ObservableVector4;\r\n private readonly _ambientUp: ObservableVector4;\r\n private readonly _radianceMap: DRef<TextureCube>;\r\n private readonly _irradianceMap: DRef<TextureCube>;\r\n private readonly _irradianceSH: DRef<GPUDataBuffer>;\r\n private readonly _irradianceSHFB: DRef<FrameBuffer>;\r\n private readonly _irradianceWindow: Vector3;\r\n private _strength: number;\r\n /** @internal */\r\n constructor() {\r\n super();\r\n this._envLight = new EnvShIBL();\r\n this._ambientColor = new ObservableVector4(0.2, 0.2, 0.2, 1).setCallback(() => {\r\n if (this.type === 'constant') {\r\n (this._envLight as EnvConstantAmbient).ambientColor.set(this._ambientColor);\r\n }\r\n });\r\n this._ambientDown = new ObservableVector4(0.2, 0.2, 0.2, 1).setCallback(() => {\r\n if (this.type === 'hemisphere') {\r\n (this._envLight as EnvHemisphericAmbient).ambientDown.set(this._ambientDown);\r\n }\r\n });\r\n this._ambientUp = new ObservableVector4(0.3, 0.5, 0.8, 1).setCallback(() => {\r\n if (this.type === 'hemisphere') {\r\n (this._envLight as EnvHemisphericAmbient).ambientUp.set(this._ambientUp);\r\n }\r\n });\r\n this._radianceMap = new DRef();\r\n this._irradianceMap = new DRef();\r\n this._irradianceSH = new DRef();\r\n this._irradianceSHFB = new DRef();\r\n this._irradianceWindow = new Vector3();\r\n this._strength = 1;\r\n }\r\n /** @internal */\r\n getHash(ctx?: DrawContext) {\r\n const irradianceSource =\r\n this.type === 'ibl'\r\n ? this._irradianceSHFB.get()\r\n ? 'fb'\r\n : this._irradianceSH.get()\r\n ? 'buf'\r\n : 'none'\r\n : 'na';\r\n return !ctx || ctx.drawEnvLight\r\n ? `${this.type}:${this._envLight!.hasRadiance() ? '1' : '0'}:${\r\n this._envLight!.hasIrradiance() ? '1' : '0'\r\n }:${irradianceSource}`\r\n : 'none';\r\n }\r\n /** @internal */\r\n get envLight() {\r\n return this._envLight!;\r\n }\r\n /** The strength of environment lighting */\r\n get strength() {\r\n return this._strength;\r\n }\r\n set strength(val) {\r\n this._strength = val;\r\n }\r\n /** Ambient light color for environment light type constant */\r\n get ambientColor(): Vector4 {\r\n return this._ambientColor;\r\n }\r\n set ambientColor(val: Vector4) {\r\n this._ambientColor.set(val);\r\n }\r\n /** Up color for environment light type hemisphere */\r\n get ambientUp(): Vector4 {\r\n return this._ambientUp;\r\n }\r\n set ambientUp(val: Vector4) {\r\n this._ambientUp.set(val);\r\n }\r\n /** Down color for environment light type hemisphere */\r\n get ambientDown(): Vector4 {\r\n return this._ambientDown;\r\n }\r\n set ambientDown(val: Vector4) {\r\n this._ambientDown.set(val);\r\n }\r\n /** Radiance map for environment light type ibl */\r\n get radianceMap() {\r\n return this._radianceMap.get();\r\n }\r\n set radianceMap(tex) {\r\n this._radianceMap.set(tex);\r\n if (this.type === 'ibl') {\r\n (this._envLight as EnvShIBL).radianceMap = this.radianceMap;\r\n }\r\n }\r\n /** Irradiance SH buffer for environment light type ibl */\r\n get irradianceSH() {\r\n return this._irradianceSH.get();\r\n }\r\n set irradianceSH(value) {\r\n this._irradianceSH.set(value);\r\n if (this.type === 'ibl') {\r\n (this._envLight as EnvShIBL).irradianceSH = this.irradianceSH;\r\n }\r\n }\r\n /** Irradiance SH texture for environment light type ibl */\r\n get irradianceSHFB() {\r\n return this._irradianceSHFB.get();\r\n }\r\n set irradianceSHFB(value) {\r\n this._irradianceSHFB.set(value);\r\n if (this.type === 'ibl') {\r\n (this._envLight as EnvShIBL).irradianceSHFB = this.irradianceSHFB;\r\n }\r\n }\r\n /** Irradiance SH window for environment light type ibl */\r\n get irradianceWindow(): Immutable<Vector3> {\r\n return this._irradianceWindow;\r\n }\r\n set irradianceWindow(value: Immutable<Vector3>) {\r\n this._irradianceWindow.set(value);\r\n if (this.type === 'ibl') {\r\n (this._envLight as EnvShIBL).irradianceWindow = this._irradianceWindow;\r\n }\r\n }\r\n /** The environment light type */\r\n get type() {\r\n return this._envLight?.getType() ?? 'none';\r\n }\r\n set type(val) {\r\n switch (val) {\r\n case 'none':\r\n this._envLight = null;\r\n break;\r\n case 'ibl':\r\n if (this._envLight?.getType() !== val) {\r\n this._envLight = new EnvShIBL(this.radianceMap!, this.irradianceSH!, this.irradianceSHFB!);\r\n }\r\n (this._envLight as EnvShIBL).radianceMap = this.radianceMap;\r\n (this._envLight as EnvShIBL).irradianceSH = this.irradianceSH;\r\n (this._envLight as EnvShIBL).irradianceSHFB = this.irradianceSHFB;\r\n (this._envLight as EnvShIBL).irradianceWindow = this.irradianceWindow;\r\n break;\r\n case 'constant':\r\n if (this._envLight?.getType() !== val) {\r\n this._envLight = new EnvConstantAmbient(this._ambientColor);\r\n }\r\n break;\r\n case 'hemisphere':\r\n if (this._envLight?.getType() !== val) {\r\n this._envLight = new EnvHemisphericAmbient(this._ambientUp, this._ambientDown);\r\n }\r\n break;\r\n default:\r\n break;\r\n }\r\n }\r\n /** Disposes the environment lighting wrapper */\r\n protected onDispose() {\r\n super.onDispose();\r\n this._envLight?.dispose();\r\n this._radianceMap.dispose();\r\n this._irradianceMap.dispose();\r\n this._irradianceSHFB.dispose();\r\n this._irradianceSH.dispose();\r\n }\r\n}\r\n\r\n/**\r\n * Environment of scene\r\n * @public\r\n */\r\nexport class Environment extends Disposable {\r\n private readonly _sky: SkyRenderer;\r\n private readonly _light: EnvLightWrapper;\r\n /** @internal */\r\n constructor() {\r\n super();\r\n this._sky = new SkyRenderer();\r\n this._light = new EnvLightWrapper();\r\n }\r\n /** The sky renderer */\r\n get sky() {\r\n return this._sky;\r\n }\r\n /** The environment lighting renderer */\r\n get light() {\r\n return this._light;\r\n }\r\n /** @internal */\r\n getHash(ctx: DrawContext) {\r\n return `${this.light?.getHash(ctx)}:${this._sky?.getHash(ctx)}`;\r\n }\r\n /** @internal */\r\n needSceneDepthTexture() {\r\n return this._sky.fogType !== 'none';\r\n }\r\n /** Disposes the environment object */\r\n protected onDispose() {\r\n super.onDispose();\r\n this._sky.dispose();\r\n this._light.dispose();\r\n }\r\n}\r\n"],"names":["EnvLightWrapper","Disposable","_envLight","_ambientColor","_ambientDown","_ambientUp","_radianceMap","_irradianceMap","_irradianceSH","_irradianceSHFB","_irradianceWindow","_strength","EnvShIBL","ObservableVector4","setCallback","type","ambientColor","set","ambientDown","ambientUp","DRef","Vector3","getHash","ctx","irradianceSource","get","drawEnvLight","hasRadiance","hasIrradiance","envLight","strength","val","radianceMap","tex","irradianceSH","value","irradianceSHFB","irradianceWindow","getType","EnvConstantAmbient","EnvHemisphericAmbient","onDispose","dispose","Environment","_sky","_light","SkyRenderer","sky","light","needSceneDepthTexture","fogType"],"mappings":"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"}
1
+ {"version":3,"file":"environment.js","sources":["../../src/scene/environment.ts"],"sourcesContent":["import type { Immutable, Nullable, Vector4 } from '@zephyr3d/base';\r\nimport { Vector3, DRef, Disposable } from '@zephyr3d/base';\r\nimport { ObservableVector4 } from '@zephyr3d/base';\r\nimport type { DrawContext, EnvironmentLighting } from '../render';\r\nimport { EnvShIBL } from '../render';\r\nimport { EnvConstantAmbient, EnvHemisphericAmbient } from '../render';\r\nimport { SkyRenderer } from '../render/sky';\r\nimport type { FrameBuffer, GPUDataBuffer, TextureCube } from '@zephyr3d/device';\r\n\r\n/**\r\n * Wrapper for environmant lighting\r\n * @public\r\n */\r\nexport class EnvLightWrapper extends Disposable {\r\n private _envLight: Nullable<EnvironmentLighting>;\r\n private readonly _ambientColor: ObservableVector4;\r\n private readonly _ambientDown: ObservableVector4;\r\n private readonly _ambientUp: ObservableVector4;\r\n private readonly _radianceMap: DRef<TextureCube>;\r\n private readonly _sheenRadianceMap: DRef<TextureCube>;\r\n private readonly _irradianceMap: DRef<TextureCube>;\r\n private readonly _irradianceSH: DRef<GPUDataBuffer>;\r\n private readonly _irradianceSHFB: DRef<FrameBuffer>;\r\n private readonly _irradianceWindow: Vector3;\r\n private _strength: number;\r\n /** @internal */\r\n constructor() {\r\n super();\r\n this._envLight = new EnvShIBL();\r\n this._ambientColor = new ObservableVector4(0.2, 0.2, 0.2, 1).setCallback(() => {\r\n if (this.type === 'constant') {\r\n (this._envLight as EnvConstantAmbient).ambientColor.set(this._ambientColor);\r\n }\r\n });\r\n this._ambientDown = new ObservableVector4(0.2, 0.2, 0.2, 1).setCallback(() => {\r\n if (this.type === 'hemisphere') {\r\n (this._envLight as EnvHemisphericAmbient).ambientDown.set(this._ambientDown);\r\n }\r\n });\r\n this._ambientUp = new ObservableVector4(0.3, 0.5, 0.8, 1).setCallback(() => {\r\n if (this.type === 'hemisphere') {\r\n (this._envLight as EnvHemisphericAmbient).ambientUp.set(this._ambientUp);\r\n }\r\n });\r\n this._radianceMap = new DRef();\r\n this._sheenRadianceMap = new DRef();\r\n this._irradianceMap = new DRef();\r\n this._irradianceSH = new DRef();\r\n this._irradianceSHFB = new DRef();\r\n this._irradianceWindow = new Vector3();\r\n this._strength = 1;\r\n }\r\n /** @internal */\r\n getHash(ctx?: DrawContext) {\r\n const irradianceSource =\r\n this.type === 'ibl'\r\n ? this._irradianceSHFB.get()\r\n ? 'fb'\r\n : this._irradianceSH.get()\r\n ? 'buf'\r\n : 'none'\r\n : 'na';\r\n return !ctx || ctx.drawEnvLight\r\n ? `${this.type}:${this._envLight!.hasRadiance() ? '1' : '0'}:${\r\n this._envLight!.hasSheenRadiance() ? '1' : '0'\r\n }:${this._envLight!.hasIrradiance() ? '1' : '0'}:${irradianceSource}`\r\n : 'none';\r\n }\r\n /** @internal */\r\n get envLight() {\r\n return this._envLight!;\r\n }\r\n /** The strength of environment lighting */\r\n get strength() {\r\n return this._strength;\r\n }\r\n set strength(val) {\r\n this._strength = val;\r\n }\r\n /** Ambient light color for environment light type constant */\r\n get ambientColor(): Vector4 {\r\n return this._ambientColor;\r\n }\r\n set ambientColor(val: Vector4) {\r\n this._ambientColor.set(val);\r\n }\r\n /** Up color for environment light type hemisphere */\r\n get ambientUp(): Vector4 {\r\n return this._ambientUp;\r\n }\r\n set ambientUp(val: Vector4) {\r\n this._ambientUp.set(val);\r\n }\r\n /** Down color for environment light type hemisphere */\r\n get ambientDown(): Vector4 {\r\n return this._ambientDown;\r\n }\r\n set ambientDown(val: Vector4) {\r\n this._ambientDown.set(val);\r\n }\r\n /** Radiance map for environment light type ibl */\r\n get radianceMap() {\r\n return this._radianceMap.get();\r\n }\r\n set radianceMap(tex) {\r\n this._radianceMap.set(tex);\r\n if (this.type === 'ibl') {\r\n (this._envLight as EnvShIBL).radianceMap = this.radianceMap;\r\n }\r\n }\r\n /** Charlie-filtered sheen radiance map for environment light type ibl */\r\n get sheenRadianceMap() {\r\n return this._sheenRadianceMap.get();\r\n }\r\n set sheenRadianceMap(tex) {\r\n this._sheenRadianceMap.set(tex);\r\n if (this.type === 'ibl') {\r\n (this._envLight as EnvShIBL).sheenRadianceMap = this.sheenRadianceMap;\r\n }\r\n }\r\n /** Irradiance SH buffer for environment light type ibl */\r\n get irradianceSH() {\r\n return this._irradianceSH.get();\r\n }\r\n set irradianceSH(value) {\r\n this._irradianceSH.set(value);\r\n if (this.type === 'ibl') {\r\n (this._envLight as EnvShIBL).irradianceSH = this.irradianceSH;\r\n }\r\n }\r\n /** Irradiance SH texture for environment light type ibl */\r\n get irradianceSHFB() {\r\n return this._irradianceSHFB.get();\r\n }\r\n set irradianceSHFB(value) {\r\n this._irradianceSHFB.set(value);\r\n if (this.type === 'ibl') {\r\n (this._envLight as EnvShIBL).irradianceSHFB = this.irradianceSHFB;\r\n }\r\n }\r\n /** Irradiance SH window for environment light type ibl */\r\n get irradianceWindow(): Immutable<Vector3> {\r\n return this._irradianceWindow;\r\n }\r\n set irradianceWindow(value: Immutable<Vector3>) {\r\n this._irradianceWindow.set(value);\r\n if (this.type === 'ibl') {\r\n (this._envLight as EnvShIBL).irradianceWindow = this._irradianceWindow;\r\n }\r\n }\r\n /** The environment light type */\r\n get type() {\r\n return this._envLight?.getType() ?? 'none';\r\n }\r\n set type(val) {\r\n switch (val) {\r\n case 'none':\r\n this._envLight = null;\r\n break;\r\n case 'ibl':\r\n if (this._envLight?.getType() !== val) {\r\n this._envLight = new EnvShIBL(\r\n this.radianceMap!,\r\n this.irradianceSH!,\r\n this.irradianceSHFB!,\r\n this.sheenRadianceMap!\r\n );\r\n }\r\n (this._envLight as EnvShIBL).radianceMap = this.radianceMap;\r\n (this._envLight as EnvShIBL).sheenRadianceMap = this.sheenRadianceMap;\r\n (this._envLight as EnvShIBL).irradianceSH = this.irradianceSH;\r\n (this._envLight as EnvShIBL).irradianceSHFB = this.irradianceSHFB;\r\n (this._envLight as EnvShIBL).irradianceWindow = this.irradianceWindow;\r\n break;\r\n case 'constant':\r\n if (this._envLight?.getType() !== val) {\r\n this._envLight = new EnvConstantAmbient(this._ambientColor);\r\n }\r\n break;\r\n case 'hemisphere':\r\n if (this._envLight?.getType() !== val) {\r\n this._envLight = new EnvHemisphericAmbient(this._ambientUp, this._ambientDown);\r\n }\r\n break;\r\n default:\r\n break;\r\n }\r\n }\r\n /** Disposes the environment lighting wrapper */\r\n protected onDispose() {\r\n super.onDispose();\r\n this._envLight?.dispose();\r\n this._radianceMap.dispose();\r\n this._sheenRadianceMap.dispose();\r\n this._irradianceMap.dispose();\r\n this._irradianceSHFB.dispose();\r\n this._irradianceSH.dispose();\r\n }\r\n}\r\n\r\n/**\r\n * Environment of scene\r\n * @public\r\n */\r\nexport class Environment extends Disposable {\r\n private readonly _sky: SkyRenderer;\r\n private readonly _light: EnvLightWrapper;\r\n /** @internal */\r\n constructor() {\r\n super();\r\n this._sky = new SkyRenderer();\r\n this._light = new EnvLightWrapper();\r\n }\r\n /** The sky renderer */\r\n get sky() {\r\n return this._sky;\r\n }\r\n /** The environment lighting renderer */\r\n get light() {\r\n return this._light;\r\n }\r\n /** @internal */\r\n getHash(ctx: DrawContext) {\r\n return `${this.light?.getHash(ctx)}:${this._sky?.getHash(ctx)}`;\r\n }\r\n /** @internal */\r\n needSceneDepthTexture() {\r\n return this._sky.fogType !== 'none';\r\n }\r\n /** Disposes the environment object */\r\n protected onDispose() {\r\n super.onDispose();\r\n this._sky.dispose();\r\n this._light.dispose();\r\n }\r\n}\r\n"],"names":["EnvLightWrapper","Disposable","_envLight","_ambientColor","_ambientDown","_ambientUp","_radianceMap","_sheenRadianceMap","_irradianceMap","_irradianceSH","_irradianceSHFB","_irradianceWindow","_strength","EnvShIBL","ObservableVector4","setCallback","type","ambientColor","set","ambientDown","ambientUp","DRef","Vector3","getHash","ctx","irradianceSource","get","drawEnvLight","hasRadiance","hasSheenRadiance","hasIrradiance","envLight","strength","val","radianceMap","tex","sheenRadianceMap","irradianceSH","value","irradianceSHFB","irradianceWindow","getType","EnvConstantAmbient","EnvHemisphericAmbient","onDispose","dispose","Environment","_sky","_light","SkyRenderer","sky","light","needSceneDepthTexture","fogType"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AASA;;;IAIO,MAAMA,eAAwBC,SAAAA,UAAAA,CAAAA;IAC3BC,SAAyC;IAChCC,aAAiC;IACjCC,YAAgC;IAChCC,UAA8B;IAC9BC,YAAgC;IAChCC,iBAAqC;IACrCC,cAAkC;IAClCC,aAAmC;IACnCC,eAAmC;IACnCC,iBAA2B;IACpCC,SAAkB;AAC1B,qBACA,WAAc,EAAA;QACZ,KAAK,EAAA;QACL,IAAI,CAACV,SAAS,GAAG,IAAIW,QAAAA,EAAAA;QACrB,IAAI,CAACV,aAAa,GAAG,IAAIW,iBAAAA,CAAkB,KAAK,GAAK,EAAA,GAAA,EAAK,CAAGC,CAAAA,CAAAA,WAAW,CAAC,IAAA;AACvE,YAAA,IAAI,IAAI,CAACC,IAAI,KAAK,UAAY,EAAA;gBAC3B,IAAI,CAACd,SAAS,CAAwBe,YAAY,CAACC,GAAG,CAAC,IAAI,CAACf,aAAa,CAAA;AAC5E;AACF,SAAA,CAAA;QACA,IAAI,CAACC,YAAY,GAAG,IAAIU,iBAAAA,CAAkB,KAAK,GAAK,EAAA,GAAA,EAAK,CAAGC,CAAAA,CAAAA,WAAW,CAAC,IAAA;AACtE,YAAA,IAAI,IAAI,CAACC,IAAI,KAAK,YAAc,EAAA;gBAC7B,IAAI,CAACd,SAAS,CAA2BiB,WAAW,CAACD,GAAG,CAAC,IAAI,CAACd,YAAY,CAAA;AAC7E;AACF,SAAA,CAAA;QACA,IAAI,CAACC,UAAU,GAAG,IAAIS,iBAAAA,CAAkB,KAAK,GAAK,EAAA,GAAA,EAAK,CAAGC,CAAAA,CAAAA,WAAW,CAAC,IAAA;AACpE,YAAA,IAAI,IAAI,CAACC,IAAI,KAAK,YAAc,EAAA;gBAC7B,IAAI,CAACd,SAAS,CAA2BkB,SAAS,CAACF,GAAG,CAAC,IAAI,CAACb,UAAU,CAAA;AACzE;AACF,SAAA,CAAA;QACA,IAAI,CAACC,YAAY,GAAG,IAAIe,IAAAA,EAAAA;QACxB,IAAI,CAACd,iBAAiB,GAAG,IAAIc,IAAAA,EAAAA;QAC7B,IAAI,CAACb,cAAc,GAAG,IAAIa,IAAAA,EAAAA;QAC1B,IAAI,CAACZ,aAAa,GAAG,IAAIY,IAAAA,EAAAA;QACzB,IAAI,CAACX,eAAe,GAAG,IAAIW,IAAAA,EAAAA;QAC3B,IAAI,CAACV,iBAAiB,GAAG,IAAIW,OAAAA,EAAAA;QAC7B,IAAI,CAACV,SAAS,GAAG,CAAA;AACnB;qBAEAW,OAAQC,CAAAA,GAAiB,EAAE;QACzB,MAAMC,gBAAAA,GACJ,IAAI,CAACT,IAAI,KAAK,KACV,GAAA,IAAI,CAACN,eAAe,CAACgB,GAAG,EACtB,GAAA,IAAA,GACA,IAAI,CAACjB,aAAa,CAACiB,GAAG,EAAA,GACpB,QACA,MACJ,GAAA,IAAA;AACN,QAAA,OAAO,CAACF,GAAOA,IAAAA,GAAAA,CAAIG,YAAY,GAC3B,CAAA,EAAG,IAAI,CAACX,IAAI,CAAC,CAAC,EAAE,IAAI,CAACd,SAAS,CAAE0B,WAAW,EAAA,GAAK,MAAM,GAAI,CAAA,CAAC,EACzD,IAAI,CAAC1B,SAAS,CAAE2B,gBAAgB,KAAK,GAAM,GAAA,GAAA,CAC5C,CAAC,EAAE,IAAI,CAAC3B,SAAS,CAAE4B,aAAa,EAAK,GAAA,GAAA,GAAM,IAAI,CAAC,EAAEL,kBAAkB,GACrE,MAAA;AACN;qBAEA,IAAIM,QAAW,GAAA;QACb,OAAO,IAAI,CAAC7B,SAAS;AACvB;gDAEA,IAAI8B,QAAW,GAAA;QACb,OAAO,IAAI,CAACpB,SAAS;AACvB;IACA,IAAIoB,QAAAA,CAASC,GAAG,EAAE;QAChB,IAAI,CAACrB,SAAS,GAAGqB,GAAAA;AACnB;mEAEA,IAAIhB,YAAwB,GAAA;QAC1B,OAAO,IAAI,CAACd,aAAa;AAC3B;IACA,IAAIc,YAAAA,CAAagB,GAAY,EAAE;AAC7B,QAAA,IAAI,CAAC9B,aAAa,CAACe,GAAG,CAACe,GAAAA,CAAAA;AACzB;0DAEA,IAAIb,SAAqB,GAAA;QACvB,OAAO,IAAI,CAACf,UAAU;AACxB;IACA,IAAIe,SAAAA,CAAUa,GAAY,EAAE;AAC1B,QAAA,IAAI,CAAC5B,UAAU,CAACa,GAAG,CAACe,GAAAA,CAAAA;AACtB;4DAEA,IAAId,WAAuB,GAAA;QACzB,OAAO,IAAI,CAACf,YAAY;AAC1B;IACA,IAAIe,WAAAA,CAAYc,GAAY,EAAE;AAC5B,QAAA,IAAI,CAAC7B,YAAY,CAACc,GAAG,CAACe,GAAAA,CAAAA;AACxB;uDAEA,IAAIC,WAAc,GAAA;AAChB,QAAA,OAAO,IAAI,CAAC5B,YAAY,CAACoB,GAAG,EAAA;AAC9B;IACA,IAAIQ,WAAAA,CAAYC,GAAG,EAAE;AACnB,QAAA,IAAI,CAAC7B,YAAY,CAACY,GAAG,CAACiB,GAAAA,CAAAA;AACtB,QAAA,IAAI,IAAI,CAACnB,IAAI,KAAK,KAAO,EAAA;AACtB,YAAA,IAAI,CAACd,SAAS,CAAcgC,WAAW,GAAG,IAAI,CAACA,WAAW;AAC7D;AACF;8EAEA,IAAIE,gBAAmB,GAAA;AACrB,QAAA,OAAO,IAAI,CAAC7B,iBAAiB,CAACmB,GAAG,EAAA;AACnC;IACA,IAAIU,gBAAAA,CAAiBD,GAAG,EAAE;AACxB,QAAA,IAAI,CAAC5B,iBAAiB,CAACW,GAAG,CAACiB,GAAAA,CAAAA;AAC3B,QAAA,IAAI,IAAI,CAACnB,IAAI,KAAK,KAAO,EAAA;AACtB,YAAA,IAAI,CAACd,SAAS,CAAckC,gBAAgB,GAAG,IAAI,CAACA,gBAAgB;AACvE;AACF;+DAEA,IAAIC,YAAe,GAAA;AACjB,QAAA,OAAO,IAAI,CAAC5B,aAAa,CAACiB,GAAG,EAAA;AAC/B;IACA,IAAIW,YAAAA,CAAaC,KAAK,EAAE;AACtB,QAAA,IAAI,CAAC7B,aAAa,CAACS,GAAG,CAACoB,KAAAA,CAAAA;AACvB,QAAA,IAAI,IAAI,CAACtB,IAAI,KAAK,KAAO,EAAA;AACtB,YAAA,IAAI,CAACd,SAAS,CAAcmC,YAAY,GAAG,IAAI,CAACA,YAAY;AAC/D;AACF;gEAEA,IAAIE,cAAiB,GAAA;AACnB,QAAA,OAAO,IAAI,CAAC7B,eAAe,CAACgB,GAAG,EAAA;AACjC;IACA,IAAIa,cAAAA,CAAeD,KAAK,EAAE;AACxB,QAAA,IAAI,CAAC5B,eAAe,CAACQ,GAAG,CAACoB,KAAAA,CAAAA;AACzB,QAAA,IAAI,IAAI,CAACtB,IAAI,KAAK,KAAO,EAAA;AACtB,YAAA,IAAI,CAACd,SAAS,CAAcqC,cAAc,GAAG,IAAI,CAACA,cAAc;AACnE;AACF;+DAEA,IAAIC,gBAAuC,GAAA;QACzC,OAAO,IAAI,CAAC7B,iBAAiB;AAC/B;IACA,IAAI6B,gBAAAA,CAAiBF,KAAyB,EAAE;AAC9C,QAAA,IAAI,CAAC3B,iBAAiB,CAACO,GAAG,CAACoB,KAAAA,CAAAA;AAC3B,QAAA,IAAI,IAAI,CAACtB,IAAI,KAAK,KAAO,EAAA;AACtB,YAAA,IAAI,CAACd,SAAS,CAAcsC,gBAAgB,GAAG,IAAI,CAAC7B,iBAAiB;AACxE;AACF;sCAEA,IAAIK,IAAO,GAAA;AACT,QAAA,OAAO,IAAI,CAACd,SAAS,EAAEuC,OAAa,EAAA,IAAA,MAAA;AACtC;IACA,IAAIzB,IAAAA,CAAKiB,GAAG,EAAE;QACZ,OAAQA,GAAAA;YACN,KAAK,MAAA;gBACH,IAAI,CAAC/B,SAAS,GAAG,IAAA;AACjB,gBAAA;YACF,KAAK,KAAA;AACH,gBAAA,IAAI,IAAI,CAACA,SAAS,EAAEuC,cAAcR,GAAK,EAAA;AACrC,oBAAA,IAAI,CAAC/B,SAAS,GAAG,IAAIW,QACnB,CAAA,IAAI,CAACqB,WAAW,EAChB,IAAI,CAACG,YAAY,EACjB,IAAI,CAACE,cAAc,EACnB,IAAI,CAACH,gBAAgB,CAAA;AAEzB;AACC,gBAAA,IAAI,CAAClC,SAAS,CAAcgC,WAAW,GAAG,IAAI,CAACA,WAAW;AAC1D,gBAAA,IAAI,CAAChC,SAAS,CAAckC,gBAAgB,GAAG,IAAI,CAACA,gBAAgB;AACpE,gBAAA,IAAI,CAAClC,SAAS,CAAcmC,YAAY,GAAG,IAAI,CAACA,YAAY;AAC5D,gBAAA,IAAI,CAACnC,SAAS,CAAcqC,cAAc,GAAG,IAAI,CAACA,cAAc;AAChE,gBAAA,IAAI,CAACrC,SAAS,CAAcsC,gBAAgB,GAAG,IAAI,CAACA,gBAAgB;AACrE,gBAAA;YACF,KAAK,UAAA;AACH,gBAAA,IAAI,IAAI,CAACtC,SAAS,EAAEuC,cAAcR,GAAK,EAAA;AACrC,oBAAA,IAAI,CAAC/B,SAAS,GAAG,IAAIwC,kBAAmB,CAAA,IAAI,CAACvC,aAAa,CAAA;AAC5D;AACA,gBAAA;YACF,KAAK,YAAA;AACH,gBAAA,IAAI,IAAI,CAACD,SAAS,EAAEuC,cAAcR,GAAK,EAAA;oBACrC,IAAI,CAAC/B,SAAS,GAAG,IAAIyC,qBAAAA,CAAsB,IAAI,CAACtC,UAAU,EAAE,IAAI,CAACD,YAAY,CAAA;AAC/E;AACA,gBAAA;AAGJ;AACF;qDAEA,SAAsB,GAAA;AACpB,QAAA,KAAK,CAACwC,SAAAA,EAAAA;QACN,IAAI,CAAC1C,SAAS,EAAE2C,OAAAA,EAAAA;QAChB,IAAI,CAACvC,YAAY,CAACuC,OAAO,EAAA;QACzB,IAAI,CAACtC,iBAAiB,CAACsC,OAAO,EAAA;QAC9B,IAAI,CAACrC,cAAc,CAACqC,OAAO,EAAA;QAC3B,IAAI,CAACnC,eAAe,CAACmC,OAAO,EAAA;QAC5B,IAAI,CAACpC,aAAa,CAACoC,OAAO,EAAA;AAC5B;AACF;AAEA;;;IAIO,MAAMC,WAAoB7C,SAAAA,UAAAA,CAAAA;IACd8C,IAAkB;IAClBC,MAAwB;AACzC,qBACA,WAAc,EAAA;QACZ,KAAK,EAAA;QACL,IAAI,CAACD,IAAI,GAAG,IAAIE,WAAAA,EAAAA;QAChB,IAAI,CAACD,MAAM,GAAG,IAAIhD,eAAAA,EAAAA;AACpB;4BAEA,IAAIkD,GAAM,GAAA;QACR,OAAO,IAAI,CAACH,IAAI;AAClB;6CAEA,IAAII,KAAQ,GAAA;QACV,OAAO,IAAI,CAACH,MAAM;AACpB;qBAEAzB,OAAQC,CAAAA,GAAgB,EAAE;AACxB,QAAA,OAAO,CAAG,EAAA,IAAI,CAAC2B,KAAK,EAAE5B,OAAQC,CAAAA,GAAAA,CAAAA,CAAK,CAAC,EAAE,IAAI,CAACuB,IAAI,EAAExB,QAAQC,GAAM,CAAA,CAAA,CAAA;AACjE;AACA,qBACA4B,qBAAwB,GAAA;AACtB,QAAA,OAAO,IAAI,CAACL,IAAI,CAACM,OAAO,KAAK,MAAA;AAC/B;2CAEA,SAAsB,GAAA;AACpB,QAAA,KAAK,CAACT,SAAAA,EAAAA;QACN,IAAI,CAACG,IAAI,CAACF,OAAO,EAAA;QACjB,IAAI,CAACG,MAAM,CAACH,OAAO,EAAA;AACrB;AACF;;;;"}
@@ -19,7 +19,9 @@ import '../material/sprite.js';
19
19
  import '../material/sprite_std.js';
20
20
  import '../material/msdf_text.js';
21
21
  import '../utility/blueprint/material/texture.js';
22
+ import { BoundingBox } from '../utility/bounding_volume.js';
22
23
  import { mixinDrawable } from '../render/drawable_mixin.js';
24
+ import { calculateMorphBoundingBox } from '../animation/morphtarget.js';
23
25
 
24
26
  const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
25
27
  /**
@@ -31,10 +33,11 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
31
33
  /** @internal */ _castShadow;
32
34
  /** @internal */ _skinnedBoundingInfo;
33
35
  /** @internal */ _animatedBoundingBox;
34
- /** @internal */ _skeletonName;
36
+ /** @internal */ _skinBindingName;
35
37
  /** @internal */ _boneMatrices;
36
38
  /** @internal */ _morphData;
37
39
  /** @internal */ _morphInfo;
40
+ /** @internal */ _morphBoundingInfo;
38
41
  /** @internal */ _morphDirty;
39
42
  /** @internal */ _instanceHash;
40
43
  /** @internal */ _batchable;
@@ -58,6 +61,7 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
58
61
  this._boneMatrices = new DRef();
59
62
  this._morphData = null;
60
63
  this._morphInfo = null;
64
+ this._morphBoundingInfo = null;
61
65
  this._morphDirty = false;
62
66
  this._instanceHash = null;
63
67
  this._pickTarget = {
@@ -67,7 +71,7 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
67
71
  this.primitive = primitive ?? null;
68
72
  this.material = material ?? Mesh._getDefaultMaterial();
69
73
  this._suspendSkinning = false;
70
- this._skeletonName = '';
74
+ this._skinBindingName = '';
71
75
  this._renderBundle = {};
72
76
  this._useRenderBundle = true;
73
77
  this._materialChangeTag = null;
@@ -96,11 +100,17 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
96
100
  };
97
101
  }
98
102
  get skeletonName() {
99
- return this._skeletonName;
103
+ return this._skinBindingName;
100
104
  }
101
105
  set skeletonName(name) {
102
- if (name !== this._skeletonName) {
103
- this._skeletonName = name;
106
+ this.skinBindingName = name;
107
+ }
108
+ get skinBindingName() {
109
+ return this._skinBindingName;
110
+ }
111
+ set skinBindingName(name) {
112
+ if (name !== this._skinBindingName) {
113
+ this._skinBindingName = name;
104
114
  this.updateSkeletonState();
105
115
  }
106
116
  }
@@ -172,6 +182,21 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
172
182
  return this._animatedBoundingBox ?? null;
173
183
  }
174
184
  /**
185
+ * Sets morph target bounding data used to update the animated bounding box when weights change.
186
+ * @param info - Morph target bounding data
187
+ */ setMorphBoundingInfo(info) {
188
+ this._morphBoundingInfo = info ? {
189
+ targetBoxes: info.targetBoxes.map((box)=>box.clone()),
190
+ originBox: info.originBox.clone()
191
+ } : null;
192
+ this.updateMorphBoundingBox();
193
+ }
194
+ /**
195
+ * Gets morph target bounding data.
196
+ */ getMorphBoundingInfo() {
197
+ return this._morphBoundingInfo;
198
+ }
199
+ /**
175
200
  * Sets the texture that contains the bone matrices for skeletal animation
176
201
  * @param matrices - The texture that contains the bone matrices
177
202
  */ setBoneMatrices(matrices) {
@@ -266,6 +291,7 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
266
291
  this._morphInfo.buffer.set(morphUniformBuffer);
267
292
  }
268
293
  this._morphDirty = false;
294
+ this.updateMorphBoundingBox();
269
295
  this._renderBundle = {};
270
296
  RenderBundleWrapper.drawableChanged(this);
271
297
  }
@@ -295,20 +321,38 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
295
321
  return null;
296
322
  }
297
323
  /**
324
+ * Get the index of the morph target by name
325
+ * @param name - The name of the morph target
326
+ * @returns The index of the morph target, or -1 if not found
327
+ */ getMorphTargetIndexByName(name) {
328
+ return this._morphInfo?.names?.[name] ?? -1;
329
+ }
330
+ /**
298
331
  * Update morph target weight
299
332
  *
300
333
  * @param name - The name of the morph target
301
334
  * @param weight - The weight of the morph target
302
335
  */ setMorphWeight(name, weight) {
303
- const index = this._morphInfo?.names?.[name];
304
- if (index !== undefined && index >= 0 && index < this._morphInfo.data[3]) {
336
+ const index = this.getMorphTargetIndexByName(name);
337
+ if (index >= 0) {
338
+ this.setMorphWeightByIndex(index, weight);
339
+ }
340
+ }
341
+ /**
342
+ * Update morph target weight by index
343
+ *
344
+ * @param index - The index of the morph target
345
+ * @param weight - The weight of the morph target
346
+ */ setMorphWeightByIndex(index, weight) {
347
+ if (index >= 0 && index < this._morphInfo.data[3]) {
305
348
  if (this._morphInfo.data[4 + index] !== weight) {
306
349
  this._morphInfo.data[4 + index] = weight;
307
350
  this._morphDirty = true;
351
+ this.updateMorphBoundingBox();
308
352
  this.scene.queueUpdateNode(this);
309
353
  }
310
354
  } else {
311
- console.warn(`Morph target ${name} not found`);
355
+ console.warn(`Morph target index out of range: ${index}`);
312
356
  }
313
357
  }
314
358
  /**
@@ -324,13 +368,14 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
324
368
  return 0;
325
369
  }
326
370
  /**
327
- * Update morph target weight
371
+ * Update morph target weights
328
372
  *
329
373
  * @param weight - The morph target weights. The length must not exceed the mesh's morph target count.
330
374
  */ updateMorphWeights(weight) {
331
375
  if (this._morphInfo && weight && weight.length <= this._morphInfo.data[3]) {
332
376
  this._morphInfo.data.set(weight, 4);
333
377
  this._morphDirty = true;
378
+ this.updateMorphBoundingBox();
334
379
  this.scene.queueUpdateNode(this);
335
380
  }
336
381
  }
@@ -379,10 +424,25 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
379
424
  */ needSceneDepth() {
380
425
  return this.material?.needSceneDepth() ?? false;
381
426
  }
427
+ /** @internal */ updateMorphBoundingBox() {
428
+ if (!this._morphInfo || !this._morphBoundingInfo) {
429
+ return;
430
+ }
431
+ const numTargets = Math.min(this._morphInfo.data[3], this._morphBoundingInfo.targetBoxes.length);
432
+ if (numTargets <= 0) {
433
+ return;
434
+ }
435
+ const weights = this._morphInfo.data instanceof Float32Array ? this._morphInfo.data.subarray(4, 4 + numTargets) : new Float32Array(Array.from(this._morphInfo.data.subarray(4, 4 + numTargets)));
436
+ const bbox = new BoundingBox();
437
+ calculateMorphBoundingBox(bbox, this._morphBoundingInfo.targetBoxes, weights, numTargets);
438
+ bbox.minPoint.addBy(this._morphBoundingInfo.originBox.minPoint);
439
+ bbox.maxPoint.addBy(this._morphBoundingInfo.originBox.maxPoint);
440
+ this.setAnimatedBoundingBox(bbox);
441
+ }
382
442
  /** @internal */ updateMorphState() {
383
443
  if (this._morphInfo && this._morphDirty) {
384
- console.log(`jawOpen: ${this._morphInfo.data[20]}`);
385
444
  this._morphInfo.buffer.get().bufferSubData(4 * 4, this._morphInfo.data, 4, this._morphInfo.data[3]);
445
+ this.updateMorphBoundingBox();
386
446
  this._morphDirty = false;
387
447
  }
388
448
  }
@@ -392,16 +452,18 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
392
452
  this.setAnimatedBoundingBox(null);
393
453
  return;
394
454
  }
395
- const skeleton = this._skeletonName && this.findSkeletonById(this._skeletonName);
396
- if (skeleton) {
397
- this.setBoneMatrices(skeleton.jointTexture);
398
- skeleton.computeBoundingBox(this._skinnedBoundingInfo, this.invWorldMatrix);
455
+ const binding = this._skinBindingName && this.findSkinBindingById(this._skinBindingName);
456
+ if (binding) {
457
+ this.setBoneMatrices(binding.jointTexture);
458
+ binding.computeBoundingBox(this._skinnedBoundingInfo, this.invWorldMatrix);
399
459
  this.setAnimatedBoundingBox(this._skinnedBoundingInfo.boundingBox);
400
460
  } else {
401
461
  this.setBoneMatrices(null);
402
- this.setAnimatedBoundingBox(null);
462
+ if (!this._morphInfo || !this._morphBoundingInfo) {
463
+ this.setAnimatedBoundingBox(null);
464
+ }
403
465
  }
404
- if (this._skeletonName) {
466
+ if (this._skinBindingName) {
405
467
  this.scene.queueUpdateNode(this);
406
468
  }
407
469
  }
@@ -470,6 +532,7 @@ const MeshBase = castObservable(applyMixins(GraphNode, mixinDrawable))();
470
532
  this._boneMatrices.dispose();
471
533
  this.setMorphData(null);
472
534
  this.setMorphInfo(null);
535
+ this.setMorphBoundingInfo(null);
473
536
  this._renderBundle = null;
474
537
  RenderBundleWrapper.drawableChanged(this);
475
538
  }