#17 - filter in SH.getAroundCellsItems() by radius

TheLucifurry · Mar 6, 2021 · 6fa88db · 6fa88db
1 parent e1aa0f8
commit 6fa88db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/algorithm.ts b/src/algorithm.ts
@@ -140,7 +140,7 @@ function adjustSprings(store: TStore, updatedPids: number[], dt: number) {
   })
 }
 function doubleDensityRelaxation(store: TStore, i: TLiquidParticle, dt: number) {
-  const kNear = store.radius / 4 // stiffness near (вроде, влияет на текучесть)
+  const kNear = store.radius / 3 // stiffness near (вроде, влияет на текучесть)
 
   let p = 0;
   let pNear = 0;

diff --git a/src/helpers/cycles.ts b/src/helpers/cycles.ts
@@ -24,7 +24,7 @@ export function foreachIds(particles: TLiquidParticle[], pids: number[], callbac
 export function getNeighbors(store: TStore, part: TLiquidParticle) {
   // const Math.sqrt((x1-x0)*(x1-x0) + (y1-y0)*(y1-y0)) < r
   // const x = part[PARTICLE_PROPS.X], y = part[PARTICLE_PROPS.Y];
-  return store.spatialHash.getAroundCellsItems(part[PARTICLE_PROPS.X], part[PARTICLE_PROPS.Y])
+  return store.spatialHash.getAroundCellsItems(part[PARTICLE_PROPS.X], part[PARTICLE_PROPS.Y], store.particles)
     // .filter(neighborPid=>{
     //   const nPart = store.particles[neighborPid];
     //   const nx = nPart[PARTICLE_PROPS.X], ny = nPart[PARTICLE_PROPS.Y];

diff --git a/src/spatialHash.ts b/src/spatialHash.ts
@@ -91,7 +91,8 @@ export default class SpatialHash{
     this._delete(item, cellid);
   }
 
-  getAroundCellsItems(x: number, y: number){
+  // Special
+  getAroundCellsItems(x: number, y: number, particles: TLiquidParticle[]){
     const centerCellX = trunc(x, this.cellSize);
     const centerCellY = trunc(y, this.cellSize);
     const selfItemId = getIndex(centerCellX, centerCellY);
@@ -102,10 +103,20 @@ export default class SpatialHash{
       const x = centerCellX + aroundCellRelatives[i], y = centerCellY + aroundCellRelatives[i+1];
       res.push(...(this.hash[getIndex(x, y)] || []))
     }
-    return res;
-  }
 
-  // Special
+    // Filter only parts in radius
+    const filteredRes: TSHItem[] = [];
+    for (let i = 0; i < res.length; i++) {
+      const pid = res[i];
+      const part = particles[pid];
+      const partX: number = trunc(part[PARTICLE_PROPS.X], this.cellSize), partY: number = trunc(part[PARTICLE_PROPS.Y], this.cellSize);
+      if((partX - centerCellX) ** 2 + (partY - centerCellY) ** 2 <= 1){
+        filteredRes.push(pid);
+      }
+    }
+
+    return filteredRes;
+  }
   fill(particles: TLiquidParticle[]){
     particles.forEach((part, pid)=>{
       const x = part[PARTICLE_PROPS.X], y = part[PARTICLE_PROPS.Y];