dacha 0.15.1 → 0.15.2

package/build/contrib/components/collider/index.d.ts

@@ -0,0 +1,19 @@
+import { Component } from '../../../engine/component';
+export interface ColliderConfig {
+    type: 'box' | 'circle';
+    centerX: number;
+    centerY: number;
+    sizeX?: number;
+    sizeY?: number;
+    radius?: number;
+}
+export declare class Collider extends Component {
+    type: 'box' | 'circle';
+    centerX: number;
+    centerY: number;
+    sizeX?: number;
+    sizeY?: number;
+    radius?: number;
+    constructor(config: ColliderConfig);
+    clone(): Collider;
+}

package/build/contrib/components/collider/index.js

@@ -0,0 +1,29 @@
+import { Component } from '../../../engine/component';
+export class Collider extends Component {
+    type;
+    centerX;
+    centerY;
+    sizeX;
+    sizeY;
+    radius;
+    constructor(config) {
+        super();
+        this.type = config.type;
+        this.centerX = config.centerX;
+        this.centerY = config.centerY;
+        this.sizeX = config.sizeX;
+        this.sizeY = config.sizeY;
+        this.radius = config.radius;
+    }
+    clone() {
+        return new Collider({
+            type: this.type,
+            centerX: this.centerX,
+            centerY: this.centerY,
+            sizeX: this.sizeX,
+            sizeY: this.sizeY,
+            radius: this.radius,
+        });
+    }
+}
+Collider.componentName = 'Collider';

package/build/contrib/components/index.d.ts

@@ -2,8 +2,8 @@ export { Camera } from './camera';
 export type { CameraConfig } from './camera';
 export { KeyboardControl } from './keyboard-control';
 export type { KeyboardControlConfig } from './keyboard-control';
-export { ColliderContainer } from './collider-container';
-export type { ColliderContainerConfig } from './collider-container';
+export { Collider } from './collider';
+export type { ColliderConfig } from './collider';
 export { RigidBody } from './rigid-body';
 export type { RigidBodyConfig } from './rigid-body';
 export { Animatable } from './animatable';

package/build/contrib/components/index.js

@@ -1,6 +1,6 @@
 export { Camera } from './camera';
 export { KeyboardControl } from './keyboard-control';
-export { ColliderContainer } from './collider-container';
+export { Collider } from './collider';
 export { RigidBody } from './rigid-body';
 export { Animatable } from './animatable';
 export { Sprite } from './sprite';

package/build/contrib/systems/physics-system/subsystems/collision-detection/aabb-builders/index.js

@@ -1,6 +1,6 @@
 import { buildBoxAABB } from './build-box-aabb';
 import { buildCircleAABB } from './build-circle-aabb';
 export const aabbBuilders = {
-    boxCollider: buildBoxAABB,
-    circleCollider: buildCircleAABB,
+    box: buildBoxAABB,
+    circle: buildCircleAABB,
 };

package/build/contrib/systems/physics-system/subsystems/collision-detection/geometry-builders/build-box-geometry.d.ts

@@ -1,3 +1,3 @@
-import type { ColliderContainer, Transform } from '../../../../../components';
+import type { Collider, Transform } from '../../../../../components';
 import type { BoxGeometry } from '../types';
-export declare const buildBoxGeometry: (container: ColliderContainer, transform: Transform) => BoxGeometry;
+export declare const buildBoxGeometry: (collider: Collider, transform: Transform) => BoxGeometry;

package/build/contrib/systems/physics-system/subsystems/collision-detection/geometry-builders/build-box-geometry.js

@@ -1,8 +1,8 @@
 import { VectorOps } from '../../../../../../engine/math-lib';
