@vworlds/vecs-physics 1.0.25 → 1.0.27
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/adapter/{state.d.ts → engine.d.ts} +13 -10
- package/adapter/{state.js → engine.js} +23 -30
- package/adapter/engine.js.map +1 -0
- package/adapter/queries.d.ts +68 -0
- package/adapter/queries.js +145 -0
- package/adapter/queries.js.map +1 -0
- package/adapter/runtime.d.ts +4 -0
- package/adapter/runtime.js +20 -0
- package/adapter/runtime.js.map +1 -1
- package/components/body.js +5 -2
- package/components/body.js.map +1 -1
- package/components/geometry.d.ts +21 -6
- package/components/geometry.js +47 -9
- package/components/geometry.js.map +1 -1
- package/components/material.d.ts +5 -0
- package/components/material.js +5 -0
- package/components/material.js.map +1 -1
- package/index.d.ts +4 -2
- package/index.js +5 -3
- package/index.js.map +1 -1
- package/module.js +32 -19
- package/module.js.map +1 -1
- package/package.json +2 -2
- package/systems/chain_lifecycle.d.ts +6 -0
- package/systems/chain_lifecycle.js +102 -0
- package/systems/chain_lifecycle.js.map +1 -0
- package/systems/debug.d.ts +4 -5
- package/systems/debug.js +26 -24
- package/systems/debug.js.map +1 -1
- package/systems/event_opt_in_sync.d.ts +3 -3
- package/systems/event_opt_in_sync.js +53 -25
- package/systems/event_opt_in_sync.js.map +1 -1
- package/systems/events.d.ts +3 -3
- package/systems/events.js +36 -34
- package/systems/events.js.map +1 -1
- package/systems/forces.d.ts +3 -3
- package/systems/forces.js +30 -21
- package/systems/forces.js.map +1 -1
- package/systems/impulse_accumulate.d.ts +4 -4
- package/systems/impulse_accumulate.js +32 -28
- package/systems/impulse_accumulate.js.map +1 -1
- package/systems/impulse_zero.d.ts +3 -3
- package/systems/impulse_zero.js +6 -4
- package/systems/impulse_zero.js.map +1 -1
- package/systems/index.d.ts +3 -4
- package/systems/index.js +42 -48
- package/systems/index.js.map +1 -1
- package/systems/kinematic.d.ts +3 -3
- package/systems/kinematic.js +33 -33
- package/systems/kinematic.js.map +1 -1
- package/systems/lifecycle.d.ts +3 -3
- package/systems/lifecycle.js +58 -36
- package/systems/lifecycle.js.map +1 -1
- package/systems/mass_recompute.d.ts +3 -3
- package/systems/mass_recompute.js +21 -19
- package/systems/mass_recompute.js.map +1 -1
- package/systems/material_filter_sync.d.ts +3 -3
- package/systems/material_filter_sync.js +64 -29
- package/systems/material_filter_sync.js.map +1 -1
- package/systems/pose_sync_in.d.ts +3 -3
- package/systems/pose_sync_in.js +47 -20
- package/systems/pose_sync_in.js.map +1 -1
- package/systems/pose_sync_out.d.ts +3 -3
- package/systems/pose_sync_out.js +8 -6
- package/systems/pose_sync_out.js.map +1 -1
- package/systems/shape_lifecycle.d.ts +31 -4
- package/systems/shape_lifecycle.js +93 -145
- package/systems/shape_lifecycle.js.map +1 -1
- package/systems/shape_pose_sync.d.ts +3 -3
- package/systems/shape_pose_sync.js +35 -10
- package/systems/shape_pose_sync.js.map +1 -1
- package/systems/shape_predicates.d.ts +12 -0
- package/systems/shape_predicates.js +5 -0
- package/systems/shape_predicates.js.map +1 -0
- package/systems/step.d.ts +3 -3
- package/systems/step.js +7 -5
- package/systems/step.js.map +1 -1
- package/util/resolve_body.d.ts +2 -2
- package/util/resolve_body.js +5 -9
- package/util/resolve_body.js.map +1 -1
- package/util/warn.d.ts +1 -1
- package/util/warn.js +2 -1
- package/util/warn.js.map +1 -1
- package/adapter/state.js.map +0 -1
|
@@ -1,57 +1,92 @@
|
|
|
1
|
+
import { ChildOf, Iter } from "@vworlds/vecs";
|
|
1
2
|
import { Body } from "../components/body.js";
|
|
2
|
-
import {
|
|
3
|
+
import { Chain, SingleShape } from "../components/geometry.js";
|
|
3
4
|
import { CollisionFilter, Material, Sensor } from "../components/material.js";
|
|
4
5
|
import { withAllocated } from "../adapter/disposal.js";
|
|
5
|
-
import {
|
|
6
|
-
|
|
6
|
+
import { PhysicsSystemTag } from "../adapter/engine.js";
|
|
7
|
+
import { recreateChainForEntity } from "./chain_lifecycle.js";
|
|
8
|
+
import { recreateSingleShapeForEntity } from "./shape_lifecycle.js";
|
|
9
|
+
import { chainWithBodyParent, singleShapeWithBodyParent } from "./shape_predicates.js";
|
|
10
|
+
export function installMaterialFilterSync(world, engine, phase) {
|
|
7
11
|
const system = world
|
|
8
|
-
.system("PhysicsMaterialFilterSync")
|
|
9
|
-
.with(
|
|
12
|
+
.system("PhysicsMaterialFilterSync:Material")
|
|
13
|
+
.with(Material, singleShapeWithBodyParent)
|
|
10
14
|
.phase(phase);
|
|
11
|
-
system.
|
|
12
|
-
|
|
15
|
+
system.entity.add(PhysicsSystemTag);
|
|
16
|
+
system.update(Iter, Material, [SingleShape, { target: [ChildOf, [Body]] }], (it, material, [shape, body]) => {
|
|
17
|
+
if (requiresMaterialRecreate(engine, shape, material)) {
|
|
13
18
|
// box2d3-wasm@5.2.0 exposes no shape setters for rollingResistance,
|
|
14
19
|
// tangentSpeed, or userMaterialId, so those updates recreate the shape.
|
|
15
|
-
|
|
20
|
+
recreateSingleShapeForEntity(engine, it.entity, it.src[1], body, shape);
|
|
16
21
|
return;
|
|
17
22
|
}
|
|
18
|
-
const shapeId =
|
|
23
|
+
const shapeId = shape?._shapeId;
|
|
19
24
|
if (shapeId !== undefined) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
if (state.chainByEntity.has(entity.eid)) {
|
|
25
|
-
recreateShapeForEntity(state, entity);
|
|
25
|
+
engine.box2d.b2Shape_SetDensity(shapeId, material.density, true);
|
|
26
|
+
engine.box2d.b2Shape_SetFriction(shapeId, material.friction);
|
|
27
|
+
engine.box2d.b2Shape_SetRestitution(shapeId, material.restitution);
|
|
26
28
|
}
|
|
27
29
|
});
|
|
28
|
-
|
|
29
|
-
|
|
30
|
+
const chainMaterialSystem = world
|
|
31
|
+
.system("PhysicsMaterialFilterSync:ChainMaterial")
|
|
32
|
+
.with(Material, chainWithBodyParent)
|
|
33
|
+
.phase(phase)
|
|
34
|
+
.update(Iter, Material, [Chain, { target: [ChildOf, [Body]] }], (it, _material, [chain, body]) => {
|
|
35
|
+
recreateChainForEntity(engine, it.entity, it.src[1], body, chain);
|
|
36
|
+
});
|
|
37
|
+
chainMaterialSystem.entity.add(PhysicsSystemTag);
|
|
38
|
+
const collisionFilterSystem = world
|
|
39
|
+
.system("PhysicsMaterialFilterSync:CollisionFilter")
|
|
40
|
+
.with(CollisionFilter, singleShapeWithBodyParent)
|
|
41
|
+
.phase(phase)
|
|
42
|
+
.update(Iter, CollisionFilter, [SingleShape, { target: [ChildOf, [Body]] }], (_it, filter, [shape]) => {
|
|
43
|
+
const shapeId = shape?._shapeId;
|
|
30
44
|
if (shapeId !== undefined) {
|
|
31
|
-
withAllocated(() => new
|
|
45
|
+
withAllocated(() => new engine.box2d.b2Filter(), (wasmFilter) => {
|
|
32
46
|
// Public filters are 32-bit numbers; Box2D stores 64-bit masks. The
|
|
33
47
|
// decimal string setters zero-pad the upper 32 bits explicitly.
|
|
34
48
|
wasmFilter.setCategoryBits64(String(filter.categoryBits >>> 0));
|
|
35
49
|
wasmFilter.setMaskBits64(String(filter.maskBits >>> 0));
|
|
36
50
|
wasmFilter.groupIndex = filter.groupIndex;
|
|
37
|
-
|
|
51
|
+
engine.box2d.b2Shape_SetFilter(shapeId, wasmFilter);
|
|
38
52
|
});
|
|
39
53
|
}
|
|
40
|
-
if (state.chainByEntity.has(entity.eid)) {
|
|
41
|
-
recreateShapeForEntity(state, entity);
|
|
42
|
-
}
|
|
43
54
|
});
|
|
44
|
-
|
|
45
|
-
|
|
55
|
+
collisionFilterSystem.entity.add(PhysicsSystemTag);
|
|
56
|
+
const chainCollisionFilterSystem = world
|
|
57
|
+
.system("PhysicsMaterialFilterSync:ChainCollisionFilter")
|
|
58
|
+
.with(CollisionFilter, chainWithBodyParent)
|
|
59
|
+
.phase(phase)
|
|
60
|
+
.update(Iter, CollisionFilter, [Chain, { target: [ChildOf, [Body]] }], (it, _filter, [chain, body]) => {
|
|
61
|
+
recreateChainForEntity(engine, it.entity, it.src[1], body, chain);
|
|
62
|
+
});
|
|
63
|
+
chainCollisionFilterSystem.entity.add(PhysicsSystemTag);
|
|
64
|
+
const sensorSystem = world
|
|
65
|
+
.system("PhysicsMaterialFilterSync:Sensor")
|
|
66
|
+
.with(Sensor, singleShapeWithBodyParent)
|
|
67
|
+
.phase(phase)
|
|
68
|
+
.update(Iter, Sensor, [SingleShape, { target: [ChildOf, [Body]] }], (it, _sensor, [shape, body]) => {
|
|
69
|
+
recreateSingleShapeForEntity(engine, it.entity, it.src[1], body, shape);
|
|
46
70
|
});
|
|
47
|
-
|
|
71
|
+
sensorSystem.entity.add(PhysicsSystemTag);
|
|
72
|
+
const chainSensorSystem = world
|
|
73
|
+
.system("PhysicsMaterialFilterSync:ChainSensor")
|
|
74
|
+
.with(Sensor, chainWithBodyParent)
|
|
75
|
+
.phase(phase)
|
|
76
|
+
.update(Iter, Sensor, [Chain, { target: [ChildOf, [Body]] }], (it, _sensor, [chain, body]) => {
|
|
77
|
+
recreateChainForEntity(engine, it.entity, it.src[1], body, chain);
|
|
78
|
+
});
|
|
79
|
+
chainSensorSystem.entity.add(PhysicsSystemTag);
|
|
48
80
|
}
|
|
49
|
-
function requiresMaterialRecreate(
|
|
50
|
-
|
|
51
|
-
|
|
81
|
+
function requiresMaterialRecreate(engine, shape, next) {
|
|
82
|
+
if (shape === undefined) {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
const shapeId = shape._shapeId;
|
|
86
|
+
if (shapeId === undefined || !engine.box2d.b2Shape_IsValid(shapeId)) {
|
|
52
87
|
return false;
|
|
53
88
|
}
|
|
54
|
-
const materialData =
|
|
89
|
+
const materialData = engine.box2d.b2Shape_GetSurfaceMaterial(shapeId);
|
|
55
90
|
try {
|
|
56
91
|
return (materialData.rollingResistance !== next.rollingResistance ||
|
|
57
92
|
materialData.tangentSpeed !== next.tangentSpeed ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"material_filter_sync.js","sourceRoot":"","sources":["../../../../src/systems/material_filter_sync.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"material_filter_sync.js","sourceRoot":"","sources":["../../../../src/systems/material_filter_sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type Entity, type
|
|
2
|
-
import { type
|
|
3
|
-
export declare function installPoseSyncIn(world: World,
|
|
1
|
+
import { type Entity, type World } from "@vworlds/vecs";
|
|
2
|
+
import { type PhysicsEngine } from "../adapter/engine.js";
|
|
3
|
+
export declare function installPoseSyncIn(world: World, engine: PhysicsEngine, phase: Entity): void;
|
package/systems/pose_sync_in.js
CHANGED
|
@@ -1,52 +1,79 @@
|
|
|
1
1
|
import { AngularVelocity, Body, LinearVelocity, Position, Rotation } from "../components/body.js";
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import { scr_b2Vec2 } from "../adapter/runtime.js";
|
|
3
|
+
import { PhysicsSystemTag } from "../adapter/engine.js";
|
|
4
|
+
export function installPoseSyncIn(world, engine, phase) {
|
|
4
5
|
const system = world.system("PhysicsPoseSyncIn").with(Body).phase(phase);
|
|
6
|
+
system.entity.add(PhysicsSystemTag);
|
|
5
7
|
system.ignoreSource([PhysicsSystemTag]);
|
|
6
|
-
|
|
7
|
-
|
|
8
|
+
const positionSystem = world
|
|
9
|
+
.system("PhysicsPoseSyncIn:Position")
|
|
10
|
+
.with(Body, Position)
|
|
11
|
+
.phase(phase)
|
|
12
|
+
.ignoreSource([PhysicsSystemTag])
|
|
13
|
+
.update(Position, [Body], (entity, position, [body]) => {
|
|
14
|
+
const bodyId = body?._bodyId;
|
|
8
15
|
if (bodyId === undefined) {
|
|
9
16
|
return;
|
|
10
17
|
}
|
|
11
|
-
const rotation =
|
|
18
|
+
const rotation = engine.box2d.b2Body_GetRotation(bodyId);
|
|
12
19
|
try {
|
|
13
|
-
|
|
14
|
-
|
|
20
|
+
const vec = scr_b2Vec2[0];
|
|
21
|
+
vec.Set(position.x, position.y);
|
|
22
|
+
engine.box2d.b2Body_SetTransform(bodyId, vec, rotation);
|
|
15
23
|
}
|
|
16
24
|
finally {
|
|
17
25
|
rotation.delete();
|
|
18
26
|
}
|
|
19
27
|
});
|
|
20
|
-
|
|
21
|
-
|
|
28
|
+
positionSystem.entity.add(PhysicsSystemTag);
|
|
29
|
+
const rotationSystem = world
|
|
30
|
+
.system("PhysicsPoseSyncIn:Rotation")
|
|
31
|
+
.with(Body, Rotation)
|
|
32
|
+
.phase(phase)
|
|
33
|
+
.ignoreSource([PhysicsSystemTag])
|
|
34
|
+
.update(Rotation, [Body], (entity, rotation, [body]) => {
|
|
35
|
+
const bodyId = body?._bodyId;
|
|
22
36
|
if (bodyId === undefined) {
|
|
23
37
|
return;
|
|
24
38
|
}
|
|
25
|
-
const position =
|
|
26
|
-
const wasmRotation =
|
|
39
|
+
const position = engine.box2d.b2Body_GetPosition(bodyId);
|
|
40
|
+
const wasmRotation = engine.box2d.b2MakeRot(rotation.angle);
|
|
27
41
|
try {
|
|
28
|
-
|
|
42
|
+
engine.box2d.b2Body_SetTransform(bodyId, position, wasmRotation);
|
|
29
43
|
}
|
|
30
44
|
finally {
|
|
31
45
|
wasmRotation.delete();
|
|
32
46
|
position.delete();
|
|
33
47
|
}
|
|
34
48
|
});
|
|
35
|
-
|
|
36
|
-
|
|
49
|
+
rotationSystem.entity.add(PhysicsSystemTag);
|
|
50
|
+
const linearVelocitySystem = world
|
|
51
|
+
.system("PhysicsPoseSyncIn:LinearVelocity")
|
|
52
|
+
.with(Body, LinearVelocity)
|
|
53
|
+
.phase(phase)
|
|
54
|
+
.ignoreSource([PhysicsSystemTag])
|
|
55
|
+
.update(LinearVelocity, [Body], (entity, velocity, [body]) => {
|
|
56
|
+
const bodyId = body?._bodyId;
|
|
37
57
|
if (bodyId === undefined) {
|
|
38
58
|
return;
|
|
39
59
|
}
|
|
40
|
-
|
|
41
|
-
|
|
60
|
+
const vec = scr_b2Vec2[0];
|
|
61
|
+
vec.Set(velocity.x, velocity.y);
|
|
62
|
+
engine.box2d.b2Body_SetLinearVelocity(bodyId, vec);
|
|
42
63
|
});
|
|
43
|
-
|
|
44
|
-
|
|
64
|
+
linearVelocitySystem.entity.add(PhysicsSystemTag);
|
|
65
|
+
const angularVelocitySystem = world
|
|
66
|
+
.system("PhysicsPoseSyncIn:AngularVelocity")
|
|
67
|
+
.with(Body, AngularVelocity)
|
|
68
|
+
.phase(phase)
|
|
69
|
+
.ignoreSource([PhysicsSystemTag])
|
|
70
|
+
.update(AngularVelocity, [Body], (entity, velocity, [body]) => {
|
|
71
|
+
const bodyId = body?._bodyId;
|
|
45
72
|
if (bodyId === undefined) {
|
|
46
73
|
return;
|
|
47
74
|
}
|
|
48
|
-
|
|
75
|
+
engine.box2d.b2Body_SetAngularVelocity(bodyId, velocity.value);
|
|
49
76
|
});
|
|
50
|
-
|
|
77
|
+
angularVelocitySystem.entity.add(PhysicsSystemTag);
|
|
51
78
|
}
|
|
52
79
|
//# sourceMappingURL=pose_sync_in.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pose_sync_in.js","sourceRoot":"","sources":["../../../../src/systems/pose_sync_in.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAClG,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"pose_sync_in.js","sourceRoot":"","sources":["../../../../src/systems/pose_sync_in.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type Entity, type
|
|
2
|
-
import { type
|
|
3
|
-
export declare function installPoseSyncOut(world: World,
|
|
1
|
+
import { type Entity, type World } from "@vworlds/vecs";
|
|
2
|
+
import { type PhysicsEngine } from "../adapter/engine.js";
|
|
3
|
+
export declare function installPoseSyncOut(world: World, engine: PhysicsEngine, phase: Entity): void;
|
package/systems/pose_sync_out.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { AngularVelocity, Body, BodyType, LinearVelocity, Position, Rotation, } from "../components/body.js";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
import { PhysicsSystemTag } from "../adapter/engine.js";
|
|
3
|
+
export function installPoseSyncOut(world, engine, phase) {
|
|
4
|
+
const system = world
|
|
4
5
|
.system("PhysicsPoseSyncOut")
|
|
5
6
|
.phase(phase)
|
|
6
7
|
.run(() => {
|
|
7
|
-
const bodyEvents =
|
|
8
|
+
const bodyEvents = engine.box2d.b2World_GetBodyEvents(engine.worldId);
|
|
8
9
|
try {
|
|
9
10
|
for (let i = 0; i < bodyEvents.moveCount; i++) {
|
|
10
11
|
const move = bodyEvents.GetMoveEvent(i);
|
|
11
12
|
try {
|
|
12
|
-
const entityId =
|
|
13
|
+
const entityId = engine.entityByBodyIndex.get(move.bodyId.index1);
|
|
13
14
|
if (entityId === undefined) {
|
|
14
15
|
continue;
|
|
15
16
|
}
|
|
@@ -23,7 +24,7 @@ export function installPoseSyncOut(world, state, phase) {
|
|
|
23
24
|
entity.set(Rotation, { angle: move.transform.q.GetAngle() });
|
|
24
25
|
}
|
|
25
26
|
if (entity.get(LinearVelocity) !== undefined) {
|
|
26
|
-
const linear =
|
|
27
|
+
const linear = engine.box2d.b2Body_GetLinearVelocity(move.bodyId);
|
|
27
28
|
try {
|
|
28
29
|
entity.set(LinearVelocity, { x: linear.x, y: linear.y });
|
|
29
30
|
}
|
|
@@ -33,7 +34,7 @@ export function installPoseSyncOut(world, state, phase) {
|
|
|
33
34
|
}
|
|
34
35
|
if (entity.get(AngularVelocity) !== undefined) {
|
|
35
36
|
entity.set(AngularVelocity, {
|
|
36
|
-
value:
|
|
37
|
+
value: engine.box2d.b2Body_GetAngularVelocity(move.bodyId),
|
|
37
38
|
});
|
|
38
39
|
}
|
|
39
40
|
}
|
|
@@ -46,5 +47,6 @@ export function installPoseSyncOut(world, state, phase) {
|
|
|
46
47
|
bodyEvents.delete();
|
|
47
48
|
}
|
|
48
49
|
});
|
|
50
|
+
system.entity.add(PhysicsSystemTag);
|
|
49
51
|
}
|
|
50
52
|
//# sourceMappingURL=pose_sync_out.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pose_sync_out.js","sourceRoot":"","sources":["../../../../src/systems/pose_sync_out.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,QAAQ,EACR,QAAQ,GACT,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"pose_sync_out.js","sourceRoot":"","sources":["../../../../src/systems/pose_sync_out.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,QAAQ,EACR,QAAQ,GACT,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAsB,MAAM,sBAAsB,CAAC;AAE5E,MAAM,UAAU,kBAAkB,CAAC,KAAY,EAAE,MAAqB,EAAE,KAAa;IACnF,MAAM,MAAM,GAAG,KAAK;SACjB,MAAM,CAAC,oBAAoB,CAAC;SAC5B,KAAK,CAAC,KAAK,CAAC;SACZ,GAAG,CAAC,GAAG,EAAE;QACR,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC;YACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9C,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACxC,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBAClE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;wBAC3B,SAAS;oBACX,CAAC;oBAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACtC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC9B,IAAI,IAAI,EAAE,IAAI,KAAK,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACpC,SAAS;oBACX,CAAC;oBAED,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACvE,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;wBACvC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAC/D,CAAC;oBACD,IAAI,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,SAAS,EAAE,CAAC;wBAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBAClE,IAAI,CAAC;4BACH,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;wBAC3D,CAAC;gCAAS,CAAC;4BACT,MAAM,CAAC,MAAM,EAAE,CAAC;wBAClB,CAAC;oBACH,CAAC;oBACD,IAAI,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE,CAAC;wBAC9C,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE;4BAC1B,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,CAAC;yBAC3D,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;wBAAS,CAAC;oBACT,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IACL,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -1,4 +1,31 @@
|
|
|
1
|
-
import { type Entity, type
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { type Entity, type World } from "@vworlds/vecs";
|
|
2
|
+
import { Body } from "../components/body.js";
|
|
3
|
+
import { SingleShape } from "../components/geometry.js";
|
|
4
|
+
import { type Box2DModule } from "../adapter/runtime.js";
|
|
5
|
+
import { type PhysicsEngine } from "../adapter/engine.js";
|
|
6
|
+
export declare function installShapeLifecycle(world: World, engine: PhysicsEngine, phase: Entity): void;
|
|
7
|
+
export declare function recreateSingleShapeForEntity(engine: PhysicsEngine, entity: Entity, parentEntity: Entity | undefined, parentBody: Body | undefined, shape: SingleShape | undefined): void;
|
|
8
|
+
export declare function applyChainDef(def: ReturnType<Box2DModule["b2DefaultChainDef"]>, options: ShapeOptions): void;
|
|
9
|
+
export declare function readShapeOptions(entity: Entity): ShapeOptions;
|
|
10
|
+
export declare function readLocalPose(entity: Entity): {
|
|
11
|
+
x: number;
|
|
12
|
+
y: number;
|
|
13
|
+
angle: number;
|
|
14
|
+
};
|
|
15
|
+
export declare function parentBodyStillExists(parent?: Entity): boolean;
|
|
16
|
+
export declare function markParentBodyMassDirty(engine: PhysicsEngine, parent?: Entity): void;
|
|
17
|
+
export interface ShapeOptions {
|
|
18
|
+
density: number;
|
|
19
|
+
friction: number;
|
|
20
|
+
restitution: number;
|
|
21
|
+
rollingResistance: number;
|
|
22
|
+
tangentSpeed: number;
|
|
23
|
+
userMaterialId: number;
|
|
24
|
+
categoryBits: number;
|
|
25
|
+
maskBits: number;
|
|
26
|
+
groupIndex: number;
|
|
27
|
+
sensor: boolean;
|
|
28
|
+
enableContactEvents: boolean;
|
|
29
|
+
enableHitEvents: boolean;
|
|
30
|
+
enableSensorEvents: boolean;
|
|
31
|
+
}
|