wip

packages/frontend-misskey-world-engine/src/avatars/AccessoryContainer.ts

@@ -55,7 +55,7 @@ export class AccessoryContainer {
 	public async load() {
 		const def = getAccessoryDef(this.type);
 
-		const filePath = def.path != null ? `/client-assets/world/avatar-accessories/${def.path(this.options)}.glb` : `/client-assets/world/avatar-accessories/${camelToKebab(this.type)}/${camelToKebab(this.type)}.glb`;
+		const filePath = def.path != null ? `/client-assets/world/objects/${def.path(this.options)}.glb` : `/client-assets/world/objects/${camelToKebab(this.type)}/${camelToKebab(this.type)}.glb`;
 		const loaderResult = await BABYLON.LoadAssetContainerAsync(filePath, this.scene);
 
 		// babylonによって自動で追加される右手系変換用ノード

packages/frontend-misskey-world-engine/src/avatars/accessories/mug.ts

@@ -14,7 +14,7 @@ export const mug = defineAccessory(mug_schema, {
 		emitter.parent = root;
 		emitter.position = new BABYLON.Vector3(0, cm(5), 0);
 		const ps = new BABYLON.ParticleSystem('steamParticleSystem', 8, scene);
-		ps.particleTexture = new BABYLON.Texture('/client-assets/world/avatar-accessories/mug/steam.png');
+		ps.particleTexture = new BABYLON.Texture('/client-assets/world/objects/mug/steam.png');
 		ps.emitter = emitter;
 		ps.minEmitBox = new BABYLON.Vector3(cm(-1), 0, cm(-1));
 		ps.maxEmitBox = new BABYLON.Vector3(cm(1), 0, cm(1));

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

@@ -530,7 +530,7 @@ export class WorldEngine extends EngineBase<{
 		const emitter = new BABYLON.TransformNode('emitter', this.scene);
 		emitter.position = new BABYLON.Vector3(0, cm(-1000), 0);
 		const ps = new BABYLON.ParticleSystem('', 128, this.scene);
-		ps.particleTexture = new BABYLON.Texture('/client-assets/room/objects/lava-lamp/bubble.png');
+		ps.particleTexture = new BABYLON.Texture('/client-assets/world/objects/lava-lamp/bubble.png');
 		ps.emitter = emitter;
 		ps.isLocal = true;
 		ps.minEmitBox = new BABYLON.Vector3(cm(-1000), 0, cm(-1000));

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

@@ -107,7 +107,7 @@ export class ObjectContainer {
 	public async load() {
 		const def = getObjectDef(this.type);
 
-		const filePath = def.path != null ? `/client-assets/room/objects/${def.path(this.options)}.glb` : `/client-assets/room/objects/${camelToKebab(this.type)}/${camelToKebab(this.type)}.glb`;
+		const filePath = def.path != null ? `/client-assets/world/objects/${def.path(this.options)}.glb` : `/client-assets/world/objects/${camelToKebab(this.type)}/${camelToKebab(this.type)}.glb`;
 		const loaderResult = await BABYLON.LoadAssetContainerAsync(filePath, this.scene);
 
 		// babylonによって自動で追加される右手系変換用ノード

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

@@ -22,7 +22,7 @@ export const aquarium = defineObject(aquarium_schema, {
 				emitter.parent = root;
 				emitter.position = new BABYLON.Vector3(cm(17), cm(7), cm(-9));
 				const ps = new BABYLON.ParticleSystem('', 128, scene);
-				ps.particleTexture = new BABYLON.Texture('/client-assets/room/objects/lava-lamp/bubble.png');
+				ps.particleTexture = new BABYLON.Texture('/client-assets/world/objects/lava-lamp/bubble.png');
 				ps.emitter = emitter;
 				ps.isLocal = true;
 				ps.minEmitBox = new BABYLON.Vector3(cm(-2), 0, cm(-2));

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

@@ -14,11 +14,11 @@ export const books = defineObject(books_schema, {
 
 		const applyVariation = () => {
 			const coverTexture =
-				options.variation === 'A' ? new BABYLON.Texture('/client-assets/room/objects/books/textures/a.png', scene, false, false) :
-				options.variation === 'B' ? new BABYLON.Texture('/client-assets/room/objects/books/textures/b.png', scene, false, false) :
-				options.variation === 'C' ? new BABYLON.Texture('/client-assets/room/objects/books/textures/c.png', scene, false, false) :
-				options.variation === 'D' ? new BABYLON.Texture('/client-assets/room/objects/books/textures/d.png', scene, false, false) :
-				new BABYLON.Texture('/client-assets/room/objects/books/textures/e.png', scene, false, false);
+				options.variation === 'A' ? new BABYLON.Texture('/client-assets/world/objects/books/textures/a.png', scene, false, false) :
+				options.variation === 'B' ? new BABYLON.Texture('/client-assets/world/objects/books/textures/b.png', scene, false, false) :
+				options.variation === 'C' ? new BABYLON.Texture('/client-assets/world/objects/books/textures/c.png', scene, false, false) :
+				options.variation === 'D' ? new BABYLON.Texture('/client-assets/world/objects/books/textures/d.png', scene, false, false) :
+				new BABYLON.Texture('/client-assets/world/objects/books/textures/e.png', scene, false, false);
 			coverMaterial.albedoTexture = coverTexture;
 		};
 

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

@@ -15,9 +15,9 @@ export const cardboardBox = defineObject(cardboardBox_schema, {
 
 		const applyVariation = () => {
 			if (options.variation === 'mikan') {
-				tex = new BABYLON.Texture('/client-assets/room/objects/cardboard-box/textures/mikan.png', scene, false, false);
+				tex = new BABYLON.Texture('/client-assets/world/objects/cardboard-box/textures/mikan.png', scene, false, false);
 			} else if (options.variation === 'aizon') {
-				tex = new BABYLON.Texture('/client-assets/room/objects/cardboard-box/textures/aizon.png', scene, false, false);
+				tex = new BABYLON.Texture('/client-assets/world/objects/cardboard-box/textures/aizon.png', scene, false, false);
 			}
 
 			if (tex != null) {

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

@@ -33,7 +33,7 @@ export const djPlayer = defineObject(djPlayer_schema, {
 			if (options.image.type === '_custom_') {
 				url = options.image.custom?.url ?? null;
 			} else if (options.image.type === 'waveform') {
-				url = '/client-assets/room/objects/dj-player/textures/display-waveform.png';
+				url = '/client-assets/world/objects/dj-player/textures/display-waveform.png';
 			}
 			return textureManager.change(url, options.image.fit).then((tex) => {
 				screenMaterial.emissiveTexture = tex;

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

@@ -21,12 +21,12 @@ export const issyoubin = defineObject(issyoubin_schema, {
 
 		const applyVariation = () => {
 			if (options.variation === 'misuki') {
-				const tex = new BABYLON.Texture('/client-assets/room/objects/issyoubin/textures/misuki.png', scene, false, false);
+				const tex = new BABYLON.Texture('/client-assets/world/objects/issyoubin/textures/misuki.png', scene, false, false);
 				labelMaterial.albedoTexture = tex;
 				bottleMaterial.albedoColor = new BABYLON.Color3(0.33, 0.06, 0);
 				bottleMaterial.alpha = 0.8;
 			} else if (options.variation === 'ai') {
-				const tex = new BABYLON.Texture('/client-assets/room/objects/issyoubin/textures/ai.png', scene, false, false);
+				const tex = new BABYLON.Texture('/client-assets/world/objects/issyoubin/textures/ai.png', scene, false, false);
 				labelMaterial.albedoTexture = tex;
 				bottleMaterial.albedoColor = new BABYLON.Color3(0.0, 0.5, 0.14);
 				bottleMaterial.alpha = 0.8;

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

@@ -90,7 +90,7 @@ export const lavaLamp = defineObject(lavaLamp_schema, {
 		emitter.parent = root;
 		emitter.position = new BABYLON.Vector3(0, cm(10), 0);
 		const ps = new BABYLON.ParticleSystem('', 32, scene);
-		ps.particleTexture = new BABYLON.Texture('/client-assets/room/objects/lava-lamp/bubble.png');
+		ps.particleTexture = new BABYLON.Texture('/client-assets/world/objects/lava-lamp/bubble.png');
 		ps.emitter = emitter;
 		ps.isLocal = true;
 		ps.minEmitBox = new BABYLON.Vector3(cm(-1), 0, cm(-1));

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

@@ -36,11 +36,11 @@ export const petBottle = defineObject(petBottle_schema, {
 
 		const applyVariation = () => {
 			if (options.variation === 'mineral-water') {
-				const tex = new BABYLON.Texture('/client-assets/room/objects/pet-bottle/textures/mineral-water.png', scene, false, false);
+				const tex = new BABYLON.Texture('/client-assets/world/objects/pet-bottle/textures/mineral-water.png', scene, false, false);
 				labelMaterial.albedoTexture = tex;
 				liquidMaterial.albedoColor = new BABYLON.Color3(1, 1, 1);
 			} else if (options.variation === 'green-tea') {
-				const tex = new BABYLON.Texture('/client-assets/room/objects/pet-bottle/textures/green-tea.png', scene, false, false);
+				const tex = new BABYLON.Texture('/client-assets/world/objects/pet-bottle/textures/green-tea.png', scene, false, false);
 				labelMaterial.albedoTexture = tex;
 				liquidMaterial.albedoColor = new BABYLON.Color3(0.56, 0.44, 0);
 			}

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

@@ -16,10 +16,10 @@ export const randomBooks = defineObject(randomBooks_schema, {
 
 		const applyVariation = () => {
 			if (options.variation === 'mix') {
-				const tex = new BABYLON.Texture('/client-assets/room/objects/random-books/textures/mix.png', scene, false, false);
+				const tex = new BABYLON.Texture('/client-assets/world/objects/random-books/textures/mix.png', scene, false, false);
 				bodyMesh.material.albedoTexture = tex;
 			} else if (options.variation === 'mix-plain') {
-				const tex = new BABYLON.Texture('/client-assets/room/objects/random-books/textures/mix-plain.png', scene, false, false);
+				const tex = new BABYLON.Texture('/client-assets/world/objects/random-books/textures/mix-plain.png', scene, false, false);
 				bodyMesh.material.albedoTexture = tex;
 			}
 		};