diff options
Diffstat (limited to 'src/systems')
| -rw-r--r-- | src/systems/gridSystem.js | 33 | ||||
| -rw-r--r-- | src/systems/physics.js | 3 |
2 files changed, 24 insertions, 12 deletions
diff --git a/src/systems/gridSystem.js b/src/systems/gridSystem.js index c80fe1a..bc67bbb 100644 --- a/src/systems/gridSystem.js +++ b/src/systems/gridSystem.js @@ -52,18 +52,31 @@ game.system.GridSystem = ({ xDim, yDim, canvasWidth, canvasHeight }) => { }); // TODO: Loop in momentum direction until we find an entity that does not have "push" component - const proposed = {x: entity.components.gridPosition.x + momentumVector.dx, y: entity.components.gridPosition.y + momentumVector.dy} + const proposed = { + x: entity.components.gridPosition.x + momentumVector.dx, + y: entity.components.gridPosition.y + momentumVector.dy + }; - const entitiesInCell = entitiesGrid[proposed.x][proposed.y]; - - for (let id in entitiesInCell) { - if (entitiesInCell[id].hasComponent("pushable")) { - entitiesInCell[id].addComponent(game.components.Momentum({...momentumVector})); - } - } + const proposedCopy = {...proposed}; + let found = false; + do { + found = false; + const entitiesInCell = entitiesGrid[proposedCopy.y][proposedCopy.x]; + entitiesInCell.forEach((entity) => { + if (entity.hasComponent("pushable")) { + entity.addComponent(game.components.Momentum({...momentumVector})); + found = true; + } + }); + proposedCopy.x += momentumVector.dx; + proposedCopy.y += momentumVector.dy; + const proposedCopyInBounds = clamp(proposedCopy, xDim, yDim); + if (!equivalence(proposedCopyInBounds, proposedCopy)) { + found = false; + } + } while (found); - entity.components.gridPosition.x = entity.components.gridPosition.x + momentumVector.dx; - entity.components.gridPosition.y = entity.components.gridPosition.y + momentumVector.dy; + entity.components.gridPosition = {...entity.components.gridPosition, ...proposed}; entity.components.position = { ...entity.components.position, diff --git a/src/systems/physics.js b/src/systems/physics.js index 0da8b9d..a49edca 100644 --- a/src/systems/physics.js +++ b/src/systems/physics.js @@ -6,8 +6,7 @@ game.system.Physics = () => { const {dx, dy} = entity.components.momentum; entity.components.position.x += dx * elapsedTime; entity.components.position.y += dy * elapsedTime; - entity.components.position.x = Math.max(0, Math.min(game.canvas.width - entity.components.appearance.width, entity.components.position.x)); - entity.components.position.y = Math.max(0, Math.min(game.canvas.height - entity.components.appearance.height, entity.components.position.y)); + entity.components.position = clamp(entity.components.position, game.canvas.width - entity.components.appearance.width, game.canvas.height - entity.components.appearance.height); } } } |