diff --git a/packages/entity/entity.synchronized.js b/packages/entity/entity.synchronized.js index 66d7b50..5d976e5 100644 --- a/packages/entity/entity.synchronized.js +++ b/packages/entity/entity.synchronized.js @@ -11,7 +11,6 @@ import { import {SynchronizedMixin} from '@avocado/net'; import {Resource} from '@avocado/resource'; -import {EntityCreatePacket} from './packets/entity-create.packet'; import {hasTrait, lookupTrait} from './trait/registry'; import {EntityUpdateTraitPacket} from './packets/entity-update-trait.packet'; diff --git a/packages/entity/index.js b/packages/entity/index.js index e58c534..581c98b 100644 --- a/packages/entity/index.js +++ b/packages/entity/index.js @@ -1,9 +1,5 @@ export {Entity} from './entity.synchronized'; -export {EntityCreatePacket} from './packets/entity-create.packet'; -export {EntityRemovePacket} from './packets/entity-remove.packet'; -export {EntityPacket} from './packets/entity.packet'; - export { EntityListUpdateEntityPacket, } from './packets/entity-list-update-entity.packet'; diff --git a/packages/entity/packets/entity-create.packet.js b/packages/entity/packets/entity-create.packet.js deleted file mode 100644 index 1344eaf..0000000 --- a/packages/entity/packets/entity-create.packet.js +++ /dev/null @@ -1,33 +0,0 @@ -import msgpack from 'msgpack-lite'; - -import {EntityPacket} from './entity.packet'; - -export class EntityCreatePacket extends EntityPacket { - - constructor(data, entity) { - if ('undefined' !== typeof entity) { - data.layer = entity.layer.index; - } - super(data, entity); - } - - static pack(packet) { - return this.builder.encode({ - _id: packet.data[0], - data: msgpack.encode(packet.data[1]), - }) - } - - static get schema() { - return { - ...super.schema, - data: 'buffer', - }; - } - - static unpack(packet) { - const {data} = this.builder.decode(packet); - return msgpack.decode(data); - } - -} diff --git a/packages/entity/packets/entity-remove.packet.js b/packages/entity/packets/entity-remove.packet.js deleted file mode 100644 index 82ae55a..0000000 --- a/packages/entity/packets/entity-remove.packet.js +++ /dev/null @@ -1,3 +0,0 @@ -import {EntityPacket} from './entity.packet'; - -export class EntityRemovePacket extends EntityPacket {} diff --git a/packages/entity/packets/entity.packet.js b/packages/entity/packets/entity.packet.js deleted file mode 100644 index 3fc930c..0000000 --- a/packages/entity/packets/entity.packet.js +++ /dev/null @@ -1,22 +0,0 @@ -import {Packet} from '@avocado/net'; - -export class EntityPacket extends Packet { - - constructor(data, entity) { - if ('undefined' !== typeof entity) { - data.uuid = entity.numericUid; - } - super(data); - this.entity = entity; - } - - static get schema() { - return { - ...super.schema, - data: { - uuid: 'uint32', - }, - }; - } - -} diff --git a/packages/entity/packets/trait-alive.packet.js b/packages/entity/packets/trait-alive.packet.js index 1b94f84..ad278f4 100644 --- a/packages/entity/packets/trait-alive.packet.js +++ b/packages/entity/packets/trait-alive.packet.js @@ -1,12 +1,10 @@ -import {EntityPacket} from '@avocado/entity'; +// export class TraitAlivePacket extends EntityPacket { -export class TraitAlivePacket extends EntityPacket { +// static get schema() { +// const schema = super.schema; +// schema.data.life = 'uint16'; +// schema.data.maxLife = 'uint16'; +// return schema; +// } - static get schema() { - const schema = super.schema; - schema.data.life = 'uint16'; - schema.data.maxLife = 'uint16'; - return schema; - } - -} +// } diff --git a/packages/entity/packets/trait-directional.packet.js b/packages/entity/packets/trait-directional.packet.js index 6022a46..0bf9d7a 100644 --- a/packages/entity/packets/trait-directional.packet.js +++ b/packages/entity/packets/trait-directional.packet.js @@ -1,11 +1,9 @@ -import {EntityPacket} from './entity.packet'; +// export class TraitDirectionalPacket extends EntityPacket { -export class TraitDirectionalPacket extends EntityPacket { +// static get schema() { +// const schema = super.schema; +// schema.data.direction = 'uint8'; +// return schema; +// } - static get schema() { - const schema = super.schema; - schema.data.direction = 'uint8'; - return schema; - } - -} +// } diff --git a/packages/graphics/packets/trait-visible.packet.js b/packages/graphics/packets/trait-visible.packet.js index 3ee25b0..c652bd5 100644 --- a/packages/graphics/packets/trait-visible.packet.js +++ b/packages/graphics/packets/trait-visible.packet.js @@ -1,12 +1,10 @@ -import {EntityPacket} from '@avocado/entity'; +// export class TraitVisiblePacket extends EntityPacket { -export class TraitVisiblePacket extends EntityPacket { +// static get schema() { +// const schema = super.schema; +// schema.data.isVisible = 'bool'; +// schema.data.opacity = 'uint8'; +// return schema; +// } - static get schema() { - const schema = super.schema; - schema.data.isVisible = 'bool'; - schema.data.opacity = 'uint8'; - return schema; - } - -} +// } diff --git a/packages/timing/packets/trait-animated.packet.js b/packages/timing/packets/trait-animated.packet.js index 5ead43b..a32d150 100644 --- a/packages/timing/packets/trait-animated.packet.js +++ b/packages/timing/packets/trait-animated.packet.js @@ -1,12 +1,10 @@ -import {EntityPacket} from '@avocado/entity'; +// export class TraitAnimatedPacket extends EntityPacket { -export class TraitAnimatedPacket extends EntityPacket { +// static get schema() { +// const schema = super.schema; +// schema.data.currentAnimation = 'string'; +// schema.data.isAnimating = 'bool'; +// return schema; +// } - static get schema() { - const schema = super.schema; - schema.data.currentAnimation = 'string'; - schema.data.isAnimating = 'bool'; - return schema; - } - -} +// } diff --git a/packages/topdown/layer.js b/packages/topdown/layer.js index edd392d..f206c65 100644 --- a/packages/topdown/layer.js +++ b/packages/topdown/layer.js @@ -1,7 +1,6 @@ import {compose, EventEmitter, Property} from '@avocado/core'; import { Entity, - EntityCreatePacket, EntityList, EntityListUpdateEntityPacket, } from '@avocado/entity'; diff --git a/packages/topdown/layers.js b/packages/topdown/layers.js index c5c8a3c..c1f8d94 100644 --- a/packages/topdown/layers.js +++ b/packages/topdown/layers.js @@ -1,7 +1,6 @@ import * as I from 'immutable'; import {arrayUnique, compose, EventEmitter, flatten} from '@avocado/core'; -import {EntityCreatePacket} from '@avocado/entity'; import {Layer} from './layer'; import {LayersUpdateLayerPacket} from './packets/layers-update-layer.packet'; diff --git a/packages/topdown/room.synchronized.js b/packages/topdown/room.synchronized.js index cef02da..4b62044 100644 --- a/packages/topdown/room.synchronized.js +++ b/packages/topdown/room.synchronized.js @@ -1,7 +1,6 @@ import * as I from 'immutable'; import {compose, EventEmitter, Property} from '@avocado/core'; -import {EntityCreatePacket, EntityPacket, EntityRemovePacket} from '@avocado/entity'; import {Vector} from '@avocado/math'; import {SynchronizedMixin} from '@avocado/net'; import {RectangleShape} from '@avocado/physics';