Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/improve bullet linking #33

Merged
merged 8 commits into from
Mar 17, 2022
Merged

Feature/improve bullet linking #33

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
56d0e42
draw link between bullet and owner
Cazka Mar 16, 2022
ef86029
export some more useful stuff
Cazka Mar 16, 2022
00a3d39
add logic to link bullet to parent
Cazka Mar 16, 2022
7711022
should improve bullet links
Cazka Mar 17, 2022
226d5e8
removing initialize method
Cazka Mar 17, 2022
d3b253a
infinity looks cooler
Cazka Mar 17, 2022
03858d9
Merge branch 'main' into feature/improve-bullet-linking
Cazka Mar 17, 2022
c435e62
remove empty lines
Cazka Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions src/entity_manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,7 @@ class EntityManager {
this.#entities = this.#entitiesUpdated;
this.#entitiesUpdated = [];
});
}

get entities(): Entity[] {
return this.#entities;
}

/**
* Calling this method is mandatory to start recording entities.
*/
initialize(): void {
this.#triangleHook();

this.#squareHook();
Expand All @@ -40,6 +31,10 @@ class EntityManager {
this.#playerHook();
}

get entities(): Entity[] {
return this.#entities;
}

/**
*
* @returns The own player entity
Expand All @@ -66,7 +61,7 @@ class EntityManager {
let parent = null;
if (type == EntityType.Bullet) {
// TODO: we want to change this to EntityType.Barrel in the future?
const parentIndex = this.#findEntity(EntityType.Player, position, 1000);
const parentIndex = this.#findEntity(EntityType.Player, position, 300);
if (parentIndex >= 0) {
parent = this.entities[parentIndex];
}
Expand All @@ -89,12 +84,14 @@ class EntityManager {
* Searches `#entities` for the entity that is closest to `position` and
* returns the __index__ of that entity or __-1__ if there is no match.
*/
#findEntity(type: EntityType, position: Vector, tolerance: number = 28): number {
#findEntity(type: EntityType, position: Vector, tolerance: number = 42): number {
let result = -1;
let shortestDistance = Number.MAX_SAFE_INTEGER;
let shortestDistance = Infinity;

this.#entities.forEach((x, i) => {
const distance = Vector.distance(x.predictPos(0), position);
if (x.type !== type) return;

const distance = Vector.distance(x.position, position);

if (distance < shortestDistance) {
shortestDistance = distance;
Expand All @@ -106,10 +103,6 @@ class EntityManager {
return -1;
}

if (this.#entities[result].type !== type) {
return -1;
}

return result;
}

Expand Down