wip

packages/frontend-misskey-world-engine/src/room/engine.ts

@@ -17,6 +17,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { registerBuiltInLoaders } from '@babylonjs/loaders/dynamic';
+import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
 import { TIME_MAP, getMeshesBoundingBox, Timer, getYRotationDirection, FreeCameraManualInput, remap } from '../utility.js';
 import { EngineBase } from '../EngineBase.js';
 import { genId } from '../id.js';

packages/frontend-misskey-world-engine/src/room/objects/allInOnePc.ts

@@ -4,10 +4,10 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { createTextureManager, defineObject } from '../object.js';
-import { cm, WORLD_SCALE } from '../../../../../frontend-misskey-world-engine/src/utility.js';
-import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
+import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
 import { allInOnePc_schema } from 'misskey-world/src/room/objects/allInOnePc.schema.js';
+import { createTextureManager, defineObject } from '../object.js';
+import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 
 export const allInOnePc = defineObject(allInOnePc_schema, {
 	createInstance: async ({ lc, scene, options, model, graphicsQuality }) => {

packages/frontend-misskey-world-engine/src/room/objects/aquarium.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { defineObject } from '../object.js';
-import { cm } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { cm } from 'misskey-world/src/utility.js';
 import { aquarium_schema } from 'misskey-world/src/room/objects/aquarium.schema.js';
 
 export const aquarium = defineObject(aquarium_schema, {

packages/frontend-misskey-world-engine/src/room/objects/beamLamp.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { defineObject } from '../object.js';
-import { cm, WORLD_SCALE } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 import { beamLamp_schema } from 'misskey-world/src/room/objects/beamLamp.schema.js';
 

packages/frontend-misskey-world-engine/src/room/objects/blind.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { defineObject } from '../object.js';
-import { cm, remap } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { cm, remap } from 'misskey-world/src/utility.js';
 import { createOverridedStates } from '../utility.js';
 import { blind_schema } from 'misskey-world/src/room/objects/blind.schema.js';
 

packages/frontend-misskey-world-engine/src/room/objects/books.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { defineObject } from '../object.js';
-import { cm } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { cm } from 'misskey-world/src/utility.js';
 import { books_schema } from 'misskey-world/src/room/objects/books.schema.js';
 
 export const books = defineObject(books_schema, {

packages/frontend-misskey-world-engine/src/room/objects/clippedPicture.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { createTextureManager, defineObject } from '../object.js';
-import { remap } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { remap } from 'misskey-world/src/utility.js';
 import { clippedPicture_schema } from 'misskey-world/src/room/objects/clippedPicture.schema.js';
 
 export const clippedPicture = defineObject(clippedPicture_schema, {

packages/frontend-misskey-world-engine/src/room/objects/cupNoodle.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { defineObject } from '../object.js';
-import { cm } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { cm } from 'misskey-world/src/utility.js';
 import { yuge } from '../utility.js';
 import { cupNoodle_schema } from 'misskey-world/src/room/objects/cupNoodle.schema.js';
 

packages/frontend-misskey-world-engine/src/room/objects/desktopPc.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { defineObject } from '../object.js';
-import { cm, WORLD_SCALE } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 import { desktopPc_schema } from 'misskey-world/src/room/objects/desktopPc.schema.js';
 

packages/frontend-misskey-world-engine/src/room/objects/djPlayer.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { createTextureManager, defineObject } from '../object.js';
-import { normalizeUvToSquare } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { normalizeUvToSquare } from 'misskey-world/src/utility.js';
 import { djPlayer_schema } from 'misskey-world/src/room/objects/djPlayer.schema.js';
 
 export const djPlayer = defineObject(djPlayer_schema, {

packages/frontend-misskey-world-engine/src/room/objects/electronicDisplayBoard.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { defineObject } from '../object.js';
-import { RecyvlingTextGrid } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { RecyvlingTextGrid } from 'misskey-world/src/utility.js';
 import { electronicDisplayBoard_schema } from 'misskey-world/src/room/objects/electronicDisplayBoard.schema.js';
 
 export const electronicDisplayBoard = defineObject(electronicDisplayBoard_schema, {

packages/frontend-misskey-world-engine/src/room/objects/laptopPc.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { createTextureManager, defineObject } from '../object.js';
-import { cm, WORLD_SCALE } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 import { laptopPc_schema } from 'misskey-world/src/room/objects/laptopPc.schema.js';
 

packages/frontend-misskey-world-engine/src/room/objects/lavaLamp.ts

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import * as BABYLON from '@babylonjs/core';
-import { defineObject } from '../object.js';
-import { cm, WORLD_SCALE } from '../../../../../frontend-misskey-world-engine/src/utility.js';
-import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 import { lavaLamp_schema } from 'misskey-world/src/room/objects/lavaLamp.schema.js';
+import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
+import { defineObject } from '../object.js';
+import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 
 export const lavaLamp = defineObject(lavaLamp_schema, {
 	createInstance: ({ options, lc, scene, sr, root, model, graphicsQuality }) => {

packages/frontend-misskey-world-engine/src/room/objects/monitor.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { createTextureManager, defineObject } from '../object.js';
-import { cm, WORLD_SCALE, normalizeUvToSquare } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { cm, WORLD_SCALE, normalizeUvToSquare } from 'misskey-world/src/utility.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 import { monitor_schema } from 'misskey-world/src/room/objects/monitor.schema.js';
 

packages/frontend-misskey-world-engine/src/room/objects/mug.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { defineObject } from '../object.js';
-import { cm } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { cm } from 'misskey-world/src/utility.js';
 import { yuge } from '../utility.js';
 import { mug_schema } from 'misskey-world/src/room/objects/mug.schema.js';
 

packages/frontend-misskey-world-engine/src/room/objects/steelRack.ts

@@ -4,9 +4,9 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineObject } from '../object.js';
 import { steelRack_schema } from 'misskey-world/src/room/objects/steelRack.schema.js';
-import { cm, remap } from '@/world/utility.js';
+import { cm, remap } from 'misskey-world/src/utility.js';
+import { defineObject } from '../object.js';
 
 export const steelRack = defineObject(steelRack_schema, {
 	path: (options) => {

packages/frontend-misskey-world-engine/src/room/objects/tabletopLcdButtonsController.ts

@@ -5,7 +5,7 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { createTextureManager, defineObject } from '../object.js';
-import { normalizeUvToSquare } from '../../../../../frontend-misskey-world-engine/src/utility.js';
+import { normalizeUvToSquare } from 'misskey-world/src/utility.js';
 import { tabletopLcdButtonsController_schema } from 'misskey-world/src/room/objects/tabletopLcdButtonsController.schema.js';
 
 export const tabletopLcdButtonsController = defineObject(tabletopLcdButtonsController_schema, {

packages/frontend-misskey-world-engine/src/room/previewEngine.ts

@@ -6,6 +6,7 @@
 import * as BABYLON from '@babylonjs/core';
 import { registerBuiltInLoaders } from '@babylonjs/loaders/dynamic.js';
 import { GridMaterial } from '@babylonjs/materials';
+import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
 import { camelToKebab, getMeshesBoundingBox, ArcRotateCameraManualInput } from '../utility.js';
 import { EngineBase } from '../EngineBase.js';
 import { getObjectDef } from './object-defs.js';

packages/frontend-misskey-world-engine/src/room/utility.ts

@@ -4,6 +4,7 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
+import { cm } from 'misskey-world/src/utility.js';
 import { applyMorphTargetsToMesh, getPlaneUvIndexes, Timer } from '../utility.js';
 
 export const GRAPHICS_QUALITY = {

packages/misskey-world/src/utility.ts

@@ -10,3 +10,7 @@ export const WORLD_SCALE = 100;
 //// cm to meter. 二重に適用しないように注意すること。
 //export const cm = (value: number) => value / 100;
 export const cm = (value: number) => value;
+
+export function remap(value: number, inMin: number, inMax: number, outMin: number, outMax: number) {
+	return outMin + (outMax - outMin) * ((value - inMin) / (inMax - inMin));
+}

pnpm-lock.yaml

@@ -1457,6 +1457,10 @@ importers:
         version: 3.1.14
 
   packages/misskey-world:
+    dependencies:
+      misskey-js:
+        specifier: workspace:*
+        version: link:../misskey-js
     devDependencies:
       '@typescript-eslint/eslint-plugin':
         specifier: 8.59.2