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

hasCollisions

Browse Source
This commit is contained in:
syuilo
2026-04-15 11:54:38 +09:00
parent c426f95bee
commit 5104bafe95
79 changed files with 86 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -337,7 +337,7 @@ export type ObjectDef<OpSc extends OptionsSchema = OptionsSchema> = {
default: GetOptionsSchemaValues<OpSc>; default: GetOptionsSchemaValues<OpSc>;
}; };
placement: 'top' | 'side' | 'bottom' | 'wall' | 'ceiling' | 'floor'; placement: 'top' | 'side' | 'bottom' | 'wall' | 'ceiling' | 'floor';
noCollisions?: boolean; hasCollisions?: boolean;
//groupingMeshes: string[]; // multi-materialなメッシュは複数のメッシュに分割されるが、それだと不便な場合に追加の親メッシュでグルーピングするための指定 //groupingMeshes: string[]; // multi-materialなメッシュは複数のメッシュに分割されるが、それだと不便な場合に追加の親メッシュでグルーピングするための指定
isChair?: boolean; isChair?: boolean;
treatLoaderResult?: (loaderResult: BABYLON.AssetContainer) => void; treatLoaderResult?: (loaderResult: BABYLON.AssetContainer) => void;
@@ -379,15 +379,6 @@ function getMeshesBoundingBox(meshes: BABYLON.Mesh[]): BABYLON.BoundingBox {
} }
function enableObjectCollision(meshes: BABYLON.Mesh[]) { function enableObjectCollision(meshes: BABYLON.Mesh[]) {
let hasCollisionMesh = false;
for (const mesh of meshes) {
if (mesh.name.includes('__COLLISION__')) {
hasCollisionMesh = true;
break;
}
}
if (hasCollisionMesh) {
for (const mesh of meshes) { for (const mesh of meshes) {
if (mesh.name.includes('__COLLISION__')) { if (mesh.name.includes('__COLLISION__')) {
mesh.checkCollisions = true; mesh.checkCollisions = true;
@@ -396,26 +387,6 @@ function enableObjectCollision(meshes: BABYLON.Mesh[]) {
mesh.checkCollisions = false; mesh.checkCollisions = 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;
}
} }
export type RoomEngineEvents = { export type RoomEngineEvents = {
@@ -1191,7 +1162,6 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
options: any; options: any;
}) { }) {
const def = getObjectDef(args.type); const def = getObjectDef(args.type);
const collisionsDisabled = def.placement === 'ceiling' || def.noCollisions;
const root = new BABYLON.TransformNode(`object_${args.id}_${args.type}`, this.scene); const root = new BABYLON.TransformNode(`object_${args.id}_${args.type}`, this.scene);
@@ -1402,7 +1372,7 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
if (!this.scene.meshes.includes(mesh)) this.scene.addMesh(mesh); if (!this.scene.meshes.includes(mesh)) this.scene.addMesh(mesh);
} }
if (!collisionsDisabled) { if (def.hasCollisions) {
enableObjectCollision(meshes); enableObjectCollision(meshes);
} }
}); });
@@ -1442,7 +1412,7 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
model.bakeMesh(); model.bakeMesh();
if (!collisionsDisabled) { if (def.hasCollisions) {
enableObjectCollision(root.getChildMeshes()); enableObjectCollision(root.getChildMeshes());
} }
@@ -1710,7 +1680,6 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
const id = genId(); const id = genId();
const def = getObjectDef(type); const def = getObjectDef(type);
const collisionsDisabled = def.placement === 'ceiling' || def.noCollisions;
const options = deepClone(def.options.default); const options = deepClone(def.options.default);
@@ -1750,7 +1719,7 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
// todo // todo
}, },
onDone: () => { // todo: sticky状態などを引数でもらうようにしたい onDone: () => { // todo: sticky状態などを引数でもらうようにしたい
if (!collisionsDisabled) { if (def.hasCollisions) {
enableObjectCollision(root.getChildMeshes()); enableObjectCollision(root.getChildMeshes());
} }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -22,6 +22,7 @@ export const cardboardBox = defineObject({
}, },
}, },
placement: 'top', placement: 'top',
hasCollisions: true,
createInstance: ({ scene, options, model }) => { createInstance: ({ scene, options, model }) => {
return { return {
onInited: () => { onInited: () => {

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

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

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

@@ -26,6 +26,7 @@ export const chair = defineObject({
}, },
}, },
placement: 'floor', placement: 'floor',
hasCollisions: true,
isChair: true, isChair: true,
createInstance: ({ model, options }) => { createInstance: ({ model, options }) => {
const primaryMesh = model.findMesh('__X_PRIMARY__'); const primaryMesh = model.findMesh('__X_PRIMARY__');

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

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

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

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

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

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

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

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

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

@@ -42,6 +42,7 @@ export const desk = defineObject({
}, },
}, },
placement: 'floor', placement: 'floor',
hasCollisions: true,
createInstance: ({ options, model }) => { createInstance: ({ options, model }) => {
const frameMaterial = model.findMaterial('__X_FRAME__'); const frameMaterial = model.findMaterial('__X_FRAME__');
const boardMaterial = model.findMaterial('__X_BOARD__'); const boardMaterial = model.findMaterial('__X_BOARD__');

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

@@ -47,6 +47,7 @@ export const desktopPc = defineObject({
}, },
}, },
placement: 'top', placement: 'top',
hasCollisions: true,
createInstance: ({ options, model, root, scene, room }) => { createInstance: ({ options, model, root, scene, room }) => {
const light1 = new BABYLON.SpotLight('', new BABYLON.Vector3(0, cm(10), cm(22)), new BABYLON.Vector3(0, 0, 1), Math.PI / 1, 2, scene, room?.lightContainer != null); const light1 = new BABYLON.SpotLight('', new BABYLON.Vector3(0, cm(10), cm(22)), new BABYLON.Vector3(0, 0, 1), Math.PI / 1, 2, scene, room?.lightContainer != null);
light1.parent = root; light1.parent = root;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -32,6 +32,7 @@ const base = defineObjectClass({
}, },
}, },
placement: 'floor', placement: 'floor',
hasCollisions: true,
createInstance: ({ options, model }) => { createInstance: ({ options, model }) => {
const frameMaterial = model.findMaterial('__X_FRAME__'); const frameMaterial = model.findMaterial('__X_FRAME__');
const boardMaterial = model.findMaterial('__X_BOARD__'); const boardMaterial = model.findMaterial('__X_BOARD__');

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -21,6 +21,7 @@ export const piano = defineObject({
}, },
}, },
placement: 'floor', placement: 'floor',
hasCollisions: true,
createInstance: ({ options, model }) => { createInstance: ({ options, model }) => {
const bodyMaterial = model.findMaterial('__X_BODY__'); const bodyMaterial = model.findMaterial('__X_BODY__');

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -40,6 +40,7 @@ export const woodRingFloorLamp = defineObject({
}, },
}, },
placement: 'floor', placement: 'floor',
hasCollisions: true,
createInstance: ({ room, scene, options, model }) => { createInstance: ({ room, scene, options, model }) => {
const shadeMaterial = model.findMaterial('__X_SHADE__'); const shadeMaterial = model.findMaterial('__X_SHADE__');

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

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

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

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