bloody-engine 1.1.7 → 1.1.8

package/dist/node/index.js

@@ -2871,7 +2871,7 @@ class GPUBasedSpriteBatchRenderer {
         // top-right
         [halfW, halfH],
         // top-right (duplicate)
-        [-halfH, halfH],
+        [-halfW, halfH],
         // top-left
         [-halfW, -halfH]
         // bottom-left (duplicate)
@@ -3584,6 +3584,7 @@ class InstancedRenderer {
 }
 class HybridRenderer {
   constructor(gl, instancedShader, batchShader, options = {}) {
+    this.quads = [];
     this.metrics = {
       instancedDrawCalls: 0,
       batchedDrawCalls: 0,
@@ -3613,20 +3614,10 @@ class HybridRenderer {
   }
   /**
    * Add a sprite for rendering
-   * Automatically determines which renderer to use
+   * Stores the sprite and routes to appropriate renderer during render()
    */
   addSprite(sprite) {
-    const instance = {
-      gridX: sprite.gridX ?? 0,
-      gridY: sprite.gridY ?? 0,
-      z: sprite.z ?? 0,
-      color: sprite.color ?? { r: 1, g: 1, b: 1, a: 1 },
-      texIndex: sprite.texIndex ?? 0,
-      uvOffset: sprite.uvRect ? { u: sprite.uvRect.uMin, v: sprite.uvRect.vMin } : { u: 0, v: 0 },
-      size: { width: sprite.width, height: sprite.height }
-    };
-    this.instancedRenderer.addInstance(instance);
-    this.batchRenderer.addQuad(sprite);
+    this.quads.push(sprite);
   }
   /**
    * Add a quad (alias for addSprite for API compatibility)
@@ -3636,11 +3627,12 @@ class HybridRenderer {
     this.addSprite(quad);
   }
   /**
-   * Clear all renderers
+   * Clear all renderers and stored quads
    */
   clear() {
     this.instancedRenderer.clear();
     this.batchRenderer.clear();
+    this.quads = [];
     this.metrics = {
       instancedDrawCalls: 0,
       batchedDrawCalls: 0,
@@ -3662,17 +3654,69 @@ class HybridRenderer {
     this.instancedRenderer.setDepthTestEnabled(enabled);
     this.batchRenderer.setDepthTestEnabled(enabled);
   }
+  /**
+   * Group quads by texture and size for efficient batching
+   */
+  groupQuads() {
+    const groups = /* @__PURE__ */ new Map();
+    for (const quad of this.quads) {
+      const key = `${quad.texIndex ?? 0}_${quad.width}_${quad.height}`;
+      if (!groups.has(key)) {
+        groups.set(key, {
+          texIndex: quad.texIndex ?? 0,
+          width: quad.width,
+          height: quad.height,
+          quads: []
+        });
+      }
+      groups.get(key).quads.push(quad);
+    }
+    return groups;
+  }
   /**
    * Render all sprites
    * Returns rendering metrics
    */
   render(camera) {
-    this.metrics.instancedDrawCalls = this.instancedRenderer.render(camera);
-    const instancedMetrics = this.instancedRenderer.getMetrics();
-    this.metrics.instancedInstances = instancedMetrics.instanceCount;
-    this.batchRenderer.render(camera);
-    this.metrics.batchedDrawCalls = 1;
-    this.metrics.batchedInstances = this.batchRenderer.getQuadCount();
+    this.metrics = {
+      instancedDrawCalls: 0,
+      batchedDrawCalls: 0,
+      instancedInstances: 0,
+      batchedInstances: 0
+    };
+    const groups = this.groupQuads();
+    for (const group of groups.values()) {
+      if (group.quads.length >= this.threshold) {
+        for (const quad of group.quads) {
+          const instance = {
+            gridX: quad.gridX ?? 0,
+            gridY: quad.gridY ?? 0,
+            z: quad.z ?? 0,
+            color: quad.color ?? { r: 1, g: 1, b: 1, a: 1 },
+            texIndex: quad.texIndex ?? 0,
+            uvOffset: quad.uvRect ? { u: quad.uvRect.uMin, v: quad.uvRect.vMin } : { u: 0, v: 0 },
+            size: { width: quad.width, height: quad.height }
+          };
+          this.instancedRenderer.addInstance(instance);
+        }
+        this.metrics.instancedInstances += group.quads.length;
+      } else {
+        for (const quad of group.quads) {
+          this.batchRenderer.addQuad(quad);
+        }
+        this.metrics.batchedInstances += group.quads.length;
+      }
+    }
+    if (this.metrics.instancedInstances > 0) {
+      this.metrics.instancedDrawCalls = this.instancedRenderer.render(camera);
+    }
+    if (this.metrics.batchedInstances > 0) {
+      this.batchRenderer.render(camera);
+      this.metrics.batchedDrawCalls = 1;
+    }
+    this.quads = [];
+    this.instancedRenderer.clear();
+    this.batchRenderer.clear();
     this.frameCount++;
     if (this.frameCount % 60 === 0) {
       this.adjustThreshold();
@@ -3687,10 +3731,10 @@ class HybridRenderer {
   }
   /**
    * Get total quad count (API compatibility with GPUBasedSpriteBatchRenderer)
-   * Returns total number of sprites across both renderers
+   * Returns actual number of quads waiting to be rendered
    */
   getQuadCount() {
-    return this.metrics.batchedInstances + this.metrics.instancedInstances;
+    return this.quads.length;
   }
   /**
    * Set instancing threshold manually

package/dist/node/src/rendering/hybrid-renderer.d.ts

@@ -42,6 +42,7 @@ export declare class HybridRenderer {
     private instancedRenderer;
     private batchRenderer;
     private threshold;
+    private quads;
     private metrics;
     private frameCount;
     private lastFpsCheck;
@@ -50,7 +51,7 @@ export declare class HybridRenderer {
     instancedShader: Shader, batchShader: Shader, options?: HybridRendererOptions);
     /**
      * Add a sprite for rendering
-     * Automatically determines which renderer to use
+     * Stores the sprite and routes to appropriate renderer during render()
      */
     addSprite(sprite: SpriteQuadInstance): void;
     /**
@@ -59,7 +60,7 @@ export declare class HybridRenderer {
      */
     addQuad(quad: SpriteQuadInstance): void;
     /**
-     * Clear all renderers
+     * Clear all renderers and stored quads
      */
     clear(): void;
     /**
@@ -70,6 +71,10 @@ export declare class HybridRenderer {
      * Set depth testing
      */
     setDepthTestEnabled(enabled: boolean): void;
+    /**
+     * Group quads by texture and size for efficient batching
+     */
+    private groupQuads;
     /**
      * Render all sprites
      * Returns rendering metrics
@@ -81,7 +86,7 @@ export declare class HybridRenderer {
     getMetrics(): RenderMetrics;
     /**
      * Get total quad count (API compatibility with GPUBasedSpriteBatchRenderer)
-     * Returns total number of sprites across both renderers
+     * Returns actual number of quads waiting to be rendered
      */
     getQuadCount(): number;
     /**

package/dist/node/src/rendering/hybrid-renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hybrid-renderer.d.ts","sourceRoot":"","sources":["../../../../src/rendering/hybrid-renderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAA+B,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAExF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2EAA2E;IAC3E,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,qCAAqC;IACrC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mCAAmC;IACnC,gBAAgB,EAAE,MAAM,CAAC;IACzB,oCAAoC;IACpC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kCAAkC;IAClC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,SAAS,CAAS;IAG1B,OAAO,CAAC,OAAO,CAKb;IAGF,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,kBAAkB,CAAgB;gBAGxC,EAAE,EAAE,GAAG,EAAE,yCAAyC;IAClD,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,qBAA0B;IAuBrC;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAsB3C;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI;IAIvC;;OAEG;IACH,KAAK,IAAI,IAAI;IAab;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI;IAKzC;;OAEG;IACH,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAK3C;;;OAGG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAuBrC;;OAEG;IACH,UAAU,IAAI,aAAa;IAI3B;;;OAGG;IACH,YAAY,IAAI,MAAM;IAItB;;OAEG;IACH,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAK/C;;OAEG;IACH,sBAAsB,IAAI,MAAM;IAIhC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAqBvB;;OAEG;IACH,OAAO,IAAI,IAAI;CAIhB"}
+{"version":3,"file":"hybrid-renderer.d.ts","sourceRoot":"","sources":["../../../../src/rendering/hybrid-renderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAA+B,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAExF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2EAA2E;IAC3E,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,qCAAqC;IACrC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mCAAmC;IACnC,gBAAgB,EAAE,MAAM,CAAC;IACzB,oCAAoC;IACpC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kCAAkC;IAClC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAYD;;;;;;GAMG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,KAAK,CAA4B;IAGzC,OAAO,CAAC,OAAO,CAKb;IAGF,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,kBAAkB,CAAgB;gBAGxC,EAAE,EAAE,GAAG,EAAE,yCAAyC;IAClD,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,qBAA0B;IAuBrC;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAI3C;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI;IAIvC;;OAEG;IACH,KAAK,IAAI,IAAI;IAcb;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI;IAKzC;;OAEG;IACH,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAK3C;;OAEG;IACH,OAAO,CAAC,UAAU;IAqBlB;;;OAGG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAmErC;;OAEG;IACH,UAAU,IAAI,aAAa;IAI3B;;;OAGG;IACH,YAAY,IAAI,MAAM;IAItB;;OAEG;IACH,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAK/C;;OAEG;IACH,sBAAsB,IAAI,MAAM;IAIhC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAqBvB;;OAEG;IACH,OAAO,IAAI,IAAI;CAIhB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bloody-engine",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "A WebGL-based 2.5D graphics engine for isometric rendering",
   "license": "MIT",
   "type": "module",