arne/asdf-games
2
1
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch entity-center-fix #4

Merged
arne merged 2 commits from entity-center-fix into master 2020-04-29 13:46:29 +02:00
Conversation 0 Commits 2 Files Changed 2 +11 -2
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0c042160ab - Show all commits

2
lib/index.d.ts vendored
View File

@ -650,7 +650,7 @@ export namespace entity {
* @param container The container. * @param container The container.
* @param hitCallback The callback that is executed when an entity hits something in the container. * @param hitCallback The callback that is executed when an entity hits something in the container.
*/ */
export function hits(entity: NumericalEntityWithHitbox | NumericalEntity, container: Container<NumericalEntityWithHitbox | NumericalEntity>, hitCallback: (e2: NumericalEntityWithHitbox | NumericalEntity) => any): void; export function hits<T extends NumericalEntityWithHitbox | NumericalEntity>(entity: NumericalEntityWithHitbox | NumericalEntity, container: Container<T>, hitCallback: (e2: T) => any): void;
/** /**
* This functions calculates whether two entities hit each other. * This functions calculates whether two entities hit each other.

11
lib/utilities/entity.js
View File

@ -20,7 +20,16 @@ function angle(a, b) {
} }
function bounds(entity) { function bounds(entity) {
const { w, h, pos, hitBox } = entity; let pos, w, h, hitBox;
// Object.prototype.hasOwnProperty.call is needed because of eslint
if (Object.prototype.hasOwnProperty.call(entity, "tileW") && Object.prototype.hasOwnProperty.call(entity, "tileH")) {
({pos, w, h} = {pos: entity.pos, w: entity.tileW, h: entity.tileH});
} else {
({pos, w, h} = entity);
}
if (entity.hitBox) hitBox = entity.hitBox;
const hit = hitBox || { x: 0, y: 0, w, h }; const hit = hitBox || { x: 0, y: 0, w, h };
return { return {
x: hit.x + pos.x, x: hit.x + pos.x,