@antha/entity-2d 0.5.0 → 0.6.1

package/dist/entity-suite.d.ts

@@ -1,6 +1,6 @@
 import { type AnyObject, type Constructor, type IsAny } from '@augment-vir/common';
 import { type Shape } from 'object-shape-tester';
-import { BaseEntity2d, type BaseEntityAssetDefinitions, type Entity2dConstructor, type Entity2dConstructorParams, EntityStore2d, type EntityStore2dConstructorParams, type MappedEntityAssets, type ParamsMap, type ReverseParamsMap, ViewEntity2d } from './entity.js';
+import { BaseEntity2d, type BaseEntityAssetDefinitions, type Entity2dConstructor, type Entity2dConstructorParams, type EntityCollisionDefinition, EntityStore2d, type EntityStore2dConstructorParams, type MappedEntityAssets, type ParamsMap, type ReverseParamsMap, ViewEntity2d } from './entity.js';
 /**
  * Params for both {@link EntitySuite2d.defineEntity} and {@link EntitySuite2d.defineLogicEntity}.
  *
@@ -8,7 +8,7 @@ import { BaseEntity2d, type BaseEntityAssetDefinitions, type Entity2dConstructor
  */
 export type DefineEntity2dArgs<ParamsShape extends Shape<AnyObject> | undefined, EntityAssets extends BaseEntityAssetDefinitions | undefined> = {
     /** Entity classes this entity observes collisions with. Omit to observe none. */
-    collidesWith?: ReadonlyArray<Entity2dConstructor> | undefined;
+    collidesWith?: EntityCollisionDefinition | undefined;
     /**
      * This key is used for deserialization of entities to track which class needs to be
      * constructed. Do not use duplicate key strings across multiple entity classes.
@@ -99,9 +99,9 @@ export type DefineEntity2dArgs<ParamsShape extends Shape<AnyObject> | undefined,
  */
 export type StaticEntity2dParts<State extends AnyObject = any, ParamsShape extends Shape<AnyObject> | undefined = any, EntityAssets extends BaseEntityAssetDefinitions | undefined = any> = {
     /** Entity classes this entity observes collisions with. Omit to observe none. */
-    collidesWith: ReadonlyArray<Entity2dConstructor> | undefined;
+    collidesWith: EntityCollisionDefinition | undefined;
     /** Cached entity classes this entity observes collisions with. */
-    collidesWithSet: ReadonlySet<Entity2dConstructor> | undefined;
+    collidesWithSet: ReadonlySet<Entity2dConstructor>;
     /**
      * This key is used for deserialization of entities to track which class needs to be
      * constructed. You cannot have duplicate keys loaded at the same time.

package/dist/entity-suite.js

@@ -31,10 +31,10 @@ export function defineEntitySuite2d() {
             // @ts-expect-error: abstract methods are intentionally not implemented here
             [key]: class extends entityParent {
                 static collidesWith = collidesWith;
-                static collidesWithSet = new Set(collidesWith);
+                static collidesWithSet = new Set(collidesWith?.collidesWithOtherEntities);
                 static entityKey = key;
                 static paramsShape = paramsShape;
-                static assets = assets;
+                static assets = assets || {};
                 static paramsMap = paramsMap;
                 static reverseParamsMap = reverseParamsMap(paramsMap);
             },

package/dist/entity.d.ts

@@ -72,7 +72,24 @@ export type EntityStore2dConstructorParams<State extends AnyObject = any> = {
  *
  * @category Internal
  */
-export type Entity2dConstructor = Constructor<BaseEntity2d> & StaticEntity2dParts;
+export type Entity2dConstructor = Constructor<BaseEntity2d> & StaticEntity2dParts<any, any, BaseEntityAssetDefinitions>;
+/**
+ * Defines which entity classes this entity observes collisions with.
+ *
+ * @category Internal
+ */
+export type EntityCollisionDefinition = PartialWithUndefined<{
+    /** Whether this entity observes collisions with instances of its own class. */
+    collidesWithSelf: boolean;
+    /** Other entity classes this entity observes collisions with. */
+    collidesWithOtherEntities: ReadonlyArray<Entity2dConstructor>;
+}>;
+/** Loads assets declared by the given entity classes. */
+export declare function loadEntityAssets({ assetLoader, entities, otherAssets, }: Readonly<{
+    assetLoader: AssetLoader;
+    entities: ReadonlyArray<Entity2dConstructor>;
+    otherAssets?: ReadonlyArray<Readonly<Asset>> | undefined;
+}>, options?: Readonly<AssetBulkLoaderLoadOptions> | undefined): Promise<readonly unknown[]>;
 /** A collision system that skips pairs no entity observes before running SAT collision checks. */
 export declare class EntityHitboxSystem extends HitboxSystem {
     protected checkedHitboxPairs: WeakMap<Hitbox, WeakSet<Hitbox>> | undefined;
@@ -109,14 +126,6 @@ export declare class EntityStore2d<State extends AnyObject = any> {
     readonly state: State;
     readonly assetLoader: AssetLoader;
     constructor(args: Readonly<EntityStore2dConstructorParams>);
-    /**
-     * Load all the assets for all the given entities. Without this, assets will be loaded on demand
-     * only.
-     */
-    loadEntityAssets({ entities, otherAssets, }: Readonly<{
-        entities: ReadonlyArray<Entity2dConstructor>;
-        otherAssets?: ReadonlyArray<Readonly<Asset>> | undefined;
-    }>, options?: Readonly<AssetBulkLoaderLoadOptions> | undefined): Promise<readonly unknown[]>;
     /**
      * Register a set of entities so that they can be deserialized (for example, when transferring
      * game state in across the network for multilayer).
@@ -307,9 +316,9 @@ export declare abstract class BaseEntity2d<State extends AnyObject = any, Params
      */
     static readonly entityKey: string;
     /** Entity classes this entity observes collisions with. Omit to observe none. */
-    static readonly collidesWith: ReadonlyArray<Entity2dConstructor> | undefined;
+    static readonly collidesWith: EntityCollisionDefinition | undefined;
     /** Cached entity classes this entity observes collisions with. */
-    static readonly collidesWithSet: ReadonlySet<Entity2dConstructor> | undefined;
+    static readonly collidesWithSet: ReadonlySet<Entity2dConstructor>;
     /** Shape definition of this entity's parameters. */
     static readonly paramsShape: Shape<AnyObject> | undefined;
     static readonly assets: MappedEntityAssets<BaseEntityAssetDefinitions | undefined> | undefined;

package/dist/entity.js

@@ -1,22 +1,31 @@
 import { assert, check } from '@augment-vir/assert';
-import { ConstructorInstanceMap, getObjectTypedEntries, makeWritable, mapObjectValues, } from '@augment-vir/common';
+import { ConstructorInstanceMap, getObjectTypedEntries, getObjectTypedValues, makeWritable, mapObjectValues, } from '@augment-vir/common';
 import { System as HitboxSystem, Response, } from 'detect-collisions';
 import { assertValidShape, defineShape } from 'object-shape-tester';
 import { ParticleContainer } from 'pixi.js';
 import { defineTypedCustomEvent, GenericListenTarget } from 'typed-event-target';
 export { System as HitboxSystem } from 'detect-collisions';
+/** Loads assets declared by the given entity classes. */
+export async function loadEntityAssets({ assetLoader, entities, otherAssets, }, options) {
+    const assets = [
+        ...(otherAssets || []),
+        ...entities.flatMap((entity) => {
+            return getObjectTypedValues(entity.assets);
+        }),
+    ];
+    return await assetLoader.bulkLoadAssets(assets, options);
+}
 function extractEntityFromHitbox(hitbox) {
     return hitbox.userData instanceof BaseEntity2d ? hitbox.userData : undefined;
 }
 function hasCollisionTargets(entity) {
-    return ((entity.entityDefinition.collidesWithSet?.size ??
-        entity.entityDefinition.collidesWith?.length ??
-        0) > 0);
+    return (!!entity.entityDefinition.collidesWith?.collidesWithSelf ||
+        entity.entityDefinition.collidesWithSet.size > 0);
 }
 function doesEntityCollideWith({ entity, otherEntity, }) {
-    return (entity.entityDefinition.collidesWithSet?.has(otherEntity.entityDefinition) ??
-        entity.entityDefinition.collidesWith?.includes(otherEntity.entityDefinition) ??
-        false);
+    return ((entity.entityDefinition.collidesWith?.collidesWithSelf &&
+        entity.entityDefinition === otherEntity.entityDefinition) ||
+        entity.entityDefinition.collidesWithSet.has(otherEntity.entityDefinition));
 }
 function shouldCheckEntityCollision({ firstEntity, secondEntity, }) {
     return (doesEntityCollideWith({
@@ -155,21 +164,6 @@ export class EntityStore2d {
             });
         }
     }
-    /**
-     * Load all the assets for all the given entities. Without this, assets will be loaded on demand
-     * only.
-     */
-    async loadEntityAssets({ entities, otherAssets, }, options) {
-        const assets = [
-            ...(otherAssets || []),
-            ...entities.flatMap((entity) => {
-                return Object.values(entity.assets).map((asset) => {
-                    return asset;
-                });
-            }),
-        ];
-        return await this.assetLoader.bulkLoadAssets(assets, options);
-    }
     /**
      * Register a set of entities so that they can be deserialized (for example, when transferring
      * game state in across the network for multilayer).
@@ -380,7 +374,7 @@ export class BaseEntity2d {
     /** Entity classes this entity observes collisions with. Omit to observe none. */
     static collidesWith;
     /** Cached entity classes this entity observes collisions with. */
-    static collidesWithSet;
+    static collidesWithSet = new Set();
     /** Shape definition of this entity's parameters. */
     static paramsShape;
     static assets;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@antha/entity-2d",
-    "version": "0.5.0",
+    "version": "0.6.1",
     "description": "An Antha mod for handling 2D entities.",
     "keywords": [
         "vir",
@@ -39,8 +39,8 @@
         "@augment-vir/common": "^32.2.3"
     },
     "devDependencies": {
-        "@antha/engine": "^0.5.0",
-        "@antha/web-test-runner-plugin-pixi": "^0.5.0",
+        "@antha/engine": "^0.6.1",
+        "@antha/web-test-runner-plugin-pixi": "^0.6.1",
         "@augment-vir/test": "^32.2.3",
         "@web/dev-server-esbuild": "^2.0.0",
         "@web/test-runner": "^1.0.0",
@@ -52,9 +52,9 @@
         "typed-event-target": "^4.3.3"
     },
     "peerDependencies": {
-        "@antha/asset": "^0.5.0",
-        "@antha/engine": "^0.5.0",
-        "@antha/graphics-2d": "^0.5.0",
+        "@antha/asset": "^0.6.1",
+        "@antha/engine": "^0.6.1",
+        "@antha/graphics-2d": "^0.6.1",
         "detect-collisions": ">=10",
         "element-vir": ">=26",
         "object-shape-tester": ">=6",