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 +15 -3
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e93c7fe6f1 - Show all commits

8
lib/index.d.ts vendored
View File

@ -600,9 +600,13 @@ export class Sound {
stop(): void; stop(): void;
} }
interface NumericalEntity {pos: Coordinates, w: number, h: number} interface NumericalEntityBase {pos: Coordinates}
interface NumericalSprite {w: number, h: number}
interface NumericalTileSprite {tileW: number, tileH: number}
interface NumericalEntityWithHitbox extends NumericalEntity {hitBox: NumericalEntity} type NumericalEntity = NumericalSprite | NumericalTileSprite
type NumericalEntityWithHitbox = {hitBox: NumericalEntity} & NumericalEntity
export namespace deadInTracks { export namespace deadInTracks {
/** /**

10
lib/utilities/entity.js
View File

@ -31,7 +31,15 @@ function bounds(entity) {
} }
function center(entity) { function center(entity) {
const { pos, w, h } = entity; let pos, w, h;
// 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);
}
return { return {
x: pos.x + w / 2, x: pos.x + w / 2,
y: pos.y + h / 2 y: pos.y + h / 2