mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-14 18:05:43 +02:00
Code Releases Activity

collision

Browse Source
This commit is contained in:
syuilo
2026-04-14 10:43:40 +09:00
parent 02eb8cfe1c
commit 240c055b45
66 changed files with 111 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
packages/frontend/src/utility/room/engine.ts
View File

@@ -17,8 +17,9 @@
* - メッシュ名を __TOP__ で始めると、その面の上にモノを置けることを示す。当該メッシュはレンダリングでは表示されません。
* - メッシュ名を __SIDE__ で始めると、その面にモノを貼り付けられることを示す。当該メッシュはレンダリングでは表示されません。
* - なお、現状 __TOP__ / __SIDE__ メッシュは単一の面でなければなりません。つまりArray Modifierなどを適用した状態では正しく動作しません。
* - メッシュ名を __COLLISION__ で始めると、コリジョン用メッシュとして扱われます。このメッシュはシーク時のレイのヒットチェックにも使われます。当該メッシュはレンダリングでは表示されません。
* - コリジョン用メッシュが無い場合、すべてのメッシュがコリジョン用メッシュとして扱われますが、例えば網目のようなメッシュではレイが隙間を通り抜けて後ろにあるオブジェクトにヒットしてしまうなどの問題が発生します。
* - メッシュ名を __COLLISION__ で始めると、コリジョン用メッシュとして扱われます。当該メッシュはレンダリングでは表示されません。
* - メッシュ名を __PICK__ で始めると、レイのヒットチェック用メッシュとして扱われます。当該メッシュはレンダリングでは表示されません。
* - __PICK__が無い場合、すべてのメッシュをヒットチェックメッシュとして扱いますが、例えば網目のようなメッシュではレイが隙間を通り抜けて後ろにあるオブジェクトにヒットしてしまうなどの問題が発生します。
* - シェイプキーを使用する場合、normalのエクスポートが有効だと面のレンダリングがおかしくなる場合があります。その場合は無効化してください。
* - 後からモデルを調整したくなった時に備え、モディファイアを駆使するなどして、なるべく非破壊的なモデリングを心がけることを推奨します。
* - パーツ的に分かれていることが自然なメッシュについても、できるだけマージせす、別々のメッシュのままにしてください。
@@ -39,6 +40,8 @@ const SNAPSHOT_RENDERING = false; // 実験的
const SNAPSHOT_RENDERING_NON_SUPPORTED_OBJECTS = ['tv', 'aquarium', 'lavaLamp'];
const IGNORE_OBJECTS: string[] = []; // for debug
const SYSTEM_MESH_NAMES = ['__TOP__', '__SIDE__', '__PICK__', '__COLLISION__', '__COLLISION_AUTO_GENERATED_INTERNALY__'];
import * as BABYLON from '@babylonjs/core';
import { AxesViewer } from '@babylonjs/core/Debug/axesViewer';
import { registerBuiltInLoaders } from '@babylonjs/loaders/dynamic';
@@ -209,7 +212,7 @@ class ModelManager {
}
this.bakedMeshes = [];
const excludeMeshes = [...this.bakeExcludeMeshes, ...this.root.getChildMeshes().filter(m => m.name.includes('__TOP__') || m.name.includes('__SIDE__') || m.name.includes('__COLLISION__'))];
const excludeMeshes = [...this.bakeExcludeMeshes, ...this.root.getChildMeshes().filter(m => SYSTEM_MESH_NAMES.some(s => m.name.includes(s)))];
const childMeshes = this.root.getChildMeshes().filter(m => !excludeMeshes.some(x => x === m) && m.isVisible);
@@ -308,6 +311,7 @@ type ObjectDef<OpSc extends OptionsSchema = OptionsSchema> = {
default: GetOptionsSchemaValues<OpSc>;
};
placement: 'top' | 'side' | 'bottom' | 'wall' | 'ceiling' | 'floor';
noCollisions?: boolean;
//groupingMeshes: string[]; // multi-materialなメッシュは複数のメッシュに分割されるが、それだと不便な場合に追加の親メッシュでグルーピングするための指定
isChair?: boolean;
treatLoaderResult?: (loaderResult: BABYLON.AssetContainer) => void;
@@ -386,24 +390,33 @@ function enableObjectCollision(meshes: BABYLON.Mesh[]) {
}
}
if (!hasCollisionMesh) {
for (const mesh of meshes) {
mesh.checkCollisions = true;
mesh.metadata ??= {};
mesh.metadata.isCollision = true;
}
} else {
if (hasCollisionMesh) {
for (const mesh of meshes) {
if (mesh.name.includes('__COLLISION__')) {
mesh.checkCollisions = true;
mesh.metadata ??= {};
mesh.metadata.isCollision = true;
} else {
mesh.checkCollisions = false;
mesh.metadata ??= {};
mesh.metadata.isCollision = false;
}
}
return;
}
// なんかうまくいかない
//const boundingInfo = getMeshesBoundingBox(meshes.filter(m => m.isEnabled() && m.isVisible));
//const collider = meshes.find(m => m.name.includes('__COLLISION_AUTO_GENERATED_INTERNALY__'))!;
//if (collider == null) return;
////collider.position.y = ((boundingInfo.maximum.y + boundingInfo.minimum.y) / 2) / WORLD_SCALE;
//collider.scaling = new BABYLON.Vector3(
// (boundingInfo.maximum.x - boundingInfo.minimum.x) || 1,
// (boundingInfo.maximum.y - boundingInfo.minimum.y) || 1,
// (boundingInfo.maximum.z - boundingInfo.minimum.z) || 1,
//);
//collider.checkCollisions = true;
//collider.isVisible = true;
for (const mesh of meshes) {
mesh.checkCollisions = true;
}
}
@@ -709,8 +722,9 @@ export class RoomEngine {
this.selectObject(null);
// TODO: __PICK__考慮
const pickingInfo = this.scene.pick(this.scene.pointerX, this.scene.pointerY,
(m) => m.metadata?.isCollision && m.metadata?.objectId != null && this.objectEntities.has(m.metadata.objectId));
(m) => m.metadata?.objectId != null && this.objectEntities.has(m.metadata.objectId));
if (pickingInfo.pickedMesh != null) {
const oid = pickingInfo.pickedMesh.metadata.objectId;
@@ -1063,6 +1077,7 @@ export class RoomEngine {
options: any;
}) {
const def = getObjectDef(args.type);
const collisionsDisabled = def.placement === 'ceiling' || def.noCollisions;
const root = new BABYLON.TransformNode(`object_${args.id}_${args.type}`, this.scene);
@@ -1213,6 +1228,10 @@ export class RoomEngine {
root.addChild(subRoot);
}
//const internalCollider = BABYLON.MeshBuilder.CreateBox(`__COLLISION_AUTO_GENERATED_INTERNALY__${root.name}`, { width: 0, height: 0, depth: 0 }, this.scene);
//internalCollider.isVisible = false;
//internalCollider.parent = root;
root.position = args.position.clone();
root.rotation = args.rotation.clone();
root.metadata = metadata;
@@ -1228,7 +1247,7 @@ export class RoomEngine {
mesh.metadata = metadata;
if (mesh.name.includes('__COLLISION__') || mesh.name.includes('__TOP__') || mesh.name.includes('__SIDE__')) {
if (SYSTEM_MESH_NAMES.some(n => mesh.name.includes(n))) {
mesh.receiveShadows = false;
mesh.isVisible = false;
} else {
@@ -1269,7 +1288,9 @@ export class RoomEngine {
if (!this.scene.meshes.includes(mesh)) this.scene.addMesh(mesh);
}
enableObjectCollision(meshes);
if (!collisionsDisabled) {
enableObjectCollision(meshes);
}
});
const objectInstance = await def.createInstance({
@@ -1307,7 +1328,9 @@ export class RoomEngine {
model.bakeMesh();
enableObjectCollision(root.getChildMeshes());
if (!collisionsDisabled) {
enableObjectCollision(root.getChildMeshes());
}
this.objectEntities.set(args.id, { instance: objectInstance, rootMesh: root, model });
@@ -1575,6 +1598,7 @@ export class RoomEngine {
const id = genId();
const def = getObjectDef(type);
const collisionsDisabled = def.placement === 'ceiling' || def.noCollisions;
const options = deepClone(def.options.default);
@@ -1617,7 +1641,9 @@ export class RoomEngine {
// todo
},
onDone: () => { // todo: sticky状態などを引数でもらうようにしたい
enableObjectCollision(root.getChildMeshes());
if (!collisionsDisabled) {
enableObjectCollision(root.getChildMeshes());
}
this.ui.isGrabbingForInstall = false;
@@ -1956,7 +1982,7 @@ export class RoomObjectPreviewEngine {
// シェイプキー(morph)を考慮してbounding boxを更新するために必要
mesh.refreshBoundingInfo({ applyMorph: true });
if (mesh.name.includes('__COLLISION__') || mesh.name.includes('__TOP__') || mesh.name.includes('__SIDE__')) {
if (SYSTEM_MESH_NAMES.some(n => mesh.name.includes(n))) {
mesh.receiveShadows = false;
mesh.isVisible = false;
} else {

1
packages/frontend/src/utility/room/objects/a4Case.ts
View File

@@ -21,6 +21,7 @@ export const a4Case = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ options, model }) => {
const bodyMesh = model.findMesh('__X_BODY__');
const bodyMaterial = bodyMesh.material as BABYLON.PBRMaterial;

1
packages/frontend/src/utility/room/objects/aircon.ts
View File

@@ -13,6 +13,7 @@ export const aircon = defineObject({
default: {},
},
placement: 'wall',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/aquarium.ts
View File

@@ -14,6 +14,7 @@ export const aquarium = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: ({ scene, root }) => {
return {
onInited: () => {

1
packages/frontend/src/utility/room/objects/aromaReedDiffuser.ts
View File

@@ -26,6 +26,7 @@ export const aromaReedDiffuser = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ options, model }) => {
const bottleMesh = model.findMesh('__X_BOTTLE__');
const bottleMaterial = bottleMesh.material as BABYLON.PBRMaterial;

1
packages/frontend/src/utility/room/objects/banknote.ts
View File

@@ -13,6 +13,7 @@ export const banknote = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/beamLamp.ts
View File

@@ -14,6 +14,7 @@ export const beamLamp = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: ({ room, root, scene }) => {
return {
onInited: () => {

1
packages/frontend/src/utility/room/objects/blind.ts
View File

@@ -40,6 +40,7 @@ export const blind = defineObject({
},
},
placement: 'bottom',
noCollisions: true,
createInstance: ({ options, model }) => {
const temp = createOverridedStates({
angle: () => options.angle,

1
packages/frontend/src/utility/room/objects/book.ts
View File

@@ -45,6 +45,7 @@ export const book = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ options, model }) => {
const bodyMesh = model.findMesh('__X_BODY__');

1
packages/frontend/src/utility/room/objects/books.ts
View File

@@ -22,6 +22,7 @@ export const books = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ scene, options, model }) => {
const coverMaterial = model.findMaterial('__X_COVER__');

1
packages/frontend/src/utility/room/objects/cactusS.ts
View File

@@ -21,6 +21,7 @@ export const cactusS = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ options, model }) => {
const potMesh = model.findMesh('__X_POT__');
const potMaterial = potMesh.material as BABYLON.PBRMaterial;

1
packages/frontend/src/utility/room/objects/ceilingFanLight.ts
View File

@@ -14,6 +14,7 @@ export const ceilingFanLight = defineObject({
default: {},
},
placement: 'ceiling',
noCollisions: true,
receiveShadows: false,
castShadows: false,
createInstance: ({ scene, model }) => {

1
packages/frontend/src/utility/room/objects/coffeeCup.ts
View File

@@ -13,6 +13,7 @@ export const coffeeCup = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/cupNoodle.ts
View File

@@ -15,6 +15,7 @@ export const cupNoodle = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: ({ scene, root }) => {
let yugeDispose: (() => void) | null = null;

1
packages/frontend/src/utility/room/objects/custardPudding.ts
View File

@@ -13,6 +13,7 @@ export const custardPudding = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/djMixer.ts
View File

@@ -13,6 +13,7 @@ export const djMixer = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/djPlayer.ts
View File

@@ -36,6 +36,7 @@ export const djPlayer = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: async ({ model, options, scene }) => {
const screenMesh = model.findMesh('__X_SCREEN__');
const screenMaterial = model.findMaterial('__X_SCREEN__');

1
packages/frontend/src/utility/room/objects/ductTape.ts
View File

@@ -13,6 +13,7 @@ export const ductTape = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/emptyBento.ts
View File

@@ -13,6 +13,7 @@ export const emptyBento = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/energyDrink.ts
View File

@@ -13,6 +13,7 @@ export const energyDrink = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/envelope.ts
View File

@@ -13,6 +13,7 @@ export const envelope = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/facialTissue.ts
View File

@@ -13,6 +13,7 @@ export const facialTissue = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/hangingTShirt.ts
View File

@@ -13,6 +13,7 @@ export const hangingTShirt = defineObject({
default: {},
},
placement: 'side',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/icosahedron.ts
View File

@@ -13,6 +13,7 @@ export const icosahedron = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/keyboard.ts
View File

@@ -13,6 +13,7 @@ export const keyboard = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/laptopPc.ts
View File

@@ -54,6 +54,7 @@ export const laptopPc = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: async ({ room, scene, options, model }) => {
const matrix = model.root.getWorldMatrix(true);
const scale = new BABYLON.Vector3();

1
packages/frontend/src/utility/room/objects/lavaLamp.ts
View File

@@ -13,6 +13,7 @@ export const lavaLamp = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: ({ room, scene, root }) => {
return {
onInited: () => {

1
packages/frontend/src/utility/room/objects/miPlate.ts
View File

@@ -13,6 +13,7 @@ export const miPlate = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/miPlateDisplayed.ts
View File

@@ -13,6 +13,7 @@ export const miPlateDisplayed = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/milk.ts
View File

@@ -13,6 +13,7 @@ export const milk = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/mixer.ts
View File

@@ -13,6 +13,7 @@ export const mixer = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/monitorSpeaker.ts
View File

@@ -21,6 +21,7 @@ export const monitorSpeaker = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ options, model }) => {
const bodyMesh = model.findMesh('__X_BODY__');
const bodyMaterial = bodyMesh.material as BABYLON.PBRMaterial;

1
packages/frontend/src/utility/room/objects/monstera.ts
View File

@@ -13,6 +13,7 @@ export const monstera = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/mug.ts
View File

@@ -15,6 +15,7 @@ export const mug = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: ({ scene, root }) => {
let yugeDispose: (() => void) | null = null;

1
packages/frontend/src/utility/room/objects/newtonsCradle.ts
View File

@@ -21,6 +21,7 @@ export const newtonsCradle = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ options, model }) => {
const frameMaterial = model.findMaterial('__X_FRAME__');

1
packages/frontend/src/utility/room/objects/petBottle.ts
View File

@@ -26,6 +26,7 @@ export const petBottle = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ model, options }) => {
const capMesh = model.findMesh('__X_CAP__');
const liquidMesh = model.findMesh('__X_LIQUID__');

1
packages/frontend/src/utility/room/objects/pictureFrame.ts
View File

@@ -83,6 +83,7 @@ export const pictureFrame = defineObject({
},
},
placement: 'side',
noCollisions: true,
createInstance: async ({ scene, options, model }) => {
const frameMesh = model.findMesh('__X_FRAME__');
frameMesh.rotationQuaternion = null;

1
packages/frontend/src/utility/room/objects/pizza.ts
View File

@@ -13,6 +13,7 @@ export const pizza = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/plant.ts
View File

@@ -13,6 +13,7 @@ export const plant = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/poster.ts
View File

@@ -48,6 +48,7 @@ export const poster = defineObject({
},
},
placement: 'side',
noCollisions: true,
createInstance: async ({ scene, options, model }) => {
const pictureMesh = model.findMesh('__X_PICTURE__');
pictureMesh.rotationQuaternion = null;

1
packages/frontend/src/utility/room/objects/powerStrip.ts
View File

@@ -13,6 +13,7 @@ export const powerStrip = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/radiometer.ts
View File

@@ -14,6 +14,7 @@ export const radiometer = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: ({ scene, model }) => {
const vanes = model.findTransformNode('__X_VANES__');
model.bakeExcludeMeshes = [...vanes.getChildMeshes()];

1
packages/frontend/src/utility/room/objects/randomBooks.ts
View File

@@ -42,6 +42,7 @@ export const randomBooks = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ options, model, scene, id }) => {
const bodyMesh = model.findMesh('__X_BODY__');
const tex = new BABYLON.Texture('/client-assets/room/objects/random-books/texture.png', scene, {

1
packages/frontend/src/utility/room/objects/rolledUpPoster.ts
View File

@@ -13,6 +13,7 @@ export const rolledUpPoster = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/roundRug.ts
View File

@@ -13,6 +13,7 @@ export const roundRug = defineObject({
default: {},
},
placement: 'floor',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/router.ts
View File

@@ -13,6 +13,7 @@ export const router = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/siphon.ts
View File

@@ -13,6 +13,7 @@ export const siphon = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/snakeplant.ts
View File

@@ -13,6 +13,7 @@ export const snakeplant = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/speaker.ts
View File

@@ -26,6 +26,7 @@ export const speaker = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ options, model }) => {
const outerMesh = model.findMesh('__X_COVER__');
const outerMaterial = outerMesh.material as BABYLON.PBRMaterial;

1
packages/frontend/src/utility/room/objects/sprayer.ts
View File

@@ -13,6 +13,7 @@ export const sprayer = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/tabletopCalendar.ts
View File

@@ -13,6 +13,7 @@ export const tabletopCalendar = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/tabletopDigitalClock.ts
View File

@@ -33,6 +33,7 @@ export const tabletopDigitalClock = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ root, room, options, model, scene }) => {
const light = new BABYLON.SpotLight('', new BABYLON.Vector3(0, 3/*cm*/, 1/*cm*/), new BABYLON.Vector3(0, 0, 1), Math.PI / 1, 2, scene, room?.lightContainer != null);
light.parent = root;

1
packages/frontend/src/utility/room/objects/tabletopFlag.ts
View File

@@ -28,6 +28,7 @@ export const tabletopFlag = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: async ({ model, options, scene }) => {
const flagMesh = model.findMesh('__X_FLAG__');
const flagMaterial = model.findMaterial('__X_FLAG__');

1
packages/frontend/src/utility/room/objects/tabletopGlassPictureFrame.ts
View File

@@ -48,6 +48,7 @@ export const tabletopGlassPictureFrame = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: async ({ scene, options, model }) => {
const pictureMesh = model.findMesh('__X_PICTURE__');
const frameMesh = model.findMesh('__X_FRAME__');

1
packages/frontend/src/utility/room/objects/tabletopIronFrameStand.ts
View File

@@ -50,6 +50,7 @@ export const tabletopIronFrameStand = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: ({ options, model }) => {
const frameMaterial = model.findMaterial('__X_FRAME__');
const boardMaterial = model.findMaterial('__X_BOARD__');

1
packages/frontend/src/utility/room/objects/tabletopPictureFrame.ts
View File

@@ -83,6 +83,7 @@ export const tabletopPictureFrame = defineObject({
},
},
placement: 'top',
noCollisions: true,
createInstance: async ({ scene, options, model }) => {
const frameMesh = model.findMesh('__X_FRAME__');
frameMesh.rotationQuaternion = null;

1
packages/frontend/src/utility/room/objects/tapestry.ts
View File

@@ -48,6 +48,7 @@ export const tapestry = defineObject({
},
},
placement: 'side',
noCollisions: true,
createInstance: async ({ scene, options, model }) => {
const pictureMesh = model.findMesh('__X_PICTURE__');
pictureMesh.rotationQuaternion = null;

1
packages/frontend/src/utility/room/objects/tetrapod.ts
View File

@@ -13,6 +13,7 @@ export const tetrapod = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/twistedCubeObjet.ts
View File

@@ -13,6 +13,7 @@ export const twistedCubeObjet = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/usedTissue.ts
View File

@@ -13,6 +13,7 @@ export const usedTissue = defineObject({
default: {},
},
placement: 'top',
noCollisions: true,
createInstance: () => {
return {
interactions: {},

1
packages/frontend/src/utility/room/objects/wallCanvas.ts
View File

@@ -44,6 +44,7 @@ export const wallCanvas = defineObject({
},
},
placement: 'side',
noCollisions: true,
createInstance: async ({ scene, options, model }) => {
const canvasMesh = model.findMesh('__X_CANVAS__');
canvasMesh.rotationQuaternion = null;

1
packages/frontend/src/utility/room/objects/wallClock.ts
View File

@@ -21,6 +21,7 @@ export const wallClock = defineObject({
},
},
placement: 'side',
noCollisions: true,
createInstance: ({ room, root, options, model }) => {
const hourHand = model.findMesh('HandH');
const minuteHand = model.findMesh('HandM');

1
packages/frontend/src/utility/room/objects/wallGlassPictureFrame.ts
View File

@@ -48,6 +48,7 @@ export const wallGlassPictureFrame = defineObject({
},
},
placement: 'wall',
noCollisions: true,
createInstance: async ({ scene, options, model }) => {
const pictureMesh = model.findMesh('__X_PICTURE__');
const frameMesh = model.findMesh('__X_FRAME__');

1
packages/frontend/src/utility/room/objects/wallMirror.ts
View File

@@ -45,6 +45,7 @@ export const wallMirror = defineObject({
},
},
placement: 'side',
noCollisions: true,
createInstance: async ({ options, model }) => {
const frameMaterial = model.findMaterial('__X_FRAME__');
const frameMesh = model.findMesh('__X_FRAME__');

1
packages/frontend/src/utility/room/objects/woodRingsPendantLight.ts
View File

@@ -51,6 +51,7 @@ export const woodRingsPendantLight = defineObject({
},
},
placement: 'ceiling',
noCollisions: true,
createInstance: ({ room, scene, options, model }) => {
const shadeMaterial = model.findMaterial('__X_SHADE__');

1
packages/frontend/src/utility/room/objects/woodSoundAbsorbingPanel.ts
View File

@@ -13,6 +13,7 @@ export const woodSoundAbsorbingPanel = defineObject({
default: {},
},
placement: 'side',
noCollisions: true,
createInstance: () => {
return {
interactions: {},