Flammable performance improvements

Author: starswaitforus

server/src/Core/Graph.php

@@ -3,9 +3,12 @@
 namespace cs\Core;
 
 use GraphPHP\Graph\DiGraph;
+use GraphPHP\Node\Node;
 
 final class Graph extends DiGraph
 {
+    /** @var array<string,string[]> */
+    private array $neighbors;
 
     public function getNodesCount(): int
     {
@@ -17,4 +20,23 @@ public function getEdgeCount(): int
         return count($this->edges);
     }
 
+    /** @return Node[] */
+    public function getGeneratedNeighbors(string $nodeId): array
+    {
+        $neighbors = [];
+        foreach ($this->neighbors[$nodeId] ?? [] as $nodeKey) {
+            $neighbors[] = $this->getNodeById($nodeKey) ?? throw new GameException("Node '{$nodeKey}' not found");
+        }
+
+        return $neighbors;
+    }
+
+    public function generateNeighbors(): void
+    {
+        $this->neighbors = [];
+        foreach ($this->edges as $edge) {
+            $this->neighbors[$edge->getSource()->getId()][] = $edge->getTarget()->getId();
+        }
+    }
+
 }

server/src/Core/PathFinder.php

@@ -187,6 +187,13 @@ public function buildNavigationMesh(Point $start, int $objectHeight): void
         }
     }
 
+    public function saveAndClear(): self
+    {
+        $this->visited = [];
+        $this->graph->generateNeighbors();
+        return $this;
+    }
+
     public function getGraph(): Graph
     {
         return $this->graph;

server/src/Core/World.php

@@ -514,12 +514,27 @@ public function checkFlameDamage(GrillEvent $fire, int $tickId): void
                 continue;
             }
 
+            $pp = $player->getReferenceToPosition();
+            $playerHeight = $player->getHeadHeight();
+            $playerRadius = $player->getBoundingRadius();
+            if (
+                $pp->y > $fire->boundaryMax->y
+                || $pp->y + $playerHeight < $fire->boundaryMin->y
+                || !Collision::circleWithRect(
+                    $pp->x, $pp->z, $playerRadius,
+                    $fire->boundaryMin->x, $fire->boundaryMax->x,
+                    $fire->boundaryMin->z, $fire->boundaryMax->z,
+                )
+            ) {
+                continue;
+            }
+
             foreach ($fire->flames as $flame) {
                 if (!Collision::pointWithCylinder(
                     $flame->highestPoint,
-                    $player->getReferenceToPosition(),
-                    $player->getBoundingRadius(),
-                    $player->getHeadHeight())
+                    $pp,
+                    $playerRadius,
+                    $playerHeight)
                 ) {
                     continue;
                 }
@@ -646,7 +661,7 @@ public function buildNavigationMesh(int $tileSize, int $objectHeight): PathFinde
             $pathFinder->buildNavigationMesh($point, $objectHeight);
         }
 
-        return $pathFinder;
+        return $pathFinder->saveAndClear();
     }
 
     public function checkXSideWallCollision(Point $bottomCenter, int $height, int $radius): ?Wall

server/src/Event/GrillEvent.php

@@ -30,6 +30,9 @@ final class GrillEvent extends Event implements ForOneRoundMax
     private readonly int $damageCoolDownTickCount;
     private readonly int $maxFlameCount;
 
+    public readonly Point $boundaryMin;
+    public readonly Point $boundaryMax;
+
     /** @var SplQueue<Node> $queue */
     private SplQueue $queue;
     /** @var array<string,bool> */
@@ -59,6 +62,8 @@ public function __construct(
         }
 
         $this->id = "grill-{$this->initiator->getId()}-{$this->world->getTickId()}";
+        $this->boundaryMin = $start->clone();
+        $this->boundaryMax = $start->clone();
         $this->queue = new SplQueue();
         $this->queue->enqueue($startNode);
         $this->igniteFlames();
@@ -100,6 +105,17 @@ public function process(int $tick): void
     private function igniteFlames(): void
     {
         foreach ($this->loadFlames() as $candidate) {
+            $this->boundaryMin->set(
+                min($this->boundaryMin->x, $candidate->x - $this->flameRadius),
+                min($this->boundaryMin->y, $candidate->y - 0),
+                min($this->boundaryMin->z, $candidate->z - $this->flameRadius),
+            );
+            $this->boundaryMax->set(
+                max($this->boundaryMax->x, $candidate->x + $this->flameRadius),
+                max($this->boundaryMax->y, $candidate->y + $this->flameHeight),
+                max($this->boundaryMax->z, $candidate->z + $this->flameRadius),
+            );
+
             $flame = new Flame($candidate, $this->flameRadius, $this->flameHeight);
             $this->flames[] = $flame;
             $this->lastFlameSpawnTickId = $this->world->getTickId();
@@ -119,16 +135,17 @@ private function loadFlames(): array
         $output = [];
         while (!$this->queue->isEmpty() && count($output) < min($this->spawnFlameCount, $loadCount)) {
             $current = $this->queue->dequeue();
-            if (array_key_exists($current->getId(), $this->visited)) {
+            $currentKey = $current->getId();
+            if (array_key_exists($currentKey, $this->visited)) {
                 continue;
             }
 
-            $this->visited[$current->getId()] = true;
+            $this->visited[$currentKey] = true;
             /** @var Point $point */
             $point = $current->getData();
             $output[] = $point;
 
-            foreach ($this->graph->getNeighbors($current) as $node) {
+            foreach ($this->graph->getGeneratedNeighbors($currentKey) as $node) {
                 $this->queue->enqueue($node);
             }
         }

test/og/World/NavigationMeshTest.php

@@ -61,6 +61,8 @@ public function testSimple(): void
         $startNode = $path->getGraph()->getNodeById($start->hash());
         $this->assertNotNull($startNode);
         $this->assertCount(3, $path->getGraph()->getNeighbors($startNode));
+        $path->getGraph()->generateNeighbors();
+        $this->assertCount(3, $path->getGraph()->getGeneratedNeighbors($startNode->getId()));
     }
 
     public function testBoundary(): void

www/assets/js/Game.js

@@ -284,6 +284,7 @@ export class Game {
             return;
         }
         if (item.slot === InventorySlot.SLOT_GRENADE_MOLOTOV || item.slot === InventorySlot.SLOT_GRENADE_HE) {
+            this.removeGrenade(throwableId)
             return;
         }