@woosh/meep-engine 2.86.6 → 2.87.0

package/build/meep.module.js

@@ -58329,25 +58329,20 @@ class TerrainTileManager {
 
         const tiles = this.tiles;
 
-        const self = this;
-
-        function ensureBuilt(x, y) {
-            return function (resolve) {
-                self.obtain(x, y).then(resolve);
-            }
-        }
-
         //populate tiles
-        for (let y = 0; y < gridSize.y; y++) {
+        const tile_resolution_y = gridSize.y;
+        const tile_resolution_x = gridSize.x;
 
-            const tY = y < gridSize.y - 1 ? time_size.y : (total_size.y - time_size.y * y);
+        for (let y = 0; y < tile_resolution_y; y++) {
 
-            for (let x = 0; x < gridSize.x; x++) {
+            const tY = y < tile_resolution_y - 1 ? time_size.y : (total_size.y - time_size.y * y);
 
-                const tX = x < gridSize.x - 1 ? time_size.x : (total_size.x - time_size.x * x);
+            for (let x = 0; x < tile_resolution_x; x++) {
+
+                const tX = x < tile_resolution_x - 1 ? time_size.x : (total_size.x - time_size.x * x);
 
                 const tile = new TerrainTile();
-                const index = y * gridSize.x + x;
+                const index = y * tile_resolution_x + x;
                 tiles[index] = tile;
 
                 this.assignTileMaterial(tile);
@@ -58362,9 +58357,6 @@ class TerrainTileManager {
                 tile.setInitialHeightBounds(this.heightRange.min, this.heightRange.max);
                 tile.computeBoundingBox();
 
-                //hook for building
-                tile.ensureBuilt = ensureBuilt(x, y);
-
                 tile.external_bvh.link(this.bvh, index);
             }
         }
@@ -71710,6 +71702,14 @@ class EntityManager {
      */
     fixedUpdateStepSize = 0.015;
 
+    /**
+     * How long can any given system run it's fixedUpdate, per simulation update
+     * This is value allows us to avoid cases where fixedUpdate takes longer that its time step and causes a runaway freeze
+     * In milliseconds
+     * @type {number}
+     */
+    fixedUpdatePerSystemExecutionTimeLimit = 15;
+
     /**
      *
      * @type {EntityComponentDataset}
@@ -71931,6 +71931,7 @@ class EntityManager {
         return null;
     }
 
+
     /**
      * Advance simulation forward by a specified amount of time
      * @param {number} timeDelta in seconds
@@ -71960,7 +71961,7 @@ class EntityManager {
             if (system.fixedUpdate !== noop) {
                 let accumulated_time = accumulatedTime.get(system) + timeDelta;
 
-
+                const t0 = performance.now();
                 while (accumulated_time >= fixed_step) {
 
                     try {
@@ -71969,6 +71970,10 @@ class EntityManager {
                     }
 
                     accumulated_time -= fixed_step;
+
+                    if (performance.now() - t0 > this.fixedUpdatePerSystemExecutionTimeLimit) {
+                        break;
+                    }
                 }
 
                 // record whatever remains
@@ -72046,9 +72051,9 @@ class EntityManager {
         }
 
         // Link EntityManager
-        if(system.entityManager === null){
+        if (system.entityManager === null) {
             system.entityManager = this;
-        }else if(system.entityManager !== this){
+        } else if (system.entityManager !== this) {
             throw new Error(`System is bound to another EntityManager`);
         }
 

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.86.6",
+  "version": "2.87.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/engine/ecs/EntityManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityManager.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/EntityManager.js"],"names":[],"mappings":";;;wBAkBU,MAAM;;;;;;iCAWN,MAAM;;;;;;;;;AAWhB;IAEI;;;OAGG;IACH,kBAFU,iCAAQ,CAEL;IAEb;;;OAGG;IACH,gCAFU,iCAAQ,CAES;IAE3B;;;OAGG;IACH,0BAFU,cAAc,EAAE,CAEL;IAErB;;OAEG;IACH;;;QAGI;;WAEG;qBADO,uCAAc;;MAI1B;IAEF;;;OAGG;IACH,OAFU,kBAAkB,CAEO;IAEnC;;;;OAIG;IACH,gDAA2C;IAE3C;;;;OAIG;IACH,qBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,gCAAe;IAEf;;;;OAIG;IACH,uCAAsC;IAEtC;;;OAGG;IACH,6BA8EC;IAED,sBAcC;IAED;;;OAGG;IACH,uBAFa,OAAO,CAuBnB;IAED;;;;;OAKG;IACH,qDAsBC;IAED;;;;OAIG;IACH,qCAFa,OAAO,CAInB;IAED;;;;OAIG;IACH,6CAcC;IAED;;;;;OAKG;IACH,wCAHW,MAAM,GACJ,IAAI,aAAS,CAezB;IAED;;;OAGG;IACH,oBAFW,MAAM,QA6DhB;IAED;;;;;OAKG;IACH,iEA0EC;IAED;;;;OAIG;IACH,uDAFa,QAAQ,OAAO,CAAC,CAyC5B;IAED;;;;;OAKG;IACH,mBA6BC;IAED;;;;;OAKG;IACH,oBAwCC;IAED;;;;OAIG;IACH,gEAwEC;IAED;;;;OAIG;IACH,mCAFa,wCAAgB,CA0B5B;IAED;;;;;OAKG;IACH,8DAFa,wCAAgB,CAsB5B;IAED;;;;OAIG;IACH,iEAkEC;CACJ;uBAtxBsD,aAAa;+BADrC,qBAAqB;mBALjC,oCAAoC"}
+{"version":3,"file":"EntityManager.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/EntityManager.js"],"names":[],"mappings":";;;wBAkBU,MAAM;;;;;;iCAWN,MAAM;;;;;;;;;AAWhB;IAEI;;;OAGG;IACH,kBAFU,iCAAQ,CAEL;IAEb;;;OAGG;IACH,gCAFU,iCAAQ,CAES;IAE3B;;;OAGG;IACH,0BAFU,cAAc,EAAE,CAEL;IAErB;;OAEG;IACH;;;QAGI;;WAEG;qBADO,uCAAc;;MAI1B;IAEF;;;OAGG;IACH,OAFU,kBAAkB,CAEO;IAEnC;;;;OAIG;IACH,gDAA2C;IAE3C;;;;OAIG;IACH,qBAFU,MAAM,CAEY;IAE5B;;;;;OAKG;IACH,wCAFU,MAAM,CAE4B;IAE5C;;;OAGG;IACH,gCAAe;IAEf;;;;OAIG;IACH,uCAAsC;IAEtC;;;OAGG;IACH,6BA8EC;IAED,sBAcC;IAED;;;OAGG;IACH,uBAFa,OAAO,CAuBnB;IAED;;;;;OAKG;IACH,qDAsBC;IAED;;;;OAIG;IACH,qCAFa,OAAO,CAInB;IAED;;;;OAIG;IACH,6CAcC;IAED;;;;;OAKG;IACH,wCAHW,MAAM,GACJ,IAAI,aAAS,CAezB;IAGD;;;OAGG;IACH,oBAFW,MAAM,QAkEhB;IAED;;;;;OAKG;IACH,iEA0EC;IAED;;;;OAIG;IACH,uDAFa,QAAQ,OAAO,CAAC,CAyC5B;IAED;;;;;OAKG;IACH,mBA6BC;IAED;;;;;OAKG;IACH,oBAwCC;IAED;;;;OAIG;IACH,gEAwEC;IAED;;;;OAIG;IACH,mCAFa,wCAAgB,CA0B5B;IAED;;;;;OAKG;IACH,8DAFa,wCAAgB,CAsB5B;IAED;;;;OAIG;IACH,iEAkEC;CACJ;uBApyBsD,aAAa;+BADrC,qBAAqB;mBALjC,oCAAoC"}

package/src/engine/ecs/EntityManager.js

@@ -91,6 +91,14 @@ export class EntityManager {
      */
     fixedUpdateStepSize = 0.015;
 
+    /**
+     * How long can any given system run it's fixedUpdate, per simulation update
+     * This is value allows us to avoid cases where fixedUpdate takes longer that its time step and causes a runaway freeze
+     * In milliseconds
+     * @type {number}
+     */
+    fixedUpdatePerSystemExecutionTimeLimit = 15;
+
     /**
      *
      * @type {EntityComponentDataset}
@@ -312,6 +320,7 @@ export class EntityManager {
         return null;
     }
 
+
     /**
      * Advance simulation forward by a specified amount of time
      * @param {number} timeDelta in seconds
@@ -347,7 +356,7 @@ export class EntityManager {
             if (system.fixedUpdate !== noop) {
                 let accumulated_time = accumulatedTime.get(system) + timeDelta;
 
-
+                const t0 = performance.now();
                 while (accumulated_time >= fixed_step) {
 
                     try {
@@ -357,6 +366,11 @@ export class EntityManager {
                     }
 
                     accumulated_time -= fixed_step;
+
+                    if (performance.now() - t0 > this.fixedUpdatePerSystemExecutionTimeLimit) {
+                        console.warn(`.fixedUpdate of system '${computeSystemName(system)}' is falling behind current clock due to slow execution. Retardation is done to avoid severe performance impact.`);
+                        break;
+                    }
                 }
 
                 // record whatever remains
@@ -438,9 +452,9 @@ export class EntityManager {
         }
 
         // Link EntityManager
-        if(system.entityManager === null){
+        if (system.entityManager === null) {
             system.entityManager = this;
-        }else if(system.entityManager !== this){
+        } else if (system.entityManager !== this) {
             throw new Error(`System is bound to another EntityManager`);
         }
 

package/src/engine/ecs/terrain/tiles/TerrainTileManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerrainTileManager.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/tiles/TerrainTileManager.js"],"names":[],"mappings":";AA+BA;IA6DI;;;;;OAKG;IACH,wCAJW,OAAO,EA8BjB;IA5FD;;;OAGG;IACH,OAFU,WAAW,EAAE,CAEZ;IAEX;;;MAGE;IAEF;;;OAGG;IACH,UAFU,OAAO,CAEc;IAE/B;;;OAGG;IACH,WAFU,OAAO,CAEa;IAC9B;;;OAGG;IACH,YAFU,eAAe,CAEW;IAEpC;;;OAGG;IACH,OAFU,OAAO,CAES;IAG1B;;;;OAIG;IACH,oBAAmC;IAEnC;;;OAGG;IACH,cAFU,GAAG,CAEG;IAEhB;;;OAGG;IACH,aAFU,eAAe,CAEe;IAExC;;;OAGG;IACH,yBAFU,OAAO,CAEe;IAqB5B,6BAA2C;IAG3C;;;OAGG;IACH,yBAA8B;IAQlC,iCAWC;IAED,8BAEC;IAED;;;;OAIG;IACH,2BAHW,MAAM,cACN,MAAM,QA8BhB;IAED,mBAIC;IAED;;;OAGG;IACH,yBAFW,WAAW,QAerB;IAED;;;;OAIG;IACH,6CASC;IAED,qBAmBC;IAED;;OAEG;IACH,gBAIC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QAuBhB;IAGD;;;;;;;OAOG;IACH,oCANW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,WAAW,EAAE,CAgCzB;IAED,wBAqDC;IAED;;;;;OAKG;IACH,oBAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;OAKG;IACH,UAJW,MAAM,KACN,MAAM,GACJ,WAAW,GAAC,SAAS,CAiBjC;IAED;;;;;OAKG;IACH,wBAJW,MAAM,KACN,MAAM,GACJ,WAAW,CAavB;IAED;;;;;OAKG;IACH,4BAJW,MAAM,KACN,MAAM,GACL,WAAW,GAAC,SAAS,CAahC;IAED;;;;;OAKG;IACH,+BAJW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CAYhC;IAED;;;;;;OAMG;IACH,UALW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CA4BhC;IAED;;;OAGG;IACH,cAFW,WAAW,QAcrB;IAED,gBASC;IAED;;;;;;OAMG;IACH,cAJW,MAAM,KACN,MAAM,QACN,WAAW,QAsCrB;IAED;;;;;;;;;;OAUG;IACH,yBATW,aAAa,WACb,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,GACJ,OAAO,CAuDnB;IAED;;;;;;OAMG;IACH,kCALW,aAAa,KACb,MAAM,KACN,MAAM,GACL,OAAO,CAOlB;IAED;;;;;;OAMG;IACH,SALW,MAAM,KACN,MAAM,6CA6DhB;CACJ;wBA/rBuB,kBAAkB;mBAVvB,0CAA0C;oBAGzC,kCAAkC;4BAG1B,2CAA2C;oBAVnD,mCAAmC;gCAQvB,mDAAmD;0BAGzD,yCAAyC;8BALrC,2CAA2C"}
+{"version":3,"file":"TerrainTileManager.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/tiles/TerrainTileManager.js"],"names":[],"mappings":";AA+BA;IA6DI;;;;;OAKG;IACH,wCAJW,OAAO,EA8BjB;IA5FD;;;OAGG;IACH,OAFU,WAAW,EAAE,CAEZ;IAEX;;;MAGE;IAEF;;;OAGG;IACH,UAFU,OAAO,CAEc;IAE/B;;;OAGG;IACH,WAFU,OAAO,CAEa;IAC9B;;;OAGG;IACH,YAFU,eAAe,CAEW;IAEpC;;;OAGG;IACH,OAFU,OAAO,CAES;IAG1B;;;;OAIG;IACH,oBAAmC;IAEnC;;;OAGG;IACH,cAFU,GAAG,CAEG;IAEhB;;;OAGG;IACH,aAFU,eAAe,CAEe;IAExC;;;OAGG;IACH,yBAFU,OAAO,CAEe;IAqB5B,6BAA2C;IAG3C;;;OAGG;IACH,yBAA8B;IAQlC,iCAWC;IAED,8BAEC;IAED;;;;OAIG;IACH,2BAHW,MAAM,cACN,MAAM,QA8BhB;IAED,mBAIC;IAED;;;OAGG;IACH,yBAFW,WAAW,QAerB;IAED;;;;OAIG;IACH,6CASC;IAED,qBAmBC;IAED;;OAEG;IACH,gBAIC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QAuBhB;IAGD;;;;;;;OAOG;IACH,oCANW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,WAAW,EAAE,CAgCzB;IAED,wBA6CC;IAED;;;;;OAKG;IACH,oBAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;OAKG;IACH,UAJW,MAAM,KACN,MAAM,GACJ,WAAW,GAAC,SAAS,CAiBjC;IAED;;;;;OAKG;IACH,wBAJW,MAAM,KACN,MAAM,GACJ,WAAW,CAavB;IAED;;;;;OAKG;IACH,4BAJW,MAAM,KACN,MAAM,GACL,WAAW,GAAC,SAAS,CAahC;IAED;;;;;OAKG;IACH,+BAJW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CAYhC;IAED;;;;;;OAMG;IACH,UALW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CA4BhC;IAED;;;OAGG;IACH,cAFW,WAAW,QAcrB;IAED,gBASC;IAED;;;;;;OAMG;IACH,cAJW,MAAM,KACN,MAAM,QACN,WAAW,QAsCrB;IAED;;;;;;;;;;OAUG;IACH,yBATW,aAAa,WACb,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,GACJ,OAAO,CAuDnB;IAED;;;;;;OAMG;IACH,kCALW,aAAa,KACb,MAAM,KACN,MAAM,GACL,OAAO,CAOlB;IAED;;;;;;OAMG;IACH,SALW,MAAM,KACN,MAAM,6CA6DhB;CACJ;wBAvrBuB,kBAAkB;mBAVvB,0CAA0C;oBAGzC,kCAAkC;4BAG1B,2CAA2C;oBAVnD,mCAAmC;gCAQvB,mDAAmD;0BAGzD,yCAAyC;8BALrC,2CAA2C"}

package/src/engine/ecs/terrain/tiles/TerrainTileManager.js

@@ -331,25 +331,20 @@ class TerrainTileManager {
 
         const tiles = this.tiles;
 
-        const self = this;
-
-        function ensureBuilt(x, y) {
-            return function (resolve) {
-                self.obtain(x, y).then(resolve);
-            }
-        }
-
         //populate tiles
-        for (let y = 0; y < gridSize.y; y++) {
+        const tile_resolution_y = gridSize.y;
+        const tile_resolution_x = gridSize.x;
+
+        for (let y = 0; y < tile_resolution_y; y++) {
 
-            const tY = y < gridSize.y - 1 ? time_size.y : (total_size.y - time_size.y * y);
+            const tY = y < tile_resolution_y - 1 ? time_size.y : (total_size.y - time_size.y * y);
 
-            for (let x = 0; x < gridSize.x; x++) {
+            for (let x = 0; x < tile_resolution_x; x++) {
 
-                const tX = x < gridSize.x - 1 ? time_size.x : (total_size.x - time_size.x * x);
+                const tX = x < tile_resolution_x - 1 ? time_size.x : (total_size.x - time_size.x * x);
 
                 const tile = new TerrainTile();
-                const index = y * gridSize.x + x;
+                const index = y * tile_resolution_x + x;
                 tiles[index] = tile;
 
                 this.assignTileMaterial(tile);
@@ -364,9 +359,6 @@ class TerrainTileManager {
                 tile.setInitialHeightBounds(this.heightRange.min, this.heightRange.max);
                 tile.computeBoundingBox();
 
-                //hook for building
-                tile.ensureBuilt = ensureBuilt(x, y);
-
                 tile.external_bvh.link(this.bvh, index);
             }
         }

package/src/engine/graphics/texture/sampler/filter/sampler2d_blur_gaussian.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampler2d_blur_gaussian.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/texture/sampler/filter/sampler2d_blur_gaussian.js"],"names":[],"mappings":"AA+BA;;;;;;GAMG;AACH,gDALW,SAAS,SACT,SAAS,QACT,MAAM,YACN,MAAM,QAkFhB;0BAnHyB,iBAAiB"}
+{"version":3,"file":"sampler2d_blur_gaussian.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/texture/sampler/filter/sampler2d_blur_gaussian.js"],"names":[],"mappings":"AAiCA;;;;;;GAMG;AACH,gDALW,SAAS,SACT,SAAS,QACT,MAAM,YACN,MAAM,QAqFhB;0BAxHyB,iBAAiB"}

package/src/engine/graphics/texture/sampler/filter/sampler2d_blur_gaussian.js

@@ -9,14 +9,16 @@ let temp_data = new Float64Array(1);
 /**
  *
  * @param {number} sample_count
+ * @param {number} sigma
  * @param {Float32Array} kernel
  */
-function build_kernel(sample_count, kernel) {
-    const sigma = 10;
+function build_kernel(sample_count, sigma, kernel) {
+
+    const half_width = (sample_count - 1) * 0.5;
 
     let kernel_power_sum = 0;
     for (let i = 0; i < sample_count; i++) {
-        const local = i - sample_count * 0.5;
+        const local = i - half_width;
 
         const power = gaussian(sigma, local);
         kernel[i] = power;
@@ -38,11 +40,12 @@ function build_kernel(sample_count, kernel) {
  */
 export function sampler2d_blur_gaussian(output, input, size, quality = 1) {
 
+    const sigma = size * 3;
     const sample_count = max2(3, makeNextOdd(Math.round(size * quality)));
 
     const kernel = new Float32Array(sample_count);
 
-    build_kernel(sample_count, kernel);
+    build_kernel(sample_count, sigma, kernel);
 
     const width = input.width;
     const height = input.height;
@@ -57,8 +60,8 @@ export function sampler2d_blur_gaussian(output, input, size, quality = 1) {
     let target = new Sampler2D(temp_data, channel_count, width, height);
 
     const half_samples = (sample_count - 1) * 0.5;
-    const local_u_scale = width / (sample_count - 1);
-    const local_v_scale = height / (sample_count - 1);
+    const local_u_scale = size / (sample_count - 1);
+    const local_v_scale = size / (sample_count - 1);
 
     const sample = new Float64Array(channel_count);
 
@@ -90,6 +93,8 @@ export function sampler2d_blur_gaussian(output, input, size, quality = 1) {
     source = target;
     target = output;
 
+    // typed_array_copy(source.data, target.data);
+
     // vertical pass
     for (let y = 0; y < height; y++) {
         for (let x = 0; x < width; x++) {
@@ -99,7 +104,7 @@ export function sampler2d_blur_gaussian(output, input, size, quality = 1) {
 
                 const local_y = iy - half_samples;
 
-                const sample_y = x + local_y * local_v_scale;
+                const sample_y = y + local_y * local_v_scale;
 
                 const power = kernel[iy];
 

package/src/generation/filtering/numeric/complex/CellFilterGaussianBlur.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellFilterGaussianBlur.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/filtering/numeric/complex/CellFilterGaussianBlur.js"],"names":[],"mappings":"AAkDA;IAiFI;;;;;;;OAOG;IACH,oBANW,UAAU,KACV,MAAM,KACN,MAAM,YACN,MAAM,GACJ,sBAAsB,CAclC;IAjGG,kBAAkB;IAClB,kBAAkB;IAElB,gBAAiB;IACjB,gBAAiB;IAEjB;;;OAGG;IACH,QAFU,UAAU,CAEF;IAElB,eAAe;IACf,eAAe;IAEf;;;;OAIG;IACH,iBAAkB;IAElB;;;;OAIG;IACH,6BAA6B;IAE7B;;;;OAIG;IACH,iCAAiC;IAEjC;;;;OAIG;IACH,wBAAwB;IAExB;;;;OAIG;IACH,wBAAwB;IAG5B,uCAuBC;IAyBD,0DA6CC;CACJ;2BAnM0B,qBAAqB"}
+{"version":3,"file":"CellFilterGaussianBlur.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/filtering/numeric/complex/CellFilterGaussianBlur.js"],"names":[],"mappings":"AA6DA;IA8EI;;;;;;;OAOG;IACH,oBANW,UAAU,KACV,MAAM,KACN,MAAM,YACN,MAAM,GACJ,sBAAsB,CAkBlC;IAlGG,kBAAkB;IAClB,kBAAkB;IAElB,gBAAiB;IACjB,gBAAiB;IAEjB;;;OAGG;IACH,QAFU,UAAU,CAEF;IAElB,eAAe;IACf,eAAe;IAEf;;;;OAIG;IACH,iBAAkB;IAElB;;;;OAIG;IACH,6BAA6B;IAE7B;;;;OAIG;IACH,iCAAiC;IAEjC;;;;OAIG;IACH,wBAAwB;IAExB;;;;OAIG;IACH,wBAAwB;IAG5B,uCAoBC;IA6BD,0DA8CC;CACJ;2BAhN0B,qBAAqB"}

package/src/generation/filtering/numeric/complex/CellFilterGaussianBlur.js

@@ -13,12 +13,16 @@ import { CellFilter } from "../../CellFilter.js";
  * @param {number} sigma_y
  * @return {number}
  */
-function buildKernel(result, samplesX, samplesY, sigma_x, sigma_y) {
+function buildKernel(
+    result,
+    samplesX, samplesY,
+    sigma_x, sigma_y
+) {
     assert.isNonNegativeInteger(samplesX, 'samplesX');
     assert.isNonNegativeInteger(samplesY, 'samplesY');
 
-    const half_samples_x = samplesX * 0.5;
-    const half_samples_y = samplesY * 0.5;
+    const half_samples_x = (samplesX - 1) * 0.5;
+    const half_samples_y = (samplesY - 1) * 0.5;
 
     let powerTotal = 0;
     let ix, iy;
@@ -45,7 +49,14 @@ function buildKernel(result, samplesX, samplesY, sigma_x, sigma_y) {
         }
     }
 
-    return powerTotal;
+    const inv_total_power = 1 / powerTotal;
+
+    // normalize kernel
+    for (let i = 0; i < samplesX * samplesY; i++) {
+        result[i] *= inv_total_power;
+    }
+
+    return 1;
 }
 
 export class CellFilterGaussianBlur extends CellFilter {
@@ -117,9 +128,6 @@ export class CellFilterGaussianBlur extends CellFilter {
         // initialize kernel
         this.__kernel_total_power = buildKernel(this.__kernel, this.samples_x, this.samples_y, this.sigma_x, this.sigma_y);
 
-        // store inverse, to be able to use multiply instead of division in execution
-        this.__inv_kernel_total_power = 1 / this.__kernel_total_power;
-
 
         // precompute scaling for the sampling(execute) stage
         this.__local_u_scale = this.size_x / (this.samples_x - 1);
@@ -148,6 +156,10 @@ export class CellFilterGaussianBlur extends CellFilter {
         r.size_x = x;
         r.size_y = y;
 
+        // sigma should scale with radius
+        r.sigma_x = x * 3;
+        r.sigma_y = y * 3;
+
         return r;
     }
 
@@ -195,6 +207,7 @@ export class CellFilterGaussianBlur extends CellFilter {
             }
         }
 
-        return sum * this.__inv_kernel_total_power;
+        // note that the kernel is already normalized, so we don't need to do anything special here
+        return sum;
     }
 }