upd

Smoren · Mar 28, 2024 · f6ae63b · f6ae63b
1 parent 1c394cb
commit f6ae63b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/src/components/config-editor/components/world-config-section.vue b/src/components/config-editor/components/world-config-section.vue
@@ -109,6 +109,13 @@ const refill = () => {
         />
         <input type="number" v-model="worldConfig.BOUNCE_FORCE_MULTIPLIER" step="0.1" />
       </div>
+      <div>
+        <input-header
+          name="Bounds Force Multiplier"
+          tooltip="Parameter by which the force of repulsion from the boundaries of space is multiplied."
+        />
+        <input type="number" v-model="worldConfig.BOUNDS_FORCE_MULTIPLIER" step="0.01" />
+      </div>
       <div>
         <input-header
           name="Inertial Multiplier"

diff --git a/src/lib/config/world.ts b/src/lib/config/world.ts
@@ -11,6 +11,7 @@ export function createBaseWorldConfig(): WorldConfig {
     GRAVITY_FORCE_MULTIPLIER: 1,
     LINK_FORCE_MULTIPLIER: 0.015,
     BOUNCE_FORCE_MULTIPLIER: 2,
+    BOUNDS_FORCE_MULTIPLIER: 0.01,
     INERTIAL_MULTIPLIER: 0.96,
     SPEED: 25,
     PLAYBACK_SPEED: 1,

diff --git a/src/lib/interaction.ts b/src/lib/interaction.ts
@@ -126,9 +126,13 @@ export class InteractionManager implements InteractionManagerInterface {
   private handleBounds(atom: AtomInterface): void {
     for (let i = 0; i < atom.position.length; ++i) {
       if (atom.position[i] < this.WORLD_CONFIG.MIN_POSITION[i]) {
-        atom.speed[i] += this.physicModel.getBoundsForce(this.WORLD_CONFIG.MIN_POSITION[i] - atom.position[i]);
+        atom.speed[i] += this.normalizeForce(
+          this.physicModel.getBoundsForce(this.WORLD_CONFIG.MIN_POSITION[i] - atom.position[i])
+        );
       } else if (atom.position[i] > this.WORLD_CONFIG.MAX_POSITION[i]) {
-        atom.speed[i] -= this.physicModel.getBoundsForce(atom.position[i] - this.WORLD_CONFIG.MAX_POSITION[i]);
+        atom.speed[i] -= this.normalizeForce(
+          this.physicModel.getBoundsForce(atom.position[i] - this.WORLD_CONFIG.MAX_POSITION[i])
+        );
       }
     }
   }

diff --git a/src/lib/physics/v1.ts b/src/lib/physics/v1.ts
@@ -29,7 +29,7 @@ export class PhysicModelV1 implements PhysicModelInterface {
     return this.WORLD_CONFIG.LINK_FORCE_MULTIPLIER;
   }
 
-  getBoundsForce(): number {
-    return 1;
+  getBoundsForce(dist: number): number {
+    return this.WORLD_CONFIG.BOUNDS_FORCE_MULTIPLIER * dist;
   }
 }
diff --git a/src/lib/physics/v2.ts b/src/lib/physics/v2.ts
@@ -41,7 +41,7 @@ export class PhysicModelV2 implements PhysicModelInterface {
     return this.WORLD_CONFIG.LINK_FORCE_MULTIPLIER;
   }
 
-  getBoundsForce(): number {
-    return 1;
+  getBoundsForce(dist: number): number {
+    return this.WORLD_CONFIG.BOUNDS_FORCE_MULTIPLIER * dist;
   }
 }
diff --git a/src/lib/types/config.ts b/src/lib/types/config.ts
@@ -27,6 +27,7 @@ export type WorldConfig = {
   GRAVITY_FORCE_MULTIPLIER: number;
   LINK_FORCE_MULTIPLIER: number;
   BOUNCE_FORCE_MULTIPLIER: number;
+  BOUNDS_FORCE_MULTIPLIER: number;
   INERTIAL_MULTIPLIER: number;
   PLAYBACK_SPEED: number;
   SIMPLIFIED_VIEW_MODE: boolean;