-export const buildBoxGeometry = (container, transform) => {
+export const buildBoxGeometry = (collider, transform) => {
     const { offsetX, offsetY, scaleX, scaleY, rotation, } = transform;
-    let { centerX, centerY } = container.collider;
-    const { sizeX, sizeY } = container.collider;
+    let { centerX, centerY } = collider;
+    const { sizeX, sizeY } = collider;
     const x1 = -(sizeX / 2);
     const x2 = (sizeX / 2);
     const y1 = -(sizeY / 2);

package/build/contrib/systems/physics-system/subsystems/collision-detection/geometry-builders/build-circle-geometry.d.ts

@@ -1,3 +1,3 @@
-import type { ColliderContainer, Transform } from '../../../../../components';
+import type { Collider, Transform } from '../../../../../components';
 import type { CircleGeometry } from '../types';
-export declare const buildCircleGeometry: (container: ColliderContainer, transform: Transform) => CircleGeometry;
+export declare const buildCircleGeometry: (collider: Collider, transform: Transform) => CircleGeometry;

package/build/contrib/systems/physics-system/subsystems/collision-detection/geometry-builders/build-circle-geometry.js

@@ -1,6 +1,6 @@
-export const buildCircleGeometry = (container, transform) => {
+export const buildCircleGeometry = (collider, transform) => {
     const { offsetX, offsetY, scaleX, scaleY, } = transform;
-    const { centerX, centerY, radius } = container.collider;
+    const { centerX, centerY, radius } = collider;
     const center = {
         x: centerX + offsetX,
         y: centerY + offsetY,

package/build/contrib/systems/physics-system/subsystems/collision-detection/geometry-builders/index.d.ts

@@ -1,4 +1,4 @@
-import type { ColliderContainer, Transform } from '../../../../../components';
+import type { Collider, Transform } from '../../../../../components';
 import type { Geometry } from '../types';
-export type BuildGeometryFn = (container: ColliderContainer, transform: Transform) => Geometry;
+export type BuildGeometryFn = (collider: Collider, transform: Transform) => Geometry;
 export declare const geometryBuilders: Record<string, BuildGeometryFn>;

package/build/contrib/systems/physics-system/subsystems/collision-detection/geometry-builders/index.js

@@ -1,6 +1,6 @@
 import { buildBoxGeometry } from './build-box-geometry';
 import { buildCircleGeometry } from './build-circle-geometry';
 export const geometryBuilders = {
-    boxCollider: buildBoxGeometry,
-    circleCollider: buildCircleGeometry,
+    box: buildBoxGeometry,
+    circle: buildCircleGeometry,
 };

package/build/contrib/systems/physics-system/subsystems/collision-detection/index.js

@@ -1,5 +1,5 @@
 import { ActorCollection } from '../../../../../engine/actor';
-import { Transform, ColliderContainer, RigidBody, } from '../../../../components';
+import { Transform, Collider, RigidBody, } from '../../../../components';
 import { AddActor, RemoveActor } from '../../../../../engine/events';
 import { Collision } from '../../../../events';
 import { insertionSort } from '../../../../../engine/data-lib';
@@ -18,7 +18,7 @@ export class CollisionDetectionSubsystem {
     constructor(options) {
         this.actorCollection = new ActorCollection(options.scene, {
             components: [
-                ColliderContainer,
+                Collider,
                 Transform,
             ],
         });
@@ -56,14 +56,14 @@ export class CollisionDetectionSubsystem {
             return true;
         }
         const transform = actor.getComponent(Transform);
-        const colliderContainer = actor.getComponent(ColliderContainer);
+        const collider = actor.getComponent(Collider);
         const transformOld = entry.orientationData.transform;
         const colliderOld = entry.orientationData.collider;
-        return checkTransform(transform, transformOld) || checkCollider(colliderContainer, colliderOld);
+        return checkTransform(transform, transformOld) || checkCollider(collider, colliderOld);
     }
     getOrientationData(actor) {
         const transform = actor.getComponent(Transform);
-        const colliderContainer = actor.getComponent(ColliderContainer);
+        const collider = actor.getComponent(Collider);
         return {
             transform: {
                 offsetX: transform.offsetX,
@@ -73,20 +73,20 @@ export class CollisionDetectionSubsystem {
                 scaleY: transform.scaleY,
             },
             collider: {
-                type: colliderContainer.type,
-                centerX: colliderContainer.collider.centerX,
-                centerY: colliderContainer.collider.centerY,
-                sizeX: colliderContainer.collider.sizeX,
-                sizeY: colliderContainer.collider.sizeY,
-                radius: colliderContainer.collider.radius,
+                type: collider.type,
+                centerX: collider.centerX,
+                centerY: collider.centerY,
+                sizeX: collider.sizeX,
+                sizeY: collider.sizeY,
+                radius: collider.radius,
             },
         };
     }
     addCollisionEntry(actor) {
         const transform = actor.getComponent(Transform);
-        const colliderContainer = actor.getComponent(ColliderContainer);
-        const geometry = geometryBuilders[colliderContainer.type](colliderContainer, transform);
-        const aabb = aabbBuilders[colliderContainer.type](geometry);
+        const collider = actor.getComponent(Collider);
+        const geometry = geometryBuilders[collider.type](collider, transform);
+        const aabb = aabbBuilders[collider.type](geometry);
         const entry = {
             actor,
             aabb,
@@ -101,9 +101,9 @@ export class CollisionDetectionSubsystem {
     }
     updateCollisionEntry(actor) {
         const transform = actor.getComponent(Transform);
-        const colliderContainer = actor.getComponent(ColliderContainer);
-        const geometry = geometryBuilders[colliderContainer.type](colliderContainer, transform);
-        const aabb = aabbBuilders[colliderContainer.type](geometry);
+        const collider = actor.getComponent(Collider);
+        const geometry = geometryBuilders[collider.type](collider, transform);
+        const aabb = aabbBuilders[collider.type](geometry);
         const entry = this.entriesMap.get(actor.id);
         const prevAABB = entry.aabb;
         entry.aabb = aabb;
@@ -181,8 +181,8 @@ export class CollisionDetectionSubsystem {
     }
     checkOnIntersection(pair) {
         const [arg1, arg2] = pair;
-        const type1 = arg1.actor.getComponent(ColliderContainer).type;
-        const type2 = arg2.actor.getComponent(ColliderContainer).type;
+        const type1 = arg1.actor.getComponent(Collider).type;
+        const type2 = arg2.actor.getComponent(Collider).type;
         return intersectionCheckers[type1][type2](arg1, arg2);
     }
     sendCollisionEvent(actor1, actor2, intersection) {

package/build/contrib/systems/physics-system/subsystems/collision-detection/intersection-checkers/check-box-and-circle-intersection.js

@@ -1,4 +1,4 @@
-import { ColliderContainer } from '../../../../../components';
+import { Collider } from '../../../../../components';
 import { MathOps, Vector2, VectorOps } from '../../../../../../engine/math-lib';
 const getMtvs = (axis, overlap, point1, point2) => {
     axis.multiplyNumber((1 / axis.magnitude) * overlap);
@@ -28,7 +28,7 @@ const getMtvs = (axis, overlap, point1, point2) => {
 export const checkBoxAndCircleIntersection = (arg1, arg2) => {
     let box;
     let circle;
-    if (arg1.actor.getComponent(ColliderContainer).type === 'boxCollider') {
+    if (arg1.actor.getComponent(Collider).type === 'box') {
         box = arg1.geometry;
         circle = arg2.geometry;
     }

package/build/contrib/systems/physics-system/subsystems/collision-detection/intersection-checkers/index.js

@@ -2,12 +2,12 @@ import { checkBoxAndCircleIntersection } from './check-box-and-circle-intersecti
 import { checkBoxesIntersection } from './check-boxes-intersection';
 import { checkCirclesIntersection } from './check-circles-intersection';
 export const intersectionCheckers = {
-    boxCollider: {
-        boxCollider: checkBoxesIntersection,
-        circleCollider: checkBoxAndCircleIntersection,
+    box: {
+        box: checkBoxesIntersection,
+        circle: checkBoxAndCircleIntersection,
     },
-    circleCollider: {
-        circleCollider: checkCirclesIntersection,
-        boxCollider: checkBoxAndCircleIntersection,
+    circle: {
+        circle: checkCirclesIntersection,
+        box: checkBoxAndCircleIntersection,
     },
 };

package/build/contrib/systems/physics-system/subsystems/collision-detection/reorientation-checkers/check-collider.d.ts

@@ -1,3 +1,3 @@
-import type { ColliderContainer } from '../../../../../components';
+import type { Collider } from '../../../../../components';
 import type { OrientationData } from '../types';
-export declare const checkCollider: (colliderContainer: ColliderContainer, colliderOld: OrientationData['collider']) => boolean;
+export declare const checkCollider: (collider: Collider, colliderOld: OrientationData['collider']) => boolean;

package/build/contrib/systems/physics-system/subsystems/collision-detection/reorientation-checkers/check-collider.js

@@ -1,15 +1,13 @@
-export const checkCollider = (colliderContainer, colliderOld) => {
-    if (colliderContainer.type !== colliderOld.type) {
+export const checkCollider = (collider, colliderOld) => {
+    if (collider.type !== colliderOld.type) {
         return true;
     }
-    if (colliderContainer.type === 'boxCollider') {
-        const collider = colliderContainer.collider;
+    if (collider.type === 'box') {
         return collider.centerX !== colliderOld.centerX
             || collider.centerY !== colliderOld.centerY
             || collider.sizeX !== colliderOld.sizeX
             || collider.sizeY !== colliderOld.sizeY;
     }
-    const collider = colliderContainer.collider;
     return collider.centerX !== colliderOld.centerX
         || collider.centerY !== colliderOld.centerY
         || collider.radius !== colliderOld.radius;

package/build/contrib/systems/physics-system/subsystems/collision-solver/index.d.ts

@@ -1,7 +1,7 @@
 import type { SceneSystemOptions } from '../../../../../engine/system';
 export declare class CollisionSolver {
     private scene;
-    private gravitationalAcceleration;
+    private gravity;
     constructor(options: SceneSystemOptions);
     destroy(): void;
     private handleCollision;

package/build/contrib/systems/physics-system/subsystems/collision-solver/index.js

@@ -6,11 +6,11 @@ const REACTION_FORCE_VECTOR_X = 0;
 const REACTION_FORCE_VECTOR_Y = -1;
 export class CollisionSolver {
     scene;
-    gravitationalAcceleration;
+    gravity;
     constructor(options) {
-        const { scene, gravitationalAcceleration } = options;
+        const { scene, gravity } = options;
         this.scene = scene;
-        this.gravitationalAcceleration = gravitationalAcceleration;
+        this.gravity = gravity;
         this.scene.addEventListener(Collision, this.handleCollision);
     }
     destroy() {
@@ -40,7 +40,7 @@ export class CollisionSolver {
         const { useGravity, mass } = rigidBody;
         if (useGravity && mtv.y && Math.sign(mtv.y) === -1 && !mtv.x) {
             const reactionForce = new Vector2(REACTION_FORCE_VECTOR_X, REACTION_FORCE_VECTOR_Y);
-            reactionForce.multiplyNumber(mass * this.gravitationalAcceleration);
+            reactionForce.multiplyNumber(mass * this.gravity);
             actor.dispatchEventImmediately(AddForce, {
                 value: reactionForce,
             });

package/build/contrib/systems/physics-system/subsystems/physics/index.d.ts

@@ -2,7 +2,7 @@ import type { SceneSystemOptions, UpdateOptions } from '../../../../../engine/sy
 export declare class PhysicsSubsystem {
     private scene;
     private actorCollection;
-    private gravitationalAcceleration;
+    private gravity;
     private actorVectors;
     constructor(options: SceneSystemOptions);
     destroy(): void;

package/build/contrib/systems/physics-system/subsystems/physics/index.js

@@ -13,10 +13,10 @@ const DIRECTION_VECTOR = {
 export class PhysicsSubsystem {
     scene;
     actorCollection;
-    gravitationalAcceleration;
+    gravity;
     actorVectors;
     constructor(options) {
-        const { gravitationalAcceleration, scene, } = options;
+        const { gravity, scene, } = options;
         this.scene = scene;
         this.actorCollection = new ActorCollection(scene, {
             components: [
@@ -24,7 +24,7 @@ export class PhysicsSubsystem {
                 Transform,
             ],
         });
-        this.gravitationalAcceleration = gravitationalAcceleration;
+        this.gravity = gravity;
         this.actorVectors = {};
         this.actorCollection.addEventListener(RemoveActor, this.handleActorRemove);
         this.scene.addEventListener(StopMovement, this.handleStopMovement);
@@ -77,7 +77,7 @@ export class PhysicsSubsystem {
         }
         const velocitySignX = Math.sign(velocity.x);
         const velocitySignY = Math.sign(velocity.y);
-        const reactionForceValue = mass * this.gravitationalAcceleration;
+        const reactionForceValue = mass * this.gravity;
         const dragForceValue = -1 * drag * reactionForceValue;
         const forceToVelocityMultiplier = deltaTime / mass;
         const slowdownValue = dragForceValue * forceToVelocityMultiplier;
@@ -94,7 +94,7 @@ export class PhysicsSubsystem {
         const gravityVector = new Vector2(0, 0);
         if (useGravity) {
             gravityVector.add(DIRECTION_VECTOR.DOWN);
-            gravityVector.multiplyNumber(mass * this.gravitationalAcceleration);
+            gravityVector.multiplyNumber(mass * this.gravity);
         }
         return gravityVector;
     }

package/build/contrib/systems/physics-system/types.d.ts

@@ -1,4 +1,4 @@
 import type { SceneSystemOptions } from '../../../engine/system';
 export interface PhysicsSystemOptions extends SceneSystemOptions {
-    gravitationalAcceleration: number;
+    gravity: number;
 }

package/build/engine/system/index.d.ts

@@ -1,2 +1,2 @@
 export { SceneSystem, WorldSystem } from './system';
-export type { SystemConstructor, SceneSystemOptions, WorldSystemOptions, UpdateOptions, } from './system';
+export type { System, SystemConstructor, SceneSystemOptions, WorldSystemOptions, UpdateOptions, } from './system';

package/build/index.d.ts

@@ -4,7 +4,7 @@ export { VectorOps, MathOps, Vector2 } from './engine/math-lib';
 export * from './engine/consts';
 export * from './engine/types';
 export { WorldSystem, SceneSystem } from './engine/system';
-export type { WorldSystemOptions, SceneSystemOptions, UpdateOptions, } from './engine/system';
+export type { System, WorldSystemOptions, SceneSystemOptions, UpdateOptions, } from './engine/system';
 export type { ActorCollectionFilter, ActorSpawner, } from './engine/actor';
 export type { EventTarget, Event, EventType, EventPayload, ListenerFn, } from './engine/event-target';
 export type { Scene } from './engine/scene';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dacha",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "exports": {

package/build/contrib/components/collider-container/box-collider.d.ts

@@ -1,7 +0,0 @@
-export declare class BoxCollider {
-    sizeX: number;
-    sizeY: number;
-    centerX: number;
-    centerY: number;
-    constructor(config: Record<string, number>);
-}

package/build/contrib/components/collider-container/box-collider.js

@@ -1,12 +0,0 @@
-export class BoxCollider {
-    sizeX;
-    sizeY;
-    centerX;
-    centerY;
-    constructor(config) {
-        this.sizeX = config.sizeX;
-        this.sizeY = config.sizeY;
-        this.centerX = config.centerX;
-        this.centerY = config.centerY;
-    }
-}

package/build/contrib/components/collider-container/circle-collider.d.ts

@@ -1,6 +0,0 @@
-export declare class CircleCollider {
-    radius: number;
-    centerX: number;
-    centerY: number;
-    constructor(config: Record<string, number>);
-}

package/build/contrib/components/collider-container/circle-collider.js

@@ -1,10 +0,0 @@
-export class CircleCollider {
-    radius;
-    centerX;
-    centerY;
-    constructor(config) {
-        this.radius = config.radius;
-        this.centerX = config.centerX;
-        this.centerY = config.centerY;
-    }
-}

package/build/contrib/components/collider-container/index.d.ts

@@ -1,13 +0,0 @@
-import { Component } from '../../../engine/component';
-import { BoxCollider } from './box-collider';
-import { CircleCollider } from './circle-collider';
-export interface ColliderContainerConfig {
-    type: 'boxCollider' | 'circleCollider';
-    collider: Record<string, number>;
-}
-export declare class ColliderContainer extends Component {
-    type: 'boxCollider' | 'circleCollider';
-    collider: BoxCollider | CircleCollider;
-    constructor(config: ColliderContainerConfig);
-    clone(): ColliderContainer;
-}

package/build/contrib/components/collider-container/index.js

@@ -1,28 +0,0 @@
-import { Component } from '../../../engine/component';
-import { BoxCollider } from './box-collider';
-import { CircleCollider } from './circle-collider';
-const COLLIDER_MAP = {
-    boxCollider: BoxCollider,
-    circleCollider: CircleCollider,
-};
-export class ColliderContainer extends Component {
-    type;
-    collider;
-    constructor(config) {
-        super();
-        const colliderContainerConfig = config;
-        this.type = colliderContainerConfig.type;
-        if (!COLLIDER_MAP[this.type]) {
-            throw new Error(`Not found collider with same type: ${this.type}`);
-        }
-        const Collider = COLLIDER_MAP[this.type];
-        this.collider = new Collider(colliderContainerConfig.collider);
-    }
-    clone() {
-        return new ColliderContainer({
-            type: this.type,
-            collider: this.collider,
-        });
-    }
-}
-ColliderContainer.componentName = 'ColliderContainer';