@inglorious/engine 0.10.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/src/ai/movement/dynamic/arrive.js +2 -5
- package/src/ai/movement/dynamic/evade.js +2 -6
- package/src/ai/movement/dynamic/face.js +2 -5
- package/src/ai/movement/dynamic/flee.js +2 -2
- package/src/ai/movement/dynamic/look-where-youre-going.js +1 -5
- package/src/ai/movement/dynamic/match-velocity.js +2 -2
- package/src/ai/movement/dynamic/pursue.js +2 -6
- package/src/ai/movement/dynamic/seek.js +2 -2
- package/src/ai/movement/dynamic/wander.js +2 -2
- package/src/ai/movement/kinematic/arrive.js +2 -2
- package/src/ai/movement/kinematic/face.js +2 -5
- package/src/ai/movement/kinematic/flee.js +2 -2
- package/src/ai/movement/kinematic/seek.js +2 -2
- package/src/ai/movement/kinematic/seek.test.js +13 -12
- package/src/ai/movement/kinematic/wander-as-seek.js +2 -5
- package/src/ai/movement/kinematic/wander.js +2 -6
- package/src/behaviors/controls/dynamic/modern.js +1 -1
- package/src/behaviors/controls/dynamic/shooter.js +1 -1
- package/src/behaviors/controls/dynamic/tank.js +1 -1
- package/src/behaviors/controls/kinematic/modern.js +1 -1
- package/src/behaviors/controls/kinematic/shooter.js +1 -1
- package/src/behaviors/controls/kinematic/tank.js +1 -1
- package/src/behaviors/input/mouse.js +1 -1
- package/src/behaviors/physics/jumpable.js +1 -5
- package/src/collision/detection.js +8 -8
- package/src/core/engine.js +3 -2
- package/src/core/middlewares/entity-pool/entity-pool-middleware.js +1 -1
- package/src/movement/dynamic/modern.js +1 -4
- package/src/movement/dynamic/tank.js +2 -7
- package/src/movement/kinematic/modern.js +1 -4
- package/src/movement/kinematic/modern.test.js +7 -6
- package/src/movement/kinematic/tank.js +2 -7
- package/src/physics/bounds.js +3 -3
- package/src/physics/position.test.js +10 -9
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@inglorious/engine",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.11.0",
|
|
4
4
|
"description": "A JavaScript game engine written with global state, immutability, and pure functions in mind. Have fun(ctional programming) with it!",
|
|
5
5
|
"author": "IceOnFire <antony.mistretta@gmail.com> (https://ingloriouscoderz.it)",
|
|
6
6
|
"license": "MIT",
|
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
"access": "public"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@inglorious/
|
|
34
|
-
"@inglorious/
|
|
33
|
+
"@inglorious/store": "3.0.0",
|
|
34
|
+
"@inglorious/utils": "3.0.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"prettier": "^3.5.3",
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { matchVelocity } from "@inglorious/engine/ai/movement/dynamic/match-velocity.js"
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
setMagnitude,
|
|
5
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
6
|
-
import { subtract } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
2
|
+
import { magnitude, setMagnitude } from "@inglorious/utils/math/vector.js"
|
|
3
|
+
import { subtract } from "@inglorious/utils/math/vectors.js"
|
|
7
4
|
|
|
8
5
|
export const DEFAULT_TARGET_RADIUS = 1
|
|
9
6
|
export const DEFAULT_SLOW_RADIUS = 100
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
import { flee } from "@inglorious/engine/ai/movement/dynamic/flee.js"
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
multiply,
|
|
5
|
-
zero,
|
|
6
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
7
|
-
import { subtract, sum } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
2
|
+
import { magnitude, multiply, zero } from "@inglorious/utils/math/vector.js"
|
|
3
|
+
import { subtract, sum } from "@inglorious/utils/math/vectors.js"
|
|
8
4
|
|
|
9
5
|
export const DEFAULT_MAX_PREDICTION = 10
|
|
10
6
|
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { align } from "@inglorious/engine/ai/movement/dynamic/align.js"
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
magnitude,
|
|
5
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
6
|
-
import { subtract } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
2
|
+
import { angle, magnitude } from "@inglorious/utils/math/vector.js"
|
|
3
|
+
import { subtract } from "@inglorious/utils/math/vectors.js"
|
|
7
4
|
|
|
8
5
|
export function face(entity, target, dt, options) {
|
|
9
6
|
const direction = subtract(target.position, entity.position)
|
|
@@ -5,8 +5,8 @@ import {
|
|
|
5
5
|
multiply,
|
|
6
6
|
setMagnitude,
|
|
7
7
|
zero,
|
|
8
|
-
} from "@inglorious/utils/math/
|
|
9
|
-
import { subtract, sum } from "@inglorious/utils/math/
|
|
8
|
+
} from "@inglorious/utils/math/vector.js"
|
|
9
|
+
import { subtract, sum } from "@inglorious/utils/math/vectors.js"
|
|
10
10
|
|
|
11
11
|
const DEFAULT_MAX_ACCELERATION = 0
|
|
12
12
|
const DEFAULT_MAX_SPEED = 0
|
|
@@ -1,9 +1,5 @@
|
|
|
1
1
|
import { align } from "@inglorious/engine/ai/movement/dynamic/align.js"
|
|
2
|
-
import {
|
|
3
|
-
angle,
|
|
4
|
-
magnitude,
|
|
5
|
-
zero,
|
|
6
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
2
|
+
import { angle, magnitude, zero } from "@inglorious/utils/math/vector.js"
|
|
7
3
|
|
|
8
4
|
export function lookWhereYoureGoing(entity, dt, options) {
|
|
9
5
|
const velocity = entity.velocity ?? zero()
|
|
@@ -5,8 +5,8 @@ import {
|
|
|
5
5
|
magnitude,
|
|
6
6
|
multiply,
|
|
7
7
|
zero,
|
|
8
|
-
} from "@inglorious/utils/math/
|
|
9
|
-
import { subtract, sum } from "@inglorious/utils/math/
|
|
8
|
+
} from "@inglorious/utils/math/vector.js"
|
|
9
|
+
import { subtract, sum } from "@inglorious/utils/math/vectors.js"
|
|
10
10
|
|
|
11
11
|
export const DEFAULT_TIME_TO_TARGET = 0.1
|
|
12
12
|
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
import { seek } from "@inglorious/engine/ai/movement/dynamic/seek.js"
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
multiply,
|
|
5
|
-
zero,
|
|
6
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
7
|
-
import { subtract, sum } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
2
|
+
import { magnitude, multiply, zero } from "@inglorious/utils/math/vector.js"
|
|
3
|
+
import { subtract, sum } from "@inglorious/utils/math/vectors.js"
|
|
8
4
|
|
|
9
5
|
export const DEFAULT_MAX_PREDICTION = 10
|
|
10
6
|
|
|
@@ -5,8 +5,8 @@ import {
|
|
|
5
5
|
multiply,
|
|
6
6
|
setMagnitude,
|
|
7
7
|
zero,
|
|
8
|
-
} from "@inglorious/utils/math/
|
|
9
|
-
import { subtract, sum } from "@inglorious/utils/math/
|
|
8
|
+
} from "@inglorious/utils/math/vector.js"
|
|
9
|
+
import { subtract, sum } from "@inglorious/utils/math/vectors.js"
|
|
10
10
|
|
|
11
11
|
const DEFAULT_MAX_ACCELERATION = 0
|
|
12
12
|
const DEFAULT_MAX_SPEED = 0
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { seek } from "@inglorious/engine/ai/movement/dynamic/seek.js"
|
|
2
|
-
import { createVector } from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
3
|
-
import { sum } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
4
2
|
import { randomBinomial } from "@inglorious/utils/math/rng.js"
|
|
3
|
+
import { createVector } from "@inglorious/utils/math/vector.js"
|
|
4
|
+
import { sum } from "@inglorious/utils/math/vectors.js"
|
|
5
5
|
|
|
6
6
|
export const DEFAULT_WANDER_OFFSET = 100
|
|
7
7
|
export const DEFAULT_WANDER_RADIUS = 100
|
|
@@ -4,8 +4,8 @@ import {
|
|
|
4
4
|
divide,
|
|
5
5
|
magnitude,
|
|
6
6
|
multiply,
|
|
7
|
-
} from "@inglorious/utils/math/
|
|
8
|
-
import { subtract, sum } from "@inglorious/utils/math/
|
|
7
|
+
} from "@inglorious/utils/math/vector.js"
|
|
8
|
+
import { subtract, sum } from "@inglorious/utils/math/vectors.js"
|
|
9
9
|
|
|
10
10
|
export const DEFAULT_TARGET_RADIUS = 1
|
|
11
11
|
export const DEFAULT_TIME_TO_TARGET = 0.1
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { align } from "@inglorious/engine/ai/movement/kinematic/align.js"
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
magnitude,
|
|
5
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
6
|
-
import { subtract } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
2
|
+
import { angle, magnitude } from "@inglorious/utils/math/vector.js"
|
|
3
|
+
import { subtract } from "@inglorious/utils/math/vectors.js"
|
|
7
4
|
|
|
8
5
|
export function face(entity, target, dt, options) {
|
|
9
6
|
const direction = subtract(target.position, entity.position)
|
|
@@ -3,8 +3,8 @@ import {
|
|
|
3
3
|
magnitude,
|
|
4
4
|
multiply,
|
|
5
5
|
setMagnitude,
|
|
6
|
-
} from "@inglorious/utils/math/
|
|
7
|
-
import { subtract, sum } from "@inglorious/utils/math/
|
|
6
|
+
} from "@inglorious/utils/math/vector.js"
|
|
7
|
+
import { subtract, sum } from "@inglorious/utils/math/vectors.js"
|
|
8
8
|
|
|
9
9
|
const DEFAULT_MAX_SPEED = 0
|
|
10
10
|
|
|
@@ -3,8 +3,8 @@ import {
|
|
|
3
3
|
magnitude,
|
|
4
4
|
multiply,
|
|
5
5
|
setMagnitude,
|
|
6
|
-
} from "@inglorious/utils/math/
|
|
7
|
-
import { subtract, sum } from "@inglorious/utils/math/
|
|
6
|
+
} from "@inglorious/utils/math/vector.js"
|
|
7
|
+
import { subtract, sum } from "@inglorious/utils/math/vectors.js"
|
|
8
8
|
|
|
9
9
|
const DEFAULT_MAX_SPEED = 0
|
|
10
10
|
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
+
import { v } from "@inglorious/utils/v.js"
|
|
1
2
|
import { expect, test } from "vitest"
|
|
2
3
|
|
|
3
4
|
import { seek } from "./seek.js"
|
|
4
5
|
|
|
5
6
|
test("it should move toward the target", () => {
|
|
6
|
-
const entity = { maxSpeed: 1, position:
|
|
7
|
-
const target = { position:
|
|
7
|
+
const entity = { maxSpeed: 1, position: v(0, 0, 0) }
|
|
8
|
+
const target = { position: v(2, 0, 0) }
|
|
8
9
|
const dt = 1
|
|
9
10
|
const expectedResult = {
|
|
10
|
-
position:
|
|
11
|
-
velocity:
|
|
11
|
+
position: v(1, 0, 0),
|
|
12
|
+
velocity: v(1, 0, 0),
|
|
12
13
|
orientation: 0,
|
|
13
14
|
}
|
|
14
15
|
|
|
@@ -16,12 +17,12 @@ test("it should move toward the target", () => {
|
|
|
16
17
|
})
|
|
17
18
|
|
|
18
19
|
test("it should eventually reach the target", () => {
|
|
19
|
-
const entity = { maxSpeed: 1, position:
|
|
20
|
-
const target = { position:
|
|
20
|
+
const entity = { maxSpeed: 1, position: v(0, 0, 0) }
|
|
21
|
+
const target = { position: v(2, 0, 0) }
|
|
21
22
|
const dt = 2
|
|
22
23
|
const expectedResult = {
|
|
23
|
-
position:
|
|
24
|
-
velocity:
|
|
24
|
+
position: v(2, 0, 0),
|
|
25
|
+
velocity: v(1, 0, 0),
|
|
25
26
|
orientation: 0,
|
|
26
27
|
}
|
|
27
28
|
|
|
@@ -29,12 +30,12 @@ test("it should eventually reach the target", () => {
|
|
|
29
30
|
})
|
|
30
31
|
|
|
31
32
|
test("it should overshoot when speed is too high", () => {
|
|
32
|
-
const entity = { maxSpeed: 10, position:
|
|
33
|
-
const target = { position:
|
|
33
|
+
const entity = { maxSpeed: 10, position: v(0, 0, 0) }
|
|
34
|
+
const target = { position: v(2, 0, 0) }
|
|
34
35
|
const dt = 1
|
|
35
36
|
const expectedResult = {
|
|
36
|
-
position:
|
|
37
|
-
velocity:
|
|
37
|
+
position: v(10, 0, 0),
|
|
38
|
+
velocity: v(10, 0, 0),
|
|
38
39
|
orientation: 0,
|
|
39
40
|
}
|
|
40
41
|
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import { seek } from "@inglorious/engine/ai/movement/kinematic/seek.js"
|
|
2
|
-
import {
|
|
3
|
-
fromAngle,
|
|
4
|
-
multiply,
|
|
5
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
6
|
-
import { sum } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
7
2
|
import { randomBinomial } from "@inglorious/utils/math/rng.js"
|
|
3
|
+
import { fromAngle, multiply } from "@inglorious/utils/math/vector.js"
|
|
4
|
+
import { sum } from "@inglorious/utils/math/vectors.js"
|
|
8
5
|
|
|
9
6
|
export const DEFAULT_WANDER_RADIUS = 10
|
|
10
7
|
|
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
angle,
|
|
3
|
-
createVector,
|
|
4
|
-
multiply,
|
|
5
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
6
|
-
import { sum } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
7
1
|
import { randomBinomial } from "@inglorious/utils/math/rng.js"
|
|
2
|
+
import { angle, createVector, multiply } from "@inglorious/utils/math/vector.js"
|
|
3
|
+
import { sum } from "@inglorious/utils/math/vectors.js"
|
|
8
4
|
|
|
9
5
|
const DEFAULT_MAX_SPEED = 0
|
|
10
6
|
const DEFAULT_MAX_ANGULAR_SPEED = 0
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { modernMove } from "@inglorious/engine/movement/dynamic/modern.js"
|
|
2
2
|
import { extend, merge } from "@inglorious/utils/data-structures/objects.js"
|
|
3
|
-
import { zero } from "@inglorious/utils/math/
|
|
3
|
+
import { zero } from "@inglorious/utils/math/vector.js"
|
|
4
4
|
|
|
5
5
|
import { createMovementEventHandlers } from "../event-handlers.js"
|
|
6
6
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { face } from "@inglorious/engine/ai/movement/dynamic/face.js"
|
|
2
2
|
import { tankMove } from "@inglorious/engine/movement/dynamic/tank.js"
|
|
3
3
|
import { extend, merge } from "@inglorious/utils/data-structures/objects.js"
|
|
4
|
-
import { zero } from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
5
4
|
import { pi } from "@inglorious/utils/math/trigonometry.js"
|
|
5
|
+
import { zero } from "@inglorious/utils/math/vector.js"
|
|
6
6
|
|
|
7
7
|
import { createMovementEventHandlers } from "../event-handlers.js"
|
|
8
8
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { tankMove } from "@inglorious/engine/movement/dynamic/tank.js"
|
|
2
2
|
import { extend, merge } from "@inglorious/utils/data-structures/objects.js"
|
|
3
|
-
import { zero } from "@inglorious/utils/math/
|
|
3
|
+
import { zero } from "@inglorious/utils/math/vector.js"
|
|
4
4
|
|
|
5
5
|
import { createMovementEventHandlers } from "../event-handlers.js"
|
|
6
6
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { modernMove } from "@inglorious/engine/movement/kinematic/modern.js"
|
|
2
2
|
import { extend, merge } from "@inglorious/utils/data-structures/objects.js"
|
|
3
|
-
import { zero } from "@inglorious/utils/math/
|
|
3
|
+
import { zero } from "@inglorious/utils/math/vector.js"
|
|
4
4
|
|
|
5
5
|
import { createMovementEventHandlers } from "../event-handlers.js"
|
|
6
6
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { face } from "@inglorious/engine/ai/movement/kinematic/face.js"
|
|
2
2
|
import { tankMove } from "@inglorious/engine/movement/kinematic/tank.js"
|
|
3
3
|
import { extend, merge } from "@inglorious/utils/data-structures/objects.js"
|
|
4
|
-
import { zero } from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
5
4
|
import { pi } from "@inglorious/utils/math/trigonometry.js"
|
|
5
|
+
import { zero } from "@inglorious/utils/math/vector.js"
|
|
6
6
|
|
|
7
7
|
import { createMovementEventHandlers } from "../event-handlers.js"
|
|
8
8
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { tankMove } from "@inglorious/engine/movement/kinematic/tank.js"
|
|
2
2
|
import { extend, merge } from "@inglorious/utils/data-structures/objects.js"
|
|
3
|
-
import { zero } from "@inglorious/utils/math/
|
|
3
|
+
import { zero } from "@inglorious/utils/math/vector.js"
|
|
4
4
|
|
|
5
5
|
import { createMovementEventHandlers } from "../event-handlers.js"
|
|
6
6
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { findCollision } from "@inglorious/engine/collision/detection.js"
|
|
2
2
|
import { clampToBounds } from "@inglorious/engine/physics/bounds.js"
|
|
3
|
-
import { zero } from "@inglorious/utils/math/
|
|
3
|
+
import { zero } from "@inglorious/utils/math/vector.js"
|
|
4
4
|
|
|
5
5
|
const DEFAULT_PARAMS = {
|
|
6
6
|
name: "mouse",
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
import { findCollision } from "@inglorious/engine/collision/detection.js"
|
|
2
2
|
import { defaults, extend } from "@inglorious/utils/data-structures/objects.js"
|
|
3
|
-
import {
|
|
4
|
-
angle,
|
|
5
|
-
magnitude,
|
|
6
|
-
zero,
|
|
7
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
3
|
+
import { angle, magnitude, zero } from "@inglorious/utils/math/vector.js"
|
|
8
4
|
import { applyGravity } from "@inglorious/utils/physics/gravity.js"
|
|
9
5
|
import { jump } from "@inglorious/utils/physics/jump.js"
|
|
10
6
|
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { filter } from "@inglorious/utils/data-structures/object.js"
|
|
2
|
-
import * as circle from "@inglorious/utils/math/
|
|
3
|
-
import * as hitmask from "@inglorious/utils/math/
|
|
4
|
-
import * as line from "@inglorious/utils/math/
|
|
5
|
-
import * as point from "@inglorious/utils/math/
|
|
6
|
-
import * as rectangle from "@inglorious/utils/math/
|
|
7
|
-
import * as segment from "@inglorious/utils/math/
|
|
8
|
-
import { zero } from "@inglorious/utils/math/
|
|
9
|
-
import { add } from "@inglorious/utils/math/
|
|
2
|
+
import * as circle from "@inglorious/utils/math/circle.js"
|
|
3
|
+
import * as hitmask from "@inglorious/utils/math/hitmask.js"
|
|
4
|
+
import * as line from "@inglorious/utils/math/line.js"
|
|
5
|
+
import * as point from "@inglorious/utils/math/point.js"
|
|
6
|
+
import * as rectangle from "@inglorious/utils/math/rectangle.js"
|
|
7
|
+
import * as segment from "@inglorious/utils/math/segment.js"
|
|
8
|
+
import { zero } from "@inglorious/utils/math/vector.js"
|
|
9
|
+
import { add } from "@inglorious/utils/math/vectors.js"
|
|
10
10
|
|
|
11
11
|
const Z = 2 // Z-axis index.
|
|
12
12
|
|
package/src/core/engine.js
CHANGED
|
@@ -5,7 +5,8 @@ import { createStore } from "@inglorious/store/store.js"
|
|
|
5
5
|
import { augmentType } from "@inglorious/store/types.js"
|
|
6
6
|
import { isArray } from "@inglorious/utils/data-structures/array.js"
|
|
7
7
|
import { extendWith } from "@inglorious/utils/data-structures/objects.js"
|
|
8
|
-
import { isVector } from "@inglorious/utils/math/
|
|
8
|
+
import { isVector } from "@inglorious/utils/math/vector.js"
|
|
9
|
+
import { v } from "@inglorious/utils/v.js"
|
|
9
10
|
|
|
10
11
|
import { coreEvents } from "./core-events.js"
|
|
11
12
|
import { disconnectDevTools, initDevTools, sendAction } from "./dev-tools.js"
|
|
@@ -29,7 +30,7 @@ const DEFAULT_GAME_CONFIG = {
|
|
|
29
30
|
|
|
30
31
|
entities: {
|
|
31
32
|
// eslint-disable-next-line no-magic-numbers
|
|
32
|
-
game: { type: "game", size:
|
|
33
|
+
game: { type: "game", size: v(800, 600) },
|
|
33
34
|
audio: { type: "audio", sounds: {} },
|
|
34
35
|
},
|
|
35
36
|
}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
angle,
|
|
3
|
-
magnitude,
|
|
4
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
1
|
+
import { angle, magnitude } from "@inglorious/utils/math/vector.js"
|
|
5
2
|
import { applyAcceleration } from "@inglorious/utils/physics/acceleration.js"
|
|
6
3
|
|
|
7
4
|
const DEFAULT_ORIENTATION = 0
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
clamp,
|
|
3
|
-
multiply,
|
|
4
|
-
rotate,
|
|
5
|
-
zero,
|
|
6
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
7
|
-
import { sum } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
8
1
|
import { toRange } from "@inglorious/utils/math/trigonometry.js"
|
|
2
|
+
import { clamp, multiply, rotate, zero } from "@inglorious/utils/math/vector.js"
|
|
3
|
+
import { sum } from "@inglorious/utils/math/vectors.js"
|
|
9
4
|
import { applyFriction } from "@inglorious/utils/physics/friction.js"
|
|
10
5
|
|
|
11
6
|
const DEFAULT_MAX_ACCELERATION = 0
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
+
import { v } from "@inglorious/utils/v.js"
|
|
1
2
|
import { expect, test } from "vitest"
|
|
2
3
|
|
|
3
4
|
import { modernMove } from "./modern.js"
|
|
4
5
|
|
|
5
6
|
test("it should move following its velocity", () => {
|
|
6
|
-
const entity = { maxSpeed: 1, velocity:
|
|
7
|
+
const entity = { maxSpeed: 1, velocity: v(1, 0, 0), position: v(0, 0, 0) }
|
|
7
8
|
const dt = 1
|
|
8
9
|
const expectedResult = {
|
|
9
|
-
velocity:
|
|
10
|
-
position:
|
|
10
|
+
velocity: v(1, 0, 0),
|
|
11
|
+
position: v(1, 0, 0),
|
|
11
12
|
orientation: 0,
|
|
12
13
|
}
|
|
13
14
|
|
|
@@ -15,11 +16,11 @@ test("it should move following its velocity", () => {
|
|
|
15
16
|
})
|
|
16
17
|
|
|
17
18
|
test("it should limit the velocity to the max speed", () => {
|
|
18
|
-
const entity = { maxSpeed: 1, velocity:
|
|
19
|
+
const entity = { maxSpeed: 1, velocity: v(10, 0, 0), position: v(0, 0, 0) }
|
|
19
20
|
const dt = 1
|
|
20
21
|
const expectedResult = {
|
|
21
|
-
velocity:
|
|
22
|
-
position:
|
|
22
|
+
velocity: v(1, 0, 0),
|
|
23
|
+
position: v(1, 0, 0),
|
|
23
24
|
orientation: 0,
|
|
24
25
|
}
|
|
25
26
|
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
clamp,
|
|
3
|
-
multiply,
|
|
4
|
-
rotate,
|
|
5
|
-
zero,
|
|
6
|
-
} from "@inglorious/utils/math/linear-algebra/vector.js"
|
|
7
|
-
import { sum } from "@inglorious/utils/math/linear-algebra/vectors.js"
|
|
8
1
|
import { toRange } from "@inglorious/utils/math/trigonometry.js"
|
|
2
|
+
import { clamp, multiply, rotate, zero } from "@inglorious/utils/math/vector.js"
|
|
3
|
+
import { sum } from "@inglorious/utils/math/vectors.js"
|
|
9
4
|
|
|
10
5
|
const DEFAULT_MAX_SPEED = 0
|
|
11
6
|
|
package/src/physics/bounds.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { abs } from "@inglorious/utils/math/numbers.js"
|
|
1
2
|
import {
|
|
2
3
|
angle,
|
|
3
4
|
clamp,
|
|
@@ -5,9 +6,8 @@ import {
|
|
|
5
6
|
fromAngle,
|
|
6
7
|
multiply,
|
|
7
8
|
zero,
|
|
8
|
-
} from "@inglorious/utils/math/
|
|
9
|
-
import { sum } from "@inglorious/utils/math/
|
|
10
|
-
import { abs } from "@inglorious/utils/math/numbers.js"
|
|
9
|
+
} from "@inglorious/utils/math/vector.js"
|
|
10
|
+
import { sum } from "@inglorious/utils/math/vectors.js"
|
|
11
11
|
|
|
12
12
|
const ORIGIN = 0
|
|
13
13
|
const DOUBLE = 2
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { v } from "@inglorious/utils/v.js"
|
|
1
2
|
import { expect, test } from "vitest"
|
|
2
3
|
|
|
3
4
|
import { calculateLandingPosition } from "./position.js"
|
|
@@ -9,9 +10,9 @@ test("it should calculate the landing position for a point entity on a platform"
|
|
|
9
10
|
},
|
|
10
11
|
}
|
|
11
12
|
const target = {
|
|
12
|
-
position:
|
|
13
|
+
position: v(0, 0, 0),
|
|
13
14
|
collisions: {
|
|
14
|
-
platform: { size:
|
|
15
|
+
platform: { size: v(20, 10, 0) },
|
|
15
16
|
},
|
|
16
17
|
}
|
|
17
18
|
const collisionGroup = "platform"
|
|
@@ -28,9 +29,9 @@ test("it should calculate the landing position for a circular entity on a platfo
|
|
|
28
29
|
},
|
|
29
30
|
}
|
|
30
31
|
const target = {
|
|
31
|
-
position:
|
|
32
|
+
position: v(0, 0, 0),
|
|
32
33
|
collisions: {
|
|
33
|
-
platform: { size:
|
|
34
|
+
platform: { size: v(20, 10, 0) },
|
|
34
35
|
},
|
|
35
36
|
}
|
|
36
37
|
const collisionGroup = "platform"
|
|
@@ -42,15 +43,15 @@ test("it should calculate the landing position for a circular entity on a platfo
|
|
|
42
43
|
|
|
43
44
|
test("it should calculate the landing position for a rectangular entity on a platform", () => {
|
|
44
45
|
const entity = {
|
|
45
|
-
size:
|
|
46
|
+
size: v(10, 10, 0),
|
|
46
47
|
collisions: {
|
|
47
48
|
platform: { shape: "rectangle" },
|
|
48
49
|
},
|
|
49
50
|
}
|
|
50
51
|
const target = {
|
|
51
|
-
position:
|
|
52
|
+
position: v(0, 0, 0),
|
|
52
53
|
collisions: {
|
|
53
|
-
platform: { size:
|
|
54
|
+
platform: { size: v(20, 10, 0) },
|
|
54
55
|
},
|
|
55
56
|
}
|
|
56
57
|
const collisionGroup = "platform"
|
|
@@ -67,9 +68,9 @@ test("it should fallback to a rectangular calculation for an unknown entity shap
|
|
|
67
68
|
},
|
|
68
69
|
}
|
|
69
70
|
const target = {
|
|
70
|
-
position:
|
|
71
|
+
position: v(0, 0, 0),
|
|
71
72
|
collisions: {
|
|
72
|
-
platform: { size:
|
|
73
|
+
platform: { size: v(20, 10, 0) },
|
|
73
74
|
},
|
|
74
75
|
}
|
|
75
76
|
const collisionGroup = "platform"
|