Skip to content

Commit fe03f9c

Browse files
committed
Add lost trigger collision group
1 parent 5920ae4 commit fe03f9c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/inflators/rigid-body.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export enum Type {
1313
export enum CollisionGroup {
1414
OBJECTS = "objects",
1515
ENVIRONMENT = "environment",
16+
TRIGGERS = "triggers",
1617
AVATARS = "avatars"
1718
}
1819

@@ -256,6 +257,7 @@ export enum GLTFRigidBodyType {
256257
export enum GLTFRigidBodyCollisionGroup {
257258
OBJECTS = "objects",
258259
ENVIRONMENT = "environment",
260+
TRIGGERS = "triggers",
259261
AVATARS = "avatars",
260262
MEDIA_FRAMES = "media-frames"
261263
}
@@ -270,6 +272,7 @@ const GLTF_DEFAULTS = {
270272
const gltfGroupToLayer = {
271273
[GLTFRigidBodyCollisionGroup.OBJECTS]: COLLISION_LAYERS.INTERACTABLES,
272274
[GLTFRigidBodyCollisionGroup.ENVIRONMENT]: COLLISION_LAYERS.ENVIRONMENT,
275+
[GLTFRigidBodyCollisionGroup.TRIGGERS]: COLLISION_LAYERS.TRIGGERS,
273276
[GLTFRigidBodyCollisionGroup.AVATARS]: COLLISION_LAYERS.AVATAR,
274277
[GLTFRigidBodyCollisionGroup.MEDIA_FRAMES]: COLLISION_LAYERS.MEDIA_FRAMES
275278
} as const;

src/systems/floaty-object-system.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const floatyObjectSystem = world => {
8383
physicsSystem.updateRigidBody(eid, {
8484
gravity: { x: 0, y: 0, z: 0 },
8585
type: "dynamic",
86-
collisionFilterMask: COLLISION_LAYERS.HANDS | COLLISION_LAYERS.MEDIA_FRAMES
86+
collisionFilterMask: COLLISION_LAYERS.HANDS | COLLISION_LAYERS.MEDIA_FRAMES | COLLISION_LAYERS.TRIGGERS
8787
});
8888
});
8989

@@ -101,7 +101,7 @@ export const floatyObjectSystem = world => {
101101
linearDamping: 0.95,
102102
linearSleepingThreshold: 0.1,
103103
angularSleepingThreshold: 0.1,
104-
collisionFilterMask: COLLISION_LAYERS.HANDS | COLLISION_LAYERS.MEDIA_FRAMES
104+
collisionFilterMask: COLLISION_LAYERS.HANDS | COLLISION_LAYERS.MEDIA_FRAMES | COLLISION_LAYERS.TRIGGERS
105105
});
106106
addComponent(world, MakeStaticWhenAtRest, eid);
107107
} else {

0 commit comments

Comments
 (0)