Skip to content

Commit

Permalink
Added hasAny to Entity
Browse files Browse the repository at this point in the history
  • Loading branch information
ayebear committed Feb 4, 2021
1 parent 3bd7f1f commit c628693
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "picoes",
"version": "1.0.0-alpha3",
"version": "1.0.0-alpha4",
"description": "Pico Entity System for JavaScript (ES6).",
"main": "./index.js",
"scripts": {
Expand Down
15 changes: 15 additions & 0 deletions src/entity.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,21 @@ class Entity {
return components.every(name => name in this.data)
}

/**
* Returns true if the entity has ANY of the specified component names.
* If no component names are specified, this method returns false.
*
* @example
* if (entity.hasAny('position', 'velocity')) {...}
*
* @param {...string} [components] - The component names to check for
*
* @return {boolean} true or false
*/
hasAny(...components) {
return components.some(name => name in this.data)
}

/**
* Returns a component by name, or undefined if it doesn't exist
*
Expand Down
40 changes: 40 additions & 0 deletions src/entity.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,35 +79,42 @@ test('entity: get and set components', testIndexers(world => {
let ent = world.entity()
ent.set('position', 5)
assert(ent.has('position'))
assert(ent.hasAny('position'))
assert(ent.components.length == 1)
assert(ent.get('position').x === 5)
assert(ent.get('position').y === 0)

ent.update('position', {y: 3})
assert(ent.has('position'))
assert(ent.hasAny('position'))
assert(ent.components.length == 1)
assert(ent.get('position').x === 5)
assert(ent.get('position').y === 3)

ent.update('object', {val: 50})
assert(ent.has('object'))
assert(ent.hasAny('object'))
assert(ent.components.length == 2)
assert(ent.get('object').val === 50)

ent.update('empty', {testing: 100})
assert(ent.has('empty'))
assert(ent.hasAny('empty'))
assert(ent.components.length == 3)
assert(ent.get('empty').testing === 100)

ent.set('anonymous')
assert(ent.components.length == 4)
assert(ent.has('anonymous'))
assert(ent.hasAny('anonymous'))

// Access test
ent.removeAll()
assert(!ent.has('position'))
assert(!ent.hasAny('position'))
ent.access('position').x = 300
assert(ent.has('position'))
assert(ent.hasAny('position'))
assert(ent.get('position').x === 300)

// Get test
Expand Down Expand Up @@ -138,6 +145,39 @@ test('entity: get and set components', testIndexers(world => {
assert(ent.get('invalid2')[0] === 'test')
}))

test('entity: check existence of components', testIndexers(world => {
world.component('position', function(x = 0, y = 0) {
this.x = x
this.y = y
})
world.component('empty')
const ent = world.entity()
assert(!ent.hasAny())
assert(ent.has())
ent.set('a')
ent.set('b')
assert(ent.has())
assert(ent.has('a'))
assert(ent.has('a','b'))
assert(!ent.has('a','b','c','d'))
assert(!ent.hasAny())
assert(ent.hasAny('a'))
assert(ent.hasAny('a','b'))
assert(ent.hasAny('','a','c'))
assert(ent.hasAny('a','b','c','d'))

ent.removeAll()
assert(ent.has())
assert(!ent.has('a'))
assert(!ent.has('a','b'))
assert(!ent.has('a','b','c','d'))
assert(!ent.hasAny())
assert(!ent.hasAny('a'))
assert(!ent.hasAny('a','b'))
assert(!ent.hasAny('','a','c'))
assert(!ent.hasAny('a','b','c','d'))
}))

test('entity: setRaw', testIndexers(world => {
world.component('position', function(x = 0, y = 0) {
this.x = x
Expand Down

0 comments on commit c628693

Please sign in to comment.