babylon.quarks 0.24.1 → 0.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "babylon.quarks",
-    "version": "0.24.1",
+    "version": "0.26.0",
     "description": "A High-Performance Particle System for Babylon.js",
     "type": "module",
     "types": "./dist/types/index.d.ts",

package/src/BatchedRenderer.ts

@@ -11,13 +11,22 @@ import {SpriteBatch} from './SpriteBatch';
 import {TrailBatch} from './TrailBatch';
 import {
     defaultMeshLighting,
+    erosionEqual,
+    gradientMapEqual,
+    mapUVEqual,
     MeshLighting,
     MeshLightingSettings,
     MeshRim,
     meshRimEqual,
+    ParticleErosion,
+    ParticleGradientMap,
+    ParticleUVDistortion,
+    readsUV1,
     RenderMode,
     SortMode,
     StoredBatchSettings,
+    TextureUV,
+    uvDistortionEqual,
     VFXBatch,
 } from './VFXBatch';
 
@@ -25,6 +34,8 @@ export interface VFXBatchSettings {
     instancingGeometry: Float32Array;
     instancingIndices: Uint32Array | Uint16Array;
     instancingUVs?: Float32Array;
+    /** The mesh's second UV set, see {@link UVChannel}. */
+    instancingUVs2?: Float32Array;
     instancingNormals?: Float32Array;
     renderMode: RenderMode;
     renderOrder: number;
@@ -100,6 +111,14 @@ export interface VFXBatchSettings {
     lighting?: MeshLighting;
     /** Rim (Fresnel) term on mesh particles; unset draws none. See {@link MeshRim}. */
     rim?: MeshRim;
+    /** How the main map is laid over the particle, see {@link TextureUV}. Unset: as drawn. Systems that differ are batched apart. */
+    mapUV?: TextureUV;
+    /** Colour ramp the map is recoloured through, see {@link ParticleGradientMap}. Unset: none. Systems that differ are batched apart. */
+    gradientMap?: ParticleGradientMap;
+    /** Map UV distortion by a noise texture, see {@link ParticleUVDistortion}. Unset: none. Systems that differ are batched apart. */
+    uvDistortion?: ParticleUVDistortion;
+    /** Alpha erosion (dissolve / wipe), see {@link ParticleErosion}. Unset: none. Systems that differ are batched apart. */
+    erosion?: ParticleErosion;
 }
 
 export interface AdaptivePerformanceOptions {
@@ -139,6 +158,8 @@ export interface AdaptivePerformanceState extends AdaptivePerformanceOptions {
 
 export class BatchedRenderer extends TransformNode {
     batches: Array<VFXBatch> = [];
+    /** Seconds this renderer has been updated for; the clock UV and erosion scrolling run on. */
+    private elapsed = 0;
     systemToBatchIndex: Map<IParticleSystem, number> = new Map<IParticleSystem, number>();
     depthTexture: BaseTexture | null = null;
     /** Systems in insertion order — iterated every frame, unlike the map. */
@@ -302,6 +323,11 @@ export class BatchedRenderer extends TransformNode {
             a.uTileCount === b.uTileCount &&
             a.vTileCount === b.vTileCount &&
             a.instancingGeometry === b.instancingGeometry &&
+            // Trails draw their own strip and read none of the instanced geometry's UVs.
+            (a.renderMode === RenderMode.Trail || a.instancingUVs === b.instancingUVs) &&
+            // Normals, and the second UV set when read, only matter to meshes.
+            (a.renderMode !== RenderMode.Mesh || a.instancingNormals === b.instancingNormals) &&
+            (a.renderMode !== RenderMode.Mesh || !readsUV1(a) || a.instancingUVs2 === b.instancingUVs2) &&
             a.renderOrder === b.renderOrder &&
             a.layerMask === b.layerMask &&
             a.renderingGroupId === b.renderingGroupId &&
@@ -311,7 +337,11 @@ export class BatchedRenderer extends TransformNode {
             a.minParticleSize === (b.minParticleSize ?? 0) &&
             a.maxParticleSize === (b.maxParticleSize ?? Infinity) &&
             (a.lighting ?? 'fixed') === (b.lighting ?? 'fixed') &&
-            meshRimEqual(a.rim, b.rim)
+            meshRimEqual(a.rim, b.rim) &&
+            mapUVEqual(a.mapUV, b.mapUV) &&
+            uvDistortionEqual(a.uvDistortion, b.uvDistortion) &&
+            gradientMapEqual(a.gradientMap, b.gradientMap) &&
+            erosionEqual(a.erosion, b.erosion)
         );
     }
 
@@ -350,6 +380,7 @@ export class BatchedRenderer extends TransformNode {
             case RenderMode.VerticalBillBoard:
             case RenderMode.HorizontalBillBoard:
             case RenderMode.StretchedBillBoard:
+            case RenderMode.Beam:
                 batch = new SpriteBatch(settings, scene);
                 break;
             default:
@@ -543,6 +574,7 @@ export class BatchedRenderer extends TransformNode {
     }
 
     update(delta: number) {
+        this.elapsed += delta;
         const adaptiveState = this.adaptivePerformanceState;
         const frameStart = adaptiveState.enabled ? performance.now() : 0;
         if (adaptiveState.enabled) {
@@ -602,6 +634,7 @@ export class BatchedRenderer extends TransformNode {
         const emptyFrames = this.batchEmptyFrames;
         for (let i = 0; i < this.batches.length; i++) {
             const batch = this.batches[i];
+            batch.time = this.elapsed;
             if (batch.systems.size > 0) {
                 emptyFrames[i] = 0;
                 batch.update();